From d5a8e209e39c1561a1bcd3b4dd66a96c3c016745 Mon Sep 17 00:00:00 2001 From: dataeaseShu Date: Tue, 27 Feb 2024 15:03:24 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6):=20?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E4=B8=8B=E6=8B=89=E7=BB=84=E4=BB=B6=E7=9A=84?= =?UTF-8?q?=E9=80=89=E9=A1=B9=E6=96=B0=E5=A2=9E=E7=A9=BA=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/frontend/src/components/widget/deWidget/DeSelect.vue | 4 ++-- core/frontend/src/lang/en.js | 1 + core/frontend/src/lang/tw.js | 1 + core/frontend/src/lang/zh.js | 1 + .../src/views/panel/filter/filterMain/FilterControl.vue | 7 +++++++ 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/core/frontend/src/components/widget/deWidget/DeSelect.vue b/core/frontend/src/components/widget/deWidget/DeSelect.vue index 3baf0596a6..280c7f3dfb 100644 --- a/core/frontend/src/components/widget/deWidget/DeSelect.vue +++ b/core/frontend/src/components/widget/deWidget/DeSelect.vue @@ -17,7 +17,7 @@ :key-word="keyWord" popper-class="coustom-de-select" :class="{'disabled-close': !inDraw && selectFirst && element.options.attrs.multiple, 'show-required-tips': showRequiredTips}" - :list="data" + :list="(element.options.attrs.showEmpty ? [{ text: '空数据', id: '_empty_$'}, ...data] : data)" :flag="flag" :is-config="isConfig" :custom-style="customStyle" @@ -554,7 +554,7 @@ export default { if (this.isCustomSortWidget && this.element.options.attrs?.sort?.sort === 'custom') { tempData = mergeCustomSortOption(this.element.options.attrs.sort.list, tempData) } - this.filterInvalidValue(tempData) + this.filterInvalidValue(this.element.options.attrs.showEmpty ? [...tempData, '_empty_$'] : tempData) return tempData.map(item => { return { id: item, diff --git a/core/frontend/src/lang/en.js b/core/frontend/src/lang/en.js index d9b403bccf..86f88eab9b 100644 --- a/core/frontend/src/lang/en.js +++ b/core/frontend/src/lang/en.js @@ -2272,6 +2272,7 @@ export default { data_list: 'Data list', component_list: 'Component list', custom_scope: 'Target', + show_empty: 'Option contains empty data', multiple_choice: 'Multiple choice', show_time: 'Show time', single_choice: 'Single choice', diff --git a/core/frontend/src/lang/tw.js b/core/frontend/src/lang/tw.js index f93ed158c5..96c9120468 100644 --- a/core/frontend/src/lang/tw.js +++ b/core/frontend/src/lang/tw.js @@ -2263,6 +2263,7 @@ export default { data_list: '數據列表', component_list: '組件列表', custom_scope: '控製範圍', + show_empty: '選項包含空數據', binding_parameters: '參數', multiple_choice: '多選', show_time: '顯示時間', diff --git a/core/frontend/src/lang/zh.js b/core/frontend/src/lang/zh.js index 1232d29d2f..82a51daef0 100644 --- a/core/frontend/src/lang/zh.js +++ b/core/frontend/src/lang/zh.js @@ -2266,6 +2266,7 @@ export default { data_list: '数据列表', component_list: '组件列表', custom_scope: '控制范围', + show_empty: '选项包含空数据', binding_parameters: '参数', multiple_choice: '多选', show_time: '显示时间', diff --git a/core/frontend/src/views/panel/filter/filterMain/FilterControl.vue b/core/frontend/src/views/panel/filter/filterMain/FilterControl.vue index 6522a314ff..75ee7acf67 100644 --- a/core/frontend/src/views/panel/filter/filterMain/FilterControl.vue +++ b/core/frontend/src/views/panel/filter/filterMain/FilterControl.vue @@ -70,6 +70,13 @@
+ {{ $t('panel.show_empty') }} + + + +