@ibiz-template/model-helper 0.7.41-alpha.30 → 0.7.41-alpha.32
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/dist/index.esm.js +905 -790
- package/dist/index.system.min.js +1 -1
- package/out/model-helper.d.ts +6 -1
- package/out/model-helper.d.ts.map +1 -1
- package/out/model-helper.js +15 -0
- package/out/model-loader.d.ts +2 -1
- package/out/model-loader.d.ts.map +1 -1
- package/out/model-loader.js +3 -0
- package/out/utils/merge-model/merge-app-codelist.d.ts +8 -0
- package/out/utils/merge-model/merge-app-codelist.d.ts.map +1 -0
- package/out/utils/merge-model/merge-app-codelist.js +35 -0
- package/out/utils/merge-model/merge-app-uiaction-group.d.ts +7 -0
- package/out/utils/merge-model/merge-app-uiaction-group.d.ts.map +1 -1
- package/out/utils/merge-model/merge-app-uiaction-group.js +54 -2
- package/out/utils/merge-model/merge-model-helper.d.ts +7 -1
- package/out/utils/merge-model/merge-model-helper.d.ts.map +1 -1
- package/out/utils/merge-model/merge-model-helper.js +16 -0
- package/package.json +5 -5
package/out/model-helper.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { IAppDataEntity, IAppView, IApplication, IAppLan, ISubAppRef, IAppBIScheme, IAppBICube, IAppBIReport } from '@ibiz/model-core';
|
|
1
|
+
import { IAppCodeList, IAppDataEntity, IAppView, IApplication, IAppLan, ISubAppRef, IAppBIScheme, IAppBICube, IAppBIReport } from '@ibiz/model-core';
|
|
2
2
|
import { DSLHelper } from '@ibiz/rt-model-api';
|
|
3
3
|
import { ModelUtil } from './model-util';
|
|
4
4
|
import { MergeSubModelHelper } from './utils';
|
|
@@ -247,5 +247,10 @@ export declare class ModelHelper {
|
|
|
247
247
|
* @return {*} {string}
|
|
248
248
|
*/
|
|
249
249
|
protected calcAppId(data?: IObject | string): string;
|
|
250
|
+
/**
|
|
251
|
+
* 合并子应用代码表
|
|
252
|
+
* @param codeList
|
|
253
|
+
*/
|
|
254
|
+
mergeSubAppCodeList(codeList: IAppCodeList): void;
|
|
250
255
|
}
|
|
251
256
|
//# sourceMappingURL=model-helper.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-helper.d.ts","sourceRoot":"","sources":["../src/model-helper.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"model-helper.d.ts","sourceRoot":"","sources":["../src/model-helper.ts"],"names":[],"mappings":"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"}
|
package/out/model-helper.js
CHANGED
|
@@ -268,6 +268,14 @@ export class ModelHelper {
|
|
|
268
268
|
this.deepFillSubAppId(appControl, subApp.id);
|
|
269
269
|
ibiz.hub.registerSubAppControls(subApp.id || ibiz.env.appId, this.dsl.control(appControl));
|
|
270
270
|
});
|
|
271
|
+
// 设置代码表模型到hub中
|
|
272
|
+
const appCodeLists = sourceSubApp.getAllPSAppCodeLists || [];
|
|
273
|
+
if (subApp.id) {
|
|
274
|
+
appCodeLists.forEach((appCodeList) => {
|
|
275
|
+
this.deepFillSubAppId(appCodeList, subApp.id);
|
|
276
|
+
ibiz.hub.registerSubAppCodeList(subApp.id, this.dsl.appCodeList(appCodeList));
|
|
277
|
+
});
|
|
278
|
+
}
|
|
271
279
|
// 实现子应用借助主应用独立打开,srfembsubapp的值为ref三段式的第一段哈希值，条件触发手动加载目标子应用
|
|
272
280
|
if (this.appContext.srfembsubapp &&
|
|
273
281
|
subApp.id &&
|
|
@@ -644,4 +652,11 @@ export class ModelHelper {
|
|
|
644
652
|
}
|
|
645
653
|
return appId;
|
|
646
654
|
}
|
|
655
|
+
/**
|
|
656
|
+
* 合并子应用代码表
|
|
657
|
+
* @param codeList
|
|
658
|
+
*/
|
|
659
|
+
mergeSubAppCodeList(codeList) {
|
|
660
|
+
this.merge.mergeSubAppCodeList(codeList, this.subAppRefs);
|
|
661
|
+
}
|
|
647
662
|
}
|
package/out/model-loader.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ModelLoaderProvider } from '@ibiz-template/runtime';
|
|
2
|
-
import { IApplication, IAppView, IAppDataEntity, IAppBIScheme, IAppBICube, IAppBIReport, ISubAppRef } from '@ibiz/model-core';
|
|
2
|
+
import { IApplication, IAppView, IAppDataEntity, IAppBIScheme, IAppBICube, IAppBIReport, ISubAppRef, IAppCodeList } from '@ibiz/model-core';
|
|
3
3
|
import { ModelHelper } from './model-helper';
|
|
4
4
|
/**
|
|
5
5
|
* 模型加载适配器
|
|
@@ -25,5 +25,6 @@ export declare class ModelLoader implements ModelLoaderProvider {
|
|
|
25
25
|
getAppAppBICubes(appId: string, ids: string[]): Promise<IAppBICube[]>;
|
|
26
26
|
getAppBIReports(appId: string, ids: string[]): Promise<IAppBIReport[]>;
|
|
27
27
|
translationModelToDsl(data: IData, type: 'APP' | 'VIEW' | 'CTRL' | 'APPENTITY' | 'APPBIREPORT'): Promise<IModel | undefined>;
|
|
28
|
+
mergeSubAppCodeList(codeList: IAppCodeList): void;
|
|
28
29
|
}
|
|
29
30
|
//# sourceMappingURL=model-loader.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-loader.d.ts","sourceRoot":"","sources":["../src/model-loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EACL,YAAY,EACZ,QAAQ,EACR,cAAc,EACd,YAAY,EACZ,UAAU,EACV,YAAY,EACZ,UAAU,
|
|
1
|
+
{"version":3,"file":"model-loader.d.ts","sourceRoot":"","sources":["../src/model-loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EACL,YAAY,EACZ,QAAQ,EACR,cAAc,EACd,YAAY,EACZ,UAAU,EACV,YAAY,EACZ,UAAU,EACV,YAAY,EACb,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C;;;;;;;;GAQG;AACH,qBAAa,WAAY,YAAW,mBAAmB;IACzC,SAAS,CAAC,MAAM,EAAE,WAAW;gBAAnB,MAAM,EAAE,WAAW;IAEzC,OAAO,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAItC,MAAM,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAI1C,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAI5D,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAI9D,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAIpE,0BAA0B,CACxB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,cAAc,CAAC;IAI1B,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAIlD,WAAW,CACT,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,QAAQ,CAAC;IAIpB,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAItE,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAIrE,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAItE,qBAAqB,CACnB,IAAI,EAAE,KAAK,EACX,IAAI,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,GAAG,WAAW,GAAG,aAAa,GAC1D,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAI9B,mBAAmB,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;CAGlD"}
|
package/out/model-loader.js
CHANGED
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { IAppCodeList } from '@ibiz/model-core';
|
|
2
|
+
/**
|
|
3
|
+
* 合并应用代码表,子应用代码表需开启支持动态模式和配置用户标记，合并规则：dynamic_overlay:replace|merge,replace表示子应用代码表完全覆盖主应用代码表，merge表示子应用代码表项合并到主应用代码表项中（前提条件：主应用代码表和子应用代码表均是静态代码表），其他情况不做处理
|
|
4
|
+
* @param mainCodeList - 主应用代码表
|
|
5
|
+
* @param subCodeList - 子应用代码表
|
|
6
|
+
*/
|
|
7
|
+
export declare function mergeAppCodeList(mainCodeList: IAppCodeList, subCodeList: IAppCodeList): void;
|
|
8
|
+
//# sourceMappingURL=merge-app-codelist.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"merge-app-codelist.d.ts","sourceRoot":"","sources":["../../../src/utils/merge-model/merge-app-codelist.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,YAAY,EAAE,YAAY,EAC1B,WAAW,EAAE,YAAY,GACxB,IAAI,CA+BN"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 合并应用代码表,子应用代码表需开启支持动态模式和配置用户标记，合并规则：dynamic_overlay:replace|merge,replace表示子应用代码表完全覆盖主应用代码表，merge表示子应用代码表项合并到主应用代码表项中（前提条件：主应用代码表和子应用代码表均是静态代码表），其他情况不做处理
|
|
3
|
+
* @param mainCodeList - 主应用代码表
|
|
4
|
+
* @param subCodeList - 子应用代码表
|
|
5
|
+
*/
|
|
6
|
+
export function mergeAppCodeList(mainCodeList, subCodeList) {
|
|
7
|
+
const { userTag } = subCodeList;
|
|
8
|
+
if (!userTag)
|
|
9
|
+
return;
|
|
10
|
+
const [mergeTag, mergeWay] = userTag.split(':');
|
|
11
|
+
if (!mergeTag ||
|
|
12
|
+
!mergeWay ||
|
|
13
|
+
mergeTag !== 'dynamic_overlay' ||
|
|
14
|
+
(mergeWay !== 'replace' && mergeWay !== 'merge'))
|
|
15
|
+
return;
|
|
16
|
+
switch (mergeWay) {
|
|
17
|
+
case 'replace':
|
|
18
|
+
mainCodeList = subCodeList;
|
|
19
|
+
break;
|
|
20
|
+
case 'merge':
|
|
21
|
+
if (mainCodeList.codeListType === 'STATIC' &&
|
|
22
|
+
subCodeList.codeListType === 'STATIC') {
|
|
23
|
+
if (!mainCodeList.codeItems)
|
|
24
|
+
mainCodeList.codeItems = [];
|
|
25
|
+
if (subCodeList.codeItems && subCodeList.codeItems.length > 0) {
|
|
26
|
+
subCodeList.codeItems.forEach(codeItem => {
|
|
27
|
+
mainCodeList.codeItems.push(codeItem);
|
|
28
|
+
});
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
break;
|
|
32
|
+
default:
|
|
33
|
+
break;
|
|
34
|
+
}
|
|
35
|
+
}
|
|
@@ -1,3 +1,10 @@
|
|
|
1
1
|
import { IUIActionGroup } from '@ibiz/model-core';
|
|
2
|
+
/**
|
|
3
|
+
* 合并两个界面行为组
|
|
4
|
+
*
|
|
5
|
+
* @param dst 目标界面行为组，用于接收合并结果
|
|
6
|
+
* @param src 源界面行为组，提供要合并的数据
|
|
7
|
+
* @returns 无返回值，直接修改目标对象
|
|
8
|
+
*/
|
|
2
9
|
export declare function mergeAppDEUIActionGroup(dst: IUIActionGroup | undefined, src: IUIActionGroup | undefined): void;
|
|
3
10
|
//# sourceMappingURL=merge-app-uiaction-group.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-app-uiaction-group.d.ts","sourceRoot":"","sources":["../../../src/utils/merge-model/merge-app-uiaction-group.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAwB,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"merge-app-uiaction-group.d.ts","sourceRoot":"","sources":["../../../src/utils/merge-model/merge-app-uiaction-group.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAwB,MAAM,kBAAkB,CAAC;AAwBxE;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,cAAc,GAAG,SAAS,EAC/B,GAAG,EAAE,cAAc,GAAG,SAAS,GAC9B,IAAI,CAiDN"}
|
|
@@ -1,14 +1,66 @@
|
|
|
1
|
+
// dynamic_overlay:before|after|replace|delete:detailid
|
|
2
|
+
/**
|
|
3
|
+
* 解析动态覆盖标签字符串，提取位置信息和目标ID
|
|
4
|
+
*
|
|
5
|
+
* @param tag - 要解析的标签字符串，格式应为 "dynamic_overlay:position:targetId"
|
|
6
|
+
* @returns 如果解析成功，返回包含position和targetId的对象；否则返回null
|
|
7
|
+
*/
|
|
8
|
+
function parseDynamicOverlay(tag) {
|
|
9
|
+
if (!tag) {
|
|
10
|
+
return null;
|
|
11
|
+
}
|
|
12
|
+
const match = tag.match(/^dynamic_overlay:(before|after|replace|delete):(.+)$/);
|
|
13
|
+
if (match) {
|
|
14
|
+
return { position: match[1], targetId: match[2] };
|
|
15
|
+
}
|
|
16
|
+
return null;
|
|
17
|
+
}
|
|
18
|
+
/**
|
|
19
|
+
* 合并两个界面行为组
|
|
20
|
+
*
|
|
21
|
+
* @param dst 目标界面行为组，用于接收合并结果
|
|
22
|
+
* @param src 源界面行为组，提供要合并的数据
|
|
23
|
+
* @returns 无返回值，直接修改目标对象
|
|
24
|
+
*/
|
|
1
25
|
export function mergeAppDEUIActionGroup(dst, src) {
|
|
2
26
|
if (!dst || !src) {
|
|
3
27
|
return;
|
|
4
28
|
}
|
|
5
|
-
//
|
|
29
|
+
// 合并界面行为组项,根据界面行为组成员用户标记(格式如：dynamic_overlay:before|after|replace|delete:detailid)进行合并，如格式不满足则添加到末尾，如没有用户标记，则直接添加到末尾
|
|
6
30
|
if (src.uiactionGroupDetails) {
|
|
7
31
|
if (!dst.uiactionGroupDetails) {
|
|
8
32
|
dst.uiactionGroupDetails = [];
|
|
9
33
|
}
|
|
10
34
|
src.uiactionGroupDetails.forEach((item) => {
|
|
11
|
-
|
|
35
|
+
const overlayInfo = parseDynamicOverlay(item.userTag);
|
|
36
|
+
if (overlayInfo && overlayInfo.position && overlayInfo.targetId) {
|
|
37
|
+
const targetIndex = dst.uiactionGroupDetails.findIndex((x) => x.id === overlayInfo.targetId);
|
|
38
|
+
if (targetIndex !== -1) {
|
|
39
|
+
switch (overlayInfo.position) {
|
|
40
|
+
case 'before':
|
|
41
|
+
dst.uiactionGroupDetails.splice(targetIndex, 0, item);
|
|
42
|
+
break;
|
|
43
|
+
case 'after':
|
|
44
|
+
dst.uiactionGroupDetails.splice(targetIndex + 1, 0, item);
|
|
45
|
+
break;
|
|
46
|
+
case 'replace':
|
|
47
|
+
dst.uiactionGroupDetails[targetIndex] = item;
|
|
48
|
+
break;
|
|
49
|
+
case 'delete':
|
|
50
|
+
dst.uiactionGroupDetails.splice(targetIndex, 1);
|
|
51
|
+
break;
|
|
52
|
+
default:
|
|
53
|
+
dst.uiactionGroupDetails.push(item);
|
|
54
|
+
break;
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
else {
|
|
58
|
+
dst.uiactionGroupDetails.push(item);
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
else {
|
|
62
|
+
dst.uiactionGroupDetails.push(item);
|
|
63
|
+
}
|
|
12
64
|
});
|
|
13
65
|
}
|
|
14
66
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { IAppView, IControl, IDEToolbarItem, ISubAppRef } from '@ibiz/model-core';
|
|
1
|
+
import { IAppCodeList, IAppView, IControl, IDEToolbarItem, ISubAppRef } from '@ibiz/model-core';
|
|
2
2
|
import { DSLHelper } from '@ibiz/rt-model-api';
|
|
3
3
|
/**
|
|
4
4
|
* 子应用模型合并对象
|
|
@@ -103,5 +103,11 @@ export declare class MergeSubModelHelper {
|
|
|
103
103
|
* @memberof MergeSubModelHelper
|
|
104
104
|
*/
|
|
105
105
|
mergeSubAppForm(view: IAppView, controls: IControl[] | undefined, subAppRefs: ISubAppRef[]): void;
|
|
106
|
+
/**
|
|
107
|
+
* @description 合并子应用代码表(子应用代码表标识和主应用代码表标识一致，包含模块、代码表代码名称2部分内容保持一致)
|
|
108
|
+
* @param codelist
|
|
109
|
+
* @param subAppRefs
|
|
110
|
+
*/
|
|
111
|
+
mergeSubAppCodeList(codelist: IAppCodeList, subAppRefs: ISubAppRef[]): void;
|
|
106
112
|
}
|
|
107
113
|
//# sourceMappingURL=merge-model-helper.d.ts.map
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"merge-model-helper.d.ts","sourceRoot":"","sources":["../../../src/utils/merge-model/merge-model-helper.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAEZ,QAAQ,EACR,QAAQ,EASR,cAAc,EAEd,UAAU,EAEX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAa/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;IAwCP;;;;OAIG;IACH,mBAAmB,CAAC,QAAQ,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,IAAI;CAY5E"}
|
|
@@ -6,6 +6,7 @@ import { mergeDEDrControl } from './merge-de-drcontrol';
|
|
|
6
6
|
import { mergeAppDEUIActionGroup } from './merge-app-uiaction-group';
|
|
7
7
|
import { mergeTreeView } from './merge-treeview';
|
|
8
8
|
import { getFormdataRelationTags, mergeAppDEForm, mergeFormDRTabpanel, } from './merge-de-form';
|
|
9
|
+
import { mergeAppCodeList } from './merge-app-codelist';
|
|
9
10
|
/**
|
|
10
11
|
* 子应用模型合并对象
|
|
11
12
|
*
|
|
@@ -379,4 +380,19 @@ export class MergeSubModelHelper {
|
|
|
379
380
|
}
|
|
380
381
|
});
|
|
381
382
|
}
|
|
383
|
+
/**
|
|
384
|
+
* @description 合并子应用代码表(子应用代码表标识和主应用代码表标识一致，包含模块、代码表代码名称2部分内容保持一致)
|
|
385
|
+
* @param codelist
|
|
386
|
+
* @param subAppRefs
|
|
387
|
+
*/
|
|
388
|
+
mergeSubAppCodeList(codelist, subAppRefs) {
|
|
389
|
+
if (!codelist || !subAppRefs || subAppRefs.length === 0)
|
|
390
|
+
return;
|
|
391
|
+
for (let i = 0; i < subAppRefs.length; i++) {
|
|
392
|
+
const subCodeList = ibiz.hub.getSubAppCodeList(codelist.codeListTag, subAppRefs[i].appId);
|
|
393
|
+
if (subCodeList) {
|
|
394
|
+
mergeAppCodeList(codelist, subCodeList);
|
|
395
|
+
}
|
|
396
|
+
}
|
|
397
|
+
}
|
|
382
398
|
}
|
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.32",
|
|
4
4
|
"description": "模型辅助库",
|
|
5
5
|
"main": "out/index.js",
|
|
6
6
|
"types": "out/index.d.ts",
|
|
@@ -31,13 +31,13 @@
|
|
|
31
31
|
"license": "MIT",
|
|
32
32
|
"dependencies": {
|
|
33
33
|
"@ibiz-template/core": "^0.7.41-alpha.28",
|
|
34
|
-
"@ibiz/model-core": "^0.1.
|
|
35
|
-
"@ibiz/rt-model-api": "0.2.
|
|
34
|
+
"@ibiz/model-core": "^0.1.83",
|
|
35
|
+
"@ibiz/rt-model-api": "0.2.81",
|
|
36
36
|
"pluralize": "^8.0.0",
|
|
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.32",
|
|
41
41
|
"@types/pluralize": "^0.0.33",
|
|
42
42
|
"@types/ramda": "^0.29.10"
|
|
43
43
|
},
|
|
@@ -45,5 +45,5 @@
|
|
|
45
45
|
"@ibiz-template/runtime": "^0.6.0",
|
|
46
46
|
"ramda": "^0.29.0"
|
|
47
47
|
},
|
|
48
|
-
"gitHead": "
|
|
48
|
+
"gitHead": "e97dbad22d580d539130fff00eac22b0b767c171"
|
|
49
49
|
}
|