From 2ea8a41d752472e37a6b1d62304a99730a6ec61b Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 31 Aug 2022 13:11:22 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF-=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E6=A1=86=E8=BF=87=E6=BB=A4=E5=99=A8):=20=E6=8B=96?=
 =?UTF-8?q?=E5=85=A5=E5=A4=9A=E4=B8=AA=E5=AD=97=E6=AE=B5=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=97=A0=E6=B3=95=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/panel/filter/filterDialog.vue   |  5 +--
 .../panel/filter/filterMain/FilterHead.vue    | 36 +++++++++++++------
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/frontend/src/views/panel/filter/filterDialog.vue b/frontend/src/views/panel/filter/filterDialog.vue
index d0f11da9a4..69df767462 100644
--- a/frontend/src/views/panel/filter/filterDialog.vue
+++ b/frontend/src/views/panel/filter/filterDialog.vue
@@ -181,7 +181,7 @@
 
     <de-main-container class="ms-main-container">
       <div v-if="currentElement.options && currentElement.options.attrs">
-        <filter-head :element="currentElement" :table-fields-map="tableFieldsMap" :widget="widget" />
+        <filter-head :element="currentElement" :widget="widget" />
 
         <filter-control :element="currentElement" :widget="widget" :control-attrs="myAttrs" :child-views="childViews" />
 
@@ -297,7 +297,6 @@ export default {
         datasetParams: []
       },
       currentElement: null,
-      tableFieldsMap: {},
       tempTreeDatas: null,
       showTips: false
     }
@@ -632,7 +631,6 @@ export default {
     loadField(tableId) {
       fieldListWithPermission(tableId).then(res => {
         let datas = res.data
-        this.$set(this.tableFieldsMap, tableId, JSON.parse(JSON.stringify(datas)))
         if (this.widget && this.widget.filterFieldMethod) {
           datas = this.widget.filterFieldMethod(datas)
         }
@@ -643,7 +641,6 @@ export default {
     comLoadField(tableId) {
       fieldListWithPermission(tableId).then(res => {
         let datas = res.data
-        this.$set(this.tableFieldsMap, tableId, JSON.parse(JSON.stringify(datas)))
         if (this.widget && this.widget.filterFieldMethod) {
           datas = this.widget.filterFieldMethod(datas)
         }
diff --git a/frontend/src/views/panel/filter/filterMain/FilterHead.vue b/frontend/src/views/panel/filter/filterMain/FilterHead.vue
index 21826c658c..859c45fa90 100644
--- a/frontend/src/views/panel/filter/filterMain/FilterHead.vue
+++ b/frontend/src/views/panel/filter/filterMain/FilterHead.vue
@@ -18,7 +18,7 @@
               >
 
                 <v-flex v-for="(item,index) in element.options.attrs.dragItems" :key="item.id">
-                  <drag-item :key="item.id" :is-sort-widget="isSortWidget" :item="item" :index="index" :sort="element.options.attrs.sort" :all-fields="index ? [] : fieldsMap[item.tableId]" @closeItem="closeItem" @sort-change="sortChange" />
+                  <drag-item :key="item.id" :is-sort-widget="isSortWidget" :item="item" :index="index" :sort="element.options.attrs.sort" :all-fields="index ? [] : tableFields" @closeItem="closeItem" @sort-change="sortChange" />
                 </v-flex>
 
                 <span solt="footer">{{ $t('panel.drag_here') }}</span>
@@ -34,6 +34,8 @@
 <script>
 import draggable from 'vuedraggable'
 import DragItem from '@/components/DragItem'
+import { fieldListWithPermission } from '@/api/dataset/dataset'
+
 export default {
   name: 'FilterHead',
   components: {
@@ -45,10 +47,7 @@ export default {
       type: Object,
       default: () => {}
     },
-    tableFieldsMap: {
-      type: Object,
-      default: () => {}
-    },
+
     widget: {
       type: Object,
       default: null
@@ -56,25 +55,42 @@ export default {
   },
   data() {
     return {
-      targets: []
+      targets: [],
+      tableFields: []
     }
   },
   computed: {
     isSortWidget() {
       return this.widget && this.widget.isSortWidget && this.widget.isSortWidget()
     },
-    fieldsMap() {
-      return JSON.parse(JSON.stringify(this.tableFieldsMap))
+
+    firstTableId() {
+      if (!this.isSortWidget) return null
+      if (this.element.options.attrs.dragItems && this.element.options.attrs.dragItems.length) {
+        return this.element.options.attrs.dragItems[0].tableId
+      }
+      return null
     }
   },
 
   watch: {
-
+    firstTableId(val, old) {
+      if (val !== old) {
+        this.loadFields()
+      }
+    }
   },
   created() {
-
+    if (this.isSortWidget && this.element.options.attrs.dragItems && this.element.options.attrs.dragItems.length) {
+      this.loadFields()
+    }
   },
   methods: {
+    loadFields() {
+      fieldListWithPermission(this.firstTableId).then(res => {
+        this.tableFields = JSON.parse(JSON.stringify(res.data))
+      })
+    },
     onMove(e, originalEvent) {
       return true
     },