blackteay/fes.js
1
0
Fork 0
mirror of https://github.com/WeBankFinTech/fes.js.git synced 2025-04-06 03:59:53 +08:00
Code Issues Projects Releases Wiki Activity

fix(fes-core): 修复模糊匹配对"/"路由判断失效

Browse Source
This commit is contained in:
harrywan 2020-11-13 14:27:00 +08:00
parent d599d2dd67
commit 47f67e54f1
2 changed files with 25 additions and 957 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

945
packages/fes-cli/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

37
packages/fes-core/src/util/index.js
View File

@ -7,21 +7,22 @@ import event from './event';
import history from './history'; import history from './history';
const util = { const util = {
// 验证一个path是否可以访问, 空的allowPage可以访问任何路由 // 验证一个path是否可以访问
canRoute(path, allowPage) { canRoute(path, allowPage) {
path = path.split('?')[0]; path = path.split('?')[0];
if (Array.isArray(allowPage) && allowPage.length > 0) { if (Array.isArray(allowPage) && allowPage.length > 0) {
if (path === '' && allowPage.includes('/')) return true; // 当路由为“/"时,传入的path为“”
if (path) { if (path === '') {
for (let i = 0; i < allowPage.length; i++) { path = '/';
if (path === allowPage[i]) { }
return true; for (let i = 0; i < allowPage.length; i++) {
} if (path === allowPage[i]) {
// 支持*匹配 return true;
const reg = new RegExp(`^${allowPage[i].replace('*', '.+')}$`); }
if (reg.test(path)) { // 支持*匹配
return true; const reg = new RegExp(`^${allowPage[i].replace('*', '.+')}$`);
} if (reg.test(path)) {
return true;
} }
} }
} }
@ -84,5 +85,13 @@ const util = {
}, },
_ _
}; };
objectUtil.merge(util, domUtil, objectUtil, typeUtil, { format }, { event }, { history });
export default util; export default {
...util,
...domUtil,
...objectUtil,
...typeUtil,
format,
event,
history
};