@ibiz-template/model-helper 0.7.38-alpha.23 → 0.7.38-alpha.33
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 +878 -786
- package/dist/index.system.min.js +1 -1
- package/out/model-helper.d.ts +3 -1
- package/out/model-helper.d.ts.map +1 -1
- package/out/model-helper.js +41 -2
- package/out/model-util.d.ts +3 -1
- package/out/model-util.d.ts.map +1 -1
- package/out/model-util.js +6 -2
- package/out/utils/merge-model/merge-model-helper.js +1 -1
- package/package.json +4 -4
package/out/model-helper.d.ts
CHANGED
|
@@ -13,6 +13,7 @@ import { MergeSubModelHelper } from './utils';
|
|
|
13
13
|
export declare class ModelHelper {
|
|
14
14
|
protected getModel: (url: string, params?: IParams) => Promise<IModel>;
|
|
15
15
|
protected defaultAppId: string;
|
|
16
|
+
protected appContext: IParams;
|
|
16
17
|
protected permission: boolean;
|
|
17
18
|
/**
|
|
18
19
|
* dsl解析包
|
|
@@ -54,9 +55,10 @@ export declare class ModelHelper {
|
|
|
54
55
|
* @date 2024-01-08 10:01:20
|
|
55
56
|
* @param {(url: string, params?: IParams) => Promise<IModel>} getModel 模型加载方法
|
|
56
57
|
* @param {string} defaultAppId 默认应用标识
|
|
58
|
+
* @param {string} appContext 应用级上下文参数
|
|
57
59
|
* @param {boolean} [permission=true] 是否启用权限
|
|
58
60
|
*/
|
|
59
|
-
constructor(getModel: (url: string, params?: IParams) => Promise<IModel>, defaultAppId: string, permission?: boolean);
|
|
61
|
+
constructor(getModel: (url: string, params?: IParams) => Promise<IModel>, defaultAppId: string, appContext: IParams, permission?: boolean);
|
|
60
62
|
/**
|
|
61
63
|
* 初始化应用内容
|
|
62
64
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-helper.d.ts","sourceRoot":"","sources":["../src/model-helper.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,cAAc,EACd,QAAQ,EACR,YAAY,EACZ,OAAO,EACP,UAAU,EACV,YAAY,EACZ,UAAU,EACV,YAAY,EACb,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAiB,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,mBAAmB,EAAU,MAAM,SAAS,CAAC;AAEtD;;;;;;;GAOG;AACH,qBAAa,WAAW;
|
|
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
|
@@ -17,11 +17,13 @@ export class ModelHelper {
|
|
|
17
17
|
* @date 2024-01-08 10:01:20
|
|
18
18
|
* @param {(url: string, params?: IParams) => Promise<IModel>} getModel 模型加载方法
|
|
19
19
|
* @param {string} defaultAppId 默认应用标识
|
|
20
|
+
* @param {string} appContext 应用级上下文参数
|
|
20
21
|
* @param {boolean} [permission=true] 是否启用权限
|
|
21
22
|
*/
|
|
22
|
-
constructor(getModel, defaultAppId, permission = true) {
|
|
23
|
+
constructor(getModel, defaultAppId, appContext, permission = true) {
|
|
23
24
|
this.getModel = getModel;
|
|
24
25
|
this.defaultAppId = defaultAppId;
|
|
26
|
+
this.appContext = appContext;
|
|
25
27
|
this.permission = permission;
|
|
26
28
|
/**
|
|
27
29
|
* dsl解析包
|
|
@@ -81,7 +83,7 @@ export class ModelHelper {
|
|
|
81
83
|
* @return {*} {Promise<void>}
|
|
82
84
|
*/
|
|
83
85
|
async initModelUtil(modelTag, appId = this.defaultAppId) {
|
|
84
|
-
const modelUtil = new ModelUtil(appId, modelTag, this.getModel, this.defaultAppId === appId, this.permission);
|
|
86
|
+
const modelUtil = new ModelUtil(appId, modelTag, this.getModel, this.defaultAppId === appId, this.appContext, this.permission);
|
|
85
87
|
await modelUtil.init();
|
|
86
88
|
this.cache.set(appId, modelUtil);
|
|
87
89
|
}
|
|
@@ -109,6 +111,13 @@ export class ModelHelper {
|
|
|
109
111
|
}
|
|
110
112
|
});
|
|
111
113
|
}
|
|
114
|
+
// 将引用插件注册到 hub 清单中
|
|
115
|
+
if (appSourceModel.getAllPSAppPFPluginRefs && appId === ibiz.env.appId) {
|
|
116
|
+
const appPFPluginRefs = appSourceModel.getAllPSAppPFPluginRefs;
|
|
117
|
+
appPFPluginRefs.forEach(appPFPluginRef => {
|
|
118
|
+
ibiz.hub.setPlugin(this.dsl.appPFPluginRef(appPFPluginRef));
|
|
119
|
+
});
|
|
120
|
+
}
|
|
112
121
|
if (appSourceModel.getDefaultPSAppIndexView) {
|
|
113
122
|
const view = appSourceModel.getDefaultPSAppIndexView;
|
|
114
123
|
const name = view.path.split('/').pop().replace('.json', '');
|
|
@@ -205,6 +214,13 @@ export class ModelHelper {
|
|
|
205
214
|
const view = views[index];
|
|
206
215
|
ibiz.hub.setAppView(id, subApp.id, view.priority);
|
|
207
216
|
});
|
|
217
|
+
// 子应用插件引用注册到hub中
|
|
218
|
+
const appPFPluginRefs = sourceSubApp.getAllPSAppPFPluginRefs || [];
|
|
219
|
+
appPFPluginRefs.forEach((appPFPluginRef) => {
|
|
220
|
+
const appPluginRef = this.dsl.appPFPluginRef(appPFPluginRef);
|
|
221
|
+
appPluginRef.appId = subApp.id;
|
|
222
|
+
ibiz.hub.setPlugin(appPluginRef, subApp.id);
|
|
223
|
+
});
|
|
208
224
|
// 设置DrCtrl到hub中
|
|
209
225
|
const drCtrlIds = subApp.dedrcontrolIds || [];
|
|
210
226
|
const drCtrls = this.dsl.controls(sourceSubApp.getAllPSDEDRControls || []);
|
|
@@ -236,6 +252,12 @@ export class ModelHelper {
|
|
|
236
252
|
this.deepFillSubAppId(appControl, subApp.id);
|
|
237
253
|
ibiz.hub.registerSubAppControls(subApp.id || ibiz.env.appId, this.dsl.control(appControl));
|
|
238
254
|
});
|
|
255
|
+
// 实现子应用借助主应用独立打开,srfembsubapp的值为ref三段式的第一段哈希值，条件触发手动加载目标子应用
|
|
256
|
+
if (this.appContext.srfembsubapp &&
|
|
257
|
+
subApp.id &&
|
|
258
|
+
subApp.id.startsWith(this.appContext.srfembsubapp)) {
|
|
259
|
+
await ibiz.hub.createApp(subApp.id);
|
|
260
|
+
}
|
|
239
261
|
}
|
|
240
262
|
/**
|
|
241
263
|
* 获取应用模型
|
|
@@ -253,6 +275,23 @@ export class ModelHelper {
|
|
|
253
275
|
}
|
|
254
276
|
const model = await this.getModelUtil(appId).getAppModel();
|
|
255
277
|
const app = this.dsl.application(model);
|
|
278
|
+
// 实现子应用借助主应用独立打开,条件触发修改hub默认首页为子应用首页
|
|
279
|
+
if (this.appContext.srfembsubapp &&
|
|
280
|
+
appId &&
|
|
281
|
+
appId.startsWith(this.appContext.srfembsubapp)) {
|
|
282
|
+
if (model.getDefaultPSAppIndexView) {
|
|
283
|
+
const view = model.getDefaultPSAppIndexView;
|
|
284
|
+
const name = view.path.split('/').pop().replace('.json', '');
|
|
285
|
+
ibiz.hub.defaultAppIndexViewName = name;
|
|
286
|
+
if (!ibiz.env.AppTitle) {
|
|
287
|
+
const views = model.cache.getPSAppViews;
|
|
288
|
+
const indexView = views.find((viewItem) => viewItem.dynaModelFilePath === view.path);
|
|
289
|
+
if (indexView) {
|
|
290
|
+
ibiz.env.AppTitle = indexView.title;
|
|
291
|
+
}
|
|
292
|
+
}
|
|
293
|
+
}
|
|
294
|
+
}
|
|
256
295
|
return app;
|
|
257
296
|
}
|
|
258
297
|
/**
|
package/out/model-util.d.ts
CHANGED
|
@@ -12,6 +12,7 @@ export declare class ModelUtil {
|
|
|
12
12
|
protected modelTag: string;
|
|
13
13
|
protected get: (url: string, params?: IParams) => Promise<IModel>;
|
|
14
14
|
protected hub: boolean;
|
|
15
|
+
protected appContext: IParams;
|
|
15
16
|
protected permission: boolean;
|
|
16
17
|
/**
|
|
17
18
|
* 模型缓存
|
|
@@ -48,8 +49,9 @@ export declare class ModelUtil {
|
|
|
48
49
|
* @param {string} modelTag
|
|
49
50
|
* @param {(url: string, params?: IParams) => Promise<IModel>} get 模型加载方法
|
|
50
51
|
* @param {boolean} hub 是否为 hub 应用基座
|
|
52
|
+
* @param {IParams} appContext 应用级上下文参数
|
|
51
53
|
*/
|
|
52
|
-
constructor(appId: string, modelTag: string, get: (url: string, params?: IParams) => Promise<IModel>, hub: boolean, permission?: boolean);
|
|
54
|
+
constructor(appId: string, modelTag: string, get: (url: string, params?: IParams) => Promise<IModel>, hub: boolean, appContext: IParams, permission?: boolean);
|
|
53
55
|
/**
|
|
54
56
|
* 在使用前需要初始化，来进行异步加载
|
|
55
57
|
*
|
package/out/model-util.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-util.d.ts","sourceRoot":"","sources":["../src/model-util.ts"],"names":[],"mappings":"AAGA,OAAO,EAA0B,eAAe,EAAE,MAAM,SAAS,CAAC;AAGlE;;;;;;;GAOG;AACH,qBAAa,SAAS;
|
|
1
|
+
{"version":3,"file":"model-util.d.ts","sourceRoot":"","sources":["../src/model-util.ts"],"names":[],"mappings":"AAGA,OAAO,EAA0B,eAAe,EAAE,MAAM,SAAS,CAAC;AAGlE;;;;;;;GAOG;AACH,qBAAa,SAAS;IA0ClB,SAAS,CAAC,KAAK,EAAE,MAAM;IACvB,SAAS,CAAC,QAAQ,EAAE,MAAM;IAC1B,SAAS,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,CAAC;IACjE,SAAS,CAAC,GAAG,EAAE,OAAO;IACtB,SAAS,CAAC,UAAU,EAAE,OAAO;IAC7B,SAAS,CAAC,UAAU,EAAE,OAAO;IA9C/B;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAEtD;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAG,MAAM,CAAC;IAE5B;;;;;;OAMG;IACH,eAAe,EAAG,eAAe,CAAC;IAElC;;;;;;;;;;OAUG;gBAES,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,CAAC,EACvD,GAAG,EAAE,OAAO,EACZ,UAAU,EAAE,OAAO,EACnB,UAAU,GAAE,OAAc;IAGtC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAqD3B;;;;;;;OAOG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAWhD;;;;;;OAMG;IACG,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IAepC;;;;;;OAMG;IACG,WAAW,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAqB3C;;;;;;;;;OASG;IACG,qBAAqB,CACzB,GAAG,EAAE,MAAM,EACX,IAAI,GAAE,OAAc,EACpB,UAAU,GAAE,OAAe,GAC1B,OAAO,CAAC,MAAM,CAAC;IA8BlB;;;;;;;;;OASG;IACG,eAAe,CACnB,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,OAAO,EAChB,SAAS,CAAC,EAAE,OAAO,GAClB,OAAO,CAAC,MAAM,CAAC;IAiBlB;;;;;;;OAOG;IACG,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAarD;;;;;;;OAOG;IACH,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAUjD;;;;;;;OAOG;IACG,mBAAmB,CAAC,KAAK,GAAE,MAAM,EAAO,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAWlE;;;;;;;OAOG;IACG,gBAAgB,CAAC,KAAK,GAAE,MAAM,EAAO,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAW/D;;;;;;;OAOG;IACG,eAAe,CAAC,KAAK,GAAE,MAAM,EAAO,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAW9D;;;;;;;;;OASG;IACG,QAAQ,CACZ,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,OAAO,EAChB,SAAS,CAAC,EAAE,OAAO,GAClB,OAAO,CAAC,MAAM,CAAC;IAmBlB;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAmB5C;;;;;;;;;OASG;IACH,SAAS,CAAC,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,GAAE,OAAe,GAAG,MAAM;IAW5E;;;;;;;;;OASG;IACH,SAAS,CAAC,cAAc,CACtB,SAAS,EAAE,MAAM,EACjB,SAAS,GAAE,OAAe,GACzB,MAAM;CAQV"}
|
package/out/model-util.js
CHANGED
|
@@ -20,12 +20,14 @@ export class ModelUtil {
|
|
|
20
20
|
* @param {string} modelTag
|
|
21
21
|
* @param {(url: string, params?: IParams) => Promise<IModel>} get 模型加载方法
|
|
22
22
|
* @param {boolean} hub 是否为 hub 应用基座
|
|
23
|
+
* @param {IParams} appContext 应用级上下文参数
|
|
23
24
|
*/
|
|
24
|
-
constructor(appId, modelTag, get, hub, permission = true) {
|
|
25
|
+
constructor(appId, modelTag, get, hub, appContext, permission = true) {
|
|
25
26
|
this.appId = appId;
|
|
26
27
|
this.modelTag = modelTag;
|
|
27
28
|
this.get = get;
|
|
28
29
|
this.hub = hub;
|
|
30
|
+
this.appContext = appContext;
|
|
29
31
|
this.permission = permission;
|
|
30
32
|
/**
|
|
31
33
|
* 模型缓存
|
|
@@ -376,7 +378,9 @@ export class ModelUtil {
|
|
|
376
378
|
if (isDynamic) {
|
|
377
379
|
return formatPath(modelPath);
|
|
378
380
|
}
|
|
379
|
-
return `${formatPath(modelPath)}${this.modelTag
|
|
381
|
+
return `${formatPath(modelPath)}${this.modelTag
|
|
382
|
+
? `?dynamodeltag=${this.modelTag}${this.appContext && this.appContext.srfembsubapp ? `&srfembsubapp=${this.appContext.srfembsubapp}` : ''}`
|
|
383
|
+
: ''}`;
|
|
380
384
|
}
|
|
381
385
|
/**
|
|
382
386
|
* 计算子应用模型请求路径
|
|
@@ -87,7 +87,7 @@ export class MergeSubModelHelper {
|
|
|
87
87
|
});
|
|
88
88
|
if (dstDRCtrl) {
|
|
89
89
|
for (let i = 0; i < subAppRefs.length; i++) {
|
|
90
|
-
const srcDRCtrl = ibiz.hub.getSubAppDrControl(dstDRCtrl.
|
|
90
|
+
const srcDRCtrl = ibiz.hub.getSubAppDrControl(`${dstDRCtrl.appDataEntityId.split('.')[1]}_${dstDRCtrl.modelType}_${dstDRCtrl.dataRelationTag}`.toLowerCase(), subAppRefs[i].appId);
|
|
91
91
|
if (srcDRCtrl) {
|
|
92
92
|
mergeDEDrControl(dstDRCtrl, srcDRCtrl);
|
|
93
93
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ibiz-template/model-helper",
|
|
3
|
-
"version": "0.7.38-alpha.
|
|
3
|
+
"version": "0.7.38-alpha.33",
|
|
4
4
|
"description": "控制器包",
|
|
5
5
|
"main": "out/index.js",
|
|
6
6
|
"types": "out/index.d.ts",
|
|
@@ -33,13 +33,13 @@
|
|
|
33
33
|
"author": "chitanda",
|
|
34
34
|
"license": "MIT",
|
|
35
35
|
"dependencies": {
|
|
36
|
-
"@ibiz/model-core": "^0.1.
|
|
37
|
-
"@ibiz/rt-model-api": "0.2.
|
|
36
|
+
"@ibiz/model-core": "^0.1.59",
|
|
37
|
+
"@ibiz/rt-model-api": "0.2.54-alpha.2",
|
|
38
38
|
"pluralize": "^8.0.0",
|
|
39
39
|
"ramda": "^0.29.1"
|
|
40
40
|
},
|
|
41
41
|
"devDependencies": {
|
|
42
|
-
"@ibiz-template/runtime": "^0.7.38-alpha.
|
|
42
|
+
"@ibiz-template/runtime": "^0.7.38-alpha.33",
|
|
43
43
|
"@types/pluralize": "^0.0.33",
|
|
44
44
|
"@types/ramda": "^0.29.10"
|
|
45
45
|
},
|