From 247c6c23b37be1dae5bf119f44b79073d506d5ef Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 27 Apr 2022 10:34:39 +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=E8=AE=BF=E9=97=AE=E6=95=B0=E6=8D=AE=E9=9B=86?=
 =?UTF-8?q?api=E6=9D=83=E9=99=90=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/panel/filter/filterDialog.vue   | 62 +++++++++----------
 1 file changed, 30 insertions(+), 32 deletions(-)

diff --git a/frontend/src/views/panel/filter/filterDialog.vue b/frontend/src/views/panel/filter/filterDialog.vue
index 6b6ddea4f3..2acc5d44c2 100644
--- a/frontend/src/views/panel/filter/filterDialog.vue
+++ b/frontend/src/views/panel/filter/filterDialog.vue
@@ -35,18 +35,17 @@
                   node-key="id"
                   :data="datas"
                   :props="defaultProps"
-                  lazy
-                  :load="loadTree"
+
                   @node-click="handleNodeClick"
                 >
                   <span slot-scope="{ node, data }" style="display: flex;flex: 1;width: 0%;" class="custom-tree-node">
                     <span>
-                      <svg-icon v-if="data.type === 'db'" icon-class="ds-db" class="ds-icon-db" />
-                      <svg-icon v-if="data.type === 'sql'" icon-class="ds-sql" class="ds-icon-sql" />
-                      <svg-icon v-if="data.type === 'excel'" icon-class="ds-excel" class="ds-icon-excel" />
-                      <svg-icon v-if="data.type === 'custom'" icon-class="ds-custom" class="ds-icon-custom" />
-                      <svg-icon v-if="data.type === 'union'" icon-class="ds-union" class="ds-icon-union" />
-                      <svg-icon v-if="data.type === 'api'" icon-class="ds-api" class="ds-icon-api" />
+                      <svg-icon v-if="data.modelInnerType === 'db'" icon-class="ds-db" class="ds-icon-db" />
+                      <svg-icon v-if="data.modelInnerType === 'sql'" icon-class="ds-sql" class="ds-icon-sql" />
+                      <svg-icon v-if="data.modelInnerType === 'excel'" icon-class="ds-excel" class="ds-icon-excel" />
+                      <svg-icon v-if="data.modelInnerType === 'custom'" icon-class="ds-custom" class="ds-icon-custom" />
+                      <svg-icon v-if="data.modelInnerType === 'union'" icon-class="ds-union" class="ds-icon-union" />
+                      <svg-icon v-if="data.modelInnerType === 'api'" icon-class="ds-api" class="ds-icon-api" />
                     </span>
                     <span v-if="data.modelInnerType === 'db' || data.modelInnerType === 'sql'">
                       <span v-if="data.mode === 0" style="margin-left: 6px"><i class="el-icon-s-operation" /></span>
@@ -202,13 +201,13 @@ import FilterHead from './filterMain/FilterHead'
 import FilterControl from './filterMain/FilterControl'
 import FilterFoot from './filterMain/FilterFoot'
 import bus from '@/utils/bus'
+import { queryAuthModel } from '@/api/authModel/authModel'
 import {
   mapState
 } from 'vuex'
 import {
   groupTree,
-  fieldListWithPermission,
-  post
+  fieldListWithPermission
 } from '@/api/dataset/dataset'
 import {
   viewsWithIds
@@ -366,6 +365,26 @@ export default {
   },
 
   methods: {
+
+    treeNode(cache) {
+      const modelInfo = localStorage.getItem('dataset-tree')
+      const userCache = (modelInfo && cache)
+      if (userCache) {
+        this.tData = JSON.parse(modelInfo)
+        const results = this.buildTree(this.tData)
+        this.defaultDatas = JSON.parse(JSON.stringify(results))
+        this.datas = JSON.parse(JSON.stringify(results))
+      }
+      queryAuthModel({ modelType: 'dataset' }, !userCache).then(res => {
+        localStorage.setItem('dataset-tree', JSON.stringify(res.data))
+        if (!userCache) {
+          this.tData = res.data
+          const results = this.buildTree(this.tData)
+          this.defaultDatas = JSON.parse(JSON.stringify(results))
+          this.datas = JSON.parse(JSON.stringify(results))
+        }
+      })
+    },
     initWithField() {
       if (this.myAttrs && this.myAttrs.activeName) {
         this.activeName = this.myAttrs.activeName
@@ -457,28 +476,7 @@ export default {
         this.showFieldDatas(data)
       }
     },
-    loadTree(node, resolve) {
-      if (!this.isTreeSearch) {
-        if (node.level > 0) {
-          if (node.data.id) {
-            post('/dataset/table/listAndGroup', {
-              sort: 'type asc,name asc,create_time desc',
-              sceneId: node.data.id
-            }).then(res => {
-              resolve(res.data)
-            })
-          }
-        }
-      } else {
-        node.data.children && resolve(node.data.children)
-      }
-    },
-    treeNode(group) {
-      post('/dataset/group/treeNode', group).then(res => {
-        this.defaultDatas = res.data
-        this.datas = res.data
-      })
-    },
+
     loadDataSetTree() {
       groupTree({}).then(res => {
         const datas = res.data