@ibiz-template/runtime 0.7.6 → 0.7.7-dev.0
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 +56 -7
- package/dist/index.system.min.js +1 -1
- package/out/controller/common/view/view.controller.d.ts +11 -0
- package/out/controller/common/view/view.controller.d.ts.map +1 -1
- package/out/controller/common/view/view.controller.js +25 -1
- package/out/engine/md-view.engine.d.ts.map +1 -1
- package/out/engine/md-view.engine.js +4 -1
- package/out/interface/controller/controller/view/i-view.controller.d.ts +8 -0
- package/out/interface/controller/controller/view/i-view.controller.d.ts.map +1 -1
- package/out/interface/controller/state/view/i-view.state.d.ts +8 -0
- package/out/interface/controller/state/view/i-view.state.d.ts.map +1 -1
- package/out/service/de-service-util.d.ts.map +1 -1
- package/out/service/de-service-util.js +11 -2
- package/out/service/vo/tree-node-data/tree-node-data.d.ts.map +1 -1
- package/out/service/vo/tree-node-data/tree-node-data.js +7 -1
- package/out/utils/error-handler/default-error-handler.d.ts.map +1 -1
- package/out/utils/error-handler/default-error-handler.js +3 -0
- package/package.json +4 -4
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { IPortalMessage } from '@ibiz-template/core';
|
|
1
2
|
import { IAppView } from '@ibiz/model-core';
|
|
2
3
|
import { LoadingState } from '../../utils/loading/loading.state';
|
|
3
4
|
import { IViewController, IViewEvent, IViewLayoutPanelController, IControlProvider, IModal, IModalData, IUIActionResult, IUILogicParams, IViewEngine, IViewMessage } from '../../../interface';
|
|
@@ -24,6 +25,7 @@ export declare class ViewController<T extends IAppView = IAppView, S extends IVi
|
|
|
24
25
|
[key: string]: IControlProvider;
|
|
25
26
|
};
|
|
26
27
|
engines: IViewEngine[];
|
|
28
|
+
error: IData;
|
|
27
29
|
slotProps: {
|
|
28
30
|
[key: string]: IData;
|
|
29
31
|
};
|
|
@@ -161,5 +163,14 @@ export declare class ViewController<T extends IAppView = IAppView, S extends IVi
|
|
|
161
163
|
* @protected
|
|
162
164
|
*/
|
|
163
165
|
protected convertMultipleLanguages(): void;
|
|
166
|
+
/**
|
|
167
|
+
* 处理视图错误
|
|
168
|
+
*
|
|
169
|
+
* @author tony001
|
|
170
|
+
* @date 2024-04-28 12:04:27
|
|
171
|
+
* @protected
|
|
172
|
+
* @param {IPortalMessage} msg
|
|
173
|
+
*/
|
|
174
|
+
protected handleViewError(msg: IPortalMessage): void;
|
|
164
175
|
}
|
|
165
176
|
//# sourceMappingURL=view.controller.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"view.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/view/view.controller.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"view.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/view/view.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
2
2
|
import { notNilEmpty } from 'qx-util';
|
|
3
|
-
import { IBizContext, RuntimeError } from '@ibiz-template/core';
|
|
3
|
+
import { HttpError, IBizContext, RuntimeError, } from '@ibiz-template/core';
|
|
4
4
|
import { isEmpty, isNil, isNotNil } from 'ramda';
|
|
5
5
|
import { LoadingState } from '../../utils/loading/loading.state';
|
|
6
6
|
import { SysUIActionTag } from '../../../constant';
|
|
@@ -62,6 +62,7 @@ export class ViewController extends BaseController {
|
|
|
62
62
|
this.modal = new Modal({});
|
|
63
63
|
this.providers = {};
|
|
64
64
|
this.engines = [];
|
|
65
|
+
this.error = {};
|
|
65
66
|
this.slotProps = {};
|
|
66
67
|
this.counters = {};
|
|
67
68
|
/**
|
|
@@ -86,6 +87,7 @@ export class ViewController extends BaseController {
|
|
|
86
87
|
}
|
|
87
88
|
this.ctx.init(this);
|
|
88
89
|
this.initEngines();
|
|
90
|
+
this.handleViewError = this.handleViewError.bind(this);
|
|
89
91
|
}
|
|
90
92
|
/**
|
|
91
93
|
* 视图重新激活
|
|
@@ -167,6 +169,7 @@ export class ViewController extends BaseController {
|
|
|
167
169
|
this.state.srfactiveviewdata = null;
|
|
168
170
|
this.state.viewMessages = {};
|
|
169
171
|
this.state.isClosing = false;
|
|
172
|
+
this.state.hasError = false;
|
|
170
173
|
}
|
|
171
174
|
async onCreated() {
|
|
172
175
|
await super.onCreated();
|
|
@@ -220,6 +223,8 @@ export class ViewController extends BaseController {
|
|
|
220
223
|
if (this.engines.length) {
|
|
221
224
|
await Promise.all(this.engines.map(engine => engine.onCreated()));
|
|
222
225
|
}
|
|
226
|
+
// 监听视图错误信息
|
|
227
|
+
ibiz.mc.error.on(this.handleViewError);
|
|
223
228
|
}
|
|
224
229
|
async onMounted() {
|
|
225
230
|
var _a;
|
|
@@ -251,6 +256,8 @@ export class ViewController extends BaseController {
|
|
|
251
256
|
}
|
|
252
257
|
this.context.destroy();
|
|
253
258
|
ibiz.log.debug(`视图[${this.model.name}](${this.model.id})销毁`);
|
|
259
|
+
// 销毁视图错误监听
|
|
260
|
+
ibiz.mc.error.off(this.handleViewError);
|
|
254
261
|
}
|
|
255
262
|
/**
|
|
256
263
|
* 处理上下文和导航参数相关的，如自定义导航参数的处理
|
|
@@ -268,6 +275,8 @@ export class ViewController extends BaseController {
|
|
|
268
275
|
const domain = ibiz.uiDomainManager.create(this.id);
|
|
269
276
|
this.context.srfsessionid = domain.id;
|
|
270
277
|
}
|
|
278
|
+
// 视图标识添加到上下文中
|
|
279
|
+
this.context.srfviewid = this.id;
|
|
271
280
|
// 处理自定义导航上下文
|
|
272
281
|
const navContexts = this.model.appViewNavContexts;
|
|
273
282
|
let context = {};
|
|
@@ -421,4 +430,19 @@ export class ViewController extends BaseController {
|
|
|
421
430
|
this.model.caption = ibiz.i18n.t(this.model.capLanguageRes.lanResTag, this.model.caption);
|
|
422
431
|
}
|
|
423
432
|
}
|
|
433
|
+
/**
|
|
434
|
+
* 处理视图错误
|
|
435
|
+
*
|
|
436
|
+
* @author tony001
|
|
437
|
+
* @date 2024-04-28 12:04:27
|
|
438
|
+
* @protected
|
|
439
|
+
* @param {IPortalMessage} msg
|
|
440
|
+
*/
|
|
441
|
+
handleViewError(msg) {
|
|
442
|
+
const { type, data } = msg;
|
|
443
|
+
if (type === 'ERROR' && data instanceof HttpError && data.tag === this.id) {
|
|
444
|
+
this.error = data;
|
|
445
|
+
this.state.hasError = true;
|
|
446
|
+
}
|
|
447
|
+
}
|
|
424
448
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"md-view.engine.d.ts","sourceRoot":"","sources":["../../src/engine/md-view.engine.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAc,MAAM,kBAAkB,CAAC;AAGnE,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,oBAAoB,EACpB,qBAAqB,EACrB,kBAAkB,EAClB,oBAAoB,EACpB,gBAAgB,EAChB,SAAS,EACT,eAAe,EACf,kBAAkB,EACnB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD;;;;;;;GAOG;AACH,qBAAa,YAAa,SAAQ,cAAc;IAC9C,UAAkB,IAAI,EAAE,cAAc,CACpC,mBAAmB,EACnB,YAAY,EACZ,YAAY,CACb,CAAC;IAEF;;;;;;OAMG;IACH,IAAI,gBAAgB,IAAI,MAAM,CAE7B;IAED;;;;;OAKG;IACH,SAAS,KAAK,UAAU,IAAI,qBAAqB,CAEhD;IAED;;;;;OAKG;IACH,SAAS,KAAK,SAAS,IAAI,oBAAoB,CAE9C;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,UAAU,IAAI,kBAAkB,GAAG,SAAS,CAEzD;IAED;;;;;OAKG;IACH,SAAS,KAAK,aAAa,IAAI,qBAAqB,CAEnD;IAED;;;;;OAKG;IACH,SAAS,KAAK,YAAY,IAAI,oBAAoB,CAEjD;IAED;;;;;;OAMG;IACH,SAAS,KAAK,YAAY,IAAI,oBAAoB,CAIjD;IAEK,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAqB1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAmFhC;;;;;OAKG;IACH,mBAAmB,IAAI,IAAI;IAQ3B;;;;;;;OAOG;cACa,aAAa,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"md-view.engine.d.ts","sourceRoot":"","sources":["../../src/engine/md-view.engine.ts"],"names":[],"mappings":"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"}
|
|
@@ -182,7 +182,10 @@ export class MDViewEngine extends ViewEngineBase {
|
|
|
182
182
|
* @return {*} {Promise<void>}
|
|
183
183
|
*/
|
|
184
184
|
async onXDataActive(event) {
|
|
185
|
-
await this.openData(event);
|
|
185
|
+
const res = await this.openData(event);
|
|
186
|
+
if (!res.cancel) {
|
|
187
|
+
this.refresh();
|
|
188
|
+
}
|
|
186
189
|
}
|
|
187
190
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
|
|
188
191
|
async call(key, args) {
|
|
@@ -29,6 +29,14 @@ export interface IViewController<T extends IAppView = IAppView, S extends IViewS
|
|
|
29
29
|
* @type {IModal}
|
|
30
30
|
*/
|
|
31
31
|
modal: IModal;
|
|
32
|
+
/**
|
|
33
|
+
* 视图错误信息
|
|
34
|
+
*
|
|
35
|
+
* @author tony001
|
|
36
|
+
* @date 2024-04-28 11:04:07
|
|
37
|
+
* @type {IData}
|
|
38
|
+
*/
|
|
39
|
+
error: IData;
|
|
32
40
|
/**
|
|
33
41
|
* 插槽额外的输入props
|
|
34
42
|
* 用来给对应插槽绘制补充额外的输入参数
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i-view.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/view/i-view.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EACL,gBAAgB,EAChB,MAAM,EACN,UAAU,EACV,eAAe,EACf,cAAc,EACd,WAAW,EACX,UAAU,EACV,0BAA0B,EAC3B,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C;;;;;;;GAOG;AACH,MAAM,WAAW,eAAe,CAC9B,CAAC,SAAS,QAAQ,GAAG,QAAQ,EAC7B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,UAAU,GAAG,UAAU,CACjC,SAAQ,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAC5B,GAAG,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC;IAExB;;;;;;OAMG;IACH,OAAO,EAAE,KAAK,CAAC;IAEf;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAAA;KAAE,CAAC;IAEpC;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAAA;KAAE,CAAC;IAE/C;;;;;OAKG;IACH,OAAO,EAAE,WAAW,EAAE,CAAC;IAEvB;;;;;;OAMG;IACH,QAAQ,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAA;KAAE,CAAC;IAExC;;;;;OAKG;IACH,QAAQ,CAAC,UAAU,EAAE,eAAe,GAAG,SAAS,CAAC;IAEjD;;;;;;;OAOG;IACH,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAE3B;;;;;OAKG;IACH,WAAW,CAAC,EAAE,0BAA0B,CAAC;IAEzC;;;;;OAKG;IACH,SAAS,CAAC,SAAS,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjD;;;;;;;OAOG;IAEH,IAAI,CAAC,CAAC,SAAS,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAE3D;;;;;;;OAOG;IACH,YAAY,CACV,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,GAC7B,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC;IAEnC;;;;;OAKG;IACH,mBAAmB,IAAI,IAAI,CAAC;IAE5B;;;;;OAKG;IACH,YAAY,IAAI,IAAI,CAAC;IAErB;;;;;OAKG;IACH,UAAU,IAAI,IAAI,CAAC;IAEnB;;;;;OAKG;IACH,WAAW,IAAI,IAAI,CAAC;IAEpB;;;;;OAKG;IACH,aAAa,IAAI,IAAI,CAAC;CACvB"}
|
|
1
|
+
{"version":3,"file":"i-view.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/view/i-view.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EACL,gBAAgB,EAChB,MAAM,EACN,UAAU,EACV,eAAe,EACf,cAAc,EACd,WAAW,EACX,UAAU,EACV,0BAA0B,EAC3B,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C;;;;;;;GAOG;AACH,MAAM,WAAW,eAAe,CAC9B,CAAC,SAAS,QAAQ,GAAG,QAAQ,EAC7B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,UAAU,GAAG,UAAU,CACjC,SAAQ,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAC5B,GAAG,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC;IAExB;;;;;;OAMG;IACH,OAAO,EAAE,KAAK,CAAC;IAEf;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;;OAMG;IACH,KAAK,EAAE,KAAK,CAAC;IAEb;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAAA;KAAE,CAAC;IAEpC;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAAA;KAAE,CAAC;IAE/C;;;;;OAKG;IACH,OAAO,EAAE,WAAW,EAAE,CAAC;IAEvB;;;;;;OAMG;IACH,QAAQ,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAA;KAAE,CAAC;IAExC;;;;;OAKG;IACH,QAAQ,CAAC,UAAU,EAAE,eAAe,GAAG,SAAS,CAAC;IAEjD;;;;;;;OAOG;IACH,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAE3B;;;;;OAKG;IACH,WAAW,CAAC,EAAE,0BAA0B,CAAC;IAEzC;;;;;OAKG;IACH,SAAS,CAAC,SAAS,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjD;;;;;;;OAOG;IAEH,IAAI,CAAC,CAAC,SAAS,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAE3D;;;;;;;OAOG;IACH,YAAY,CACV,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,GAC7B,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC;IAEnC;;;;;OAKG;IACH,mBAAmB,IAAI,IAAI,CAAC;IAE5B;;;;;OAKG;IACH,YAAY,IAAI,IAAI,CAAC;IAErB;;;;;OAKG;IACH,UAAU,IAAI,IAAI,CAAC;IAEnB;;;;;OAKG;IACH,WAAW,IAAI,IAAI,CAAC;IAEpB;;;;;OAKG;IACH,aAAa,IAAI,IAAI,CAAC;CACvB"}
|
|
@@ -16,6 +16,14 @@ export interface IViewState extends IControllerState, IViewSession {
|
|
|
16
16
|
* @type {boolean}
|
|
17
17
|
*/
|
|
18
18
|
activated: boolean;
|
|
19
|
+
/**
|
|
20
|
+
* 当前视图是否出现错误
|
|
21
|
+
*
|
|
22
|
+
* @author tony001
|
|
23
|
+
* @date 2024-04-26 15:04:51
|
|
24
|
+
* @type {boolean}
|
|
25
|
+
*/
|
|
26
|
+
hasError: boolean;
|
|
19
27
|
/**
|
|
20
28
|
* 视图标题
|
|
21
29
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i-view.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/view/i-view.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAEhE;;;;;GAKG;AACH,MAAM,WAAW,UAAW,SAAQ,gBAAgB,EAAE,YAAY;IAChE;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAC;IAEnB;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;;OAKG;IACH,SAAS,EAAE,OAAO,CAAC;IAEnB;;;;;OAKG;IACH,aAAa,EAAE,OAAO,CAAC;IAEvB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;;;;OAKG;IACH,YAAY,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,YAAY,EAAE,CAAA;KAAE,CAAC;IAE9C;;;;;OAKG;IACH,SAAS,EAAE,OAAO,CAAC;CACpB"}
|
|
1
|
+
{"version":3,"file":"i-view.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/view/i-view.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAEhE;;;;;GAKG;AACH,MAAM,WAAW,UAAW,SAAQ,gBAAgB,EAAE,YAAY;IAChE;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAC;IAEnB;;;;;;OAMG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;;OAKG;IACH,SAAS,EAAE,OAAO,CAAC;IAEnB;;;;;OAKG;IACH,aAAa,EAAE,OAAO,CAAC;IAEvB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;;;;OAKG;IACH,YAAY,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,YAAY,EAAE,CAAA;KAAE,CAAC;IAE9C;;;;;OAKG;IACH,SAAS,EAAE,OAAO,CAAC;CACpB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"de-service-util.d.ts","sourceRoot":"","sources":["../../src/service/de-service-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,
|
|
1
|
+
{"version":3,"file":"de-service-util.d.ts","sourceRoot":"","sources":["../../src/service/de-service-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAa,aAAa,EAAgB,MAAM,qBAAqB,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAG7C;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG,CACjC,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,cAAc,KACxB,OAAO,CAAC,aAAa,CAAC,CAAC;AAE5B;;;;;;;GAOG;AACH,qBAAa,aAAa;IA4BZ,SAAS,CAAC,QAAQ,EAAE,YAAY;IA3B5C;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAa;IAErE;;;;;;OAMG;IACH,SAAS,CAAC,MAAM,CAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,CACxD;IAEZ;;;;;;OAMG;gBACmB,QAAQ,EAAE,YAAY;IAE5C;;;;;;;OAOG;IACH,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,oBAAoB,GAAG,IAAI;IAIpE;;;;;;;;OAQG;IACG,UAAU,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IA0BvE;;;;;;;OAOG;IACH,KAAK,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI;IAY9B;;;;;;;OAOG;IACH,cAAc,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI;IAWvC;;;;;;;;;OASG;IACH,kBAAkB,CAChB,OAAO,EAAE,QAAQ,EACjB,QAAQ,EAAE,MAAM,EAChB,aAAa,GAAE,MAAM,EAAO,GAC3B,IAAI;IA6BP;;;;;;;;;;OAUG;IACG,IAAI,CACR,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,GAAG,SAAS,EACpC,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,EAC7B,MAAM,CAAC,EAAE,KAAK,GACb,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;CAkBjC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { RuntimeError } from '@ibiz-template/core';
|
|
1
|
+
import { HttpError, RuntimeError } from '@ibiz-template/core';
|
|
2
2
|
import { DEService } from './service';
|
|
3
3
|
/**
|
|
4
4
|
* 应用服务工具类
|
|
@@ -155,7 +155,16 @@ export class DEServiceUtil {
|
|
|
155
155
|
*/
|
|
156
156
|
async exec(appDataEntityId, methodName, context, params, params2, header) {
|
|
157
157
|
const service = await this.getService(context, appDataEntityId);
|
|
158
|
-
|
|
158
|
+
try {
|
|
159
|
+
const result = await service.exec(methodName, context, params, params2, header);
|
|
160
|
+
return result;
|
|
161
|
+
}
|
|
162
|
+
catch (error) {
|
|
163
|
+
if (error instanceof HttpError) {
|
|
164
|
+
error.tag = context.srfviewid;
|
|
165
|
+
}
|
|
166
|
+
throw error;
|
|
167
|
+
}
|
|
159
168
|
}
|
|
160
169
|
}
|
|
161
170
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tree-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"tree-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAG/C,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAE1D;;;;;;GAMG;AACH,8BAAsB,YAAa,YAAW,aAAa;IACzD,KAAK,EAAE,MAAM,CAAgB;IAE7B,SAAS,EAAE,MAAM,CAAC;IAElB,GAAG,EAAG,MAAM,CAAC;IAEb,SAAS,EAAG,MAAM,CAAC;IAEnB,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE5B,KAAK,EAAG,MAAM,CAAC;IAEf,SAAS,CAAC,EAAE,aAAa,EAAE,GAAG,SAAS,CAAC;IAExC,OAAO,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC;IAE5B,UAAU,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC;IAE/B,YAAY,EAAE,OAAO,CAAC;IAEtB,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE5B,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAElC,OAAO,EAAE,MAAM,CAAC;IAEhB,KAAK,EAAE,OAAO,CAAS;IAEvB,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,OAAO,CAAC,EAAE,aAAa,CAAC;IAExB,KAAK,CAAC,EAAE,KAAK,CAAC;IAEd,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,cAAc,CAAC,EAAE,OAAO,CAAC;gBAGvB,KAAK,EAAE,WAAW,EAClB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QAAE,IAAI,EAAE,OAAO,CAAC;QAAC,UAAU,CAAC,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,OAAO,CAAA;KAAE;IAiCpE;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,WAAW,GAAG,KAAK,GAAG,SAAS;IAqBzD;;;;;;OAMG;IACH,WAAW,IAAI,KAAK,GAAG,SAAS;CAiBjC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { createUUID } from 'qx-util';
|
|
2
|
+
import { isBase64Image } from '@ibiz-template/core';
|
|
2
3
|
/**
|
|
3
4
|
* 树节点数据基类
|
|
4
5
|
*
|
|
@@ -54,7 +55,12 @@ export class TreeNodeData {
|
|
|
54
55
|
icon.imagePath = sysImage.imagePath;
|
|
55
56
|
}
|
|
56
57
|
if (sysImage.rawContent) {
|
|
57
|
-
|
|
58
|
+
if (isBase64Image(sysImage.rawContent)) {
|
|
59
|
+
icon.imagePath = sysImage.rawContent;
|
|
60
|
+
}
|
|
61
|
+
else {
|
|
62
|
+
icon.htmlStr = sysImage.rawContent;
|
|
63
|
+
}
|
|
58
64
|
}
|
|
59
65
|
}
|
|
60
66
|
return Object.values(icon).length > 0 ? icon : undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-error-handler.d.ts","sourceRoot":"","sources":["../../../src/utils/error-handler/default-error-handler.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD;;;;;;;GAOG;AACH,qBAAa,mBAAoB,YAAW,aAAa;IACvD,MAAM,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,GAAG,SAAS;
|
|
1
|
+
{"version":3,"file":"default-error-handler.d.ts","sourceRoot":"","sources":["../../../src/utils/error-handler/default-error-handler.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD;;;;;;;GAOG;AACH,qBAAa,mBAAoB,YAAW,aAAa;IACvD,MAAM,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,GAAG,SAAS;CAuB5C"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ibiz-template/runtime",
|
|
3
|
-
"version": "0.7.
|
|
3
|
+
"version": "0.7.7-dev.0",
|
|
4
4
|
"description": "控制器包",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "out/index.js",
|
|
@@ -35,8 +35,8 @@
|
|
|
35
35
|
"animejs": "^3.2.2"
|
|
36
36
|
},
|
|
37
37
|
"devDependencies": {
|
|
38
|
-
"@ibiz-template/core": "^0.7.
|
|
39
|
-
"@ibiz/model-core": "^0.1.
|
|
38
|
+
"@ibiz-template/core": "^0.7.7-dev.0",
|
|
39
|
+
"@ibiz/model-core": "^0.1.22",
|
|
40
40
|
"@types/animejs": "^3.1.12",
|
|
41
41
|
"@types/path-browserify": "^1.0.2",
|
|
42
42
|
"@types/qs": "^6.9.11",
|
|
@@ -54,7 +54,7 @@
|
|
|
54
54
|
},
|
|
55
55
|
"peerDependencies": {
|
|
56
56
|
"@ibiz-template/core": "^0.6.0",
|
|
57
|
-
"@ibiz/model-core": "^0.1.
|
|
57
|
+
"@ibiz/model-core": "^0.1.22",
|
|
58
58
|
"async-validator": "^4.2.5",
|
|
59
59
|
"dayjs": "^1.11.7",
|
|
60
60
|
"echarts": "^5.4.3",
|