From 71b782d96d1d5adb845d5e323093cec340fdb6d8 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Tue, 16 Jul 2024 11:45:08 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6):=20?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E7=BB=84=E4=BB=B6=E7=9A=84=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=B1=95=E7=A4=BA=E6=94=AF=E6=8C=81=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=E5=92=8C=E9=BB=98=E8=AE=A4=E4=B8=A4=E7=A7=8D=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=20#10770?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/api/dataset.ts                     | 1 +
 .../v-query/QueryConditionConfiguration.vue               | 8 ++++++++
 .../core-frontend/src/custom-component/v-query/Select.vue | 8 +++++++-
 core/core-frontend/src/custom-component/v-query/Tree.vue  | 7 ++++++-
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/core/core-frontend/src/api/dataset.ts b/core/core-frontend/src/api/dataset.ts
index 796cf88402..d8b5c469fd 100644
--- a/core/core-frontend/src/api/dataset.ts
+++ b/core/core-frontend/src/api/dataset.ts
@@ -16,6 +16,7 @@ export interface EnumValue {
   displayId?: string
   sortId?: string
   sort?: string
+  resultMode?: number
   searchText: string
   filter?: Array<{}>
 }
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 dae6c1674e..9d4e98f5e3 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -922,6 +922,7 @@ const parameterCompletion = () => {
     conditionValueF: '',
     conditionValueOperatorS: 'like',
     conditionValueS: '',
+    resultMode: 0,
     defaultConditionValueOperatorF: 'eq',
     defaultConditionValueF: '',
     defaultConditionValueOperatorS: 'like',
@@ -1850,6 +1851,13 @@ defineExpose({
                 </div>
               </div>
             </div>
+            <div class="label">选项值数量</div>
+            <div class="value">
+              <el-radio-group v-model="curComponent.resultMode">
+                <el-radio :label="0">默认</el-radio>
+                <el-radio :label="1">全部</el-radio>
+              </el-radio-group>
+            </div>
           </div>
           <div class="list-item top-item" v-if="curComponent.displayType === '8'">
             <div class="label">条件类型</div>
diff --git a/core/core-frontend/src/custom-component/v-query/Select.vue b/core/core-frontend/src/custom-component/v-query/Select.vue
index 4ae900a494..f0728dfaf8 100644
--- a/core/core-frontend/src/custom-component/v-query/Select.vue
+++ b/core/core-frontend/src/custom-component/v-query/Select.vue
@@ -25,6 +25,7 @@ interface SelectConfig {
   displayType: string
   showEmpty: boolean
   id: string
+  resultMode: number
   displayId: string
   sort: string
   sortId: string
@@ -50,6 +51,7 @@ const props = defineProps({
     default: () => {
       return {
         selectValue: '',
+        resultMode: 0,
         defaultValue: '',
         displayType: '',
         defaultValueCheck: false,
@@ -219,7 +221,10 @@ const displayTypeChange = () => {
 
 const handleFieldIdDefaultChange = (val: string[]) => {
   loading.value = true
-  getEnumValue(val)
+  getEnumValue({
+    fieldIds: val,
+    resultMode: config.value.resultMode || 0
+  })
     .then(res => {
       options.value = (res || [])
         .filter(ele => ele !== null)
@@ -501,6 +506,7 @@ const setOptions = (num: number) => {
           displayId: displayId || field.id,
           sort,
           sortId,
+          resultMode: config.value.resultMode || 0,
           searchText: searchText.value,
           filter: getCascadeFieldId()
         })
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 0b29fb690c..79d255a21a 100644
--- a/core/core-frontend/src/custom-component/v-query/Tree.vue
+++ b/core/core-frontend/src/custom-component/v-query/Tree.vue
@@ -16,6 +16,7 @@ interface SelectConfig {
   selectValue: any
   defaultMapValue: any
   defaultValue: any
+  resultMode: number
   checkedFieldsMap: object
   displayType: string
   id: string
@@ -39,6 +40,7 @@ const props = defineProps({
         selectValue: '',
         defaultValue: '',
         displayType: '',
+        resultMode: 0,
         defaultValueCheck: false,
         multiple: false,
         checkedFieldsMap: {},
@@ -176,7 +178,10 @@ const loading = ref(false)
 
 const getTreeOption = debounce(() => {
   loading.value = true
-  getFieldTree(props.config.treeFieldList.map(ele => ele.id))
+  getFieldTree({
+    fieldIds: props.config.treeFieldList.map(ele => ele.id),
+    resultMode: config.value.resultMode || 0
+  })
     .then(res => {
       treeOptionList.value = dfs(res)
     })