diff --git a/core/frontend/src/views/chart/view/ChartEdit.vue b/core/frontend/src/views/chart/view/ChartEdit.vue index 9107e9c61a..3cd0d5dd38 100644 --- a/core/frontend/src/views/chart/view/ChartEdit.vue +++ b/core/frontend/src/views/chart/view/ChartEdit.vue @@ -2098,6 +2098,13 @@ export default { if (newVal.type === oldVal.type && newVal.render === oldVal.render && newVal.isPlugin === oldVal.isPlugin) { return } + if (newVal.render === 'antv' && newVal.type === 'chart-mix') { + // 针对antv组合图,清理自定义排序 + this.view.xaxis.forEach(x => { + x.customSort = [] + x.sort = 'none' + }) + } this.setChartDefaultOptions() this.calcData(true, 'chart', true, newVal.type !== oldVal.type, newVal.render !== oldVal.render) } diff --git a/extensions/dataease-extensions-view/view-chartmix/build.sh b/extensions/dataease-extensions-view/view-chartmix/build.sh index 008e6c4823..950a7b59e0 100644 --- a/extensions/dataease-extensions-view/view-chartmix/build.sh +++ b/extensions/dataease-extensions-view/view-chartmix/build.sh @@ -1,8 +1,8 @@ #!/bin/sh mvn clean package -cp view-chartmix-backend/target/view-chartmix-backend-1.18.11.jar . +cp view-chartmix-backend/target/view-chartmix-backend-1.18.12.jar . -zip -r chartmix.zip ./view-chartmix-backend-1.18.11.jar ./plugin.json +zip -r chartmix.zip ./view-chartmix-backend-1.18.12.jar ./plugin.json -rm -f ./view-chartmix-backend-1.18.11.jar +rm -f ./view-chartmix-backend-1.18.12.jar diff --git a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/views/DimensionItem.vue b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/views/DimensionItem.vue index d05065b2db..2fe99cf058 100644 --- a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/views/DimensionItem.vue +++ b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/views/DimensionItem.vue @@ -89,10 +89,10 @@ {{ $t('chart.none') }} {{ $t('chart.asc') }} {{ $t('chart.desc') }} - {{ $t('chart.custom_sort') }}... + >{{ $t('chart.custom_sort') }}...-->