From 57b159eb98577f910e586f3cf79356274d68db0f Mon Sep 17 00:00:00 2001
From: wangzhaoqiang <tjwangzhaoqiang@163.com>
Date: Mon, 16 Aug 2021 14:48:34 +0800
Subject: [PATCH] 添加日期范围支持重复添加多组日期范围，请求参数中对象的属性为null、undefined不进行拼接
---
ruoyi-ui/src/utils/ruoyi.js | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index bf8390e..db42885 100644
--- a/ruoyi-ui/src/utils/ruoyi.js
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -55,18 +55,17 @@
// 添加日期范围
export function addDateRange(params, dateRange, propName) {
- var search = params;
- search.params = {};
- if (null != dateRange && '' != dateRange) {
- if (typeof (propName) === "undefined") {
- search.params["beginTime"] = dateRange[0];
- search.params["endTime"] = dateRange[1];
- } else {
- search.params["begin" + propName] = dateRange[0];
- search.params["end" + propName] = dateRange[1];
- }
- }
- return search;
+ let search = params
+ search.params = typeof (search.params) === 'object' && search.params !== null && !Array.isArray(search.params) ? search.params : {}
+ dateRange = Array.isArray(dateRange) ? dateRange : []
+ if (typeof (propName) === 'undefined') {
+ search.params['beginTime'] = dateRange[0]
+ search.params['endTime'] = dateRange[1]
+ } else {
+ search.params['begin' + propName] = dateRange[0]
+ search.params['end' + propName] = dateRange[1]
+ }
+ return search
}
// 回显数据字典
--
Gitblit v1.9.2