指标看板name为空的情况/指标看板拍序列允许选中备注字段/指标看板可选列相互过滤

src/components/chartDesigner/charts/indicatorView.jsx

@@ -103,11 +103,16 @@ class IndicatorView extends React.Component {
                                     <div className='over-wrapper' title={d.name}>{d.name === null ? '空' : d.name}</div>
                                 </div>
                             </div>}
-                            <div className='row indicator-key'>
+                            {d.name !== undefined && <div className='row indicator-key'>
                                 <div className='cell c-key'>
                                     <div className='over-wrapper' title={d.key}>{d.key === null ? '空': d.key}</div>
                                 </div>
-                            </div>
+                            </div>}
+                            {d.name === undefined && <div className='row indicator-name'>
+                                <div className='cell c-name'>
+                                    <div className='over-wrapper' title={d.key}>{d.key === null ? '空' : d.key}</div>
+                                </div>
+                            </div>}
                             <div className='row indicator-value'>
                                 <div className='cell c-value'>
                                     <div className='over-wrapper' title={d.value}>{d.value === null ? '--' : d.value}</div>

src/components/chartDesigner/sections/indicatorConfigForm.jsx

@@ -33,7 +33,7 @@ const IndicatorConfigForm = ({ autoRefresh, chartDesigner, dispatch }) => {
 					}}
 					value={indicatorConfig.xAxis.column.value}
 				>
-					{columns.filter(c => c.name !== indicatorConfig.yAxis.column.value).map((c, i)=>{
+					{columns.filter(c => [indicatorConfig.yAxis.column.value, ].concat(indicatorConfig.otherColumn.map(c => c.value)).indexOf(c.name) === -1).map((c, i)=>{
 						return (<Option key={i} value={c.name}>{c.label}</Option>)
 					})}
 				</Select>
@@ -65,7 +65,7 @@ const IndicatorConfigForm = ({ autoRefresh, chartDesigner, dispatch }) => {
 							return <div>{label0}>{path[1].label}</div>
 						}
 					}}
-					options={columns.filter(c => c.name !== indicatorConfig.xAxis.column.value).map((c, i)=>{
+					options={columns.filter(c => [indicatorConfig.xAxis.column.value, ].concat(indicatorConfig.otherColumn.map(c => c.value)).indexOf(c.name) === -1).map((c, i)=>{
 						return {
 							value: c.name,
 							label: c.label,
@@ -161,7 +161,7 @@ const IndicatorConfigForm = ({ autoRefresh, chartDesigner, dispatch }) => {
                         dispatch({ type: 'chartDesigner/changeField', name: 'indicatorConfig', value: { ...indicatorConfig, sortColumn: value }, autoRefresh });
                     }}
                 >
-                    {[indicatorConfig.xAxis.column, indicatorConfig.yAxis.column].filter(x => !!x.value).map((c, i)=>{
+                    {[indicatorConfig.xAxis.column, indicatorConfig.yAxis.column].concat(indicatorConfig.otherColumn).filter(x => !!x.value).map((c, i)=>{
                         return <Option key={c.value} value={c.value}>{c.label}</Option>
                     })}
                 </Select>

src/models/parseChartOption.js

@@ -554,7 +554,7 @@ function indicatorOption(data, indicatorConfig, themeConfig, styleConfig) {
         },
         themeConfig,
         data: (data.serieses || []).map(d => ({
-            name: xAxis.column.type === 'time' ? (moment(d.name).isValid() ? moment(d.name).format('YYYY-MM-DD') : d.name) : d.name,
+            name: xAxis.column.value ? (xAxis.column.type === 'time' ? (moment(d.name).isValid() ? moment(d.name).format('YYYY-MM-DD') : d.name) : d.name) : undefined,
             key: `${yAxis.column.label}(${yAxis.gauge.label})`,
             value: d.value,
             others: otherColumn.map(c => ({