fix: [AntV组合图/Echarts动态排序图] 维度/指标限制不正确

extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/data.vue

@@ -197,7 +197,9 @@ export default {
     },
 
     addXaxis(e) {
-
+      if (this.view.type !== 'table-info') {
+        this.dragCheckType(this.view.xaxis, 'd')
+      }
       this.dragMoveDuplicate(this.view.xaxis, e)
       /*if (this.view.xaxis.length > 1) {
         this.view.xaxis = [this.view.xaxis[0]]

extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/views/antv/racebar/data.vue

@@ -111,10 +111,10 @@
 </template>
 
 <script>
-import DimensionItem from '@/components/views/DimensionItem'
+import DimensionItem from '../../../components/views/DimensionItem'
-import DimensionExtItem from '@/components/views/DimensionExtItem'
+import DimensionExtItem from '../../../components/views/DimensionExtItem'
-import QuotaItem from '@/components/views/QuotaItem'
+import QuotaItem from '../../../components/views/QuotaItem'
-import FilterItem from '@/components/views/FilterItem'
+import FilterItem from '../../../components/views/FilterItem'
 import messages from '@/de-base/lang/messages'
 
 export default {
@@ -176,11 +176,41 @@ export default {
     quotaData() {
       return this.obj.quotaData
     },
+    listenLists() {
+      if (!this.view) return [0, 0, 0];
+      return [
+        this.view.xaxis ? this.view.xaxis.length : 0,
+        this.view.xaxisExt ? this.view.xaxisExt.length : 0,
+        this.view.yaxis ? this.view.yaxis.length : 0
+      ]
+    }
   },
   created() {
     this.$emit('on-add-languages', messages)
   },
-  watch: {},
+  mounted() {
+  },
+  watch: {
+    listenLists: function (val) {
+      if (this.listenLists[0] <= 1 && this.listenLists[1] <= 1 && this.listenLists[2] <= 1) {
+        return;
+      }
+      if (this.view.xaxis.length > 1) {
+        this.dragCheckType(this.view.xaxis, 'd')
+        this.view.xaxis = [this.view.xaxis[0]]
+      }
+      if (this.view.xaxisExt.length > 1) {
+        this.dragCheckType(this.view.xaxisExt, 'd')
+        this.view.xaxisExt = [this.view.xaxisExt[0]]
+      }
+      if (this.view.yaxis.length > 1) {
+        this.dragCheckType(this.view.yaxis, 'q')
+        this.view.yaxis = [this.view.yaxis[0]]
+      }
+      this.calcData(true)
+    },
+
+  },
   methods: {
     executeAxios(url, type, data, callBack) {
       const param = {
@@ -210,37 +240,39 @@ export default {
     },
 
     addXaxis(e) {
+      if (this.view.type !== 'table-info') {
+        this.dragCheckType(this.view.xaxis, 'd')
+      }
       this.dragMoveDuplicate(this.view.xaxis, e)
       if (this.view.xaxis.length > 1) {
-        this.view.xaxis = [this.view.xaxis[0]]
+        //this.view.xaxis = [this.view.xaxis[0]]
-      }
+      } else {
         this.calcData(true)
+      }
     },
     addXaxisExt(e) {
+      if (this.view.type !== 'table-info') {
+        this.dragCheckType(this.view.xaxisExt, 'd')
+      }
       this.dragMoveDuplicate(this.view.xaxisExt, e)
       if (this.view.xaxisExt.length > 1) {
-        this.view.xaxisExt = [this.view.xaxisExt[0]]
+        //this.view.xaxisExt = [this.view.xaxisExt[0]]
-      }
+      } else {
         this.calcData(true)
+      }
     },
     addYaxis(e) {
       this.dragCheckType(this.view.yaxis, 'q')
       this.dragMoveDuplicate(this.view.yaxis, e)
       if (this.view.yaxis.length > 1) {
-        this.view.yaxis = [this.view.yaxis[0]]
+        //this.view.yaxis = [this.view.yaxis[0]]
+      } else {
+        this.calcData(true)
       }
-      this.calcData(true)
-    },
-    addYaxisExt(e) {
-      this.dragCheckType(this.view.yaxisExt, 'q')
-      this.dragMoveDuplicate(this.view.yaxisExt, e)
-      /*if (equalsAny(this.view.type, 'map', 'bidirectional-bar') && this.view.yaxisExt.length > 1) {
-        this.view.yaxisExt = [this.view.yaxisExt[0]]
-      }*/
-      this.calcData(true)
     },
+
     calcData(cache) {
-      console.log(cache)
+      //console.log(cache)
       //this.view.xaxis = [...this.source, ...this.target]
 
       this.$emit('plugin-call-back', {