@ibiz-template/runtime 0.7.41-alpha.141 → 0.7.41-alpha.142
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 +40 -11
- package/dist/index.system.min.js +1 -1
- package/out/app-hub.d.ts.map +1 -1
- package/out/app-hub.js +47 -11
- package/out/types.d.ts +6 -0
- package/out/types.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/app-hub.ts +51 -11
- package/src/types.ts +7 -0
package/out/app-hub.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-hub.d.ts","sourceRoot":"","sources":["../src/app-hub.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"app-hub.d.ts","sourceRoot":"","sources":["../src/app-hub.ts"],"names":[],"mappings":"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"}
|
package/out/app-hub.js
CHANGED
|
@@ -722,6 +722,8 @@ export class AppHub {
|
|
|
722
722
|
}
|
|
723
723
|
if (pluginListLength === 0)
|
|
724
724
|
return;
|
|
725
|
+
// 设置临时appId，主应用appId格式为：中心系统标识__应用名称
|
|
726
|
+
ibiz.__TEMPAPPID__ = ibiz.env.appId.split('__')[1];
|
|
725
727
|
// 构建任务列表
|
|
726
728
|
const pluginTasks = Array.from({ length: pluginListLength }, (_, i) => {
|
|
727
729
|
const index = i + 1;
|
|
@@ -750,6 +752,8 @@ export class AppHub {
|
|
|
750
752
|
targetUrl: ((_a = errorResults[0].data) === null || _a === void 0 ? void 0 : _a.targetUrl) || 'Unknown',
|
|
751
753
|
}));
|
|
752
754
|
}
|
|
755
|
+
// 还原临时appId
|
|
756
|
+
ibiz.__TEMPAPPID__ = '';
|
|
753
757
|
}
|
|
754
758
|
/**
|
|
755
759
|
* @description 加载指定子应用扩展插件
|
|
@@ -758,23 +762,54 @@ export class AppHub {
|
|
|
758
762
|
* @memberof AppHub
|
|
759
763
|
*/
|
|
760
764
|
async loadSubExtensionPlugin(appId) {
|
|
761
|
-
|
|
765
|
+
var _a;
|
|
766
|
+
const { enableExternalPlugin, concurrentPluginCount } = ibiz.appUtil.getRuntimeDevToolConfig();
|
|
762
767
|
if (!enableExternalPlugin) {
|
|
763
768
|
return;
|
|
764
769
|
}
|
|
765
|
-
|
|
766
|
-
|
|
767
|
-
|
|
768
|
-
|
|
769
|
-
|
|
770
|
-
|
|
771
|
-
|
|
770
|
+
// 获取扩展插件总数
|
|
771
|
+
let pluginListLength = 0;
|
|
772
|
+
const res = await ibiz.net.axios({
|
|
773
|
+
method: 'get',
|
|
774
|
+
url: `${ibiz.env.baseUrl}/${ibiz.env.appId}${ibiz.env.remoteModelUrl}/subapps/${appId}/extension`,
|
|
775
|
+
});
|
|
776
|
+
if (res.status === 200 && res.data) {
|
|
777
|
+
pluginListLength = Number(res.data);
|
|
772
778
|
}
|
|
773
|
-
|
|
779
|
+
if (pluginListLength === 0)
|
|
780
|
+
return;
|
|
781
|
+
// 设置临时appId,子应用appId格式为: 子应用hash__当前应用codename__子应用codename (全小写)
|
|
782
|
+
ibiz.__TEMPAPPID__ = appId.split('__')[2];
|
|
783
|
+
// 构建任务列表
|
|
784
|
+
const pluginTasks = Array.from({ length: pluginListLength }, (_, i) => {
|
|
785
|
+
const index = i + 1;
|
|
786
|
+
const suffix = index === 1 ? '' : `${index}`;
|
|
787
|
+
const targetUrl = `${ibiz.env.baseUrl}/${ibiz.env.appId}${ibiz.env.remoteModelUrl}/subapps/${appId}/ext${suffix}`;
|
|
788
|
+
return async () => {
|
|
789
|
+
try {
|
|
790
|
+
await ibiz.plugin.loadPlugin({
|
|
791
|
+
runtimeObject: true,
|
|
792
|
+
rtobjectName: `${appId}_ExtensionPlugin${suffix}`,
|
|
793
|
+
rtobjectRepo: targetUrl,
|
|
794
|
+
});
|
|
795
|
+
return { ok: true, data: { index, targetUrl } };
|
|
796
|
+
}
|
|
797
|
+
catch (error) {
|
|
798
|
+
return { ok: false, data: { index, targetUrl, error } };
|
|
799
|
+
}
|
|
800
|
+
};
|
|
801
|
+
});
|
|
802
|
+
// 并发执行任务
|
|
803
|
+
const results = await runWithConcurrency(pluginTasks, concurrentPluginCount || 1);
|
|
804
|
+
// 处理结果
|
|
805
|
+
const errorResults = results.filter(result => !(result === null || result === void 0 ? void 0 : result.ok));
|
|
806
|
+
if (errorResults && errorResults.length > 0) {
|
|
774
807
|
ibiz.log.warn(ibiz.i18n.t('runtime.hub.noExtensionPlugin', {
|
|
775
|
-
targetUrl,
|
|
808
|
+
targetUrl: ((_a = errorResults[0].data) === null || _a === void 0 ? void 0 : _a.targetUrl) || 'Unknown',
|
|
776
809
|
}));
|
|
777
810
|
}
|
|
811
|
+
// 还原临时appId
|
|
812
|
+
ibiz.__TEMPAPPID__ = '';
|
|
778
813
|
}
|
|
779
814
|
/**
|
|
780
815
|
* 新建 hub 应用
|
|
@@ -793,7 +828,8 @@ export class AppHub {
|
|
|
793
828
|
}
|
|
794
829
|
// 加载子应用扩展插件
|
|
795
830
|
if (id !== ibiz.env.appId) {
|
|
796
|
-
|
|
831
|
+
// TODO 临时注释，待后续完善
|
|
832
|
+
// await this.loadSubExtensionPlugin(id);
|
|
797
833
|
}
|
|
798
834
|
const appModel = await this.modelLoaderProvider.getApp(id);
|
|
799
835
|
const subAppRef = await this.modelLoaderProvider.getSubAppRef(id);
|
package/out/types.d.ts
CHANGED
|
@@ -226,6 +226,12 @@ declare module '@ibiz-template/core' {
|
|
|
226
226
|
* @memberof IBizSys
|
|
227
227
|
*/
|
|
228
228
|
screenShotUtil: IScreenShotUtil;
|
|
229
|
+
/**
|
|
230
|
+
* @description 扩展插件临时应用ID(仅用于加载扩展插件存储临时应用数据，方便注册模型处理器附加应用标识)
|
|
231
|
+
* @type {string}
|
|
232
|
+
* @memberof IBizSys
|
|
233
|
+
*/
|
|
234
|
+
__TEMPAPPID__: string;
|
|
229
235
|
}
|
|
230
236
|
interface IEnvironment {
|
|
231
237
|
/**
|
package/out/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,aAAa,EACb,UAAU,EACV,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,kBAAkB,EAClB,aAAa,EACb,cAAc,EACd,YAAY,EACZ,iBAAiB,EACjB,WAAW,EACX,oBAAoB,EACpB,WAAW,EACX,QAAQ,EACR,eAAe,EACf,iBAAiB,EACjB,WAAW,EACX,aAAa,EACb,WAAW,EACX,eAAe,EACf,iBAAiB,EAClB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAE9D,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,OAAO;QACf;;;;;;WAMG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;WAMG;QACH,GAAG,EAAE,cAAc,CAAC;QAEpB;;;;;;;WAOG;QACH,KAAK,EAAE,UAAU,CAAC;QAElB;;;;;;;WAOG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;;WAOG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;;WAOG;QACH,YAAY,EAAE,iBAAiB,CAAC;QAEhC;;;;;WAKG;QACH,MAAM,EAAE,WAAW,CAAC;QAEpB;;;;;;;WAOG;QACH,QAAQ,EAAE,aAAa,CAAC;QAExB;;;;;;;WAOG;QACH,MAAM,EAAE,WAAW,CAAC;QAEpB;;;;;;WAMG;QACH,OAAO,EAAE,QAAQ,CAAC;QAElB;;WAEG;QACH,YAAY,EAAE,iBAAiB,CAAC;QAEhC;;;;;;WAMG;QACH,OAAO,EAAE,kBAAkB,CAAC;QAE5B;;;;;;WAMG;QACH,MAAM,EAAE,cAAc,CAAC;QAEvB;;;;;;WAMG;QACH,QAAQ,EAAE,cAAc,CAAC;QAEzB;;;;;;WAMG;QACH,MAAM,EAAE,aAAa,CAAC;QAEtB;;;;;;WAMG;QACH,IAAI,EAAE,YAAY,CAAC;QAEnB;;;;;;WAMG;QACH,SAAS,EAAE,iBAAiB,CAAC;QAE7B;;;;;WAKG;QACH,MAAM,EAAE,aAAa,CAAC;QAEtB;;;;;;WAMG;QACH,IAAI,EAAE,UAAU,CAAC;QAEjB;;;;;WAKG;QACH,SAAS,EAAE,oBAAoB,CAAC;QAEhC;;;;;;;WAOG;QACH,QAAQ,EAAE,iBAAiB,CAAC;QAE5B;;;;;;WAMG;QACH,eAAe,EAAE,eAAe,CAAC;QAEjC;;;;;;WAMG;QACH,kBAAkB,EAAE,kBAAkB,CAAC;QAEvC;;;;;WAKG;QACH,YAAY,EAAE,oBAAoB,CAAC;QAEnC;;;;;WAKG;QACH,cAAc,EAAE,eAAe,CAAC;QAEhC;;;;;WAKG;QACH,UAAU,EAAE,WAAW,CAAC;QAExB;;;WAGG;QACH,YAAY,EAAE,aAAa,CAAC;QAE5B;;WAEG;QACH,UAAU,EAAE,WAAW,CAAC;QAExB;;;;WAIG;QACH,cAAc,EAAE,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,aAAa,EACb,UAAU,EACV,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,kBAAkB,EAClB,aAAa,EACb,cAAc,EACd,YAAY,EACZ,iBAAiB,EACjB,WAAW,EACX,oBAAoB,EACpB,WAAW,EACX,QAAQ,EACR,eAAe,EACf,iBAAiB,EACjB,WAAW,EACX,aAAa,EACb,WAAW,EACX,eAAe,EACf,iBAAiB,EAClB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAE9D,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,OAAO;QACf;;;;;;WAMG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;WAMG;QACH,GAAG,EAAE,cAAc,CAAC;QAEpB;;;;;;;WAOG;QACH,KAAK,EAAE,UAAU,CAAC;QAElB;;;;;;;WAOG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;;WAOG;QACH,OAAO,EAAE,YAAY,CAAC;QAEtB;;;;;;;WAOG;QACH,YAAY,EAAE,iBAAiB,CAAC;QAEhC;;;;;WAKG;QACH,MAAM,EAAE,WAAW,CAAC;QAEpB;;;;;;;WAOG;QACH,QAAQ,EAAE,aAAa,CAAC;QAExB;;;;;;;WAOG;QACH,MAAM,EAAE,WAAW,CAAC;QAEpB;;;;;;WAMG;QACH,OAAO,EAAE,QAAQ,CAAC;QAElB;;WAEG;QACH,YAAY,EAAE,iBAAiB,CAAC;QAEhC;;;;;;WAMG;QACH,OAAO,EAAE,kBAAkB,CAAC;QAE5B;;;;;;WAMG;QACH,MAAM,EAAE,cAAc,CAAC;QAEvB;;;;;;WAMG;QACH,QAAQ,EAAE,cAAc,CAAC;QAEzB;;;;;;WAMG;QACH,MAAM,EAAE,aAAa,CAAC;QAEtB;;;;;;WAMG;QACH,IAAI,EAAE,YAAY,CAAC;QAEnB;;;;;;WAMG;QACH,SAAS,EAAE,iBAAiB,CAAC;QAE7B;;;;;WAKG;QACH,MAAM,EAAE,aAAa,CAAC;QAEtB;;;;;;WAMG;QACH,IAAI,EAAE,UAAU,CAAC;QAEjB;;;;;WAKG;QACH,SAAS,EAAE,oBAAoB,CAAC;QAEhC;;;;;;;WAOG;QACH,QAAQ,EAAE,iBAAiB,CAAC;QAE5B;;;;;;WAMG;QACH,eAAe,EAAE,eAAe,CAAC;QAEjC;;;;;;WAMG;QACH,kBAAkB,EAAE,kBAAkB,CAAC;QAEvC;;;;;WAKG;QACH,YAAY,EAAE,oBAAoB,CAAC;QAEnC;;;;;WAKG;QACH,cAAc,EAAE,eAAe,CAAC;QAEhC;;;;;WAKG;QACH,UAAU,EAAE,WAAW,CAAC;QAExB;;;WAGG;QACH,YAAY,EAAE,aAAa,CAAC;QAE5B;;WAEG;QACH,UAAU,EAAE,WAAW,CAAC;QAExB;;;;WAIG;QACH,cAAc,EAAE,eAAe,CAAC;QAEhC;;;;WAIG;QACH,aAAa,EAAE,MAAM,CAAC;KACvB;IAED,UAAU,YAAY;QACpB;;;;;;;WAOG;QACH,YAAY,CAAC,EAAE,aAAa,CAAC;KAC9B;CACF"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ibiz-template/runtime",
|
|
3
|
-
"version": "0.7.41-alpha.
|
|
3
|
+
"version": "0.7.41-alpha.142",
|
|
4
4
|
"description": "运行时逻辑库",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "out/index.js",
|
|
@@ -70,5 +70,5 @@
|
|
|
70
70
|
"qx-util": "^0.4.8",
|
|
71
71
|
"ramda": "^0.29.0"
|
|
72
72
|
},
|
|
73
|
-
"gitHead": "
|
|
73
|
+
"gitHead": "16456661afe5fa7de7d3cda608997ea1f78b1646"
|
|
74
74
|
}
|
package/src/app-hub.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
/* eslint-disable prefer-destructuring */
|
|
1
2
|
import {
|
|
2
3
|
IAppBICube,
|
|
3
4
|
IAppBIReport,
|
|
@@ -872,6 +873,8 @@ export class AppHub implements IAppHubService {
|
|
|
872
873
|
pluginListLength = Number(res.data);
|
|
873
874
|
}
|
|
874
875
|
if (pluginListLength === 0) return;
|
|
876
|
+
// 设置临时appId，主应用appId格式为：中心系统标识__应用名称
|
|
877
|
+
ibiz.__TEMPAPPID__ = ibiz.env.appId.split('__')[1];
|
|
875
878
|
// 构建任务列表
|
|
876
879
|
const pluginTasks = Array.from({ length: pluginListLength }, (_, i) => {
|
|
877
880
|
const index = i + 1;
|
|
@@ -905,6 +908,8 @@ export class AppHub implements IAppHubService {
|
|
|
905
908
|
}),
|
|
906
909
|
);
|
|
907
910
|
}
|
|
911
|
+
// 还原临时appId
|
|
912
|
+
ibiz.__TEMPAPPID__ = '';
|
|
908
913
|
}
|
|
909
914
|
|
|
910
915
|
/**
|
|
@@ -914,24 +919,58 @@ export class AppHub implements IAppHubService {
|
|
|
914
919
|
* @memberof AppHub
|
|
915
920
|
*/
|
|
916
921
|
public async loadSubExtensionPlugin(appId: string): Promise<void> {
|
|
917
|
-
const { enableExternalPlugin } =
|
|
922
|
+
const { enableExternalPlugin, concurrentPluginCount } =
|
|
923
|
+
ibiz.appUtil.getRuntimeDevToolConfig();
|
|
918
924
|
if (!enableExternalPlugin) {
|
|
919
925
|
return;
|
|
920
926
|
}
|
|
921
|
-
|
|
922
|
-
|
|
923
|
-
|
|
924
|
-
|
|
925
|
-
|
|
926
|
-
|
|
927
|
-
|
|
928
|
-
|
|
927
|
+
// 获取扩展插件总数
|
|
928
|
+
let pluginListLength: number = 0;
|
|
929
|
+
const res = await ibiz.net.axios({
|
|
930
|
+
method: 'get',
|
|
931
|
+
url: `${ibiz.env.baseUrl}/${ibiz.env.appId}${ibiz.env.remoteModelUrl}/subapps/${appId}/extension`,
|
|
932
|
+
});
|
|
933
|
+
if (res.status === 200 && res.data) {
|
|
934
|
+
pluginListLength = Number(res.data);
|
|
935
|
+
}
|
|
936
|
+
if (pluginListLength === 0) return;
|
|
937
|
+
// 设置临时appId,子应用appId格式为: 子应用hash__当前应用codename__子应用codename (全小写)
|
|
938
|
+
ibiz.__TEMPAPPID__ = appId.split('__')[2];
|
|
939
|
+
// 构建任务列表
|
|
940
|
+
const pluginTasks = Array.from({ length: pluginListLength }, (_, i) => {
|
|
941
|
+
const index = i + 1;
|
|
942
|
+
const suffix = index === 1 ? '' : `${index}`;
|
|
943
|
+
const targetUrl = `${ibiz.env.baseUrl}/${ibiz.env.appId}${ibiz.env.remoteModelUrl}/subapps/${appId}/ext${suffix}`;
|
|
944
|
+
return async (): Promise<{ ok: boolean; data: IData }> => {
|
|
945
|
+
try {
|
|
946
|
+
await ibiz.plugin.loadPlugin({
|
|
947
|
+
runtimeObject: true,
|
|
948
|
+
rtobjectName: `${appId}_ExtensionPlugin${suffix}`,
|
|
949
|
+
rtobjectRepo: targetUrl,
|
|
950
|
+
} as IAppPFPluginRef);
|
|
951
|
+
|
|
952
|
+
return { ok: true, data: { index, targetUrl } };
|
|
953
|
+
} catch (error) {
|
|
954
|
+
return { ok: false, data: { index, targetUrl, error } };
|
|
955
|
+
}
|
|
956
|
+
};
|
|
957
|
+
});
|
|
958
|
+
// 并发执行任务
|
|
959
|
+
const results = await runWithConcurrency(
|
|
960
|
+
pluginTasks,
|
|
961
|
+
concurrentPluginCount || 1,
|
|
962
|
+
);
|
|
963
|
+
// 处理结果
|
|
964
|
+
const errorResults = results.filter(result => !result?.ok);
|
|
965
|
+
if (errorResults && errorResults.length > 0) {
|
|
929
966
|
ibiz.log.warn(
|
|
930
967
|
ibiz.i18n.t('runtime.hub.noExtensionPlugin', {
|
|
931
|
-
targetUrl,
|
|
968
|
+
targetUrl: errorResults[0].data?.targetUrl || 'Unknown',
|
|
932
969
|
}),
|
|
933
970
|
);
|
|
934
971
|
}
|
|
972
|
+
// 还原临时appId
|
|
973
|
+
ibiz.__TEMPAPPID__ = '';
|
|
935
974
|
}
|
|
936
975
|
|
|
937
976
|
/**
|
|
@@ -951,7 +990,8 @@ export class AppHub implements IAppHubService {
|
|
|
951
990
|
}
|
|
952
991
|
// 加载子应用扩展插件
|
|
953
992
|
if (id !== ibiz.env.appId) {
|
|
954
|
-
|
|
993
|
+
// TODO 临时注释，待后续完善
|
|
994
|
+
// await this.loadSubExtensionPlugin(id);
|
|
955
995
|
}
|
|
956
996
|
const appModel: IApplication = await this.modelLoaderProvider.getApp(id);
|
|
957
997
|
const subAppRef: ISubAppRef | undefined =
|
package/src/types.ts
CHANGED
|
@@ -279,6 +279,13 @@ declare module '@ibiz-template/core' {
|
|
|
279
279
|
* @memberof IBizSys
|
|
280
280
|
*/
|
|
281
281
|
screenShotUtil: IScreenShotUtil;
|
|
282
|
+
|
|
283
|
+
/**
|
|
284
|
+
* @description 扩展插件临时应用ID(仅用于加载扩展插件存储临时应用数据，方便注册模型处理器附加应用标识)
|
|
285
|
+
* @type {string}
|
|
286
|
+
* @memberof IBizSys
|
|
287
|
+
*/
|
|
288
|
+
__TEMPAPPID__: string;
|
|
282
289
|
}
|
|
283
290
|
|
|
284
291
|
interface IEnvironment {
|