From ec18489f089202c64466fd3ad0fec57df5bd9b53 Mon Sep 17 00:00:00 2001 From: dataeaseShu Date: Sun, 7 Apr 2024 10:56:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E7=BB=84=E4=BB=B6=E6=A0=B7=E5=BC=8F=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=E7=82=B9=E5=87=BB?= =?UTF-8?q?X=E5=BF=85=E5=A1=AB=E9=80=89=E9=A1=B9=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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/FilterHead.vue | 5 ++++- 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/core/frontend/src/lang/en.js b/core/frontend/src/lang/en.js index 616a3e68f2..5f74ff4cac 100644 --- a/core/frontend/src/lang/en.js +++ b/core/frontend/src/lang/en.js @@ -42,6 +42,7 @@ export default { } }, time: { + dropdown_display_must: 'The display style of the current component is tiled. If it is not mandatory, the display style of the component will switch to dropdown display', end_time_start_time: 'The end time must be greater than or equal to the start time', passing_parameters: 'Empty data does not support passing parameters', not_supported: 'After binding parameters, passing empty data is not supported', diff --git a/core/frontend/src/lang/tw.js b/core/frontend/src/lang/tw.js index 2d9b9baafe..f714b597cf 100644 --- a/core/frontend/src/lang/tw.js +++ b/core/frontend/src/lang/tw.js @@ -42,6 +42,7 @@ export default { } }, time: { + dropdown_display_must: '當前組件的展示風格為平鋪，如果設為非必填，那麼組件的展示風格將切換為下拉展示。', end_time_start_time: '結束時間必須大於或等於開始時間', passing_parameters: '空數據不支持傳參數', not_supported: '綁定參數後，不支持傳空數據', diff --git a/core/frontend/src/lang/zh.js b/core/frontend/src/lang/zh.js index 8618970c08..a69e63aa59 100644 --- a/core/frontend/src/lang/zh.js +++ b/core/frontend/src/lang/zh.js @@ -46,6 +46,7 @@ export default { upload_limit_size: '图片大小不超过' }, time: { + dropdown_display_must: '当前组件的展示风格为平铺，如果设为非必填，那么组件的展示风格将切换为下拉展示。', end_time_start_time: '结束时间必须大于或等于开始时间', passing_parameters: '空数据不支持传参数', not_supported: '空数据不支持传参数', diff --git a/core/frontend/src/views/panel/filter/filterMain/FilterHead.vue b/core/frontend/src/views/panel/filter/filterMain/FilterHead.vue index 45f183f3f8..7459d91fc8 100644 --- a/core/frontend/src/views/panel/filter/filterMain/FilterHead.vue +++ b/core/frontend/src/views/panel/filter/filterMain/FilterHead.vue @@ -58,9 +58,12 @@ - 当前组件的展示风格为平铺，如果设为非必填，那么组件的展示风格将切换为下拉展示。 + {{ $t('time.dropdown_display_must') }}
Date: Sun, 7 Apr 2024 10:57:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6):?= =?UTF-8?q?=20=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E5=BF=AB=E6=8D=B7=E9=80=89=E5=8F=96=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E7=AA=81=E7=A0=B4=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4?= =?UTF-8?q?=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/frontend/src/components/widget/deWidget/DeDate.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/frontend/src/components/widget/deWidget/DeDate.vue b/core/frontend/src/components/widget/deWidget/DeDate.vue index 65a4c9d5b6..6ff5e5a66c 100644 --- a/core/frontend/src/components/widget/deWidget/DeDate.vue +++ b/core/frontend/src/components/widget/deWidget/DeDate.vue @@ -254,7 +254,7 @@ export default { const param = cut.callBack(); this.startWindowTime = param[0] const disabled = param.some(ele => { - return this.disabledDate(ele) + return this.disabledDate(ele - 1000) }) this.startWindowTime = 0 if (disabled) return