From 7d1d453146b33257bf0d8a32ef7a652aacbd6abc Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Fri, 27 Oct 2023 10:22:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=9D=E5=AD=98=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=9B=86=E6=97=A0=E6=B3=95=E6=90=9C=E7=B4=A2=E5=88=B0=E6=8C=87?=
 =?UTF-8?q?=E5=AE=9A=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/data-visualization/canvas/Area.vue     | 2 +-
 .../src/components/visualization/FrameLinks.vue           | 2 +-
 .../src/custom-component/rich-text/DeRichEditor.vue       | 2 +-
 .../components/dialog/TextLabelThresholdEdit.vue          | 2 +-
 .../editor-senior/components/dialog/TextThresholdEdit.vue | 2 +-
 .../views/visualized/data/dataset/form/CreatDsGroup.vue   | 8 ++------
 .../visualized/data/datasource/form/CreatDsGroup.vue      | 7 +------
 7 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/core/core-frontend/src/components/data-visualization/canvas/Area.vue b/core/core-frontend/src/components/data-visualization/canvas/Area.vue
index 62d3778c76..d425fdbbb3 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/Area.vue
+++ b/core/core-frontend/src/components/data-visualization/canvas/Area.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { defineProps, toRefs } from 'vue'
+import { toRefs } from 'vue'
 const props = defineProps({
   start: {
     type: Object,
diff --git a/core/core-frontend/src/components/visualization/FrameLinks.vue b/core/core-frontend/src/components/visualization/FrameLinks.vue
index c570c6dca1..c8e25eb3b1 100644
--- a/core/core-frontend/src/components/visualization/FrameLinks.vue
+++ b/core/core-frontend/src/components/visualization/FrameLinks.vue
@@ -26,7 +26,7 @@
 </template>
 
 <script setup lang="ts">
-import { defineEmits, reactive, ref, toRefs, watch } from 'vue'
+import { reactive, ref, toRefs, watch } from 'vue'
 import { dvMainStoreWithOut } from '../../store/modules/data-visualization/dvMain'
 import { storeToRefs } from 'pinia/dist/pinia'
 import { checkAddHttp, deepCopy } from '../../utils/utils'
diff --git a/core/core-frontend/src/custom-component/rich-text/DeRichEditor.vue b/core/core-frontend/src/custom-component/rich-text/DeRichEditor.vue
index a42fdadbf4..867085704f 100644
--- a/core/core-frontend/src/custom-component/rich-text/DeRichEditor.vue
+++ b/core/core-frontend/src/custom-component/rich-text/DeRichEditor.vue
@@ -21,7 +21,7 @@ import 'tinymce/plugins/code' // 源码
 
 //接下来定义编辑器所需要的插件数据
 import { reactive, ref } from 'vue'
-import { onMounted, defineEmits, watch } from 'vue'
+import { onMounted, watch } from 'vue'
 import axios from 'axios'
 // import { updateImg } from '@/api/order/order'
 const emits = defineEmits(['getContent'])
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/TextLabelThresholdEdit.vue b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/TextLabelThresholdEdit.vue
index e41c7b6e5c..7aec022118 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/TextLabelThresholdEdit.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/TextLabelThresholdEdit.vue
@@ -1,5 +1,5 @@
 <script lang="tsx" setup>
-import { defineEmits, reactive } from 'vue'
+import { reactive } from 'vue'
 import { useI18n } from '@/hooks/web/useI18n'
 import { COLOR_PANEL } from '../../../util/chart'
 
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/TextThresholdEdit.vue b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/TextThresholdEdit.vue
index 0f4474ea7e..e4d7effd0e 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/TextThresholdEdit.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/TextThresholdEdit.vue
@@ -1,5 +1,5 @@
 <script lang="tsx" setup>
-import { defineEmits, reactive } from 'vue'
+import { reactive } from 'vue'
 import { useI18n } from '@/hooks/web/useI18n'
 import { COLOR_PANEL } from '../../../util/chart'
 
diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/CreatDsGroup.vue b/core/core-frontend/src/views/visualized/data/dataset/form/CreatDsGroup.vue
index 075e49aa24..85ec90c558 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/form/CreatDsGroup.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/form/CreatDsGroup.vue
@@ -113,10 +113,7 @@ const showAll = ref(true)
 const dataset = ref()
 const loading = ref(false)
 const createDataset = ref(false)
-let tData = []
-const filterMethod = value => {
-  state.tData = [...tData].filter(item => item.name.includes(value))
-}
+const filterMethod = (value, data) => data.name.includes(value)
 const resetForm = () => {
   createDataset.value = false
 }
@@ -160,7 +157,6 @@ const createInit = (type, data: Tree, exec, name: string) => {
         state.tData[0].name = '数据集'
       }
       data.id = formatRootMiss(data.id, state.tData)
-      tData = [...state.tData]
       if (exec) {
         pid.value = data.pid
         id.value = data.id
@@ -322,7 +318,7 @@ const emits = defineEmits(['finish'])
           style="width: 100%"
           :props="props"
           @node-click="nodeClick"
-          :filter-method="filterMethod"
+          :filter-node-method="filterMethod"
           filterable
         >
           <template #default="{ data: { name } }">
diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/CreatDsGroup.vue b/core/core-frontend/src/views/visualized/data/datasource/form/CreatDsGroup.vue
index 6be38bc601..95e7cf9700 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/form/CreatDsGroup.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/form/CreatDsGroup.vue
@@ -107,11 +107,7 @@ const showAll = ref(true)
 const datasource = ref()
 const loading = ref(false)
 const createDataset = ref(false)
-let tData = []
-
-const filterMethod = value => {
-  state.tData = [...tData].filter(item => item.name.includes(value))
-}
+const filterMethod = (value, data) => data.name.includes(value)
 const resetForm = () => {
   createDataset.value = false
 }
@@ -147,7 +143,6 @@ const createInit = (type, data: Tree, exec, name: string) => {
         if (state.tData.length && state.tData[0].name === 'root' && state.tData[0].id === '0') {
           state.tData[0].name = '数据源'
         }
-        tData = [...state.tData]
       })
     }
     if (exec) {