|
@@ -8,11 +8,12 @@ export const dva = {
|
|
|
},
|
|
},
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
-let authRoutes = null;
|
|
|
|
|
|
|
+let authRoutes = {};
|
|
|
|
|
|
|
|
function ergodicRoutes(routes, authKey, authority) {
|
|
function ergodicRoutes(routes, authKey, authority) {
|
|
|
routes.forEach(element => {
|
|
routes.forEach(element => {
|
|
|
if (element.path === authKey) {
|
|
if (element.path === authKey) {
|
|
|
|
|
+ if (!element.authority) element.authority = []; // eslint-disable-line
|
|
|
Object.assign(element.authority, authority || []);
|
|
Object.assign(element.authority, authority || []);
|
|
|
} else if (element.routes) {
|
|
} else if (element.routes) {
|
|
|
ergodicRoutes(element.routes, authKey, authority);
|
|
ergodicRoutes(element.routes, authKey, authority);
|
|
@@ -31,8 +32,13 @@ export function patchRoutes(routes) {
|
|
|
export function render(oldRender) {
|
|
export function render(oldRender) {
|
|
|
fetch('/api/auth_routes')
|
|
fetch('/api/auth_routes')
|
|
|
.then(res => res.json())
|
|
.then(res => res.json())
|
|
|
- .then(ret => {
|
|
|
|
|
- authRoutes = ret;
|
|
|
|
|
- oldRender();
|
|
|
|
|
- });
|
|
|
|
|
|
|
+ .then(
|
|
|
|
|
+ ret => {
|
|
|
|
|
+ authRoutes = ret;
|
|
|
|
|
+ oldRender();
|
|
|
|
|
+ },
|
|
|
|
|
+ () => {
|
|
|
|
|
+ oldRender();
|
|
|
|
|
+ }
|
|
|
|
|
+ );
|
|
|
}
|
|
}
|