From 6f528cd16b831a810dc14484ed6000377da9af47 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 2 Jan 2024 12:40:06 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BF=87=E6=BB=A4=E5=99=A8=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E5=BF=85=E5=A1=AB=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=BD=AE=E7=A9=BA=E5=90=8E=E9=87=8D=E6=96=B0=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E6=97=A0=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/widget/serviceImpl/NumberRangeServiceImpl.js | 2 +- .../widget/serviceImpl/NumberSelectGridServiceImpl.js | 2 +- .../components/widget/serviceImpl/NumberSelectServiceImpl.js | 2 +- .../components/widget/serviceImpl/TimeDateRangeServiceImpl.js | 2 +- .../src/components/widget/serviceImpl/TimeDateServiceImpl.js | 2 +- .../src/components/widget/serviceImpl/TimeMonthServiceImpl.js | 2 +- .../src/components/widget/serviceImpl/TimeYearServiceImpl.js | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/frontend/src/components/widget/serviceImpl/NumberRangeServiceImpl.js b/core/frontend/src/components/widget/serviceImpl/NumberRangeServiceImpl.js index 2554e250dc..53d70777ea 100644 --- a/core/frontend/src/components/widget/serviceImpl/NumberRangeServiceImpl.js +++ b/core/frontend/src/components/widget/serviceImpl/NumberRangeServiceImpl.js @@ -72,7 +72,7 @@ class NumberRangeServiceImpl extends WidgetService { if (val === null || val === '' || typeof val === 'undefined') { values = element.options.value } else { - values = Array.isArray(val) ? val : val.split(',') + values = Array.isArray(val) ? val : typeof val === 'string' ? val.split(',') : [val] } if (values && values.length > 0) { const min = values[0] diff --git a/core/frontend/src/components/widget/serviceImpl/NumberSelectGridServiceImpl.js b/core/frontend/src/components/widget/serviceImpl/NumberSelectGridServiceImpl.js index add5c7d2f2..986e130e91 100644 --- a/core/frontend/src/components/widget/serviceImpl/NumberSelectGridServiceImpl.js +++ b/core/frontend/src/components/widget/serviceImpl/NumberSelectGridServiceImpl.js @@ -87,7 +87,7 @@ class NumberSelectGridServiceImpl extends WidgetService { if (val === null || val === '' || typeof val === 'undefined') { value = this.fillValueDerfault(element) } else { - value = Array.isArray(val) ? val : val.split(',') + value = Array.isArray(val) ? val : typeof val === 'string' ? val.split(',') : [val] } const param = { component: element, diff --git a/core/frontend/src/components/widget/serviceImpl/NumberSelectServiceImpl.js b/core/frontend/src/components/widget/serviceImpl/NumberSelectServiceImpl.js index 5a43afd67f..c206e8f7a3 100644 --- a/core/frontend/src/components/widget/serviceImpl/NumberSelectServiceImpl.js +++ b/core/frontend/src/components/widget/serviceImpl/NumberSelectServiceImpl.js @@ -89,7 +89,7 @@ class NumberSelectServiceImpl extends WidgetService { if (val === null || val === '' || typeof val === 'undefined') { value = this.fillValueDerfault(element) } else { - value = Array.isArray(val) ? val : val.split(',') + value = Array.isArray(val) ? val : typeof val === 'string' ? val.split(',') : [val] } const param = { component: element, diff --git a/core/frontend/src/components/widget/serviceImpl/TimeDateRangeServiceImpl.js b/core/frontend/src/components/widget/serviceImpl/TimeDateRangeServiceImpl.js index 9d16151a00..3045c3c13a 100644 --- a/core/frontend/src/components/widget/serviceImpl/TimeDateRangeServiceImpl.js +++ b/core/frontend/src/components/widget/serviceImpl/TimeDateRangeServiceImpl.js @@ -313,7 +313,7 @@ class TimeDateRangeServiceImpl extends WidgetService { getParam(element, val) { let timeArr = [] if (val) { - let value = Array.isArray(val) ? val : val.split(',') + let value = Array.isArray(val) ? val : typeof val === 'string' ? val.split(',') : [val] value = this.formatFilterValue(value) timeArr = this.formatValues(value, element) } else if (element.options.attrs.default && element.options.attrs.default.isDynamic) { diff --git a/core/frontend/src/components/widget/serviceImpl/TimeDateServiceImpl.js b/core/frontend/src/components/widget/serviceImpl/TimeDateServiceImpl.js index 03ee0b3a68..eb3df7bc91 100644 --- a/core/frontend/src/components/widget/serviceImpl/TimeDateServiceImpl.js +++ b/core/frontend/src/components/widget/serviceImpl/TimeDateServiceImpl.js @@ -170,7 +170,7 @@ class TimeDateServiceImpl extends WidgetService { getParam(element, val) { let timeArr = [] if (val) { - let value = Array.isArray(val) ? val : val.split(',') + let value = Array.isArray(val) ? val : typeof val === 'string' ? val.split(',') : [val] value = this.formatFilterValue(value) timeArr = this.formatValues(value, element) } else if (element.options.attrs.default && element.options.attrs.default.isDynamic) { diff --git a/core/frontend/src/components/widget/serviceImpl/TimeMonthServiceImpl.js b/core/frontend/src/components/widget/serviceImpl/TimeMonthServiceImpl.js index f8b0109d85..2c562632a1 100644 --- a/core/frontend/src/components/widget/serviceImpl/TimeMonthServiceImpl.js +++ b/core/frontend/src/components/widget/serviceImpl/TimeMonthServiceImpl.js @@ -131,7 +131,7 @@ class TimeMonthServiceImpl extends WidgetService { getParam(element, val) { let timeArr = [] if (val) { - let value = Array.isArray(val) ? val : val.split(',') + let value = Array.isArray(val) ? val : typeof val === 'string' ? val.split(',') : [val] value = this.formatFilterValue(value) timeArr = this.formatValues(value, element) } else if (element.options.attrs.default && element.options.attrs.default.isDynamic) { diff --git a/core/frontend/src/components/widget/serviceImpl/TimeYearServiceImpl.js b/core/frontend/src/components/widget/serviceImpl/TimeYearServiceImpl.js index 8993aeee33..1d24491532 100644 --- a/core/frontend/src/components/widget/serviceImpl/TimeYearServiceImpl.js +++ b/core/frontend/src/components/widget/serviceImpl/TimeYearServiceImpl.js @@ -118,7 +118,7 @@ class TimeYearServiceImpl extends WidgetService { getParam(element, val) { let timeArr = [] if (val) { - let value = Array.isArray(val) ? val : val.split(',') + let value = Array.isArray(val) ? val : typeof val === 'string' ? val.split(',') : [val] value = this.formatFilterValue(value) timeArr = this.formatValues(value, element) } else if (element.options.attrs.default && element.options.attrs.default.isDynamic) {