From f1124fad3f511ca6fcf33e6852566905257a8e7d Mon Sep 17 00:00:00 2001
From: ulleo <ulleo.wang@gmail.com>
Date: Wed, 6 Sep 2023 16:29:55 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BB=AA=E8=A1=A8=E6=9D=BF>=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E5=99=A8=20=E9=80=89=E6=8B=A9=E2=80=9C=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=9E=9A=E4=B8=BE=E5=80=BC=E2=80=9D=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E5=86=8D=E6=AC=A1=E6=89=93=E5=BC=80=E4=B8=8B=E6=8B=89=E6=A1=86?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/filter/ResultFilterEditor.vue  |   5 +
 .../src/components/views/FilterItem.vue       | 161 ++++++++++++------
 .../src/views/antv/chartmix/data.vue          |  26 +--
 .../src/components/views/FilterItem.vue       | 161 ++++++++++++------
 .../src/views/antv/racebar/data.vue           |   2 +-
 5 files changed, 231 insertions(+), 124 deletions(-)

diff --git a/core/frontend/src/views/chart/components/filter/ResultFilterEditor.vue b/core/frontend/src/views/chart/components/filter/ResultFilterEditor.vue
index a90c5658ee..21d446f52c 100644
--- a/core/frontend/src/views/chart/components/filter/ResultFilterEditor.vue
+++ b/core/frontend/src/views/chart/components/filter/ResultFilterEditor.vue
@@ -275,6 +275,11 @@ export default {
       this.logic = this.item.logic
       this.filterType = this.item.filterType
       this.enumCheckField = this.item.enumCheckField
+
+      // init enum option
+      if (this.item.filterType === 'enum' && this.needRequestEnum) {
+        this.initEnumOptions()
+      }
     },
     initEnumOptions() {
       // 查找枚举值
diff --git a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/views/FilterItem.vue b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/views/FilterItem.vue
index 3dd5952d69..0afbe621e3 100644
--- a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/views/FilterItem.vue
+++ b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/views/FilterItem.vue
@@ -1,24 +1,65 @@
 <template>
   <span style="position: relative;display: inline-block;">
-    <i class="el-icon-arrow-down el-icon-delete" style="position: absolute;top: 6px;right: 24px;color: #878d9f;cursor: pointer;z-index: 1;" @click="removeItem" />
-    <el-dropdown  trigger="click" size="mini" @command="clickItem">
+    <i
+      class="el-icon-arrow-down el-icon-delete"
+      style="position: absolute;top: 6px;right: 24px;color: #878d9f;cursor: pointer;z-index: 1;"
+      @click="removeItem"
+    />
+    <el-dropdown
+      trigger="click"
+      size="mini"
+      @command="clickItem"
+    >
       <span class="el-dropdown-link">
-        <el-tag size="small" class="item-axis" :type="tagType">
+        <el-tag
+          size="small"
+          class="item-axis"
+          :type="tagType"
+        >
           <span style="float: left">
-            <svg-icon v-if="item.deType === 0" icon-class="field_text" class="field-icon-text" />
-            <svg-icon v-if="item.deType === 1" icon-class="field_time" class="field-icon-time" />
-            <svg-icon v-if="item.deType === 2 || item.deType === 3" icon-class="field_value" class="field-icon-value" />
-            <svg-icon v-if="item.deType === 5" icon-class="field_location" class="field-icon-location" />
+            <svg-icon
+              v-if="item.deType === 0"
+              icon-class="field_text"
+              class="field-icon-text"
+            />
+            <svg-icon
+              v-if="item.deType === 1"
+              icon-class="field_time"
+              class="field-icon-time"
+            />
+            <svg-icon
+              v-if="item.deType === 2 || item.deType === 3"
+              icon-class="field_value"
+              class="field-icon-value"
+            />
+            <svg-icon
+              v-if="item.deType === 5"
+              icon-class="field_location"
+              class="field-icon-location"
+            />
           </span>
-          <span class="item-span-style" :title="item.name">{{ item.name }}</span>
-          <field-error-tips v-if="tagType === 'danger'" />
-          <i class="el-icon-arrow-down el-icon--right" style="position: absolute;top: 6px;right: 10px;" />
+          <span
+            class="item-span-style"
+            :title="item.name"
+          >{{ item.name }}</span>
+          <field-error-tips v-if="tagType === 'danger'"/>
+          <i
+            class="el-icon-arrow-down el-icon--right"
+            style="position: absolute;top: 6px;right: 10px;"
+          />
         </el-tag>
         <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item icon="el-icon-files" :command="beforeClickItem('filter')">
+          <el-dropdown-item
+            icon="el-icon-files"
+            :command="beforeClickItem('filter')"
+          >
             <span>{{ $t('chart.filter') }}...</span>
           </el-dropdown-item>
-          <el-dropdown-item icon="el-icon-delete" divided :command="beforeClickItem('remove')">
+          <el-dropdown-item
+            icon="el-icon-delete"
+            divided
+            :command="beforeClickItem('remove')"
+          >
             <span>{{ $t('chart.delete') }}</span>
           </el-dropdown-item>
         </el-dropdown-menu>
@@ -28,11 +69,12 @@
 </template>
 
 <script>
-import { getItemType } from './utils'
+import {getItemType} from './utils'
 import FieldErrorTips from './FieldErrorTips'
+
 export default {
   name: 'FilterItem',
-  components: { FieldErrorTips },
+  components: {FieldErrorTips},
   props: {
     param: {
       type: Object,
@@ -53,25 +95,34 @@ export default {
     quotaData: {
       type: Array,
       required: true
-    }
+    },
+    bus: {
+      type: Object,
+      required: false,
+      default: null
+    },
   },
   data() {
     return {
-        tagType: 'success'
+      tagType: 'success'
     }
   },
   watch: {
-    dimensionData: function() {
+    dimensionData: function () {
       this.getItemTagType()
     },
-    quotaData: function() {
+    quotaData: function () {
       this.getItemTagType()
     },
-    item: function() {
+    item: function () {
       this.getItemTagType()
     }
   },
   mounted() {
+    this.bus.$on('reset-change-table', this.getItemTagType)
+  },
+  beforeDestroy() {
+    this.bus.$off('reset-change-table', this.getItemTagType)
   },
   methods: {
     clickItem(param) {
@@ -110,45 +161,45 @@ export default {
 </script>
 
 <style scoped>
-  .item-axis {
-    padding: 1px 6px;
-    margin: 0 3px 2px 3px;
-    text-align: left;
-    height: 24px;
-    line-height: 22px;
-    display: flex;
-    border-radius: 4px;
-    box-sizing: border-box;
-    white-space: nowrap;
-    width: 159px;
-  }
+.item-axis {
+  padding: 1px 6px;
+  margin: 0 3px 2px 3px;
+  text-align: left;
+  height: 24px;
+  line-height: 22px;
+  display: flex;
+  border-radius: 4px;
+  box-sizing: border-box;
+  white-space: nowrap;
+  width: 159px;
+}
 
-  .item-axis:hover {
-    background-color: #fdfdfd;
-    cursor: pointer;
-  }
+.item-axis:hover {
+  background-color: #fdfdfd;
+  cursor: pointer;
+}
 
-  span {
-    font-size: 12px;
-  }
+span {
+  font-size: 12px;
+}
 
-  .summary-span{
-    margin-left: 4px;
-    color: #878d9f;;
-  }
+.summary-span {
+  margin-left: 4px;
+  color: #878d9f;;
+}
 
-  .inner-dropdown-menu{
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    width: 100%
-  }
+.inner-dropdown-menu {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%
+}
 
-  .item-span-style{
-    display: inline-block;
-    width: 100px;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    overflow: hidden;
-  }
+.item-span-style {
+  display: inline-block;
+  width: 115px;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
 </style>
diff --git a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/data.vue b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/data.vue
index 66e761c5e5..60f8821b2f 100644
--- a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/data.vue
+++ b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/data.vue
@@ -9,18 +9,18 @@
                  @add="addXaxis" @update="calcData(true)">
         <transition-group class="draggable-group">
           <dimension-item v-for="(item,index) in view.xaxis" :key="index"
-                                 :param="param"
-                                 :index="0"
-                                 :item="item"
-                                 :dimension-data="dimension"
-                                 :quota-data="quotaData"
-                                 :chart="chart"
-                                 @onDimensionItemChange="dimensionItemChange"
-                                 @onDimensionItemRemove="dimensionItemRemove"
-                                 @editItemFilter="showDimensionEditFilter"
-                                 @onNameEdit="showRename"
-                                 dimension-name="dimension"
-                                 :bus="bus"
+                          :param="param"
+                          :index="0"
+                          :item="item"
+                          :dimension-data="dimension"
+                          :quota-data="quotaData"
+                          :chart="chart"
+                          @onDimensionItemChange="dimensionItemChange"
+                          @onDimensionItemRemove="dimensionItemRemove"
+                          @editItemFilter="showDimensionEditFilter"
+                          @onNameEdit="showRename"
+                          dimension-name="dimension"
+                          :bus="bus"
           />
         </transition-group>
       </draggable>
@@ -84,7 +84,7 @@
                  @add="addCustomFilter" @update="calcData(true)">
         <transition-group class="draggable-group">
           <filter-item v-for="(item,index) in view.customFilter" :key="item.id" :param="param" :index="index"
-                       :item="item" :dimension-data="dimension" :quota-data="quota"
+                       :item="item" :dimension-data="dimension" :quota-data="quota" :bus="bus"
                        @onFilterItemRemove="filterItemRemove"
                        @editItemFilter="showEditFilter"/>
         </transition-group>
diff --git a/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/components/views/FilterItem.vue b/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/components/views/FilterItem.vue
index 3dd5952d69..0afbe621e3 100644
--- a/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/components/views/FilterItem.vue
+++ b/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/components/views/FilterItem.vue
@@ -1,24 +1,65 @@
 <template>
   <span style="position: relative;display: inline-block;">
-    <i class="el-icon-arrow-down el-icon-delete" style="position: absolute;top: 6px;right: 24px;color: #878d9f;cursor: pointer;z-index: 1;" @click="removeItem" />
-    <el-dropdown  trigger="click" size="mini" @command="clickItem">
+    <i
+      class="el-icon-arrow-down el-icon-delete"
+      style="position: absolute;top: 6px;right: 24px;color: #878d9f;cursor: pointer;z-index: 1;"
+      @click="removeItem"
+    />
+    <el-dropdown
+      trigger="click"
+      size="mini"
+      @command="clickItem"
+    >
       <span class="el-dropdown-link">
-        <el-tag size="small" class="item-axis" :type="tagType">
+        <el-tag
+          size="small"
+          class="item-axis"
+          :type="tagType"
+        >
           <span style="float: left">
-            <svg-icon v-if="item.deType === 0" icon-class="field_text" class="field-icon-text" />
-            <svg-icon v-if="item.deType === 1" icon-class="field_time" class="field-icon-time" />
-            <svg-icon v-if="item.deType === 2 || item.deType === 3" icon-class="field_value" class="field-icon-value" />
-            <svg-icon v-if="item.deType === 5" icon-class="field_location" class="field-icon-location" />
+            <svg-icon
+              v-if="item.deType === 0"
+              icon-class="field_text"
+              class="field-icon-text"
+            />
+            <svg-icon
+              v-if="item.deType === 1"
+              icon-class="field_time"
+              class="field-icon-time"
+            />
+            <svg-icon
+              v-if="item.deType === 2 || item.deType === 3"
+              icon-class="field_value"
+              class="field-icon-value"
+            />
+            <svg-icon
+              v-if="item.deType === 5"
+              icon-class="field_location"
+              class="field-icon-location"
+            />
           </span>
-          <span class="item-span-style" :title="item.name">{{ item.name }}</span>
-          <field-error-tips v-if="tagType === 'danger'" />
-          <i class="el-icon-arrow-down el-icon--right" style="position: absolute;top: 6px;right: 10px;" />
+          <span
+            class="item-span-style"
+            :title="item.name"
+          >{{ item.name }}</span>
+          <field-error-tips v-if="tagType === 'danger'"/>
+          <i
+            class="el-icon-arrow-down el-icon--right"
+            style="position: absolute;top: 6px;right: 10px;"
+          />
         </el-tag>
         <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item icon="el-icon-files" :command="beforeClickItem('filter')">
+          <el-dropdown-item
+            icon="el-icon-files"
+            :command="beforeClickItem('filter')"
+          >
             <span>{{ $t('chart.filter') }}...</span>
           </el-dropdown-item>
-          <el-dropdown-item icon="el-icon-delete" divided :command="beforeClickItem('remove')">
+          <el-dropdown-item
+            icon="el-icon-delete"
+            divided
+            :command="beforeClickItem('remove')"
+          >
             <span>{{ $t('chart.delete') }}</span>
           </el-dropdown-item>
         </el-dropdown-menu>
@@ -28,11 +69,12 @@
 </template>
 
 <script>
-import { getItemType } from './utils'
+import {getItemType} from './utils'
 import FieldErrorTips from './FieldErrorTips'
+
 export default {
   name: 'FilterItem',
-  components: { FieldErrorTips },
+  components: {FieldErrorTips},
   props: {
     param: {
       type: Object,
@@ -53,25 +95,34 @@ export default {
     quotaData: {
       type: Array,
       required: true
-    }
+    },
+    bus: {
+      type: Object,
+      required: false,
+      default: null
+    },
   },
   data() {
     return {
-        tagType: 'success'
+      tagType: 'success'
     }
   },
   watch: {
-    dimensionData: function() {
+    dimensionData: function () {
       this.getItemTagType()
     },
-    quotaData: function() {
+    quotaData: function () {
       this.getItemTagType()
     },
-    item: function() {
+    item: function () {
       this.getItemTagType()
     }
   },
   mounted() {
+    this.bus.$on('reset-change-table', this.getItemTagType)
+  },
+  beforeDestroy() {
+    this.bus.$off('reset-change-table', this.getItemTagType)
   },
   methods: {
     clickItem(param) {
@@ -110,45 +161,45 @@ export default {
 </script>
 
 <style scoped>
-  .item-axis {
-    padding: 1px 6px;
-    margin: 0 3px 2px 3px;
-    text-align: left;
-    height: 24px;
-    line-height: 22px;
-    display: flex;
-    border-radius: 4px;
-    box-sizing: border-box;
-    white-space: nowrap;
-    width: 159px;
-  }
+.item-axis {
+  padding: 1px 6px;
+  margin: 0 3px 2px 3px;
+  text-align: left;
+  height: 24px;
+  line-height: 22px;
+  display: flex;
+  border-radius: 4px;
+  box-sizing: border-box;
+  white-space: nowrap;
+  width: 159px;
+}
 
-  .item-axis:hover {
-    background-color: #fdfdfd;
-    cursor: pointer;
-  }
+.item-axis:hover {
+  background-color: #fdfdfd;
+  cursor: pointer;
+}
 
-  span {
-    font-size: 12px;
-  }
+span {
+  font-size: 12px;
+}
 
-  .summary-span{
-    margin-left: 4px;
-    color: #878d9f;;
-  }
+.summary-span {
+  margin-left: 4px;
+  color: #878d9f;;
+}
 
-  .inner-dropdown-menu{
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    width: 100%
-  }
+.inner-dropdown-menu {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%
+}
 
-  .item-span-style{
-    display: inline-block;
-    width: 100px;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    overflow: hidden;
-  }
+.item-span-style {
+  display: inline-block;
+  width: 115px;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
 </style>
diff --git a/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/views/antv/racebar/data.vue b/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/views/antv/racebar/data.vue
index 499f1c3b58..e4a399b586 100644
--- a/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/views/antv/racebar/data.vue
+++ b/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/views/antv/racebar/data.vue
@@ -97,7 +97,7 @@
                  @add="addCustomFilter" @update="calcData(true)">
         <transition-group class="draggable-group">
           <filter-item v-for="(item,index) in view.customFilter" :key="item.id" :param="param" :index="index"
-                       :item="item" :dimension-data="dimension" :quota-data="quota"
+                       :item="item" :dimension-data="dimension" :quota-data="quota" :bus="bus"
                        @onFilterItemRemove="filterItemRemove"
                        @editItemFilter="showEditFilter"/>
         </transition-group>