@ibiz-template/runtime 0.7.41-alpha.53 → 0.7.41-alpha.55
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 +110 -81
- package/dist/index.system.min.js +1 -1
- package/out/controller/control/form/form-detail/form-button/form-button.controller.d.ts.map +1 -1
- package/out/controller/control/form/form-detail/form-button/form-button.controller.js +31 -7
- package/out/interface/api/controller/control/i-api-grid.controller.d.ts.map +1 -1
- package/out/interface/api/controller/control/i-api-mob-md-ctrl.controller.d.ts.map +1 -1
- package/out/interface/api/controller/control/i-api-tree-grid.controller.d.ts.map +1 -1
- package/out/interface/controller/event/control/i-edit-form.event.d.ts +1 -2
- package/out/interface/controller/event/control/i-edit-form.event.d.ts.map +1 -1
- package/out/service/service/entity/de.service.d.ts.map +1 -1
- package/out/service/service/entity/de.service.js +2 -1
- package/out/service/service/entity/method/de-action.js +2 -2
- package/out/service/service/entity/method/method-renturn.d.ts.map +1 -1
- package/out/service/service/entity/method/method-renturn.js +6 -1
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"form-button.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-button/form-button.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAGtD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EACL,wBAAwB,EACxB,YAAY,EAEb,MAAM,0BAA0B,CAAC;AAIlC;;;;;;;;GAQG;AACH,qBAAa,oBACX,SAAQ,oBAAoB,CAAC,aAAa,CAC1C,YAAW,wBAAwB;IAE3B,KAAK,EAAE,eAAe,CAAC;IAE/B;;;;;OAKG;IACH,WAAW,EAAE,YAAY,GAAG,IAAI,CAAQ;IAExC,SAAS,CAAC,WAAW,IAAI,eAAe;cAIxB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAKvC;;;;;OAKG;IACG,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAYvC;;;;;OAKG;IACG,eAAe,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAU7D;;;;OAIG;IACH,kBAAkB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"form-button.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-button/form-button.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAGtD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EACL,wBAAwB,EACxB,YAAY,EAEb,MAAM,0BAA0B,CAAC;AAIlC;;;;;;;;GAQG;AACH,qBAAa,oBACX,SAAQ,oBAAoB,CAAC,aAAa,CAC1C,YAAW,wBAAwB;IAE3B,KAAK,EAAE,eAAe,CAAC;IAE/B;;;;;OAKG;IACH,WAAW,EAAE,YAAY,GAAG,IAAI,CAAQ;IAExC,SAAS,CAAC,WAAW,IAAI,eAAe;cAIxB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAKvC;;;;;OAKG;IACG,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAYvC;;;;;OAKG;IACG,eAAe,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAU7D;;;;OAIG;IACH,kBAAkB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAuBrC;;;;OAIG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IA0BpC;;;;;;OAMG;IACG,OAAO,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAc/C;;;;;;;OAOG;IACG,UAAU,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBlD;;;;;;;;OAQG;IACI,kBAAkB,CACvB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IAezC;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CA+BzD"}
|
|
@@ -65,10 +65,22 @@ export class FormButtonController extends FormDetailController {
|
|
|
65
65
|
* @param {IData} data
|
|
66
66
|
*/
|
|
67
67
|
calcDetailDisabled(data) {
|
|
68
|
-
|
|
68
|
+
let { disabled } = this.dynaLogicResult;
|
|
69
|
+
// 上层计算为启用时计算预定义项启用逻辑
|
|
70
|
+
if (disabled !== true && this.form.scheduler) {
|
|
71
|
+
const itemEnable = this.form.scheduler.triggerItemEnable(this.model.id, {
|
|
72
|
+
data: [data],
|
|
73
|
+
});
|
|
74
|
+
if (itemEnable !== undefined) {
|
|
75
|
+
disabled = !itemEnable;
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
if (disabled !== true && this.actionState) {
|
|
79
|
+
disabled = this.actionState.disabled;
|
|
80
|
+
}
|
|
69
81
|
// 表单项与界面行为都有权限时才有权限
|
|
70
|
-
if (
|
|
71
|
-
this.state.disabled =
|
|
82
|
+
if (disabled !== undefined) {
|
|
83
|
+
this.state.disabled = disabled;
|
|
72
84
|
}
|
|
73
85
|
}
|
|
74
86
|
/**
|
|
@@ -77,10 +89,22 @@ export class FormButtonController extends FormDetailController {
|
|
|
77
89
|
* @param {IData} data
|
|
78
90
|
*/
|
|
79
91
|
calcDetailVisible(data) {
|
|
80
|
-
|
|
81
|
-
//
|
|
82
|
-
if (this.
|
|
83
|
-
|
|
92
|
+
let { visible } = this.dynaLogicResult;
|
|
93
|
+
// 上层计算为显示时计算预定义项显示逻辑
|
|
94
|
+
if (visible !== false && this.form.scheduler) {
|
|
95
|
+
const itemVIsible = this.form.scheduler.triggerItemVisible(this.model.id, {
|
|
96
|
+
data: [data],
|
|
97
|
+
});
|
|
98
|
+
if (itemVIsible !== undefined) {
|
|
99
|
+
visible = itemVIsible;
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
if (visible !== false && this.actionState) {
|
|
103
|
+
visible = this.actionState.visible;
|
|
104
|
+
}
|
|
105
|
+
// 有值的时候才会去修改state
|
|
106
|
+
if (visible !== undefined) {
|
|
107
|
+
this.state.visible = visible;
|
|
84
108
|
}
|
|
85
109
|
}
|
|
86
110
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i-api-grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/api/controller/control/i-api-grid.controller.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"i-api-grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/api/controller/control/i-api-grid.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AACxE,OAAO,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEhD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,MAAM,WAAW,kBAAkB,CACjC,CAAC,SAAS,OAAO,GAAG,OAAO,EAC3B,CAAC,SAAS,aAAa,GAAG,aAAa,CACvC,SAAQ,uBAAuB,CAAC,CAAC,EAAE,CAAC,CAAC;IACrC;;;;OAIG;IACH,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,wBAAwB,CAAA;KAAE,CAAC;IAErD;;;;;OAKG;IACH,IAAI,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEpC;;;;;;;;OAQG;IACH,WAAW,CACT,GAAG,EAAE,gBAAgB,EACrB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,OAAO,EACd,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjB;;;;;OAKG;IACH,QAAQ,CAAC,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAElD;;;;OAIG;IACH,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAEhC;;;;OAIG;IACH,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzB;;;OAGG;IACH,aAAa,IAAI,IAAI,CAAC;IAEtB;;;;;;;OAOG;IACH,aAAa,CACX,GAAG,EAAE,gBAAgB,EACrB,QAAQ,CAAC,EAAE,OAAO,EAClB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjB;;;;;;OAMG;IACH,kBAAkB,CAAC,GAAG,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE3E;;;;;OAKG;IACH,UAAU,CAAC,IAAI,EAAE;QAAC,KAAK,CAAC,EAAE,UAAU,CAAC;QAAC,MAAM,EAAE,gBAAgB,CAAC;KAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjF;;;;;OAKG;IACH,YAAY,CAAC,IAAI,EAAE,QAAQ,GAAG,gBAAgB,GAAG,SAAS,CAAC;IAE3D;;;;OAIG;IACH,cAAc,CAAC,MAAM,CAAC,EAAE;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI,CAAC;IAElE;;;;;;;OAOG;IACH,aAAa,CAAC,CAAC,SAAS,MAAM,qBAAqB,EACjD,IAAI,EAAE,CAAC,EACP,EAAE,EAAE,MAAM,GACT,qBAAqB,CAAC,CAAC,CAAC,CAAC;CAC7B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i-api-mob-md-ctrl.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/api/controller/control/i-api-mob-md-ctrl.controller.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"i-api-mob-md-ctrl.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/api/controller/control/i-api-mob-md-ctrl.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AACxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEhD;;;;;;;;;;GAUG;AACH,MAAM,WAAW,uBAAuB,CACtC,CAAC,SAAS,YAAY,GAAG,YAAY,EACrC,CAAC,SAAS,kBAAkB,GAAG,kBAAkB,CACjD,SAAQ,uBAAuB,CAAC,CAAC,EAAE,CAAC,CAAC;IACrC;;;;;;;;OAQG;IACH,UAAU,CAAC,IAAI,CAAC,EAAE;QAAC,KAAK,CAAC,EAAE,UAAU,CAAC;QAAC,MAAM,CAAC,EAAE,gBAAgB,CAAA;KAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACnF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i-api-tree-grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/api/controller/control/i-api-tree-grid.controller.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"i-api-tree-grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/api/controller/control/i-api-tree-grid.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEhD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,WAAW,sBAAsB,CACrC,CAAC,SAAS,WAAW,GAAG,WAAW,EACnC,CAAC,SAAS,iBAAiB,GAAG,iBAAiB,CAC/C,SAAQ,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC;IAChC;;;OAGG;IACH,kBAAkB,IAAI,IAAI,CAAC;IAE3B;;;;;OAKG;IACH,UAAU,CAAC,KAAK,EAAE;QAAC,KAAK,EAAE,UAAU,CAAC;QAAA,MAAM,EAAE,gBAAgB,CAAA;KAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAChF"}
|
|
@@ -167,8 +167,7 @@ export interface IEditFormEvent extends IFormEvent {
|
|
|
167
167
|
};
|
|
168
168
|
};
|
|
169
169
|
/**
|
|
170
|
-
* @description
|
|
171
|
-
* - 用于外部调用
|
|
170
|
+
* @description 表单操作完成事件，用于外部调用
|
|
172
171
|
* @type {{
|
|
173
172
|
* event: EventBase;
|
|
174
173
|
* emitArgs: PartialWithObject<EditFormEvent, EventBase>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i-edit-form.event.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/event/control/i-edit-form.event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AAEtE,MAAM,WAAW,aAAc,SAAQ,SAAS;IAC9C;;OAEG;IACH,IAAI,EAAE,KAAK,CAAC;CACb;AAED;;;;;;GAMG;AACH,MAAM,WAAW,cAAe,SAAQ,UAAU;IAChD;;;;;;;OAOG;IACH,YAAY,EAAE;QACZ,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;IAEF;;;;;;;OAOG;IACH,aAAa,EAAE;QACb,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;IAEF;;;;;;;OAOG;IACH,WAAW,EAAE;QACX,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;IAEF;;;;;;;OAOG;IACH,YAAY,EAAE;QACZ,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;IAEF;;;;;;;OAOG;IACH,aAAa,EAAE;QACb,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;IAEF;;;;;;;OAOG;IACH,WAAW,EAAE;QACX,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;IAEF;;;;;;;OAOG;IACH,cAAc,EAAE;QACd,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;IAEF;;;;;;;OAOG;IACH,eAAe,EAAE;QACf,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;IAEF;;;;;;;OAOG;IACH,aAAa,EAAE;QACb,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;IAEF;;;;;;;OAOG;IACH,cAAc,EAAE;QACd,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;IAEF;;;;;;;OAOG;IACH,WAAW,EAAE;QACX,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;IAEF;;;;;;;;;;OAUG;IACH,cAAc,EAAE;QACd,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE;YACR,IAAI,EAAE,MAAM,CAAC;YACb,IAAI,EAAE,4BAA4B,CAAC;SACpC,CAAC;KACH,CAAC;IAEF
|
|
1
|
+
{"version":3,"file":"i-edit-form.event.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/event/control/i-edit-form.event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AAEtE,MAAM,WAAW,aAAc,SAAQ,SAAS;IAC9C;;OAEG;IACH,IAAI,EAAE,KAAK,CAAC;CACb;AAED;;;;;;GAMG;AACH,MAAM,WAAW,cAAe,SAAQ,UAAU;IAChD;;;;;;;OAOG;IACH,YAAY,EAAE;QACZ,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;IAEF;;;;;;;OAOG;IACH,aAAa,EAAE;QACb,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;IAEF;;;;;;;OAOG;IACH,WAAW,EAAE;QACX,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;IAEF;;;;;;;OAOG;IACH,YAAY,EAAE;QACZ,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;IAEF;;;;;;;OAOG;IACH,aAAa,EAAE;QACb,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;IAEF;;;;;;;OAOG;IACH,WAAW,EAAE;QACX,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;IAEF;;;;;;;OAOG;IACH,cAAc,EAAE;QACd,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;IAEF;;;;;;;OAOG;IACH,eAAe,EAAE;QACf,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;IAEF;;;;;;;OAOG;IACH,aAAa,EAAE;QACb,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;IAEF;;;;;;;OAOG;IACH,cAAc,EAAE;QACd,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;IAEF;;;;;;;OAOG;IACH,WAAW,EAAE;QACX,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;IAEF;;;;;;;;;;OAUG;IACH,cAAc,EAAE;QACd,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE;YACR,IAAI,EAAE,MAAM,CAAC;YACb,IAAI,EAAE,4BAA4B,CAAC;SACpC,CAAC;KACH,CAAC;IAEF;;;;;;;OAOG;IACH,QAAQ,EAAE;QACR,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;KACvD,CAAC;CACH"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"de.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/entity/de.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,eAAe,EACf,cAAc,EACf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAGL,aAAa,EACb,kBAAkB,EAInB,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"de.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/entity/de.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { HttpError, IBizContext, ModelError, RuntimeError, RuntimeModelError, } from '@ibiz-template/core';
|
|
2
2
|
import { createUUID } from 'qx-util';
|
|
3
|
+
import { isNil, isUndefined } from 'lodash-es';
|
|
3
4
|
import { DECache, DeMethodProcesser, calcResPath } from '../../utils';
|
|
4
5
|
import { WorkFlowService } from '../work-flow/work-flow.service';
|
|
5
6
|
import { FileService } from '../file/file.service';
|
|
@@ -187,7 +188,7 @@ export class DEService {
|
|
|
187
188
|
path = `${path}/createdownloadticket/${srfkey}`;
|
|
188
189
|
}
|
|
189
190
|
const res = await this.app.net.get(path, params);
|
|
190
|
-
if (
|
|
191
|
+
if (isNil(res.data) || isUndefined(res.data)) {
|
|
191
192
|
ibiz.log.error(ibiz.i18n.t('runtime.deAction.responseDataError'), res);
|
|
192
193
|
}
|
|
193
194
|
return res;
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/* eslint-disable @typescript-eslint/no-this-alias */
|
|
3
3
|
/* eslint-disable @typescript-eslint/no-unused-vars */
|
|
4
4
|
import { HttpError, HttpResponse, RuntimeError, RuntimeModelError, } from '@ibiz-template/core';
|
|
5
|
-
import { isArray, isNil } from 'lodash-es';
|
|
5
|
+
import { isArray, isNil, isUndefined } from 'lodash-es';
|
|
6
6
|
import { ascSort } from 'qx-util';
|
|
7
7
|
import { clone } from 'ramda';
|
|
8
8
|
import { Method } from './method';
|
|
@@ -145,7 +145,7 @@ export class DEActionMethod extends Method {
|
|
|
145
145
|
path = `${path}/${srfkey}`;
|
|
146
146
|
}
|
|
147
147
|
const res = await this.request(path, context, data, params, header);
|
|
148
|
-
if (
|
|
148
|
+
if (isNil(res.data) || isUndefined(res.data)) {
|
|
149
149
|
ibiz.log.error(ibiz.i18n.t('runtime.deAction.responseDataError'), res);
|
|
150
150
|
}
|
|
151
151
|
if (!(params && params.srfupdateitem)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"method-renturn.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/method-renturn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhE,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAGpD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEnE;;;;;;;GAOG;AACH,qBAAa,YAAY;IAcrB,SAAS,CAAC,OAAO,EAAE,aAAa;IAChC,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,MAAM,EAAE,YAAY;IAC9B,SAAS,CAAC,WAAW,EAAE,OAAO;IAhBhC,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC;IAE1B;;;;;;;;;OASG;gBAES,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,YAAY,EACpB,WAAW,GAAE,OAAe;IAgBxC;;;;;;;;OAQG;IACG,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"method-renturn.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/method-renturn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhE,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAGpD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEnE;;;;;;;GAOG;AACH,qBAAa,YAAY;IAcrB,SAAS,CAAC,OAAO,EAAE,aAAa;IAChC,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,MAAM,EAAE,YAAY;IAC9B,SAAS,CAAC,WAAW,EAAE,OAAO;IAhBhC,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC;IAE1B;;;;;;;;;OASG;gBAES,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,YAAY,EACpB,WAAW,GAAE,OAAe;IAgBxC;;;;;;;;OAQG;IACG,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,WAAW,CAAC;IAgClE;;;;;;;;OAQG;IACG,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;CAM7D"}
|
|
@@ -62,7 +62,12 @@ export class MethodReturn {
|
|
|
62
62
|
const items = await this.dto.sets(context, [data]);
|
|
63
63
|
return items[0];
|
|
64
64
|
}
|
|
65
|
-
|
|
65
|
+
// 返回类型为简单类型时，返回数据key为srfresult，值为响应数据
|
|
66
|
+
const output = this.method.appDEMethodReturn;
|
|
67
|
+
if (output && output.type === 'SIMPLE') {
|
|
68
|
+
data = { srfresult: data };
|
|
69
|
+
}
|
|
70
|
+
else if (isNilOrEmpty(data)) {
|
|
66
71
|
data = {};
|
|
67
72
|
}
|
|
68
73
|
return new AppDataEntity(this.entity, data);
|
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.55",
|
|
4
4
|
"description": "运行时逻辑库",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "out/index.js",
|
|
@@ -68,5 +68,5 @@
|
|
|
68
68
|
"qx-util": "^0.4.8",
|
|
69
69
|
"ramda": "^0.29.0"
|
|
70
70
|
},
|
|
71
|
-
"gitHead": "
|
|
71
|
+
"gitHead": "3454a18113a9a1a9563f107ceb4397c04254c61b"
|
|
72
72
|
}
|