From a49c3512160c6fb3005ea23b4365acb258554639 Mon Sep 17 00:00:00 2001
From: ulleo <ulleo.wang@gmail.com>
Date: Tue, 31 Oct 2023 16:45:12 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20antv=E7=BB=84=E5=90=88=E5=9B=BE?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E5=8E=BB=E9=99=A4=E7=BB=B4=E5=BA=A6=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/frontend/src/views/chart/view/ChartEdit.vue           | 7 +++++++
 extensions/dataease-extensions-view/view-chartmix/build.sh | 6 +++---
 .../src/components/views/DimensionItem.vue                 | 4 ++--
 3 files changed, 12 insertions(+), 5 deletions(-)

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 @@
                 <el-dropdown-item :command="beforeSort('none')">{{ $t('chart.none') }}</el-dropdown-item>
                 <el-dropdown-item :command="beforeSort('asc')">{{ $t('chart.asc') }}</el-dropdown-item>
                 <el-dropdown-item :command="beforeSort('desc')">{{ $t('chart.desc') }}</el-dropdown-item>
-                <el-dropdown-item
+<!--                <el-dropdown-item
                   v-show="!item.chartId && (item.deType === 0 || item.deType === 5)"
                   :command="beforeSort('custom_sort')"
-                >{{ $t('chart.custom_sort') }}...</el-dropdown-item>
+                >{{ $t('chart.custom_sort') }}...</el-dropdown-item>-->
               </el-dropdown-menu>
             </el-dropdown>
           </el-dropdown-item>