From 48199eb2710401f5fc3235d9307ed9e4b2b83ec4 Mon Sep 17 00:00:00 2001
From: ulleo <ulleo.wang@gmail.com>
Date: Thu, 16 Nov 2023 14:25:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20antv=E7=BB=84=E5=90=88=E5=9B=BE=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6=20=E6=95=B0=E5=80=BC=E6=A0=BC=E5=BC=8F=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E6=B8=85=E9=99=A4=E4=B8=8A=E4=B8=80=E4=B8=AA=E6=8C=87?=
 =?UTF-8?q?=E6=A0=87=E7=9A=84=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extensions/dataease-extensions-view/view-chartmix/build.sh | 6 +++---
 .../dataease-extensions-view/view-chartmix/plugin.json     | 2 +-
 .../src/components/views/QuotaExtItem.vue                  | 7 ++++++-
 .../src/components/views/QuotaItem.vue                     | 7 ++++++-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/extensions/dataease-extensions-view/view-chartmix/build.sh b/extensions/dataease-extensions-view/view-chartmix/build.sh
index 950a7b59e0..d272e61077 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.12.jar .
+cp view-chartmix-backend/target/view-chartmix-backend-1.18.13.jar .
 
-zip -r chartmix.zip  ./view-chartmix-backend-1.18.12.jar ./plugin.json
+zip -r chartmix.zip  ./view-chartmix-backend-1.18.13.jar ./plugin.json
 
-rm -f ./view-chartmix-backend-1.18.12.jar
+rm -f ./view-chartmix-backend-1.18.13.jar
diff --git a/extensions/dataease-extensions-view/view-chartmix/plugin.json b/extensions/dataease-extensions-view/view-chartmix/plugin.json
index afc373ab45..d6f73d3385 100644
--- a/extensions/dataease-extensions-view/view-chartmix/plugin.json
+++ b/extensions/dataease-extensions-view/view-chartmix/plugin.json
@@ -5,7 +5,7 @@
     "cost": 0,
     "category": "view",
     "descript": "AntV G2Plot 组合图插件",
-    "version": "1.18.11",
+    "version": "1.18.13",
     "creator": "DATAEASE",
     "moduleName": "view-chartmix-backend",
     "require": "1.18.11",
diff --git a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/views/QuotaExtItem.vue b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/views/QuotaExtItem.vue
index 826d1394e9..36557dbf52 100644
--- a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/views/QuotaExtItem.vue
+++ b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/views/QuotaExtItem.vue
@@ -152,9 +152,10 @@
 </template>
 
 <script>
-import {compareItem} from '@/utils/compare'
+import {compareItem} from '../../utils/compare'
 import {getItemType, getOriginFieldName, resetValueFormatter, quotaViews} from './utils'
 import FieldErrorTips from './FieldErrorTips'
+import {formatterItem} from "../../utils/map";
 
 export default {
   name: 'QuotaExtItem',
@@ -188,6 +189,7 @@ export default {
   data() {
     return {
       compareItem: compareItem,
+      formatterItem: formatterItem,
       disableEditCompare: false,
       tagType: 'success',
       quotaViews: quotaViews
@@ -216,6 +218,9 @@ export default {
       if (!this.item.compareCalc) {
         this.item.compareCalc = JSON.parse(JSON.stringify(this.compareItem))
       }
+      if (!this.item.formatterCfg) {
+        this.item.formatterCfg = JSON.parse(JSON.stringify(this.formatterItem))
+      }
     },
     isEnableCompare() {
       let xAxis = null
diff --git a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/views/QuotaItem.vue b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/views/QuotaItem.vue
index 9eb9dbaf68..a862787359 100644
--- a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/views/QuotaItem.vue
+++ b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/views/QuotaItem.vue
@@ -152,9 +152,10 @@
 </template>
 
 <script>
-import {compareItem} from '@/utils/compare'
+import {compareItem} from '../../utils/compare'
 import {getItemType, getOriginFieldName, resetValueFormatter, quotaViews} from './utils'
 import FieldErrorTips from './FieldErrorTips'
+import {formatterItem} from "../../utils/map";
 
 export default {
   name: 'QuotaItem',
@@ -188,6 +189,7 @@ export default {
   data() {
     return {
       compareItem: compareItem,
+      formatterItem: formatterItem,
       disableEditCompare: false,
       tagType: 'success',
       quotaViews: quotaViews
@@ -213,6 +215,9 @@ export default {
       if (!this.item.compareCalc) {
         this.item.compareCalc = JSON.parse(JSON.stringify(this.compareItem))
       }
+      if (!this.item.formatterCfg) {
+        this.item.formatterCfg = JSON.parse(JSON.stringify(this.formatterItem))
+      }
     },
     isEnableCompare() {
       let xAxis = null