diff --git a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/index.vue b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/index.vue index 7b8de49534..859c8a445b 100644 --- a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/index.vue +++ b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/index.vue @@ -390,13 +390,23 @@ export default { item.value = valueFormatter(item.data.value, yaxisExtList[item.data.i].formatterCfg) } }) - return filter(originalItems, (item) => { - const v = item.data.key; - if (item.title === v && item.title === item.value && item.name === "key" || !names.includes(item.name)) { - return false; + + // 由于只会触发一个scatter,所以针对scatter的进行一次过滤,只保留一个scatter的值 + let hasScatter = false; + + const list = filter(originalItems, (item) => { + if (item.data.chartType === 'scatter') { + if (!hasScatter) { + hasScatter = true; + item.name = item.data.name; + } else { + return false; + } } + return true; }) + return list; } } : false; @@ -721,12 +731,15 @@ export default { const setting = { type: _chartType, options: { - data: data, + data: map(data, (d) => { + d.chartType = _chartType + return d + }), xField: 'key', yField: 'value', seriesField: 'name', colorField: 'name', - isGroup: true, + isGroup: _chartType === "column" ? true : undefined, meta: { key: { sync: true, @@ -776,11 +789,15 @@ export default { const setting = { type: _chartType, options: { - data: data, + data: map(data, (d) => { + d.chartType = _chartType + return d + }), xField: 'key', yField: 'value', seriesField: 'name', - isGroup: true, + colorField: 'name', + isGroup: _chartType === "column" ? true : undefined, meta: { key: { sync: true,