From 34ea49b15a4246c6832f2f5ef02a9ccd987a0b69 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 28 Nov 2023 15:01:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=A4=96=E9=83=A8?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=95=B0=E5=AD=97=E5=8C=BA=E9=97=B4=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E7=BB=84=E4=BB=B6=E6=95=B0=E5=80=BC=E5=8C=B9=E9=85=8D?= =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/frontend/src/store/index.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/frontend/src/store/index.js b/core/frontend/src/store/index.js index 28b151f961..3dd54769e1 100644 --- a/core/frontend/src/store/index.js +++ b/core/frontend/src/store/index.js @@ -509,7 +509,11 @@ const data = { currentFilters.push(condition) } if (element.type === 'custom' && element.id === targetViewId) { // 过滤组件处理 - element.options.value = paramValueStr + if (element.component === 'de-number-range') { + element.options.value = paramValue + } else { + element.options.value = paramValueStr + } } }) if (element.type === 'view') { From 5ef1e4970a9e7800ddd9b9ae8c33a622791f7206 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 28 Nov 2023 15:14:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E5=A4=96?= =?UTF-8?q?=E9=83=A8=E5=8F=82=E6=95=B0=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=90=8D=E7=A7=B0=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/panel/outerParamsSet/index.vue | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/core/frontend/src/views/panel/outerParamsSet/index.vue b/core/frontend/src/views/panel/outerParamsSet/index.vue index a413f23c65..f36a64c5ce 100644 --- a/core/frontend/src/views/panel/outerParamsSet/index.vue +++ b/core/frontend/src/views/panel/outerParamsSet/index.vue @@ -284,7 +284,20 @@ export default { targetFieldId: null }, currentLinkPanelViewArray: [], - viewIdFieldArrayMap: {} + viewIdFieldArrayMap: {}, + widgetSubjectsTrans: { + timeYearWidget: '年份过滤组件', + timeMonthWidget: '年月过滤组件', + timeDateWidget: '日期过滤组件', + timeDateRangeWidget: '日期范围过滤组件', + textSelectWidget: '文本下拉过滤组件', + textSelectGridWidget: '文本列表过滤组件', + textInputWidget: '文本搜索过滤组件', + textSelectTreeWidget: '下拉树过滤组件', + numberSelectWidget: '数字下来过滤组件', + numberSelectGridWidget: '数字列表过滤组件', + numberRangeWidget: '数值区间过滤组件' + } } }, @@ -374,7 +387,7 @@ export default { this.currentLinkPanelViewArray.push({ id: componentItem.id, type: 'filter', - name: componentItem.options.attrs.title ? componentItem.options.attrs.title : '过滤组件' + name: componentItem.options.attrs.title ? componentItem.options.attrs.title : this.widgetSubjectsTrans[componentItem.serviceName] }) this.viewIdFieldArrayMap[componentItem.id] = [{ id: 'empty', name: this.$t('panel.filter_no_select') }] }