From 08e847d14e1cf7765c212f06396c878216b62d67 Mon Sep 17 00:00:00 2001
From: teukkk <mengyuan.lv@fit2cloud.com>
Date: Sun, 17 Nov 2024 20:27:36 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=AB=98=E7=BA=A7=E7=AD=9B=E9=80=89-?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AD=97=E6=AE=B5-=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81CASCADER=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pure/ms-advance-filter/filterDrawer.vue       | 15 +++++++++++++++
 .../components/pure/ms-advance-filter/index.ts    |  6 ++++++
 frontend/src/enums/advancedFilterEnum.ts          |  1 +
 3 files changed, 22 insertions(+)

diff --git a/frontend/src/components/pure/ms-advance-filter/filterDrawer.vue b/frontend/src/components/pure/ms-advance-filter/filterDrawer.vue
index 740acdd38e..fa408d72b3 100644
--- a/frontend/src/components/pure/ms-advance-filter/filterDrawer.vue
+++ b/frontend/src/components/pure/ms-advance-filter/filterDrawer.vue
@@ -136,6 +136,19 @@
             :placeholder="t('common.pleaseSelect')"
             :field-names="item.treeSelectProps?.fieldNames"
           />
+          <MsCascader
+            v-else-if="item.type === FilterType.CASCADER"
+            v-model:model-value="item.value"
+            :options="item.cascaderProps?.options || []"
+            mode="native"
+            option-size="small"
+            strictly
+            label-path-mode
+            v-bind="item.cascaderProps"
+            :placeholder="t('common.pleaseSelect')"
+            :disabled="isValueDisabled(item)"
+            :virtual-list-props="{ height: 200 }"
+          />
           <a-date-picker
             v-else-if="item.type === FilterType.DATE_PICKER && item.operator !== OperatorEnum.BETWEEN"
             v-model:model-value="item.value"
@@ -225,6 +238,7 @@
   import MsDrawer from '@/components/pure/ms-drawer/index.vue';
   import MsTagsInput from '@/components/pure/ms-tags-input/index.vue';
   import MsTreeSelect from '@/components/pure/ms-tree-select/index.vue';
+  import MsCascader from '@/components/business/ms-cascader/index.vue';
   import MsSelect from '@/components/business/ms-select';
   import ViewNameInput from './components/viewNameInput.vue';
 
@@ -350,6 +364,7 @@
   function valueIsArray(listItem: FilterFormItem) {
     return (
       listItem.selectProps?.multiple ||
+      listItem.cascaderProps?.multiple ||
       (listItem.type === FilterType.TAGS_INPUT &&
         ![OperatorEnum.COUNT_LT, OperatorEnum.COUNT_GT].includes(listItem.operator as OperatorEnum)) ||
       (listItem.type === FilterType.DATE_PICKER && listItem.operator === OperatorEnum.BETWEEN)
diff --git a/frontend/src/components/pure/ms-advance-filter/index.ts b/frontend/src/components/pure/ms-advance-filter/index.ts
index 66e675f9be..5e8c4f3b2e 100644
--- a/frontend/src/components/pure/ms-advance-filter/index.ts
+++ b/frontend/src/components/pure/ms-advance-filter/index.ts
@@ -36,6 +36,7 @@ export const operatorOptionsMap: Record<string, { value: string; label: string }
   [FilterType.TEXTAREA]: COMMON_TEXT_OPERATORS,
   [FilterType.NUMBER]: [GT, LT, EQUAL, EMPTY, NOT_EMPTY],
   [FilterType.SELECT]: COMMON_SELECTION_OPERATORS,
+  [FilterType.CASCADER]: COMMON_SELECTION_OPERATORS,
   [FilterType.BOOLEAN]: [EQUAL],
   [FilterType.MEMBER]: COMMON_SELECTION_OPERATORS,
   [FilterType.TAGS_INPUT]: [EMPTY, CONTAINS, NO_CONTAINS, COUNT_LT, COUNT_GT],
@@ -79,6 +80,11 @@ export const CustomTypeMaps: Record<string, any> = {
   INPUT: {
     type: 'INPUT',
   },
+  CASCADER: {
+    type: 'CASCADER',
+    propsKey: 'cascaderProps',
+    props: { multiple: true, valueKey: 'value', labelKey: 'text', options: [] },
+  },
   SELECT: {
     type: 'SELECT',
     propsKey: 'selectProps',
diff --git a/frontend/src/enums/advancedFilterEnum.ts b/frontend/src/enums/advancedFilterEnum.ts
index 2e0e4d94da..1851c6bbe2 100644
--- a/frontend/src/enums/advancedFilterEnum.ts
+++ b/frontend/src/enums/advancedFilterEnum.ts
@@ -24,6 +24,7 @@ export enum FilterType {
   TREE_SELECT = 'TreeSelect',
   TEXTAREA = 'textArea',
   BOOLEAN = 'boolean',
+  CASCADER = 'Cascader',
 }
 
 export enum ViewTypeEnum {