diff --git a/data-room-ui/packages/BasicComponents/Candlestick/index.vue b/data-room-ui/packages/BasicComponents/Candlestick/index.vue index 9cafe386..d03f0cc9 100644 --- a/data-room-ui/packages/BasicComponents/Candlestick/index.vue +++ b/data-room-ui/packages/BasicComponents/Candlestick/index.vue @@ -141,11 +141,11 @@ export default { */ handleOption (config) { this.option = { - xAxis: [ + xAxis: { show: true, name: config.customize.xAxis.name, - nameGap: 30, + nameGap: config.customize.xAxis.nameGap, data: this.xData, nameTextStyle: { color: config.customize.xAxis.nameColor, @@ -178,11 +178,10 @@ export default { }, margin: 30 } - } - ], + }, yAxis: { name: config.customize.yAxis.name, - nameGap: 10, + nameGap: config.customize.yAxis.nameGap, nameTextStyle: { color: config.customize.yAxis.nameColor, fontSize: config.customize.yAxis.nameSize diff --git a/data-room-ui/packages/BasicComponents/Candlestick/setting.vue b/data-room-ui/packages/BasicComponents/Candlestick/setting.vue index b96ff034..0e820ec4 100644 --- a/data-room-ui/packages/BasicComponents/Candlestick/setting.vue +++ b/data-room-ui/packages/BasicComponents/Candlestick/setting.vue @@ -128,6 +128,19 @@ </el-select> </el-form-item> + <el-form-item + label="标题间距" + label-width="100px" + > + <el-input-number + v-model="config.customize.xAxis.nameGap" + class="bs-el-input-number" + placeholder="请输入标题间距" + :min="0" + clearable + /> + </el-form-item> + <el-form-item label="标题字体大小" label-width="100px" @@ -247,6 +260,18 @@ /> </el-select> </el-form-item> + <el-form-item + label="标题间距" + label-width="100px" + > + <el-input-number + v-model="config.customize.yAxis.nameGap" + class="bs-el-input-number" + placeholder="请输入标题间距" + :min="0" + clearable + /> + </el-form-item> <el-form-item label="标题字体大小" diff --git a/data-room-ui/packages/BasicComponents/Candlestick/settingConfig.js b/data-room-ui/packages/BasicComponents/Candlestick/settingConfig.js index 7f477e6f..32a5e745 100644 --- a/data-room-ui/packages/BasicComponents/Candlestick/settingConfig.js +++ b/data-room-ui/packages/BasicComponents/Candlestick/settingConfig.js @@ -48,6 +48,7 @@ const customConfig = { bottom: 60, xAxis: { name: '', + nameGap: 30, nameColor: '#fff', nameSize: 16, position: 'end', @@ -60,6 +61,7 @@ const customConfig = { }, yAxis: { name: '', + nameGap: 10, nameColor: '#fff', nameSize: 16, position: 'end',