From cfdf98ce2ffbabfec22c729a7e4d37f959d6e04f Mon Sep 17 00:00:00 2001 From: dataeaseShu Date: Fri, 12 Dec 2025 10:47:43 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E4=B8=8B?= =?UTF-8?q?=E6=8B=89=E6=A0=91=E5=88=9B=E5=BB=BA=E7=BA=A7=E8=81=94=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=85=B3=E8=81=94=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=B8=94?= =?UTF-8?q?=E4=B8=BA=E7=9B=B8=E5=90=8C=E6=95=B0=E6=8D=AE=E9=9B=86=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E5=BA=94=E8=AF=A5=E9=9C=80=E8=A6=81=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=B8=BB=E5=8A=A8=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/custom-component/v-query/QueryCascade.vue | 1 + .../custom-component/v-query/QueryConditionConfiguration.vue | 3 ++- core/core-frontend/src/locales/en.ts | 2 +- core/core-frontend/src/locales/tw.ts | 2 +- core/core-frontend/src/locales/zh-CN.ts | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/core/core-frontend/src/custom-component/v-query/QueryCascade.vue b/core/core-frontend/src/custom-component/v-query/QueryCascade.vue index 2a5fc0da61..3e19567ac5 100644 --- a/core/core-frontend/src/custom-component/v-query/QueryCascade.vue +++ b/core/core-frontend/src/custom-component/v-query/QueryCascade.vue @@ -327,6 +327,7 @@ defineExpose({ font-family: var(--de-custom_font, 'PingFang'); font-size: 14px; font-weight: 400; + line-height: 20px; .ed-icon { position: absolute; 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 cf8b8081fa..9ca42e530d 100644 --- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue +++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue @@ -1189,8 +1189,9 @@ const openCascadeDialog = () => { .reduce((pre, next) => { const isTree = [9].includes(+next.displayType) const fieldId = isTree ? next.treeFieldList[0].id : next.field.id + const datasetId = isTree ? next.treeFieldList[0].datasetGroupId : next.dataset.id pre[next.id] = { - datasetId: next.dataset.id, + datasetId, isTree, name: next.name, queryId: next.id, diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts index b974e3b624..2e6d9e8e11 100644 --- a/core/core-frontend/src/locales/en.ts +++ b/core/core-frontend/src/locales/en.ts @@ -2868,7 +2868,7 @@ export default { must_be_met: "Based on the current component's condition, if cascade configuration is required, the following conditions must be met:", select_data_set: - '1. Display type: text and number drop-down component; 2. Option value source: select Dataset', + '1. Display type: Text dropdown component and numeric dropdown component, dropdown tree; 2. Source of option values: Selection dataset', add_cascade_configuration: 'Add cascade configuration', add_cascade_condition: 'Add cascade condition', query_condition_level: 'Level', diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts index a7841091f4..0d1159bbbc 100644 --- a/core/core-frontend/src/locales/tw.ts +++ b/core/core-frontend/src/locales/tw.ts @@ -2793,7 +2793,7 @@ export default { condition_cascade_configuration: '查詢條件級聯配置', not_reverse_cascade: '(僅上級能級聯下級,不可反向級聯)', must_be_met: '基於目前查詢元件的查詢條件，如果需要進行級聯配置，需要滿足以下條件：', - select_data_set: '1. 展示類型：文字下拉元件與數字下拉元件；2. 選項值來源：選擇資料集', + select_data_set: '1. 展示類型：文字下拉元件與數字下拉元件，下拉樹；2. 選項值來源：選擇資料集', add_cascade_configuration: '新增級聯配置', add_cascade_condition: '新增級聯條件', query_condition_level: '查詢條件層級', diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index cfe33ff079..8cd47acc8f 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -2799,7 +2799,7 @@ export default { condition_cascade_configuration: '查询条件级联配置', not_reverse_cascade: '(仅上级能级联下级,不可反向级联)', must_be_met: '基于当前查询组件的查询条件，如果需要进行级联配置，需要满足以下条件：', - select_data_set: '1. 展示类型：文本下拉组件和数字下拉组件；2. 选项值来源：选择数据集', + select_data_set: '1. 展示类型：文本下拉组件和数字下拉组件，下拉树；2. 选项值来源：选择数据集', add_cascade_configuration: '添加级联配置', add_cascade_condition: '添加级联条件', query_condition_level: '查询条件层级',