From b2aec20462c340bd388ad5e59dcd83ff8e6236de Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Fri, 29 Dec 2023 15:36:21 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=89=80=E6=9C=89=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E5=99=A8=E5=9C=A8=E5=AD=98=E5=9C=A8=E6=9F=A5=E8=AF=A2=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E5=9C=BA=E6=99=AF=E5=88=87=E6=8D=A2=E5=85=A8=E5=B1=8F?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=A4=B1=E8=B4=A5?= 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 +- .../src/components/widget/serviceImpl/TextInputServiceImpl.js | 2 +- .../components/widget/serviceImpl/TextSelectGridServiceImpl.js | 2 +- .../src/components/widget/serviceImpl/TextSelectServiceImpl.js | 2 +- .../components/widget/serviceImpl/TextSelectTreeServiceImpl.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 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/core/frontend/src/components/widget/serviceImpl/NumberRangeServiceImpl.js b/core/frontend/src/components/widget/serviceImpl/NumberRangeServiceImpl.js index 341b4fb2ca..2554e250dc 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 = val.split(',') + values = Array.isArray(val) ? val : val.split(',') } 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 c34ffc01aa..add5c7d2f2 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 = [val] + value = Array.isArray(val) ? val : val.split(',') } 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 92efb280cb..5a43afd67f 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 = [val] + value = Array.isArray(val) ? val : val.split(',') } const param = { component: element, diff --git a/core/frontend/src/components/widget/serviceImpl/TextInputServiceImpl.js b/core/frontend/src/components/widget/serviceImpl/TextInputServiceImpl.js index 207aea0188..156e32c3d1 100644 --- a/core/frontend/src/components/widget/serviceImpl/TextInputServiceImpl.js +++ b/core/frontend/src/components/widget/serviceImpl/TextInputServiceImpl.js @@ -73,7 +73,7 @@ class TextInputServiceImpl extends WidgetService { if (!val) { value = this.fillValueDerfault(element) } else { - value = [val] + value = Array.isArray(val) ? val : val.split(',') } const param = { component: element, diff --git a/core/frontend/src/components/widget/serviceImpl/TextSelectGridServiceImpl.js b/core/frontend/src/components/widget/serviceImpl/TextSelectGridServiceImpl.js index 75808bb1f0..b91ddeab33 100644 --- a/core/frontend/src/components/widget/serviceImpl/TextSelectGridServiceImpl.js +++ b/core/frontend/src/components/widget/serviceImpl/TextSelectGridServiceImpl.js @@ -88,7 +88,7 @@ class TextSelectGridServiceImpl extends WidgetService { if (!val) { value = this.fillValueDerfault(element) } else { - value = [val] + value = Array.isArray(val) ? val : val.split(',') } const param = { component: element, diff --git a/core/frontend/src/components/widget/serviceImpl/TextSelectServiceImpl.js b/core/frontend/src/components/widget/serviceImpl/TextSelectServiceImpl.js index 455db68835..e101adb136 100644 --- a/core/frontend/src/components/widget/serviceImpl/TextSelectServiceImpl.js +++ b/core/frontend/src/components/widget/serviceImpl/TextSelectServiceImpl.js @@ -92,7 +92,7 @@ class TextSelectServiceImpl extends WidgetService { if (!val) { value = this.fillValueDerfault(element) } else { - value = [val] + value = Array.isArray(val) ? val : val.split(',') } const param = { component: element, diff --git a/core/frontend/src/components/widget/serviceImpl/TextSelectTreeServiceImpl.js b/core/frontend/src/components/widget/serviceImpl/TextSelectTreeServiceImpl.js index 01f7acfa13..25b2f72613 100644 --- a/core/frontend/src/components/widget/serviceImpl/TextSelectTreeServiceImpl.js +++ b/core/frontend/src/components/widget/serviceImpl/TextSelectTreeServiceImpl.js @@ -91,7 +91,7 @@ class TextSelectTreeServiceImpl extends WidgetService { if (!val) { value = this.fillValueDerfault(element) } else { - value = [val] + value = Array.isArray(val) ? val : val.split(',') } 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 765b109a6c..9d16151a00 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 = [val] + let value = Array.isArray(val) ? val : val.split(',') 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 2d6d619d41..03ee0b3a68 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 = [val] + let value = Array.isArray(val) ? val : val.split(',') 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 f8ba82b7f7..f8b0109d85 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 = [val] + let value = Array.isArray(val) ? val : val.split(',') 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 12169259fe..8993aeee33 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 = [val] + let value = Array.isArray(val) ? val : val.split(',') value = this.formatFilterValue(value) timeArr = this.formatValues(value, element) } else if (element.options.attrs.default && element.options.attrs.default.isDynamic) {