From 4bd1bcceda6f60d73a7d7d7279cdedb277994d76 Mon Sep 17 00:00:00 2001 From: XieYongHong <18010623010@163.com> Date: Thu, 23 Nov 2023 10:16:34 +0800 Subject: [PATCH] fix: bug#20430 --- .../Save/action/ListItem/FilterCondition.vue | 13 ++++++++++- .../Platforms/Api/components/ApiTest.vue | 22 +++++++++---------- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/src/views/rule-engine/Scene/Save/action/ListItem/FilterCondition.vue b/src/views/rule-engine/Scene/Save/action/ListItem/FilterCondition.vue index 5469d1d2..08a81d47 100644 --- a/src/views/rule-engine/Scene/Save/action/ListItem/FilterCondition.vue +++ b/src/views/rule-engine/Scene/Save/action/ListItem/FilterCondition.vue @@ -203,6 +203,17 @@ const handOptionByColumn = (option: any) => { valueOptions.value = [] valueColumnOptions.value = [] } + if(paramsValue.termType){ + if (columnType.value ==='date') { + if (timeTypeKeys.includes(paramsValue.termType)) { + if (tabsOptions.value[0].component !== 'int') { + } + tabsOptions.value[0].component = 'int' + } else if (!timeTypeKeys.includes(paramsValue.termType) && tabsOptions.value[0].component == 'int') { + tabsOptions.value[0].component = 'date' + } + } + } } watch(() => [columnOptions.value, paramsValue.column], () => { @@ -367,4 +378,4 @@ nextTick(() => { \ No newline at end of file + diff --git a/src/views/system/Platforms/Api/components/ApiTest.vue b/src/views/system/Platforms/Api/components/ApiTest.vue index bc3ef0c4..ed67b4f9 100644 --- a/src/views/system/Platforms/Api/components/ApiTest.vue +++ b/src/views/system/Platforms/Api/components/ApiTest.vue @@ -225,21 +225,21 @@ const _send = () => { let url = props.selectApi?.url; let params - if (methodName === 'get'){ - const urlParams = {}; - requestBody.params.paramsTable.forEach((item) => { - urlParams[item.name] = item.value; - if (url.includes(`{${item.name}}`)) - url = url.replace(`{${item.name}}`, item.value); + const urlParams = {}; + requestBody.params.paramsTable.forEach((item) => { + urlParams[item.name] = item.value; + if (url.includes(`{${item.name}}`)) + url = url.replace(`{${item.name}}`, item.value); }); - params = { - ...JSON.parse(requestBody.code || '{}'), - ...urlParams, - }; + if (methodName === 'get'){ + params = { + ...JSON.parse(requestBody.code || '{}'), + ...urlParams, + }; }else{ params = JSON.parse(requestBody.code || '{}') } - + server[methodObj[methodName]](url, params).then((resp: any) => { // 如果用户没填写参数且有body的情况下,给用户展示请求示例 if (Object.keys(params).length === 0 && refStr.value) {