提交者
Gitee
!289 添加日期范围支持重复添加多组日期范围,请求参数中对象的属性为null、undefined不进行拼接
Merge pull request !289 from wangzhaoqiang/master
正在显示
2 个修改的文件
包含
16 行增加
和
15 行删除
| @@ -28,9 +28,11 @@ service.interceptors.request.use(config => { | @@ -28,9 +28,11 @@ service.interceptors.request.use(config => { | ||
| 28 | if (value !== null && typeof(value) !== "undefined") { | 28 | if (value !== null && typeof(value) !== "undefined") { |
| 29 | if (typeof value === 'object') { | 29 | if (typeof value === 'object') { |
| 30 | for (const key of Object.keys(value)) { | 30 | for (const key of Object.keys(value)) { |
| 31 | - let params = propName + '[' + key + ']'; | ||
| 32 | - var subPart = encodeURIComponent(params) + "="; | ||
| 33 | - url += subPart + encodeURIComponent(value[key]) + "&"; | 31 | + if (value[key] !== null && typeof (value[key]) !== 'undefined') { |
| 32 | + let params = propName + '[' + key + ']' | ||
| 33 | + let subPart = encodeURIComponent(params) + '=' | ||
| 34 | + url += subPart + encodeURIComponent(value[key]) + '&' | ||
| 35 | + } | ||
| 34 | } | 36 | } |
| 35 | } else { | 37 | } else { |
| 36 | url += part + encodeURIComponent(value) + "&"; | 38 | url += part + encodeURIComponent(value) + "&"; |
| @@ -55,18 +55,17 @@ export function resetForm(refName) { | @@ -55,18 +55,17 @@ export function resetForm(refName) { | ||
| 55 | 55 | ||
| 56 | // 添加日期范围 | 56 | // 添加日期范围 |
| 57 | export function addDateRange(params, dateRange, propName) { | 57 | export function addDateRange(params, dateRange, propName) { |
| 58 | - var search = params; | ||
| 59 | - search.params = {}; | ||
| 60 | - if (null != dateRange && '' != dateRange) { | ||
| 61 | - if (typeof (propName) === "undefined") { | ||
| 62 | - search.params["beginTime"] = dateRange[0]; | ||
| 63 | - search.params["endTime"] = dateRange[1]; | ||
| 64 | - } else { | ||
| 65 | - search.params["begin" + propName] = dateRange[0]; | ||
| 66 | - search.params["end" + propName] = dateRange[1]; | ||
| 67 | - } | ||
| 68 | - } | ||
| 69 | - return search; | 58 | + let search = params |
| 59 | + search.params = typeof (search.params) === 'object' && search.params !== null && !Array.isArray(search.params) ? search.params : {} | ||
| 60 | + dateRange = Array.isArray(dateRange) ? dateRange : [] | ||
| 61 | + if (typeof (propName) === 'undefined') { | ||
| 62 | + search.params['beginTime'] = dateRange[0] | ||
| 63 | + search.params['endTime'] = dateRange[1] | ||
| 64 | + } else { | ||
| 65 | + search.params['begin' + propName] = dateRange[0] | ||
| 66 | + search.params['end' + propName] = dateRange[1] | ||
| 67 | + } | ||
| 68 | + return search | ||
| 70 | } | 69 | } |
| 71 | 70 | ||
| 72 | // 回显数据字典 | 71 | // 回显数据字典 |
-
请 注册 或 登录 后发表评论