From 2b7bb59d1255c3027257bc5ba76d4b14c4a24463 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: Sun, 14 Mar 2021 22:07:45 +0800
Subject: [PATCH] !49 修复Byte[]类型参数死循环的问题 Merge pull request !49 from 周艺峰/master
---
ruoyi-ui/src/utils/ruoyi.js | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index 899459b..5277672 100644
--- a/ruoyi-ui/src/utils/ruoyi.js
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -54,13 +54,17 @@
}
// 添加日期范围
-export function addDateRange(params, dateRange) {
+export function addDateRange(params, dateRange, propName) {
var search = params;
- search.beginTime = "";
- search.endTime = "";
+ search.params = {};
if (null != dateRange && '' != dateRange) {
- search.beginTime = this.dateRange[0];
- search.endTime = this.dateRange[1];
+ 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;
}
@@ -154,7 +158,7 @@
export function tansParams(params) {
let result = ''
Object.keys(params).forEach((key) => {
- if (!Object.is(params[key], undefined) && !Object.is(params[key], null)) {
+ if (!Object.is(params[key], undefined) && !Object.is(params[key], null) && !Object.is(JSON.stringify(params[key]), '{}')) {
result += encodeURIComponent(key) + '=' + encodeURIComponent(params[key]) + '&'
}
})
--
Gitblit v1.9.3