ecinc-cloud-wappaio 9.6.440 → 9.6.441
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/ecwappaio.common.js +14 -8
- package/lib/ecwappaio.umd.js +14 -8
- package/lib/ecwappaio.umd.min.js +1 -1
- package/package.json +1 -1
package/lib/ecwappaio.common.js
CHANGED
|
@@ -10294,7 +10294,7 @@ var actions = {
|
|
|
10294
10294
|
return new Promise(function (resolve, reject) {
|
|
10295
10295
|
window.$user.findNavMenus(nowf).then( /*#__PURE__*/function () {
|
|
10296
10296
|
var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(response) {
|
|
10297
|
-
var layout, accessedRoutes, topMenus, key, loginUser, dynamicRoutes, i, proute;
|
|
10297
|
+
var layout, accessedRoutes, topMenus, key, loginUser, dynamicRoutes, d, i, proute;
|
|
10298
10298
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
10299
10299
|
while (1) switch (_context.prev = _context.next) {
|
|
10300
10300
|
case 0:
|
|
@@ -10332,12 +10332,16 @@ var actions = {
|
|
|
10332
10332
|
dynamicRoutes = sessionStorage.getItem('dynamicRoutes-' + loginUser.personAccount);
|
|
10333
10333
|
if (dynamicRoutes) {
|
|
10334
10334
|
dynamicRoutes = JSON.parse(dynamicRoutes);
|
|
10335
|
-
|
|
10336
|
-
|
|
10337
|
-
|
|
10338
|
-
|
|
10339
|
-
|
|
10340
|
-
|
|
10335
|
+
for (d = 0; d < dynamicRoutes.length; d++) {
|
|
10336
|
+
if (dynamicRoutes[d].children.length > 0) {
|
|
10337
|
+
for (i = 0; i < accessedRoutes.length; i++) {
|
|
10338
|
+
proute = accessedRoutes[i];
|
|
10339
|
+
if (proute.meta && proute.meta.parentId === dynamicRoutes[d].children[0].meta.id) {
|
|
10340
|
+
//删除模块菜单配置的路由定义,保留本次话产品会动态子路径
|
|
10341
|
+
accessedRoutes.splice(i--, 1);
|
|
10342
|
+
} else if (proute.meta && proute.meta.id === dynamicRoutes[d].meta.id) {
|
|
10343
|
+
accessedRoutes.splice(i, 1, dynamicRoutes[d]);
|
|
10344
|
+
}
|
|
10341
10345
|
}
|
|
10342
10346
|
}
|
|
10343
10347
|
}
|
|
@@ -10374,7 +10378,9 @@ function loadWappRoutes(accessedRoutes, wappRoutes) {
|
|
|
10374
10378
|
} else if (route.meta && route.meta.href && (route.meta.href.indexOf('@/') === 0 || route.meta.href.indexOf('#/dcontent') === 0)) {
|
|
10375
10379
|
route.component = window.$loadComponent(route.meta.href);
|
|
10376
10380
|
}
|
|
10377
|
-
|
|
10381
|
+
if (route.meta.level > 1) {
|
|
10382
|
+
accessedRoutes.push(route);
|
|
10383
|
+
}
|
|
10378
10384
|
if (route.children !== undefined && route.children !== null) {
|
|
10379
10385
|
loadWappRoutes(accessedRoutes, route.children);
|
|
10380
10386
|
}
|
package/lib/ecwappaio.umd.js
CHANGED
|
@@ -10304,7 +10304,7 @@ var actions = {
|
|
|
10304
10304
|
return new Promise(function (resolve, reject) {
|
|
10305
10305
|
window.$user.findNavMenus(nowf).then( /*#__PURE__*/function () {
|
|
10306
10306
|
var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(response) {
|
|
10307
|
-
var layout, accessedRoutes, topMenus, key, loginUser, dynamicRoutes, i, proute;
|
|
10307
|
+
var layout, accessedRoutes, topMenus, key, loginUser, dynamicRoutes, d, i, proute;
|
|
10308
10308
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
10309
10309
|
while (1) switch (_context.prev = _context.next) {
|
|
10310
10310
|
case 0:
|
|
@@ -10342,12 +10342,16 @@ var actions = {
|
|
|
10342
10342
|
dynamicRoutes = sessionStorage.getItem('dynamicRoutes-' + loginUser.personAccount);
|
|
10343
10343
|
if (dynamicRoutes) {
|
|
10344
10344
|
dynamicRoutes = JSON.parse(dynamicRoutes);
|
|
10345
|
-
|
|
10346
|
-
|
|
10347
|
-
|
|
10348
|
-
|
|
10349
|
-
|
|
10350
|
-
|
|
10345
|
+
for (d = 0; d < dynamicRoutes.length; d++) {
|
|
10346
|
+
if (dynamicRoutes[d].children.length > 0) {
|
|
10347
|
+
for (i = 0; i < accessedRoutes.length; i++) {
|
|
10348
|
+
proute = accessedRoutes[i];
|
|
10349
|
+
if (proute.meta && proute.meta.parentId === dynamicRoutes[d].children[0].meta.id) {
|
|
10350
|
+
//删除模块菜单配置的路由定义,保留本次话产品会动态子路径
|
|
10351
|
+
accessedRoutes.splice(i--, 1);
|
|
10352
|
+
} else if (proute.meta && proute.meta.id === dynamicRoutes[d].meta.id) {
|
|
10353
|
+
accessedRoutes.splice(i, 1, dynamicRoutes[d]);
|
|
10354
|
+
}
|
|
10351
10355
|
}
|
|
10352
10356
|
}
|
|
10353
10357
|
}
|
|
@@ -10384,7 +10388,9 @@ function loadWappRoutes(accessedRoutes, wappRoutes) {
|
|
|
10384
10388
|
} else if (route.meta && route.meta.href && (route.meta.href.indexOf('@/') === 0 || route.meta.href.indexOf('#/dcontent') === 0)) {
|
|
10385
10389
|
route.component = window.$loadComponent(route.meta.href);
|
|
10386
10390
|
}
|
|
10387
|
-
|
|
10391
|
+
if (route.meta.level > 1) {
|
|
10392
|
+
accessedRoutes.push(route);
|
|
10393
|
+
}
|
|
10388
10394
|
if (route.children !== undefined && route.children !== null) {
|
|
10389
10395
|
loadWappRoutes(accessedRoutes, route.children);
|
|
10390
10396
|
}
|