From d5cc95fefbb7dea269602b8b20d67c368d905369 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期五, 17 七月 2020 16:56:03 +0800
Subject: [PATCH] 升级element-ui版本到2.13.2
---
ruoyi-ui/src/utils/index.js | 22 ++++++++++++----------
ruoyi-ui/package.json | 2 +-
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 6353e1b..40a0f4e 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -44,7 +44,7 @@
"axios": "0.18.1",
"clipboard": "2.0.4",
"echarts": "4.2.1",
- "element-ui": "2.13.0",
+ "element-ui": "2.13.2",
"file-saver": "2.0.1",
"js-beautify": "^1.10.2",
"fuse.js": "3.4.4",
diff --git a/ruoyi-ui/src/utils/index.js b/ruoyi-ui/src/utils/index.js
index 6c3017c..49897c9 100644
--- a/ruoyi-ui/src/utils/index.js
+++ b/ruoyi-ui/src/utils/index.js
@@ -124,19 +124,21 @@
* @returns {Object}
*/
export function param2Obj(url) {
- const search = url.split('?')[1]
+ const search = decodeURIComponent(url.split('?')[1]).replace(/\+/g, ' ')
if (!search) {
return {}
}
- return JSON.parse(
- '{"' +
- decodeURIComponent(search)
- .replace(/"/g, '\\"')
- .replace(/&/g, '","')
- .replace(/=/g, '":"')
- .replace(/\+/g, ' ') +
- '"}'
- )
+ const obj = {}
+ const searchArr = search.split('&')
+ searchArr.forEach(v => {
+ const index = v.indexOf('=')
+ if (index !== -1) {
+ const name = v.substring(0, index)
+ const val = v.substring(index + 1, v.length)
+ obj[name] = val
+ }
+ })
+ return obj
}
/**
--
Gitblit v1.9.3