From 32d8bf517afa84988296c20d154d43decfad2dba Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Thu, 26 Sep 2024 10:31:54 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6):=20?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6=E5=9C=A8=E5=A4=96=E9=9D=A2?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=B2=BE=E7=A1=AE=E5=8C=B9=E9=85=8D=E5=92=8C?=
 =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E5=8C=B9=E9=85=8D=E9=9C=80=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=98=BE=E7=A4=BA=E4=B8=8E=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=20#12183?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v-query/ConditionDefaultConfiguration.vue      | 14 +++++++++++++-
 .../v-query/QueryConditionConfiguration.vue        |  6 +++++-
 .../src/custom-component/v-query/TextSearch.vue    |  3 +++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/core/core-frontend/src/custom-component/v-query/ConditionDefaultConfiguration.vue b/core/core-frontend/src/custom-component/v-query/ConditionDefaultConfiguration.vue
index 3f3eba59e6..810cf0c467 100644
--- a/core/core-frontend/src/custom-component/v-query/ConditionDefaultConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/ConditionDefaultConfiguration.vue
@@ -325,10 +325,11 @@ defineExpose({
 <template>
   <div class="list-item top-item" v-if="curComponent.displayType === '8'" @click.stop>
     <div class="label">设置默认值</div>
-    <div class="value">
+    <div class="value" :class="curComponent.hideConditionSwitching && 'hide-condition_switching'">
       <div class="condition-type">
         <el-select
           class="condition-value-select"
+          v-if="!curComponent.hideConditionSwitching"
           popper-class="condition-value-select-popper"
           v-model="curComponent.defaultConditionValueOperatorF"
         >
@@ -346,6 +347,7 @@ defineExpose({
       <div class="condition-type" v-if="[1, 2].includes(curComponent.conditionType)">
         <sapn class="condition-type-tip">{{ curComponent.conditionType === 1 ? '与' : '或' }}</sapn>
         <el-select
+          v-if="!curComponent.hideConditionSwitching"
           class="condition-value-select"
           popper-class="condition-value-select-popper"
           v-model="curComponent.defaultConditionValueOperatorS"
@@ -710,6 +712,16 @@ defineExpose({
         margin-top: -0.5px;
       }
     }
+
+    &.hide-condition_switching {
+      .bottom-line {
+        width: 307px !important;
+
+        &.next-line {
+          width: 288px !important;
+        }
+      }
+    }
   }
   .value {
     .sort-field {
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 efcdd0bf0d..b680693711 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -1020,6 +1020,7 @@ const weightlessness = () => {
 const parameterCompletion = () => {
   const attributes = {
     timeType: 'fixed',
+    hideConditionSwitching: false,
     required: false,
     defaultMapValue: [],
     mapValue: [],
@@ -1067,7 +1068,7 @@ const parameterCompletion = () => {
     treeFieldList: []
   }
   Object.entries(attributes).forEach(([key, val]) => {
-    !curComponent.value[key] && (curComponent.value[key] = val)
+    curComponent.value[key] ?? (curComponent.value[key] = val)
   })
 
   if (!curComponent.value.timeRange.relativeToCurrentRange) {
@@ -2138,6 +2139,9 @@ defineExpose({
               </div>
             </div>
           </div>
+          <div v-if="curComponent.displayType === '8'">
+            <el-checkbox v-model="curComponent.hideConditionSwitching" label="隐藏条件切换" />
+          </div>
           <condition-default-configuration
             ref="defaultConfigurationRef"
             @handleTimeTypeChange="handleTimeTypeChange"
diff --git a/core/core-frontend/src/custom-component/v-query/TextSearch.vue b/core/core-frontend/src/custom-component/v-query/TextSearch.vue
index 3f448c0d22..5a6e1c706f 100644
--- a/core/core-frontend/src/custom-component/v-query/TextSearch.vue
+++ b/core/core-frontend/src/custom-component/v-query/TextSearch.vue
@@ -6,6 +6,7 @@ interface SelectConfig {
   id: string
   conditionValueOperatorF: string
   conditionValueF: string
+  hideConditionSwitching: boolean
   conditionValueOperatorS: string
   conditionValueS: string
   defaultConditionValueOperatorF: string
@@ -90,6 +91,7 @@ const lineWidth = computed(() => {
     <div class="condition-type">
       <el-select
         class="condition-value-select"
+        v-if="!config.hideConditionSwitching"
         @change="handleValueChange"
         :effect="dvInfo.type === 'dataV' ? 'dark' : ''"
         popper-class="condition-value-select-popper"
@@ -109,6 +111,7 @@ const lineWidth = computed(() => {
     <div class="condition-type" v-if="[1, 2].includes(config.conditionType)">
       <sapn class="condition-type-tip">{{ config.conditionType === 1 ? '与' : '或' }}</sapn>
       <el-select
+        v-if="!config.hideConditionSwitching"
         class="condition-value-select"
         @change="handleValueChange"
         :effect="dvInfo.type === 'dataV' ? 'dark' : ''"