Browse Source

主题命名/轴名称不显示统计名

zhuth 6 years ago
parent
commit
30e0421093

+ 2 - 2
src/components/chartDesigner/sections/style/theme/index.js

@@ -11,10 +11,10 @@ export default [{
     config: defaultTheme
 }, {
     name: 'theme1',
-    label: '主题一',
+    label: '昂扬',
     config: theme1
 }, {
     name: 'theme2',
-    label: '主题二',
+    label: '藏拙',
     config: theme2
 }]

+ 4 - 4
src/models/parseChartOption.js

@@ -169,8 +169,8 @@ function lineOption(data, lineConfig, themeConfig, styleConfig) {
         yNameLocation, yNameGap, yNameRotate, stack, labelVisible, labelPosition, labelDistance, labelRotate,
         lineSmooth, labelSymbolSize, dataZoomVisible } = styleConfig;
     const { xAxis, yAxis, groupBy } = lineConfig;
-    let xTitle = xAxis?`${xAxis.column.label}${xAxis.granularity.value?'('+xAxis.granularity.label+')':''}`:null
-    let yTitle = yAxis?`${yAxis.column.label}${yAxis.gauge.value?'('+yAxis.gauge.label+')':''}`:null
+    let xTitle = xAxis?`${xAxis.column.label}`:null
+    let yTitle = yAxis?`${yAxis.column.label}`:null
     let hasGroupBy = !!groupBy && !!groupBy.key;
     let legendVisible = hasGroupBy;
     data.serieses = data.serieses || [];
@@ -344,8 +344,8 @@ function pieOption(data, pieConfig, themeConfig, styleConfig) {
 function scatterOption(data, scatterConfig, themeConfig, styleConfig) {
     const { labelSymbol, xNameLocation, xNameGap, xNameRotate, yNameLocation, yNameGap, yNameRotate, labelSymbolSize, dataZoomVisible } = styleConfig;
     const { xAxis, yAxis, groupBy } = scatterConfig;
-    let xTitle = xAxis?`${xAxis.column.label}${xAxis.granularity.value?'('+xAxis.granularity.label+')':''}`:null
-    let yTitle = yAxis?`${yAxis.column.label}${yAxis.gauge.value?'('+yAxis.gauge.label+')':''}`:null;
+    let xTitle = xAxis?`${xAxis.column.label}`:null
+    let yTitle = yAxis?`${yAxis.column.label}`:null;
     let hasGroupBy = !!groupBy && !!groupBy.key;
     let legendVisible = hasGroupBy;
     

+ 5 - 0
src/themes/default/base.less

@@ -182,6 +182,11 @@
     font-size: 12px;
 }
 
+// 登录框图标
+.ant-input-affix-wrapper .ant-input-prefix, .ant-input-affix-wrapper .ant-input-suffix {
+    background-color: transparent;
+}
+
 
 // 滚动条
 *::-webkit-scrollbar {