|
|
@@ -23,8 +23,6 @@ class BarStyle extends React.Component {
|
|
|
const { styleConfig, chartOption, barConfig } = chartDesigner;
|
|
|
const { groupBy } = barConfig;
|
|
|
const barStyle = styleConfig.bar || {};
|
|
|
- chartOption.baseOption = chartOption.baseOption || {};
|
|
|
- chartOption.baseOption.series = chartOption.baseOption.series || [];
|
|
|
|
|
|
return <Form>
|
|
|
<Divider>柱条</Divider>
|
|
|
@@ -34,30 +32,35 @@ class BarStyle extends React.Component {
|
|
|
placeholder='80'
|
|
|
onBlur={e => {
|
|
|
let value = e.target.value;
|
|
|
- let seriesArr = [];
|
|
|
- for(let i = 0; i < chartOption.baseOption.series.length; i++) {
|
|
|
- seriesArr.push({
|
|
|
- barMaxWidth: value || '80'
|
|
|
- });
|
|
|
- }
|
|
|
- dispatch({ type: 'chartDesigner/setFields', fields: [
|
|
|
- { name: 'styleConfig', value: deepAssign(styleConfig, { bar: { barMaxWidth: value } }) },
|
|
|
- { name: 'chartOption', value: deepAssign(chartOption, { baseOption: { series: seriesArr } } ) },
|
|
|
- ] });
|
|
|
- }}
|
|
|
- onKeyDown={e => {
|
|
|
- if(e.keyCode === 13) {
|
|
|
- let value = e.target.value;
|
|
|
+ let fields = [{ name: 'styleConfig', value: deepAssign(styleConfig, { bar: { barMaxWidth: value } }) }];
|
|
|
+ if(!!chartOption.baseOption) {
|
|
|
let seriesArr = [];
|
|
|
for(let i = 0; i < chartOption.baseOption.series.length; i++) {
|
|
|
seriesArr.push({
|
|
|
barMaxWidth: value || '80'
|
|
|
});
|
|
|
}
|
|
|
- dispatch({ type: 'chartDesigner/setFields', fields: [
|
|
|
- { name: 'styleConfig', value: deepAssign(styleConfig, { bar: { barMaxWidth: value } }) },
|
|
|
- { name: 'chartOption', value: deepAssign(chartOption, { baseOption: { series: seriesArr } } ) },
|
|
|
- ] });
|
|
|
+ fields.push({ name: 'chartOption', value: deepAssign(chartOption, { baseOption: { series: seriesArr } } ) });
|
|
|
+ }
|
|
|
+
|
|
|
+ dispatch({ type: 'chartDesigner/setFields', fields });
|
|
|
+ }}
|
|
|
+ onKeyDown={e => {
|
|
|
+ if(e.keyCode === 13) {
|
|
|
+ let value = e.target.value;
|
|
|
+ let fields = [
|
|
|
+ { name: 'styleConfig', value: deepAssign(styleConfig, { bar: { barMaxWidth: value } }) }
|
|
|
+ ]
|
|
|
+ if(!!chartOption.baseOption) {
|
|
|
+ let seriesArr = [];
|
|
|
+ for(let i = 0; i < chartOption.baseOption.series.length; i++) {
|
|
|
+ seriesArr.push({
|
|
|
+ barMaxWidth: value || '80'
|
|
|
+ });
|
|
|
+ }
|
|
|
+ fields.push({ name: 'chartOption', value: deepAssign(chartOption, { baseOption: { series: seriesArr } } ) });
|
|
|
+ }
|
|
|
+ dispatch({ type: 'chartDesigner/setFields', fields });
|
|
|
}
|
|
|
}}
|
|
|
/>
|
|
|
@@ -68,30 +71,32 @@ class BarStyle extends React.Component {
|
|
|
placeholder={0}
|
|
|
onBlur={e => {
|
|
|
let value = e.target.value;
|
|
|
- let seriesArr = [];
|
|
|
- for(let i = 0; i < chartOption.baseOption.series.length; i++) {
|
|
|
- seriesArr.push({
|
|
|
- barMinHeight: value || 0
|
|
|
- });
|
|
|
+ let fields = [{ name: 'styleConfig', value: deepAssign(styleConfig, { bar: { barMinHeight: value } }) }];
|
|
|
+ if(!!chartOption.baseOption) {
|
|
|
+ let seriesArr = [];
|
|
|
+ for(let i = 0; i < chartOption.baseOption.series.length; i++) {
|
|
|
+ seriesArr.push({
|
|
|
+ barMinHeight: value || 0
|
|
|
+ });
|
|
|
+ }
|
|
|
+ fields.push({ name: 'chartOption', value: deepAssign(chartOption, { baseOption: { series: seriesArr } }) });
|
|
|
}
|
|
|
- dispatch({ type: 'chartDesigner/setFields', fields: [
|
|
|
- { name: 'styleConfig', value: deepAssign(styleConfig, { bar: { barMinHeight: value } }) },
|
|
|
- { name: 'chartOption', value: deepAssign(chartOption, { baseOption: { series: seriesArr } }) },
|
|
|
- ] });
|
|
|
+ dispatch({ type: 'chartDesigner/setFields', fields });
|
|
|
}}
|
|
|
onKeyDown={e => {
|
|
|
if(e.keyCode === 13) {
|
|
|
let value = e.target.value;
|
|
|
+ let fields = [{ name: 'styleConfig', value: deepAssign(styleConfig, { bar: { barMinHeight: value } }) }];
|
|
|
+ if(!!chartOption.baseOption) {
|
|
|
let seriesArr = [];
|
|
|
for(let i = 0; i < chartOption.baseOption.series.length; i++) {
|
|
|
seriesArr.push({
|
|
|
barMinHeight: value || 0
|
|
|
});
|
|
|
}
|
|
|
- dispatch({ type: 'chartDesigner/setFields', fields: [
|
|
|
- { name: 'styleConfig', value: deepAssign(styleConfig, { bar: { barMinHeight: value } }) },
|
|
|
- { name: 'chartOption', value: deepAssign(chartOption, { baseOption: { series: seriesArr } }) },
|
|
|
- ] });
|
|
|
+ fields.push({ name: 'chartOption', value: deepAssign(chartOption, { baseOption: { series: seriesArr } }) });
|
|
|
+ }
|
|
|
+ dispatch({ type: 'chartDesigner/setFields', fields });
|
|
|
}
|
|
|
}}
|
|
|
/>
|
|
|
@@ -102,30 +107,32 @@ class BarStyle extends React.Component {
|
|
|
placeholder={'30%'}
|
|
|
onBlur={e => {
|
|
|
let value = e.target.value;
|
|
|
- let seriesArr = [];
|
|
|
- for(let i = 0; i < chartOption.baseOption.series.length; i++) {
|
|
|
- seriesArr.push({
|
|
|
- barGap: value || '30%'
|
|
|
- });
|
|
|
- }
|
|
|
- dispatch({ type: 'chartDesigner/setFields', fields: [
|
|
|
- { name: 'styleConfig', value: deepAssign(styleConfig, { bar: { barGap: value } }) },
|
|
|
- { name: 'chartOption', value: deepAssign(chartOption, { baseOption: { series: seriesArr } }) },
|
|
|
- ] });
|
|
|
- }}
|
|
|
- onKeyDown={e => {
|
|
|
- if(e.keyCode === 13) {
|
|
|
- let value = e.target.value;
|
|
|
+ let fields = [{ name: 'styleConfig', value: deepAssign(styleConfig, { bar: { barGap: value } }) }];
|
|
|
+ if(!!chartOption.baseOption) {
|
|
|
let seriesArr = [];
|
|
|
for(let i = 0; i < chartOption.baseOption.series.length; i++) {
|
|
|
seriesArr.push({
|
|
|
barGap: value || '30%'
|
|
|
});
|
|
|
}
|
|
|
- dispatch({ type: 'chartDesigner/setFields', fields: [
|
|
|
- { name: 'styleConfig', value: deepAssign(styleConfig, { bar: { barGap: value } }) },
|
|
|
- { name: 'chartOption', value: deepAssign(chartOption, { baseOption: { series: seriesArr } }) },
|
|
|
- ] });
|
|
|
+ fields.push({ name: 'chartOption', value: deepAssign(chartOption, { baseOption: { series: seriesArr } }) });
|
|
|
+ }
|
|
|
+ dispatch({ type: 'chartDesigner/setFields', fields });
|
|
|
+ }}
|
|
|
+ onKeyDown={e => {
|
|
|
+ if(e.keyCode === 13) {
|
|
|
+ let value = e.target.value;
|
|
|
+ let fields = [{ name: 'styleConfig', value: deepAssign(styleConfig, { bar: { barGap: value } }) }];
|
|
|
+ if(!!chartOption.baseOption) {
|
|
|
+ let seriesArr = [];
|
|
|
+ for(let i = 0; i < chartOption.baseOption.series.length; i++) {
|
|
|
+ seriesArr.push({
|
|
|
+ barGap: value || '30%'
|
|
|
+ });
|
|
|
+ }
|
|
|
+ fields.push({ name: 'chartOption', value: deepAssign(chartOption, { baseOption: { series: seriesArr } }) });
|
|
|
+ }
|
|
|
+ dispatch({ type: 'chartDesigner/setFields', fields });
|
|
|
}
|
|
|
}}
|
|
|
/>
|
|
|
@@ -138,17 +145,18 @@ class BarStyle extends React.Component {
|
|
|
checked={!!barStyle.labelVisible}
|
|
|
onChange={e => {
|
|
|
let checked = e.target.checked;
|
|
|
- let seriesArr = [];
|
|
|
- for(let i = 0; i < chartOption.baseOption.series.length; i++) {
|
|
|
- seriesArr.push({
|
|
|
- label: { normal: { show: checked } },
|
|
|
- labelLine: { normal: { show: checked } }
|
|
|
- });
|
|
|
+ let fields = [{ name: 'styleConfig', value: deepAssign(styleConfig, { bar: { labelVisible: checked } }) }];
|
|
|
+ if(!!chartOption.baseOption) {
|
|
|
+ let seriesArr = [];
|
|
|
+ for(let i = 0; i < chartOption.baseOption.series.length; i++) {
|
|
|
+ seriesArr.push({
|
|
|
+ label: { normal: { show: checked } },
|
|
|
+ labelLine: { normal: { show: checked } }
|
|
|
+ });
|
|
|
+ }
|
|
|
+ fields.push({ name: 'chartOption', value: deepAssign(chartOption, { baseOption: { series: seriesArr } }) });
|
|
|
}
|
|
|
- dispatch({ type: 'chartDesigner/setFields', fields: [
|
|
|
- { name: 'styleConfig', value: deepAssign(styleConfig, { bar: { labelVisible: checked } }) },
|
|
|
- { name: 'chartOption', value: deepAssign(chartOption, { baseOption: { series: seriesArr } }) },
|
|
|
- ] });
|
|
|
+ dispatch({ type: 'chartDesigner/setFields', fields });
|
|
|
}}
|
|
|
/>
|
|
|
</FormItem>
|
|
|
@@ -159,22 +167,24 @@ class BarStyle extends React.Component {
|
|
|
checked={!!barStyle.labelZeroVisible}
|
|
|
onChange={e => {
|
|
|
let checked = e.target.checked;
|
|
|
- let seriesArr = [];
|
|
|
- for(let i = 0; i < chartOption.baseOption.series.length; i++) {
|
|
|
- seriesArr.push({
|
|
|
- label: { normal: {
|
|
|
- formatterKey: checked,
|
|
|
- formatter: !checked ? (params) => {
|
|
|
- const { value } = params;
|
|
|
- return value === 0 ? '' : value;
|
|
|
- } : '{c}'
|
|
|
- } },
|
|
|
- });
|
|
|
+ let fields = [{ name: 'styleConfig', value: deepAssign(styleConfig, { bar: { labelZeroVisible: checked } }) }];
|
|
|
+ if(!!chartOption.baseOption) {
|
|
|
+ let seriesArr = [];
|
|
|
+ for(let i = 0; i < chartOption.baseOption.series.length; i++) {
|
|
|
+ seriesArr.push({
|
|
|
+ label: { normal: {
|
|
|
+ formatterKey: checked,
|
|
|
+ formatter: !checked ? (params) => {
|
|
|
+ const { value } = params;
|
|
|
+ return value === 0 ? '' : value;
|
|
|
+ } : '{c}'
|
|
|
+ } },
|
|
|
+ });
|
|
|
+ }
|
|
|
+ fields.push({ name: 'chartOption', value: deepAssign(chartOption, { baseOption: { series: seriesArr } }) });
|
|
|
}
|
|
|
- dispatch({ type: 'chartDesigner/setFields', fields: [
|
|
|
- { name: 'styleConfig', value: deepAssign(styleConfig, { bar: { labelZeroVisible: checked } }) },
|
|
|
- { name: 'chartOption', value: deepAssign(chartOption, { baseOption: { series: seriesArr } }) },
|
|
|
- ] });
|
|
|
+
|
|
|
+ dispatch({ type: 'chartDesigner/setFields', fields });
|
|
|
}}
|
|
|
/>
|
|
|
</FormItem>}
|
|
|
@@ -184,16 +194,17 @@ class BarStyle extends React.Component {
|
|
|
<Select
|
|
|
defaultValue={barStyle.labelPosition || 'inside'}
|
|
|
onChange={(value, item) => {
|
|
|
- let seriesArr = [];
|
|
|
- for(let i = 0; i < chartOption.baseOption.series.length; i++) {
|
|
|
- seriesArr.push({
|
|
|
- label: { normal: { position: value } }
|
|
|
- });
|
|
|
+ let fields = [{ name: 'styleConfig', value: deepAssign(styleConfig, { bar: { labelPosition: value } }) }];
|
|
|
+ if(!!chartOption.baseOption) {
|
|
|
+ let seriesArr = [];
|
|
|
+ for(let i = 0; i < chartOption.baseOption.series.length; i++) {
|
|
|
+ seriesArr.push({
|
|
|
+ label: { normal: { position: value } }
|
|
|
+ });
|
|
|
+ }
|
|
|
+ fields.push({ name: 'chartOption', value: deepAssign(chartOption, { baseOption: { series: seriesArr } }) });
|
|
|
}
|
|
|
- dispatch({ type: 'chartDesigner/setFields', fields: [
|
|
|
- { name: 'styleConfig', value: deepAssign(styleConfig, { bar: { labelPosition: value } }) },
|
|
|
- { name: 'chartOption', value: deepAssign(chartOption, { baseOption: { series: seriesArr } }) },
|
|
|
- ] });
|
|
|
+ dispatch({ type: 'chartDesigner/setFields', fields });
|
|
|
}}
|
|
|
>
|
|
|
<Select.Option value='top'>外上</Select.Option>
|
|
|
@@ -217,22 +228,8 @@ class BarStyle extends React.Component {
|
|
|
placeholder={5}
|
|
|
onBlur={e => {
|
|
|
let value = e.target.value;
|
|
|
- let seriesArr = [];
|
|
|
- for(let i = 0; i < chartOption.baseOption.series.length; i++) {
|
|
|
- seriesArr.push({
|
|
|
- label: {
|
|
|
- normal: { distance: (value === '' || value === null || value === undefined) ? 5 : Number(value) }
|
|
|
- }
|
|
|
- });
|
|
|
- }
|
|
|
- dispatch({ type: 'chartDesigner/setFields', fields: [
|
|
|
- { name: 'styleConfig', value: deepAssign(styleConfig, { bar: { labelDistance: value } }) },
|
|
|
- { name: 'chartOption', value: deepAssign(chartOption, { baseOption: { series: seriesArr } }) },
|
|
|
- ] });
|
|
|
- }}
|
|
|
- onKeyDown={e => {
|
|
|
- if(e.keyCode === 13) {
|
|
|
- let value = e.target.value;
|
|
|
+ let fields = [{ name: 'styleConfig', value: deepAssign(styleConfig, { bar: { labelDistance: value } }) }];
|
|
|
+ if(!!chartOption.baseOption) {
|
|
|
let seriesArr = [];
|
|
|
for(let i = 0; i < chartOption.baseOption.series.length; i++) {
|
|
|
seriesArr.push({
|
|
|
@@ -241,10 +238,26 @@ class BarStyle extends React.Component {
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
- dispatch({ type: 'chartDesigner/setFields', fields: [
|
|
|
- { name: 'styleConfig', value: deepAssign(styleConfig, { bar: { labelDistance: value } }) },
|
|
|
- { name: 'chartOption', value: deepAssign(chartOption, { baseOption: { series: seriesArr } }) },
|
|
|
- ] });
|
|
|
+ fields.push({ name: 'chartOption', value: deepAssign(chartOption, { baseOption: { series: seriesArr } }) });
|
|
|
+ }
|
|
|
+ dispatch({ type: 'chartDesigner/setFields', fields });
|
|
|
+ }}
|
|
|
+ onKeyDown={e => {
|
|
|
+ if(e.keyCode === 13) {
|
|
|
+ let value = e.target.value;
|
|
|
+ let fields = [{ name: 'styleConfig', value: deepAssign(styleConfig, { bar: { labelDistance: value } }) }];
|
|
|
+ if(!!chartOption.baseOption) {
|
|
|
+ let seriesArr = [];
|
|
|
+ for(let i = 0; i < chartOption.baseOption.series.length; i++) {
|
|
|
+ seriesArr.push({
|
|
|
+ label: {
|
|
|
+ normal: { distance: (value === '' || value === null || value === undefined) ? 5 : Number(value) }
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
+ fields.push({ name: 'chartOption', value: deepAssign(chartOption, { baseOption: { series: seriesArr } }) });
|
|
|
+ }
|
|
|
+ dispatch({ type: 'chartDesigner/setFields', fields });
|
|
|
}
|
|
|
}}
|
|
|
/>
|
|
|
@@ -255,22 +268,8 @@ class BarStyle extends React.Component {
|
|
|
placeholder={0}
|
|
|
onBlur={e => {
|
|
|
let value = e.target.value;
|
|
|
- let seriesArr = [];
|
|
|
- for(let i = 0; i < chartOption.baseOption.series.length; i++) {
|
|
|
- seriesArr.push({
|
|
|
- label: {
|
|
|
- normal: { rotate: (value === '' || value === null || value === undefined) ? 0 : Number(value) }
|
|
|
- }
|
|
|
- });
|
|
|
- }
|
|
|
- dispatch({ type: 'chartDesigner/setFields', fields: [
|
|
|
- { name: 'styleConfig', value: deepAssign(styleConfig, { bar: { labelRotate: value } }) },
|
|
|
- { name: 'chartOption', value: deepAssign(chartOption, { baseOption: { series: seriesArr } }) },
|
|
|
- ] });
|
|
|
- }}
|
|
|
- onKeyDown={e => {
|
|
|
- if(e.keyCode === 13) {
|
|
|
- let value = e.target.value;
|
|
|
+ let fields = [{ name: 'styleConfig', value: deepAssign(styleConfig, { bar: { labelRotate: value } }) }];
|
|
|
+ if(!!chartOption.baseOption) {
|
|
|
let seriesArr = [];
|
|
|
for(let i = 0; i < chartOption.baseOption.series.length; i++) {
|
|
|
seriesArr.push({
|
|
|
@@ -279,10 +278,26 @@ class BarStyle extends React.Component {
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
- dispatch({ type: 'chartDesigner/setFields', fields: [
|
|
|
- { name: 'styleConfig', value: deepAssign(styleConfig, { bar: { labelRotate: value } }) },
|
|
|
- { name: 'chartOption', value: deepAssign(chartOption, { baseOption: { series: seriesArr } }) },
|
|
|
- ] });
|
|
|
+ fields.push({ name: 'chartOption', value: deepAssign(chartOption, { baseOption: { series: seriesArr } }) });
|
|
|
+ }
|
|
|
+ dispatch({ type: 'chartDesigner/setFields', fields });
|
|
|
+ }}
|
|
|
+ onKeyDown={e => {
|
|
|
+ if(e.keyCode === 13) {
|
|
|
+ let value = e.target.value;
|
|
|
+ let fields = [{ name: 'styleConfig', value: deepAssign(styleConfig, { bar: { labelRotate: value } }) }];
|
|
|
+ if(!!chartOption.baseOption) {
|
|
|
+ let seriesArr = [];
|
|
|
+ for(let i = 0; i < chartOption.baseOption.series.length; i++) {
|
|
|
+ seriesArr.push({
|
|
|
+ label: {
|
|
|
+ normal: { rotate: (value === '' || value === null || value === undefined) ? 0 : Number(value) }
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
+ fields.push({ name: 'chartOption', value: deepAssign(chartOption, { baseOption: { series: seriesArr } }) });
|
|
|
+ }
|
|
|
+ dispatch({ type: 'chartDesigner/setFields', fields });
|
|
|
}
|
|
|
}}
|
|
|
/>
|
|
|
@@ -292,12 +307,13 @@ class BarStyle extends React.Component {
|
|
|
<Select
|
|
|
defaultValue={barStyle.xNameLocation || 'end'}
|
|
|
onChange={(value, item) => {
|
|
|
- dispatch({ type: 'chartDesigner/setFields', fields: [
|
|
|
- { name: 'styleConfig', value: deepAssign(styleConfig, { bar: { xNameLocation: value } }) },
|
|
|
- { name: 'chartOption', value: deepAssign(chartOption, { baseOption: { xAxis: { 0: {
|
|
|
+ let fields = [{ name: 'styleConfig', value: deepAssign(styleConfig, { bar: { xNameLocation: value } }) }];
|
|
|
+ if(!!chartOption.baseOption) {
|
|
|
+ fields.push({ name: 'chartOption', value: deepAssign(chartOption, { baseOption: { xAxis: { 0: {
|
|
|
nameLocation: (value === '' || value === null || value === undefined) ? 'end' : value
|
|
|
- }} } }) },
|
|
|
- ] });
|
|
|
+ }} } }) });
|
|
|
+ }
|
|
|
+ dispatch({ type: 'chartDesigner/setFields', fields });
|
|
|
}}
|
|
|
>
|
|
|
<Select.Option value='start'>头部</Select.Option>
|
|
|
@@ -311,22 +327,24 @@ class BarStyle extends React.Component {
|
|
|
placeholder={15}
|
|
|
onBlur={e => {
|
|
|
let value = e.target.value;
|
|
|
- dispatch({ type: 'chartDesigner/setFields', fields: [
|
|
|
- { name: 'styleConfig', value: deepAssign(styleConfig, { bar: { xNameGap: value } }) },
|
|
|
- { name: 'chartOption', value: deepAssign(chartOption, { baseOption: { xAxis: { 0: {
|
|
|
+ let fields = [{ name: 'styleConfig', value: deepAssign(styleConfig, { bar: { xNameGap: value } }) }];
|
|
|
+ if(!!chartOption.baseOption) {
|
|
|
+ fields.push({ name: 'chartOption', value: deepAssign(chartOption, { baseOption: { xAxis: { 0: {
|
|
|
nameGap: (value === '' || value === null || value === undefined) ? 15 : Number(value)
|
|
|
- } } } }) },
|
|
|
- ] });
|
|
|
+ } } } }) });
|
|
|
+ }
|
|
|
+ dispatch({ type: 'chartDesigner/setFields', fields });
|
|
|
}}
|
|
|
onKeyDown={e => {
|
|
|
if(e.keyCode === 13) {
|
|
|
let value = e.target.value;
|
|
|
- dispatch({ type: 'chartDesigner/setFields', fields: [
|
|
|
- { name: 'styleConfig', value: deepAssign(styleConfig, { bar: { xNameGap: value } }) },
|
|
|
- { name: 'chartOption', value: deepAssign(chartOption, { baseOption: { xAxis: { 0: {
|
|
|
+ let fields = [{ name: 'styleConfig', value: deepAssign(styleConfig, { bar: { xNameGap: value } }) }];
|
|
|
+ if(!!chartOption.baseOption) {
|
|
|
+ fields.push({ name: 'chartOption', value: deepAssign(chartOption, { baseOption: { xAxis: { 0: {
|
|
|
nameGap: (value === '' || value === null || value === undefined) ? 15 : Number(value)
|
|
|
- } } } }) },
|
|
|
- ] });
|
|
|
+ } } } }) });
|
|
|
+ }
|
|
|
+ dispatch({ type: 'chartDesigner/setFields', fields });
|
|
|
}
|
|
|
}}
|
|
|
/>
|
|
|
@@ -337,22 +355,24 @@ class BarStyle extends React.Component {
|
|
|
placeholder={0}
|
|
|
onBlur={e => {
|
|
|
let value = e.target.value;
|
|
|
- dispatch({ type: 'chartDesigner/setFields', fields: [
|
|
|
- { name: 'styleConfig', value: deepAssign(styleConfig, { bar: { xNameRotate: value } }) },
|
|
|
- { name: 'chartOption', value: deepAssign(chartOption, { baseOption: { xAxis: { 0: {
|
|
|
+ let fields = [{ name: 'styleConfig', value: deepAssign(styleConfig, { bar: { xNameRotate: value } }) }];
|
|
|
+ if(!!chartOption.baseOption) {
|
|
|
+ fields.push({ name: 'chartOption', value: deepAssign(chartOption, { baseOption: { xAxis: { 0: {
|
|
|
nameRotate: (value === '' || value === null || value === undefined) ? 0 : Number(value)
|
|
|
- } } } }) },
|
|
|
- ] });
|
|
|
+ } } } }) });
|
|
|
+ }
|
|
|
+ dispatch({ type: 'chartDesigner/setFields', fields });
|
|
|
}}
|
|
|
onKeyDown={e => {
|
|
|
if(e.keyCode === 13) {
|
|
|
let value = e.target.value;
|
|
|
- dispatch({ type: 'chartDesigner/setFields', fields: [
|
|
|
- { name: 'styleConfig', value: deepAssign(styleConfig, { bar: { xNameRotate: value } }) },
|
|
|
- { name: 'chartOption', value: deepAssign(chartOption, { baseOption: { xAxis: { 0: {
|
|
|
+ let fields = [{ name: 'styleConfig', value: deepAssign(styleConfig, { bar: { xNameRotate: value } }) }];
|
|
|
+ if(!!chartOption.baseOption) {
|
|
|
+ fields.push({ name: 'chartOption', value: deepAssign(chartOption, { baseOption: { xAxis: { 0: {
|
|
|
nameRotate: (value === '' || value === null || value === undefined) ? 0 : Number(value)
|
|
|
- } } } }) },
|
|
|
- ] });
|
|
|
+ } } } }) });
|
|
|
+ }
|
|
|
+ dispatch({ type: 'chartDesigner/setFields', fields });
|
|
|
}
|
|
|
}}
|
|
|
/>
|
|
|
@@ -363,14 +383,15 @@ class BarStyle extends React.Component {
|
|
|
checked={barStyle.xLabelHiddenCover === undefined ? true : barStyle.xLabelHiddenCover}
|
|
|
onChange={e => {
|
|
|
let checked = e.target.checked;
|
|
|
- dispatch({ type: 'chartDesigner/setFields', fields: [
|
|
|
- { name: 'styleConfig', value: deepAssign(styleConfig, { bar: { xLabelHiddenCover: checked } }) },
|
|
|
- { name: 'chartOption', value: deepAssign(chartOption, { baseOption: { xAxis: { 0: {
|
|
|
+ let fields = [{ name: 'styleConfig', value: deepAssign(styleConfig, { bar: { xLabelHiddenCover: checked } }) }];
|
|
|
+ if(!!chartOption.baseOption) {
|
|
|
+ fields.push({ name: 'chartOption', value: deepAssign(chartOption, { baseOption: { xAxis: { 0: {
|
|
|
axisLabel: {
|
|
|
interval: checked ? 'auto' : 0
|
|
|
}
|
|
|
- } } } }) },
|
|
|
- ] });
|
|
|
+ } } } }) });
|
|
|
+ }
|
|
|
+ dispatch({ type: 'chartDesigner/setFields', fields });
|
|
|
}}
|
|
|
/>
|
|
|
</FormItem>
|
|
|
@@ -380,26 +401,28 @@ class BarStyle extends React.Component {
|
|
|
placeholder={8}
|
|
|
onBlur={e => {
|
|
|
let value = e.target.value;
|
|
|
- dispatch({ type: 'chartDesigner/setFields', fields: [
|
|
|
- { name: 'styleConfig', value: deepAssign(styleConfig, { bar: { xLabelMargin: value } }) },
|
|
|
- { name: 'chartOption', value: deepAssign(chartOption, { baseOption: { xAxis: { 0: {
|
|
|
+ let fields = [{ name: 'styleConfig', value: deepAssign(styleConfig, { bar: { xLabelMargin: value } }) }];
|
|
|
+ if(!!chartOption.baseOption) {
|
|
|
+ fields.push({ name: 'chartOption', value: deepAssign(chartOption, { baseOption: { xAxis: { 0: {
|
|
|
axisLabel: {
|
|
|
margin: (value === '' || value === null || value === undefined) ? 8 : Number(value)
|
|
|
}
|
|
|
- } } } }) },
|
|
|
- ] });
|
|
|
+ } } } }) });
|
|
|
+ }
|
|
|
+ dispatch({ type: 'chartDesigner/setFields', fields });
|
|
|
}}
|
|
|
onKeyDown={e => {
|
|
|
if(e.keyCode === 13) {
|
|
|
let value = e.target.value;
|
|
|
- dispatch({ type: 'chartDesigner/setFields', fields: [
|
|
|
- { name: 'styleConfig', value: deepAssign(styleConfig, { bar: { xLabelMargin: value } }) },
|
|
|
- { name: 'chartOption', value: deepAssign(chartOption, { baseOption: { xAxis: { 0: {
|
|
|
+ let fields = [{ name: 'styleConfig', value: deepAssign(styleConfig, { bar: { xLabelMargin: value } }) }];
|
|
|
+ if(!!chartOption.baseOption) {
|
|
|
+ fields.push({ name: 'chartOption', value: deepAssign(chartOption, { baseOption: { xAxis: { 0: {
|
|
|
axisLabel: {
|
|
|
margin: (value === '' || value === null || value === undefined) ? 8 : Number(value)
|
|
|
}
|
|
|
- } } } }) },
|
|
|
- ] });
|
|
|
+ } } } }) });
|
|
|
+ }
|
|
|
+ dispatch({ type: 'chartDesigner/setFields', fields });
|
|
|
}
|
|
|
}}
|
|
|
/>
|
|
|
@@ -410,26 +433,28 @@ class BarStyle extends React.Component {
|
|
|
placeholder={0}
|
|
|
onBlur={e => {
|
|
|
let value = e.target.value;
|
|
|
- dispatch({ type: 'chartDesigner/setFields', fields: [
|
|
|
- { name: 'styleConfig', value: deepAssign(styleConfig, { bar: { xLabelRotate: value } }) },
|
|
|
- { name: 'chartOption', value: deepAssign(chartOption, { baseOption: { xAxis: { 0: {
|
|
|
+ let fields = [{ name: 'styleConfig', value: deepAssign(styleConfig, { bar: { xLabelRotate: value } }) }];
|
|
|
+ if(!!chartOption.baseOption) {
|
|
|
+ fields.push({ name: 'chartOption', value: deepAssign(chartOption, { baseOption: { xAxis: { 0: {
|
|
|
axisLabel: {
|
|
|
rotate: (value === '' || value === null || value === undefined) ? 0 : Number(value)
|
|
|
}
|
|
|
- } } } }) },
|
|
|
- ] });
|
|
|
+ } } } }) });
|
|
|
+ }
|
|
|
+ dispatch({ type: 'chartDesigner/setFields', fields });
|
|
|
}}
|
|
|
onKeyDown={e => {
|
|
|
if(e.keyCode === 13) {
|
|
|
let value = e.target.value;
|
|
|
- dispatch({ type: 'chartDesigner/setFields', fields: [
|
|
|
- { name: 'styleConfig', value: deepAssign(styleConfig, { bar: { xLabelRotate: value } }) },
|
|
|
- { name: 'chartOption', value: deepAssign(chartOption, { baseOption: { xAxis: { 0: {
|
|
|
+ let fields = [{ name: 'styleConfig', value: deepAssign(styleConfig, { bar: { xLabelRotate: value } }) }];
|
|
|
+ if(!!chartOption.baseOption) {
|
|
|
+ fields.push({ name: 'chartOption', value: deepAssign(chartOption, { baseOption: { xAxis: { 0: {
|
|
|
axisLabel: {
|
|
|
rotate: (value === '' || value === null || value === undefined) ? 0 : Number(value)
|
|
|
}
|
|
|
- } } } }) },
|
|
|
- ] });
|
|
|
+ } } } }) });
|
|
|
+ }
|
|
|
+ dispatch({ type: 'chartDesigner/setFields', fields });
|
|
|
}
|
|
|
}}
|
|
|
/>
|
|
|
@@ -439,12 +464,13 @@ class BarStyle extends React.Component {
|
|
|
<Select
|
|
|
defaultValue={barStyle.yNameLocation || 'end'}
|
|
|
onChange={(value, item) => {
|
|
|
- dispatch({ type: 'chartDesigner/setFields', fields: [
|
|
|
- { name: 'styleConfig', value: deepAssign(styleConfig, { bar: { yNameLocation: value } }) },
|
|
|
- { name: 'chartOption', value: deepAssign(chartOption, { baseOption: { yAxis: { 0: {
|
|
|
+ let fields = [{ name: 'styleConfig', value: deepAssign(styleConfig, { bar: { yNameLocation: value } }) }];
|
|
|
+ if(!!chartOption.baseOption) {
|
|
|
+ fields.push({ name: 'chartOption', value: deepAssign(chartOption, { baseOption: { yAxis: { 0: {
|
|
|
nameLocation: (value === '' || value === null || value === undefined) ? 'end' : value,
|
|
|
- }} } }) },
|
|
|
- ] });
|
|
|
+ }} } }) });
|
|
|
+ }
|
|
|
+ dispatch({ type: 'chartDesigner/setFields', fields });
|
|
|
}}
|
|
|
>
|
|
|
<Select.Option value='start'>头部</Select.Option>
|
|
|
@@ -458,22 +484,24 @@ class BarStyle extends React.Component {
|
|
|
placeholder={15}
|
|
|
onBlur={e => {
|
|
|
let value = e.target.value;
|
|
|
- dispatch({ type: 'chartDesigner/setFields', fields: [
|
|
|
- { name: 'styleConfig', value: deepAssign(styleConfig, { bar: { yNameGap: value } }) },
|
|
|
- { name: 'chartOption', value: deepAssign(chartOption, { baseOption: { yAxis: { 0: {
|
|
|
+ let fields = [{ name: 'styleConfig', value: deepAssign(styleConfig, { bar: { yNameGap: value } }) }];
|
|
|
+ if(!!chartOption.baseOption) {
|
|
|
+ fields.push({ name: 'chartOption', value: deepAssign(chartOption, { baseOption: { yAxis: { 0: {
|
|
|
nameGap: (value === '' || value === null || value === undefined) ? 15 : Number(value)
|
|
|
- } } } }) },
|
|
|
- ] });
|
|
|
+ } } } }) });
|
|
|
+ }
|
|
|
+ dispatch({ type: 'chartDesigner/setFields', fields });
|
|
|
}}
|
|
|
onKeyDown={e => {
|
|
|
if(e.keyCode === 13) {
|
|
|
let value = e.target.value;
|
|
|
- dispatch({ type: 'chartDesigner/setFields', fields: [
|
|
|
- { name: 'styleConfig', value: deepAssign(styleConfig, { bar: { yNameGap: value } }) },
|
|
|
- { name: 'chartOption', value: deepAssign(chartOption, { baseOption: { yAxis: { 0: {
|
|
|
+ let fields = [{ name: 'styleConfig', value: deepAssign(styleConfig, { bar: { yNameGap: value } }) }];
|
|
|
+ if(!!chartOption.baseOption) {
|
|
|
+ fields.push({ name: 'chartOption', value: deepAssign(chartOption, { baseOption: { yAxis: { 0: {
|
|
|
nameGap: (value === '' || value === null || value === undefined) ? 15 : Number(value)
|
|
|
- } } } }) },
|
|
|
- ] });
|
|
|
+ } } } }) });
|
|
|
+ }
|
|
|
+ dispatch({ type: 'chartDesigner/setFields', fields });
|
|
|
}
|
|
|
}}
|
|
|
/>
|
|
|
@@ -484,22 +512,24 @@ class BarStyle extends React.Component {
|
|
|
placeholder={0}
|
|
|
onBlur={e => {
|
|
|
let value = e.target.value;
|
|
|
- dispatch({ type: 'chartDesigner/setFields', fields: [
|
|
|
- { name: 'styleConfig', value: deepAssign(styleConfig, { bar: { yNameRotate: value } }) },
|
|
|
- { name: 'chartOption', value: deepAssign(chartOption, { baseOption: { yAxis: { 0: {
|
|
|
+ let fields = [{ name: 'styleConfig', value: deepAssign(styleConfig, { bar: { yNameRotate: value } }) }];
|
|
|
+ if(!!chartOption.baseOption) {
|
|
|
+ fields.push({ name: 'chartOption', value: deepAssign(chartOption, { baseOption: { yAxis: { 0: {
|
|
|
nameRotate: (value === '' || value === null || value === undefined) ? 0 : Number(value)
|
|
|
- } } } }) },
|
|
|
- ] });
|
|
|
+ } } } }) });
|
|
|
+ }
|
|
|
+ dispatch({ type: 'chartDesigner/setFields', fields });
|
|
|
}}
|
|
|
onKeyDown={e => {
|
|
|
if(e.keyCode === 13) {
|
|
|
let value = e.target.value;
|
|
|
- dispatch({ type: 'chartDesigner/setFields', fields: [
|
|
|
- { name: 'styleConfig', value: deepAssign(styleConfig, { bar: { yNameRotate: value } }) },
|
|
|
- { name: 'chartOption', value: deepAssign(chartOption, { baseOption: { yAxis: { 0: {
|
|
|
+ let fields = [{ name: 'styleConfig', value: deepAssign(styleConfig, { bar: { yNameRotate: value } }) }];
|
|
|
+ if(!!chartOption.baseOption) {
|
|
|
+ fields.push({ name: 'chartOption', value: deepAssign(chartOption, { baseOption: { yAxis: { 0: {
|
|
|
nameRotate: (value === '' || value === null || value === undefined) ? 0 : Number(value)
|
|
|
- } } } }) },
|
|
|
- ] });
|
|
|
+ } } } }) });
|
|
|
+ }
|
|
|
+ dispatch({ type: 'chartDesigner/setFields', fields });
|
|
|
}
|
|
|
}}
|
|
|
/>
|
|
|
@@ -510,16 +540,17 @@ class BarStyle extends React.Component {
|
|
|
checked={!!barStyle.stack}
|
|
|
onChange={e => {
|
|
|
let checked = e.target.checked;
|
|
|
- let seriesArr = [];
|
|
|
- for(let i = 0; i < chartOption.baseOption.series.length; i++) {
|
|
|
- seriesArr.push({
|
|
|
- stack: checked
|
|
|
- });
|
|
|
+ let fields = [];
|
|
|
+ if(!!chartOption.baseOption) {
|
|
|
+ let seriesArr = [{ name: 'styleConfig', value: deepAssign(styleConfig, { bar: { stack: checked } }) }];
|
|
|
+ for(let i = 0; i < chartOption.baseOption.series.length; i++) {
|
|
|
+ seriesArr.push({
|
|
|
+ stack: checked
|
|
|
+ });
|
|
|
+ }
|
|
|
+ fields.push({ name: 'chartOption', value: deepAssign(chartOption, { baseOption: { series: seriesArr } }) });
|
|
|
}
|
|
|
- dispatch({ type: 'chartDesigner/setFields', fields: [
|
|
|
- { name: 'styleConfig', value: deepAssign(styleConfig, { bar: { stack: checked } }) },
|
|
|
- { name: 'chartOption', value: deepAssign(chartOption, { baseOption: { series: seriesArr } }) },
|
|
|
- ] });
|
|
|
+ dispatch({ type: 'chartDesigner/setFields', fields });
|
|
|
}}
|
|
|
/>
|
|
|
</FormItem>}
|
|
|
@@ -529,14 +560,15 @@ class BarStyle extends React.Component {
|
|
|
checked={!!barStyle.dataZoomVisible}
|
|
|
onChange={e => {
|
|
|
let checked = e.target.checked;
|
|
|
- let legendVisible = chartOption.baseOption.legend ? chartOption.baseOption.legend.show : false;
|
|
|
- dispatch({ type: 'chartDesigner/setFields', fields: [
|
|
|
- { name: 'styleConfig', value: deepAssign(styleConfig, { bar: { dataZoomVisible: checked } }) },
|
|
|
- { name: 'chartOption', value: deepAssign(chartOption, {
|
|
|
+ let fields = [{ name: 'styleConfig', value: deepAssign(styleConfig, { bar: { dataZoomVisible: checked } }) }];
|
|
|
+ if(!!chartOption.baseOption) {
|
|
|
+ let legendVisible = chartOption.baseOption.legend ? chartOption.baseOption.legend.show : false;
|
|
|
+ fields.push({ name: 'chartOption', value: deepAssign(chartOption, {
|
|
|
baseOption: { dataZoom: { show: checked } },
|
|
|
media: EChartsMedia('bar', legendVisible, checked)
|
|
|
- }) },
|
|
|
- ] });
|
|
|
+ }) });
|
|
|
+ }
|
|
|
+ dispatch({ type: 'chartDesigner/setFields', fields });
|
|
|
}}
|
|
|
/>
|
|
|
</FormItem>
|