ecinc-cloud-wappaio 9.6.430 → 9.6.432
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 +30 -22
- package/lib/ecwappaio.umd.js +30 -22
- 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, loginUser, dynamicRoutes,
|
|
10297
|
+
var layout, accessedRoutes, topMenus, key, loginUser, dynamicRoutes, i, proute;
|
|
10298
10298
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
10299
10299
|
while (1) switch (_context.prev = _context.next) {
|
|
10300
10300
|
case 0:
|
|
@@ -10302,29 +10302,19 @@ var actions = {
|
|
|
10302
10302
|
accessedRoutes = [];
|
|
10303
10303
|
topMenus = response.body.listdata.filter(function (item) {
|
|
10304
10304
|
if (item.moduleLevel === 1) return true;
|
|
10305
|
-
});
|
|
10306
|
-
_context.next = 5;
|
|
10307
|
-
return window.$user.getLoginUser(window.$auth.getToken());
|
|
10308
|
-
case 5:
|
|
10309
|
-
loginUser = _context.sent;
|
|
10310
|
-
dynamicRoutes = sessionStorage.getItem('dynamicRoutes-' + loginUser.personAccount);
|
|
10311
|
-
if (dynamicRoutes) {
|
|
10312
|
-
dynamicRoutes = JSON.parse(dynamicRoutes);
|
|
10313
|
-
loadWappRoutes(accessedRoutes, dynamicRoutes);
|
|
10314
|
-
}
|
|
10315
|
-
|
|
10316
|
-
//模块菜单定义路由
|
|
10305
|
+
}); //模块菜单定义路由
|
|
10317
10306
|
topMenus.forEach(function (item) {
|
|
10318
|
-
|
|
10319
|
-
|
|
10320
|
-
|
|
10321
|
-
view = window.$loadComponent(item.href);
|
|
10322
|
-
}
|
|
10323
|
-
var route = convertToRoute(view, item, null, null, null);
|
|
10324
|
-
accessedRoutes.push(route);
|
|
10325
|
-
var children = findChildrenRoute(view, response.body.listdata, item, null, null);
|
|
10326
|
-
accessedRoutes = accessedRoutes.concat(children);
|
|
10307
|
+
var view = layout;
|
|
10308
|
+
if (item.href && (item.href.substring(0, 2) === '@/' || item.href.substring(0, 10) === '#/dcontent') && item.target === '_top') {
|
|
10309
|
+
view = window.$loadComponent(item.href);
|
|
10327
10310
|
}
|
|
10311
|
+
var route = convertToRoute(view, item, null, null, null);
|
|
10312
|
+
accessedRoutes.push(route);
|
|
10313
|
+
|
|
10314
|
+
// if (item.leafFlag === 0) {
|
|
10315
|
+
var children = findChildrenRoute(view, response.body.listdata, item, null, null);
|
|
10316
|
+
accessedRoutes = accessedRoutes.concat(children);
|
|
10317
|
+
// }
|
|
10328
10318
|
});
|
|
10329
10319
|
|
|
10330
10320
|
//产品定义子路由
|
|
@@ -10333,6 +10323,24 @@ var actions = {
|
|
|
10333
10323
|
loadWappRoutes(accessedRoutes, response.body.wappRoutes[key]);
|
|
10334
10324
|
}
|
|
10335
10325
|
}
|
|
10326
|
+
|
|
10327
|
+
//本次会话产品动态子路径
|
|
10328
|
+
_context.next = 7;
|
|
10329
|
+
return window.$user.getLoginUser(window.$auth.getToken());
|
|
10330
|
+
case 7:
|
|
10331
|
+
loginUser = _context.sent;
|
|
10332
|
+
dynamicRoutes = sessionStorage.getItem('dynamicRoutes-' + loginUser.personAccount);
|
|
10333
|
+
if (dynamicRoutes) {
|
|
10334
|
+
dynamicRoutes = JSON.parse(dynamicRoutes);
|
|
10335
|
+
for (i = 0; i < accessRoutes.length; i++) {
|
|
10336
|
+
proute = accessRoutes[i];
|
|
10337
|
+
if (proute.meta && dynamicRoutes[0].children.length > 0 && proute.meta.parentId === dynamicRoutes[0].children[0].meta.id) {
|
|
10338
|
+
//删除模块菜单配置的路由定义，保留本次话产品会动态子路径
|
|
10339
|
+
accessRoutes.splice(i--, 1);
|
|
10340
|
+
}
|
|
10341
|
+
}
|
|
10342
|
+
loadWappRoutes(accessedRoutes, dynamicRoutes);
|
|
10343
|
+
}
|
|
10336
10344
|
commit('SET_ROUTES', accessedRoutes);
|
|
10337
10345
|
|
|
10338
10346
|
// 登录成功后连接webSocket
|
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, loginUser, dynamicRoutes,
|
|
10307
|
+
var layout, accessedRoutes, topMenus, key, loginUser, dynamicRoutes, i, proute;
|
|
10308
10308
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
10309
10309
|
while (1) switch (_context.prev = _context.next) {
|
|
10310
10310
|
case 0:
|
|
@@ -10312,29 +10312,19 @@ var actions = {
|
|
|
10312
10312
|
accessedRoutes = [];
|
|
10313
10313
|
topMenus = response.body.listdata.filter(function (item) {
|
|
10314
10314
|
if (item.moduleLevel === 1) return true;
|
|
10315
|
-
});
|
|
10316
|
-
_context.next = 5;
|
|
10317
|
-
return window.$user.getLoginUser(window.$auth.getToken());
|
|
10318
|
-
case 5:
|
|
10319
|
-
loginUser = _context.sent;
|
|
10320
|
-
dynamicRoutes = sessionStorage.getItem('dynamicRoutes-' + loginUser.personAccount);
|
|
10321
|
-
if (dynamicRoutes) {
|
|
10322
|
-
dynamicRoutes = JSON.parse(dynamicRoutes);
|
|
10323
|
-
loadWappRoutes(accessedRoutes, dynamicRoutes);
|
|
10324
|
-
}
|
|
10325
|
-
|
|
10326
|
-
//模块菜单定义路由
|
|
10315
|
+
}); //模块菜单定义路由
|
|
10327
10316
|
topMenus.forEach(function (item) {
|
|
10328
|
-
|
|
10329
|
-
|
|
10330
|
-
|
|
10331
|
-
view = window.$loadComponent(item.href);
|
|
10332
|
-
}
|
|
10333
|
-
var route = convertToRoute(view, item, null, null, null);
|
|
10334
|
-
accessedRoutes.push(route);
|
|
10335
|
-
var children = findChildrenRoute(view, response.body.listdata, item, null, null);
|
|
10336
|
-
accessedRoutes = accessedRoutes.concat(children);
|
|
10317
|
+
var view = layout;
|
|
10318
|
+
if (item.href && (item.href.substring(0, 2) === '@/' || item.href.substring(0, 10) === '#/dcontent') && item.target === '_top') {
|
|
10319
|
+
view = window.$loadComponent(item.href);
|
|
10337
10320
|
}
|
|
10321
|
+
var route = convertToRoute(view, item, null, null, null);
|
|
10322
|
+
accessedRoutes.push(route);
|
|
10323
|
+
|
|
10324
|
+
// if (item.leafFlag === 0) {
|
|
10325
|
+
var children = findChildrenRoute(view, response.body.listdata, item, null, null);
|
|
10326
|
+
accessedRoutes = accessedRoutes.concat(children);
|
|
10327
|
+
// }
|
|
10338
10328
|
});
|
|
10339
10329
|
|
|
10340
10330
|
//产品定义子路由
|
|
@@ -10343,6 +10333,24 @@ var actions = {
|
|
|
10343
10333
|
loadWappRoutes(accessedRoutes, response.body.wappRoutes[key]);
|
|
10344
10334
|
}
|
|
10345
10335
|
}
|
|
10336
|
+
|
|
10337
|
+
//本次会话产品动态子路径
|
|
10338
|
+
_context.next = 7;
|
|
10339
|
+
return window.$user.getLoginUser(window.$auth.getToken());
|
|
10340
|
+
case 7:
|
|
10341
|
+
loginUser = _context.sent;
|
|
10342
|
+
dynamicRoutes = sessionStorage.getItem('dynamicRoutes-' + loginUser.personAccount);
|
|
10343
|
+
if (dynamicRoutes) {
|
|
10344
|
+
dynamicRoutes = JSON.parse(dynamicRoutes);
|
|
10345
|
+
for (i = 0; i < accessRoutes.length; i++) {
|
|
10346
|
+
proute = accessRoutes[i];
|
|
10347
|
+
if (proute.meta && dynamicRoutes[0].children.length > 0 && proute.meta.parentId === dynamicRoutes[0].children[0].meta.id) {
|
|
10348
|
+
//删除模块菜单配置的路由定义，保留本次话产品会动态子路径
|
|
10349
|
+
accessRoutes.splice(i--, 1);
|
|
10350
|
+
}
|
|
10351
|
+
}
|
|
10352
|
+
loadWappRoutes(accessedRoutes, dynamicRoutes);
|
|
10353
|
+
}
|
|
10346
10354
|
commit('SET_ROUTES', accessedRoutes);
|
|
10347
10355
|
|
|
10348
10356
|
// 登录成功后连接webSocket
|