ソースを参照

图表名称与轴线距离默认值错误问题

zhuth 6 年 前
コミット
935e97f94d

+ 0 - 1
src/components/chartDesigner/charts/echartsView.jsx

@@ -7,7 +7,6 @@ const EchartsView = ({ chartOption }) => {
     if(!chartOption || ((!chartOption.series || chartOption.series.length === 0) && (!chartOption.baseOption || !chartOption.baseOption.series || chartOption.baseOption.series.length === 0))) {
         return <EmptyContent />
     }else {
-        console.log(chartOption);
         return <Echarts
         key={hashcode(chartOption)}
         option={chartOption}

+ 2 - 2
src/components/chartDesigner/sections/style/bar.jsx

@@ -234,7 +234,7 @@ class BarStyle extends React.Component {
                         dispatch({ type: 'chartDesigner/setFields', fields: [
                             { name: 'styleConfig', value: deepAssign(styleConfig, { bar: { xNameGap: value } }) },
                             { name: 'chartOption', value: deepAssign(chartOption, { baseOption: { xAxis: { 0: {
-                                nameGap: (value === '' || value === null || value === undefined) ? 'end' : Number(value)
+                                nameGap: (value === '' || value === null || value === undefined) ? 15 : Number(value)
                             } } } }) },
                         ] });
                     }}
@@ -333,7 +333,7 @@ class BarStyle extends React.Component {
                         dispatch({ type: 'chartDesigner/setFields', fields: [
                             { name: 'styleConfig', value: deepAssign(styleConfig, { bar: { yNameGap: value } }) },
                             { name: 'chartOption', value: deepAssign(chartOption, { baseOption: { yAxis: { 0: {
-                                nameGap: (value === '' || value === null || value === undefined) ? 'end' : Number(value)
+                                nameGap: (value === '' || value === null || value === undefined) ? 15 : Number(value)
                             } } } }) },
                         ] });
                     }}

+ 2 - 3
src/components/chartDesigner/sections/style/line.jsx

@@ -212,7 +212,7 @@ class LineStyle extends React.Component {
                         dispatch({ type: 'chartDesigner/setFields', fields: [
                             { name: 'styleConfig', value: deepAssign(styleConfig, { line: { xNameGap: value } }) },
                             { name: 'chartOption', value: deepAssign(chartOption, { baseOption: { xAxis: { 0: {
-                                nameGap: (value === '' || value === null || value === undefined) ? 'end' : Number(value)
+                                nameGap: (value === '' || value === null || value === undefined) ? 15 : Number(value)
                             } } } }) },
                         ] });
                     }}
@@ -277,7 +277,6 @@ class LineStyle extends React.Component {
                             { name: 'styleConfig', value: deepAssign(styleConfig, { line: { yNameLocation: value } }) },
                             { name: 'chartOption', value: deepAssign(chartOption, { baseOption: { yAxis: { 0: { 
                                 nameLocation: (value === '' || value === null || value === undefined) ? 'end' : value,
-                                name: ((value === '' || value === null || value === undefined) ? 'end' : value) === 'center' ? chartOption.yAxis[0].name.split('').join('\n') : chartOption.yAxis[0].name.replace(/\s/g, '')
                              }} } }) },
                         ] });
                     }}
@@ -296,7 +295,7 @@ class LineStyle extends React.Component {
                         dispatch({ type: 'chartDesigner/setFields', fields: [
                             { name: 'styleConfig', value: deepAssign(styleConfig, { line: { yNameGap: value } }) },
                             { name: 'chartOption', value: deepAssign(chartOption, { baseOption: { yAxis: { 0: {
-                                nameGap: (value === '' || value === null || value === undefined) ? 'end' : Number(value)
+                                nameGap: (value === '' || value === null || value === undefined) ? 15 : Number(value)
                             } } } }) },
                         ] });
                     }}

+ 2 - 2
src/components/chartDesigner/sections/style/scatter.jsx

@@ -99,7 +99,7 @@ class ScatterStyle extends React.Component {
                         dispatch({ type: 'chartDesigner/setFields', fields: [
                             { name: 'styleConfig', value: deepAssign(styleConfig, { scatter: { xNameGap: value } }) },
                             { name: 'chartOption', value: deepAssign(chartOption, { xAxis: { 0: {
-                                nameGap: (value === '' || value === null || value === undefined) ? 'end' : Number(value)
+                                nameGap: (value === '' || value === null || value === undefined) ? 15 : Number(value)
                             } } }) },
                         ] });
                     }}
@@ -182,7 +182,7 @@ class ScatterStyle extends React.Component {
                         dispatch({ type: 'chartDesigner/setFields', fields: [
                             { name: 'styleConfig', value: deepAssign(styleConfig, { scatter: { yNameGap: value } }) },
                             { name: 'chartOption', value: deepAssign(chartOption, { yAxis: { 0: {
-                                nameGap: (value === '' || value === null || value === undefined) ? 'end' : Number(value)
+                                nameGap: (value === '' || value === null || value === undefined) ? 15 : Number(value)
                             } } }) },
                         ] });
                     }}

+ 0 - 1
src/models/parseChartOption.js

@@ -585,7 +585,6 @@ function aggregateTableOption( data, aggregateTableConfig, themeConfig, styleCon
         data: tableData
     };
 
-    console.log(option);
     return option;
 }