首页 每月数据增加显示KPI 删除测试

feature/2.0-sales-trade
Lei OT 2 years ago
parent 8106d22e28
commit 45236c6bfa

@ -29,14 +29,14 @@ export default observer((props) => {
const _data = dataSource.reduce((r, v) => { const _data = dataSource.reduce((r, v) => {
r.push(v); r.push(v);
if ( ! isEmpty(v[kpiKey])) { // 线 : #F4664A if ( ! isEmpty(v[kpiKey])) { // 线 : #F4664A
r.push({...v, [config.yField]: v[kpiKey], [config.seriesField]: dataFieldAlias[kpiKey].label}); r.push({...v, [config.yField]: v[kpiKey], [config.seriesField]: dataFieldAlias[kpiKey].label, extraLine: true,});
} }
return r; return r;
}, []); }, []);
const mergeLineConfig = merge({ const mergeLineConfig = merge({
color: ['#598cf3', '#F4664A', '#FAAD14'], color: ['#598cf3', '#F4664A', '#FAAD14'],
lineStyle: (data) => { lineStyle: (data) => {
console.log(data); // console.log(data);
if (data[config.seriesField].includes('目标')) { if (data[config.seriesField].includes('目标')) {
return { return {
lineDash: [4, 4], lineDash: [4, 4],

@ -155,7 +155,7 @@ export default observer((props) => {
}))(curObj); }))(curObj);
return r.concat(allMonth, yearRow); return r.concat(allMonth, yearRow);
}, []); }, []);
console.log('sub', tableData, 'del:', delKpiIds); // console.log('sub', tableData, 'del:', delKpiIds);
// return false; // debug: // return false; // debug:
KPIStore.onSubmit(tableData, { delQueue: delKpiIds }).then((res) => { KPIStore.onSubmit(tableData, { delQueue: delKpiIds }).then((res) => {
if (res) { if (res) {

@ -99,7 +99,7 @@ class SearchInput extends React.Component {
}; };
handleChange = (value, option) => { handleChange = (value, option) => {
console.log('invoke denpendencies change', value); // console.log('invoke denpendencies change', value);
this.setState({ value }, () => this.props.onChange(value, option)); this.setState({ value }, () => this.props.onChange(value, option));
}; };

@ -130,11 +130,6 @@ export default observer(() => {
legend: false, legend: false,
meta: { meta: {
...cloneDeep(dataFieldAlias), ...cloneDeep(dataFieldAlias),
// [extProps.yField]: {
// alias: dataFieldAlias[extProps.yField]?.alias || extProps.yField,
// formatter: (v) => dataFieldAlias[extProps.yField]?.formatter(v) || v,
// max: Math.ceil(yMax / 0.95),
// },
}, },
}; };
const [timeDataField, setTimeDataField] = useState('SumML'); const [timeDataField, setTimeDataField] = useState('SumML');
@ -147,7 +142,7 @@ export default observer(() => {
tooltip: { tooltip: {
customItems: (originalItems) => { customItems: (originalItems) => {
// process originalItems, // process originalItems,
const items = originalItems.map((ele) => ({ ...ele, name: dataFieldAlias[key]?.alias || key })); const items = originalItems.map((ele) => ({ ...ele, name: ele.data?.extraLine ? ele.name : (dataFieldAlias[key]?.alias || key) }));
return items; return items;
}, },
}, },

Loading…
Cancel
Save