From d498f3fb21d8189fe8f9e87852a2349a507b3dcf Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 26 Jun 2024 11:50:09 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6):=20?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v-query/QueryConditionConfiguration.vue   |  4 +-
 .../src/custom-component/v-query/Tree.vue     | 82 +++++++------------
 core/core-frontend/src/hooks/web/useFilter.ts | 14 +++-
 3 files changed, 44 insertions(+), 56 deletions(-)

diff --git a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
index cb7c45e7a3..6c61f8942b 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -319,10 +319,10 @@ const typeTimeMap = {
 
 const timeParameterList = computed(() => {
   if (!isTimeParameter.value) return timeList
-  const [_, y] = curComponent.value.parameters?.filter(
+  const [year, y] = curComponent.value.parameters?.filter(
     ele => ele.deType === 1 && !!ele.variableName
   )[0].type
-  return timeList.filter(ele => ele.value === typeTimeMap[y])
+  return timeList.filter(ele => ele.value === (typeTimeMap[y] || typeTimeMap[year]))
 })
 
 const cancelClick = () => {
diff --git a/core/core-frontend/src/custom-component/v-query/Tree.vue b/core/core-frontend/src/custom-component/v-query/Tree.vue
index 44a2032f66..e8aaa653ad 100644
--- a/core/core-frontend/src/custom-component/v-query/Tree.vue
+++ b/core/core-frontend/src/custom-component/v-query/Tree.vue
@@ -1,5 +1,15 @@
 <script lang="ts" setup>
-import { ref, PropType, toRefs, nextTick, watch, onMounted, computed, inject } from 'vue'
+import {
+  ref,
+  PropType,
+  toRefs,
+  nextTick,
+  watch,
+  onMounted,
+  computed,
+  inject,
+  shallowRef
+} from 'vue'
 import { cloneDeep, debounce } from 'lodash-es'
 import { getFieldTree } from '@/api/dataset'
 interface SelectConfig {
@@ -72,7 +82,6 @@ watch(
   () => config.value.treeFieldList,
   () => {
     treeValue.value = config.value.multiple ? [] : undefined
-    cacheData.value = []
     showOrHide.value = false
     getTreeOption()
   }
@@ -81,19 +90,10 @@ watch(
 const init = () => {
   const { defaultValueCheck, multiple: plus, defaultValue } = config.value
   if (defaultValueCheck) {
-    const arr = Array.isArray(defaultValue) ? '' : (defaultValue || '').split('-de-')
     config.value.selectValue = Array.isArray(defaultValue)
       ? cloneDeep([...defaultValue])
       : defaultValue
     treeValue.value = Array.isArray(defaultValue) ? cloneDeep([...defaultValue]) : defaultValue
-    cacheData.value = Array.isArray(defaultValue)
-      ? defaultValue.map(ele => ({
-          value: ele,
-          label: ele.split('-de-')[ele.split('-de-').length - 1]
-        }))
-      : arr.length
-      ? [arr[arr.length - 1]]
-      : []
   } else {
     config.value.selectValue = plus ? [] : undefined
     treeValue.value = plus ? [] : undefined
@@ -149,12 +149,8 @@ watch(
     if (val) {
       treeValue.value = []
     }
-
     nextTick(() => {
       multiple.value = val
-      nextTick(() => {
-        resolveFunc(treeOptionList)
-      })
       if (!val) {
         nextTick(() => {
           treeValue.value = undefined
@@ -164,7 +160,7 @@ watch(
   }
 )
 let cacheId = ''
-let treeOptionList = []
+let treeOptionList = shallowRef([])
 
 const dfs = arr => {
   return (arr || []).map(ele => {
@@ -176,16 +172,16 @@ const dfs = arr => {
   })
 }
 
+const loading = ref(false)
+
 const getTreeOption = debounce(() => {
+  loading.value = true
   getFieldTree(props.config.treeFieldList.map(ele => ele.id))
     .then(res => {
-      treeOptionList = dfs(res)
+      treeOptionList.value = dfs(res)
     })
     .finally(() => {
-      showOrHide.value = true
-      nextTick(() => {
-        resolveFunc(treeOptionList)
-      })
+      loading.value = false
     })
 }, 300)
 watch(
@@ -199,25 +195,8 @@ watch(
     }
   }
 )
-const propsTree = {
-  label: 'label',
-  children: 'children',
-  isLeaf: data => !data.children?.length
-}
+const fakeValue = ''
 const treeValue = ref()
-let cacheData = ref([])
-
-let resolveFunc = (arr = []) => {
-  arr = cloneDeep(arr)
-}
-const load = (node, resolve) => {
-  resolveFunc = debounce(resolve, 500)
-  if (!node.data?.children?.length) return resolve([])
-  setTimeout(() => {
-    resolve([...node.data?.children])
-  }, 400)
-}
-
 const selectStyle = computed(() => {
   return props.isConfig ? {} : { width: queryConditionWidth() + 'px' }
 })
@@ -226,39 +205,36 @@ const selectStyle = computed(() => {
 <template>
   <el-tree-select
     v-model="treeValue"
-    lazy
-    v-if="multiple && showOrHide"
+    :data="treeOptionList"
+    v-if="multiple && !loading"
+    clearable
     @change="handleValueChange"
-    check-strictly
     :render-after-expand="false"
+    show-checkbox
     key="multipleTree"
     filterable
     :style="selectStyle"
     multiple
-    :cache-data="cacheData"
-    :load="load"
-    :props="propsTree"
   />
   <el-tree-select
     v-model="treeValue"
     @change="handleValueChange"
-    lazy
+    :data="treeOptionList"
     check-strictly
+    clearable
     :render-after-expand="false"
-    v-else-if="showOrHide"
+    v-else-if="!loading"
     key="singleTree"
     :style="selectStyle"
     filterable
-    :cache-data="cacheData"
-    :load="load"
-    :props="propsTree"
   />
   <el-tree-select
-    v-model="treeValue"
-    v-loading="!showOrHide"
+    v-model="fakeValue"
+    v-loading="loading"
     :data="[]"
+    :render-after-expand="false"
     v-else
-    key="hideTree"
+    key="fakeTree"
     :style="selectStyle"
   />
 </template>
diff --git a/core/core-frontend/src/hooks/web/useFilter.ts b/core/core-frontend/src/hooks/web/useFilter.ts
index cfa364e3e3..9a49209380 100644
--- a/core/core-frontend/src/hooks/web/useFilter.ts
+++ b/core/core-frontend/src/hooks/web/useFilter.ts
@@ -76,6 +76,15 @@ const getDayEnd = timestamp => {
   return [+new Date(timestamp), +new Date(timestamp) + 60 * 1000 * 60 * 24 - 1000]
 }
 
+const getFieldId = (arr, result) => {
+  const [obj] = result
+  const idArr = obj.split(',')
+  return arr
+    .map(ele => ele.id)
+    .slice(0, idArr.length)
+    .join(',')
+}
+
 const getValueByDefaultValueCheckOrFirstLoad = (
   defaultValueCheck: boolean,
   defaultValue: any,
@@ -166,6 +175,9 @@ const getOperator = (
   conditionValueS,
   firstLoad
 ) => {
+  if (+displayType === 9) {
+    return multiple ? 'in' : 'eq'
+  }
   const valueF = firstLoad ? defaultConditionValueF : conditionValueF
   const valueS = firstLoad ? defaultConditionValueS : conditionValueS
   const operatorF = firstLoad ? defaultConditionValueOperatorF : conditionValueOperatorF
@@ -318,7 +330,7 @@ export const searchQuery = (queryComponentList, filter, curComponentId, firstLoa
                 filter.push({
                   componentId: ele.id,
                   fieldId: isTree
-                    ? treeFieldList.map(ele => ele.id).join(',')
+                    ? getFieldId(treeFieldList, result)
                     : item.checkedFieldsMap[curComponentId],
                   operator,
                   value: result,