From bd3ff54eac73e01e212050ed2600a37f58349ec5 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 24 Jan 2024 10:05:01 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E6=97=A5=E5=BF=97=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../drawer-filter/src/DrawerFilter.vue        | 12 +++++--
 .../drawer-filter/src/DrawerTreeFilter.vue    | 35 +++++++++++++++----
 .../components/drawer-main/src/DrawerMain.vue |  2 ++
 de-xpack                                      |  2 +-
 4 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/core/core-frontend/src/components/drawer-filter/src/DrawerFilter.vue b/core/core-frontend/src/components/drawer-filter/src/DrawerFilter.vue
index 06de4f472f..07d807af03 100644
--- a/core/core-frontend/src/components/drawer-filter/src/DrawerFilter.vue
+++ b/core/core-frontend/src/components/drawer-filter/src/DrawerFilter.vue
@@ -2,7 +2,8 @@
 import { propTypes } from '@/utils/propTypes'
 import { ElSelect, ElOption } from 'element-plus-secondary'
 import { computed, reactive } from 'vue'
-
+import { useI18n } from '@/hooks/web/useI18n'
+const { t } = useI18n()
 const props = defineProps({
   optionList: propTypes.arrayOf(
     propTypes.shape({
@@ -10,7 +11,13 @@ const props = defineProps({
       name: propTypes.string
     })
   ),
-  title: propTypes.string
+  title: propTypes.string,
+  property: {
+    type: Object,
+    default: () => {
+      placeholder: ''
+    }
+  }
 })
 
 const state = reactive({
@@ -46,6 +53,7 @@ defineExpose({
         v-model="state.activeStatus"
         value-key="id"
         filterable
+        :placeholder="t('common.please_select') + props.property.placeholder"
         multiple
         @change="selectStatus"
       >
diff --git a/core/core-frontend/src/components/drawer-filter/src/DrawerTreeFilter.vue b/core/core-frontend/src/components/drawer-filter/src/DrawerTreeFilter.vue
index aa06ae72d4..2eb1a307f9 100644
--- a/core/core-frontend/src/components/drawer-filter/src/DrawerTreeFilter.vue
+++ b/core/core-frontend/src/components/drawer-filter/src/DrawerTreeFilter.vue
@@ -1,8 +1,15 @@
 <script setup lang="ts">
 import { propTypes } from '@/utils/propTypes'
 import { ElTreeSelect } from 'element-plus-secondary'
-import { computed, reactive, ref } from 'vue'
-
+import { computed, reactive, ref, PropType, toRefs } from 'vue'
+import { useI18n } from '@/hooks/web/useI18n'
+const { t } = useI18n()
+interface TreeConfig {
+  checkStrictly: boolean
+  showCheckbox: boolean
+  checkOnClickNode: boolean
+  placeholder: string
+}
 const props = defineProps({
   optionList: propTypes.arrayOf(
     propTypes.shape({
@@ -12,7 +19,22 @@ const props = defineProps({
       disabled: Boolean
     })
   ),
-  title: propTypes.string
+  title: propTypes.string,
+  property: Object as PropType<TreeConfig>
+})
+
+const { property } = toRefs(props)
+const treeConfig = computed(() => {
+  let obj = Object.assign(
+    {
+      checkStrictly: false,
+      showCheckbox: true,
+      checkOnClickNode: true,
+      placeholder: t('user.role')
+    },
+    property.value
+  )
+  return obj
 })
 
 const state = reactive({
@@ -58,9 +80,10 @@ defineExpose({
         :highlight-current="true"
         multiple
         :render-after-expand="false"
-        :placeholder="$t('common.please_select') + $t('user.role')"
-        show-checkbox
-        check-on-click-node
+        :placeholder="$t('common.please_select') + treeConfig.placeholder"
+        :show-checkbox="treeConfig.showCheckbox"
+        :check-strictly="treeConfig.checkStrictly"
+        :check-on-click-node="treeConfig.checkOnClickNode"
       />
     </div>
   </div>
diff --git a/core/core-frontend/src/components/drawer-main/src/DrawerMain.vue b/core/core-frontend/src/components/drawer-main/src/DrawerMain.vue
index 13853900ea..f00042c752 100644
--- a/core/core-frontend/src/components/drawer-main/src/DrawerMain.vue
+++ b/core/core-frontend/src/components/drawer-main/src/DrawerMain.vue
@@ -107,6 +107,7 @@ defineExpose({
         v-if="component.type === 'tree-select'"
         :option-list="component.option"
         :title="component.title"
+        :property="component.property"
         @filter-change="v => filterChange(v, component.field, 'in')"
       />
       <drawer-filter
@@ -114,6 +115,7 @@ defineExpose({
         v-if="component.type === 'select'"
         :option-list="component.option"
         :title="component.title"
+        :property="component.property"
         @filter-change="v => filterChange(v, component.field, 'in')"
       />
       <drawer-enum-filter
diff --git a/de-xpack b/de-xpack
index 217f54b5a7..62f9e14297 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 217f54b5a74178cb1de0b9daed983ea78bf48578
+Subproject commit 62f9e14297af537ce48f32571d97e3e90ba60796