@ibiz-template/model-helper 0.7.41-alpha.28 → 0.7.41-alpha.29
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-model-helper.d.ts","sourceRoot":"","sources":["../../../src/utils/merge-model/merge-model-helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EACR,QAAQ,EASR,cAAc,EAEd,UAAU,EAEX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAY/C;;;;;;;GAOG;AACH,qBAAa,mBAAmB;IAC9B;;;;;;OAMG;IACH,SAAS,CAAC,GAAG,YAAmB;IAEhC;;;;;;;OAOG;IACH,gBAAgB,CACd,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,EAChC,UAAU,EAAE,UAAU,EAAE,GACvB,IAAI;
|
|
1
|
+
{"version":3,"file":"merge-model-helper.d.ts","sourceRoot":"","sources":["../../../src/utils/merge-model/merge-model-helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EACR,QAAQ,EASR,cAAc,EAEd,UAAU,EAEX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAY/C;;;;;;;GAOG;AACH,qBAAa,mBAAmB;IAC9B;;;;;;OAMG;IACH,SAAS,CAAC,GAAG,YAAmB;IAEhC;;;;;;;OAOG;IACH,gBAAgB,CACd,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,EAChC,UAAU,EAAE,UAAU,EAAE,GACvB,IAAI;IAuCP;;;;;;;;OAQG;IACH,uBAAuB,CACrB,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,EAChC,UAAU,EAAE,UAAU,EAAE,GACvB,IAAI;IA8BP;;;;;;;;OAQG;IACH,iBAAiB,CACf,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,EAChC,UAAU,EAAE,UAAU,EAAE,GACvB,IAAI;IAiBP;;;;;;;;OAQG;IACH,6BAA6B,CAC3B,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,EAChC,UAAU,EAAE,UAAU,EAAE,GACvB,IAAI;IAwBP;;;;;;OAMG;IACH,0CAA0C,CACxC,eAAe,EAAE,cAAc,EAAE,EACjC,IAAI,EAAE,QAAQ,EACd,UAAU,EAAE,UAAU,EAAE,GACvB,IAAI;IAwCP;;;;;;;;OAQG;IACH,qCAAqC,CACnC,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,EAChC,UAAU,EAAE,UAAU,EAAE,GACvB,IAAI;IAyEP,mBAAmB,CACjB,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,EAChC,UAAU,EAAE,UAAU,EAAE,GACvB,IAAI;IAwBP;;;;;;;;OAQG;IACH,0BAA0B,CACxB,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,EAChC,UAAU,EAAE,UAAU,EAAE,GACvB,IAAI;IAuCP;;;;;;;;OAQG;IACH,gCAAgC,CAC9B,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,EAChC,UAAU,EAAE,UAAU,EAAE,GACvB,IAAI;IAqCP;;;;;;OAMG;IACH,eAAe,CACb,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,EAChC,UAAU,EAAE,UAAU,EAAE,GACvB,IAAI;CAuCR"}
|
|
@@ -34,6 +34,11 @@ export class MergeSubModelHelper {
|
|
|
34
34
|
* @param {ISubAppRef[]} subAppRefs
|
|
35
35
|
*/
|
|
36
36
|
mergeAppMainMenu(view, controls, subAppRefs) {
|
|
37
|
+
// config.common.mergeAppMenu参数值为disable，不处理该应用的菜单合并
|
|
38
|
+
if (ibiz.config.common.mergeAppMenu &&
|
|
39
|
+
ibiz.config.common.mergeAppMenu === 'disable') {
|
|
40
|
+
return;
|
|
41
|
+
}
|
|
37
42
|
const dstAppMenu = controls === null || controls === void 0 ? void 0 : controls.find(item => {
|
|
38
43
|
return item.controlType === 'APPMENU' && item.name === 'appmenu';
|
|
39
44
|
});
|
|
@@ -41,6 +46,23 @@ export class MergeSubModelHelper {
|
|
|
41
46
|
for (let i = 0; i < subAppRefs.length; i++) {
|
|
42
47
|
const srcAppMenu = subAppRefs[i].appMenuModel;
|
|
43
48
|
if (srcAppMenu) {
|
|
49
|
+
const { userTag } = srcAppMenu;
|
|
50
|
+
if (userTag) {
|
|
51
|
+
const [userKey, userValue] = userTag.split(':');
|
|
52
|
+
// mergemenutag: 目标菜单代码名称,目标菜单代码名称建议识别正则缺省配置以匹配更多目标
|
|
53
|
+
if (userKey === 'mergemenutag') {
|
|
54
|
+
try {
|
|
55
|
+
const userValueReg = new RegExp(userValue);
|
|
56
|
+
if (!userValueReg.test(dstAppMenu.codeName)) {
|
|
57
|
+
continue;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
catch (error) {
|
|
61
|
+
ibiz.log.warn(`[菜单合并]：无效的正则表达式${userValue},忽略处理`);
|
|
62
|
+
continue;
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
}
|
|
44
66
|
mergeAppMenu(dstAppMenu, srcAppMenu);
|
|
45
67
|
}
|
|
46
68
|
}
|
|
@@ -56,6 +78,11 @@ export class MergeSubModelHelper {
|
|
|
56
78
|
* @return {*} {void}
|
|
57
79
|
*/
|
|
58
80
|
mergeSubAppExtendedMenu(view, controls, subAppRefs) {
|
|
81
|
+
// config.common.mergeAppMenu参数值为disable，不处理该应用的菜单合并
|
|
82
|
+
if (ibiz.config.common.mergeAppMenu &&
|
|
83
|
+
ibiz.config.common.mergeAppMenu === 'disable') {
|
|
84
|
+
return;
|
|
85
|
+
}
|
|
59
86
|
if (view.viewType !== 'APPINDEXVIEW' || !controls)
|
|
60
87
|
return;
|
|
61
88
|
const dstAppMenus = controls.filter(item => {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ibiz-template/model-helper",
|
|
3
|
-
"version": "0.7.41-alpha.
|
|
3
|
+
"version": "0.7.41-alpha.29",
|
|
4
4
|
"description": "模型辅助库",
|
|
5
5
|
"main": "out/index.js",
|
|
6
6
|
"types": "out/index.d.ts",
|
|
@@ -37,12 +37,13 @@
|
|
|
37
37
|
"ramda": "^0.29.1"
|
|
38
38
|
},
|
|
39
39
|
"devDependencies": {
|
|
40
|
-
"@ibiz-template/runtime": "^0.7.41-alpha.
|
|
40
|
+
"@ibiz-template/runtime": "^0.7.41-alpha.29",
|
|
41
41
|
"@types/pluralize": "^0.0.33",
|
|
42
42
|
"@types/ramda": "^0.29.10"
|
|
43
43
|
},
|
|
44
44
|
"peerDependencies": {
|
|
45
45
|
"@ibiz-template/runtime": "^0.6.0",
|
|
46
46
|
"ramda": "^0.29.0"
|
|
47
|
-
}
|
|
47
|
+
},
|
|
48
|
+
"gitHead": "40ae1f7e7fd0a9f03bc648d8854023a499097684"
|
|
48
49
|
}
|