From 85ba1f3951931d6965ea929376487f31fa1433f1 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 2 Apr 2025 10:49:06 +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=E7=BB=84=E4=BB=B6=E5=9C=A8=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E7=BB=84=E4=BB=B6=E7=B1=BB=E5=9E=8B=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E6=B8=85=E9=99=A4=E5=85=B6=E4=BB=96=E5=B1=82=E7=BA=A7=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v-query/QueryConditionConfiguration.vue   | 29 ++++++++++++++++++-
 core/core-frontend/src/locales/en.ts          |  3 +-
 core/core-frontend/src/locales/tw.ts          |  1 +
 core/core-frontend/src/locales/zh-CN.ts       |  1 +
 .../visualized/data/dataset/form/AddSql.vue   |  4 ++-
 5 files changed, 35 insertions(+), 3 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 853341084c..60879ec674 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -764,6 +764,27 @@ const setType = () => {
   }
 }
 
+let oldDisplayType
+
+const handleSetTypeChange = () => {
+  let displayType = curComponent.value.displayType
+  if (oldDisplayType === '9' && ['0', '8'].includes(displayType)) {
+    curComponent.value.displayType = '9'
+    ElMessageBox.confirm(t('common.changing_the_display'), {
+      confirmButtonType: 'primary',
+      type: 'warning',
+      cancelButtonText: t('common.cancel'),
+      autofocus: false,
+      showClose: false
+    }).then(() => {
+      curComponent.value.displayType = displayType
+      setTypeChange()
+    })
+  } else {
+    setTypeChange()
+  }
+}
+
 const setTypeChange = () => {
   handleDialogClick()
   nextTick(() => {
@@ -779,6 +800,11 @@ const setTypeChange = () => {
     }
     setTreeDefault()
     setRelationBack()
+    if (curComponent.value.displayType === '0' && curComponent.value.treeFieldList?.length) {
+      curComponent.value.treeFieldList = []
+      curComponent.value.treeCheckedList = []
+    }
+    oldDisplayType = curComponent.value.displayType
   })
 }
 
@@ -1827,6 +1853,7 @@ const handleCondition = (item, idx = 0) => {
   }
   nextTick(() => {
     if (curComponent.value.displayType === '9') {
+      oldDisplayType = '9'
       handleRelationshipChart(idx)
       if (!curComponent.value.treeDatasetId && fields.value?.length) {
         nextTick(() => {
@@ -2808,7 +2835,7 @@ defineExpose({
               <div class="value">
                 <el-select
                   @focus="handleDialogClick"
-                  @change="setTypeChange"
+                  @change="handleSetTypeChange"
                   v-model="curComponent.displayType"
                 >
                   <el-option
diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts
index 0d4a0db6bc..e85da69548 100644
--- a/core/core-frontend/src/locales/en.ts
+++ b/core/core-frontend/src/locales/en.ts
@@ -3,6 +3,8 @@ export default {
     empty: ' ',
     associated_chart: 'Associated chart',
     associated_chart_first: 'First level associated chart',
+    changing_the_display:
+      'Changing the display type will clear the drop-down tree related settings. Are you sure?',
     other_levels:
       'Except for level 1, no query condition configuration is required for other levels',
     tree_structure: 'The drop-down tree structure cannot be empty',
@@ -2911,7 +2913,6 @@ export default {
     small: 'Small',
     middle: 'Medium',
     large: 'Large',
-    custom: 'Custom',
     no_details: 'No Data',
     sync_pc_design: 'Synchronize PC Design',
     title_background: 'Title Background',
diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts
index 76690b45d4..11ce2d0ea1 100644
--- a/core/core-frontend/src/locales/tw.ts
+++ b/core/core-frontend/src/locales/tw.ts
@@ -4,6 +4,7 @@ export default {
     other_levels: '除層級一外,其他層級無須進行查詢條件配置',
     tree_structure: '下拉樹的結構不能為空',
     associated_chart: '關聯圖表',
+    changing_the_display: '更改展示類型將會清除下拉樹相關設定,是否確定?',
     associated_chart_first: '第一層級已關聯圖表',
     component: {
       input: '單行輸入',
diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts
index 53f6f9e813..61a5c47fbd 100644
--- a/core/core-frontend/src/locales/zh-CN.ts
+++ b/core/core-frontend/src/locales/zh-CN.ts
@@ -11,6 +11,7 @@ export default {
     watermarkManagement: '水印管理',
     list_selection: '列表选择',
     date_setting: '日期设置',
+    changing_the_display: '更改展示类型将会清除下拉树相关设置,是否确定?',
     component: {
       input: '单行输入',
       textarea: '多行输入',
diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue b/core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue
index 77d484a7fe..f01218b922 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/form/AddSql.vue
@@ -433,7 +433,9 @@ const getSQLPreview = () => {
 
 let tableList = []
 watch(searchTable, val => {
-  datasourceTableData.value = tableList.filter(ele => ele.tableName.includes(val))
+  datasourceTableData.value = tableList.filter(ele =>
+    ele.tableName.toLowerCase().includes(val.toLowerCase())
+  )
 })
 
 const getIconName = (type: string) => {