@ibiz-template/runtime 0.2.15 → 0.2.16
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 +10 -5
- package/dist/index.system.min.js +1 -1
- package/dist/index.system.min.js.map +1 -1
- package/out/controller/control/form/edit-form/edit-form.controller.d.ts +2 -2
- package/out/controller/control/form/edit-form/edit-form.controller.d.ts.map +1 -1
- package/out/controller/control/form/edit-form/edit-form.controller.js +11 -3
- package/out/controller/control/panel/panel/panel-item.controller.d.ts +8 -9
- package/out/controller/control/panel/panel/panel-item.controller.d.ts.map +1 -1
- package/out/controller/control/panel/panel/panel-item.controller.js +2 -2
- package/out/interface/controller/controller/control/i-control.controller.d.ts +9 -0
- package/out/interface/controller/controller/control/i-control.controller.d.ts.map +1 -1
- package/out/interface/controller/controller/control/i-edit-form.controller.d.ts +10 -1
- package/out/interface/controller/controller/control/i-edit-form.controller.d.ts.map +1 -1
- package/out/interface/controller/controller/control/i-md-control.controller.d.ts +0 -7
- package/out/interface/controller/controller/control/i-md-control.controller.d.ts.map +1 -1
- package/out/interface/controller/state/control/panel-item/i-panel-item.state.d.ts +8 -0
- package/out/interface/controller/state/control/panel-item/i-panel-item.state.d.ts.map +1 -1
- package/package.json +3 -2
- package/src/controller/control/form/edit-form/edit-form.controller.ts +12 -4
- package/src/controller/control/panel/panel/panel-item.controller.ts +7 -7
- package/src/interface/controller/controller/control/i-control.controller.ts +10 -0
- package/src/interface/controller/controller/control/i-edit-form.controller.ts +11 -1
- package/src/interface/controller/controller/control/i-md-control.controller.ts +0 -8
- package/src/interface/controller/state/control/panel-item/i-panel-item.state.ts +9 -0
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { IAppDEEditView, IDEEditForm } from '@ibiz/model-core';
|
|
2
|
-
import { IEditFormState, IEditFormEvent, IEditFormController, IViewController, IEditViewState, IEditViewEvent, IDataAbilityParams } from '../../../../interface';
|
|
2
|
+
import { IEditFormState, IEditFormEvent, IEditFormController, IViewController, IEditViewState, IEditViewEvent, IDataAbilityParams, FormSaveParams } from '../../../../interface';
|
|
3
3
|
import { FormController } from '../form';
|
|
4
4
|
import { EditFormService } from './edit-form.service';
|
|
5
5
|
/**
|
|
@@ -58,7 +58,7 @@ export declare class EditFormController extends FormController<IDEEditForm, IEdi
|
|
|
58
58
|
* @author lxm
|
|
59
59
|
* @date 2022-08-31 22:08:40
|
|
60
60
|
*/
|
|
61
|
-
save(args?:
|
|
61
|
+
save(args?: FormSaveParams): Promise<IData>;
|
|
62
62
|
/**
|
|
63
63
|
* 删除表单数据
|
|
64
64
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"edit-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/edit-form/edit-form.controller.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAI/D,OAAO,EACL,cAAc,EACd,cAAc,EACd,mBAAmB,EACnB,eAAe,EACf,cAAc,EACd,cAAc,EACd,kBAAkB,
|
|
1
|
+
{"version":3,"file":"edit-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/edit-form/edit-form.controller.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAI/D,OAAO,EACL,cAAc,EACd,cAAc,EACd,mBAAmB,EACnB,eAAe,EACf,cAAc,EACd,cAAc,EACd,kBAAkB,EAClB,cAAc,EACf,MAAM,uBAAuB,CAAC;AAK/B,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;;;;GAQG;AACH,qBAAa,kBACX,SAAQ,cAAc,CAAC,WAAW,EAAE,cAAc,EAAE,cAAc,CAClE,YAAW,mBAAmB;IAE9B;;;;;OAKG;IACH,OAAO,EAAG,eAAe,CAAC;IAE1B,IAAI,IAAI,IAAI,eAAe,CAAC,cAAc,EAAE,cAAc,EAAE,cAAc,CAAC,CAM1E;IAED;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAY1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAS1C;;;;;OAKG;IACG,SAAS,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,KAAK,CAAC;IAiC1D;;;;;;OAMG;cACa,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IA8CtC;;;;;OAKG;IACG,IAAI,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,KAAK,CAAC;IA4CrD;;;;;OAKG;IACG,IAAI,CAAC,IAAI,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC;IAoEjD;;;;;;OAMG;IACG,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC;IA4CzD;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,KAAK,CAAC;IAe9B;;;;;;;OAOG;IACG,cAAc,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA+C7D;;;;;;;OAOG;IACG,OAAO,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAyBvD;;;;;;;OAOG;IACG,QAAQ,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BlD,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtD;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAUhC"}
|
|
@@ -182,7 +182,7 @@ export class EditFormController extends FormController {
|
|
|
182
182
|
const silent = (args === null || args === void 0 ? void 0 : args.silent) === true;
|
|
183
183
|
// 如果数据正在处理中,则延迟保存
|
|
184
184
|
if (this.state.processing) {
|
|
185
|
-
const data = await awaitTimeout(500, this.save.bind(this));
|
|
185
|
+
const data = await awaitTimeout(500, this.save.bind(this), [args]);
|
|
186
186
|
return data;
|
|
187
187
|
}
|
|
188
188
|
const isValid = await this.validate();
|
|
@@ -214,9 +214,17 @@ export class EditFormController extends FormController {
|
|
|
214
214
|
await this.endLoading();
|
|
215
215
|
}
|
|
216
216
|
}
|
|
217
|
+
const noFillBack = (args === null || args === void 0 ? void 0 : args.noFillBack) === true;
|
|
217
218
|
// 保存结束后合并修改临时主键
|
|
218
219
|
if (res.data) {
|
|
219
|
-
|
|
220
|
+
// 回填数据的合并后台数据
|
|
221
|
+
if (noFillBack) {
|
|
222
|
+
// 自动保存不回填数据的时候只更新更新时间
|
|
223
|
+
this.data.updatedate = res.data.updatedate;
|
|
224
|
+
}
|
|
225
|
+
else {
|
|
226
|
+
mergeInLeft(this.data, res.data);
|
|
227
|
+
}
|
|
220
228
|
this.data.tempsrfkey = this.data.srfkey;
|
|
221
229
|
}
|
|
222
230
|
this.state.modified = false;
|
|
@@ -419,7 +427,7 @@ export class EditFormController extends FormController {
|
|
|
419
427
|
if (this.model.enableAutoSave) {
|
|
420
428
|
// 自动保存静默,报错直接控制台输出
|
|
421
429
|
try {
|
|
422
|
-
await this.save({ silent: true });
|
|
430
|
+
await this.save({ silent: true, noFillBack: true });
|
|
423
431
|
}
|
|
424
432
|
catch (error) {
|
|
425
433
|
ibiz.log.error(error);
|
|
@@ -1,20 +1,19 @@
|
|
|
1
1
|
import { IPanelItem } from '@ibiz/model-core';
|
|
2
|
-
import { IPanelItemController, IPanelController, IPanelDataContainerController } from '../../../../interface';
|
|
2
|
+
import { IPanelItemController, IPanelController, IPanelDataContainerController, IPanelItemState } from '../../../../interface';
|
|
3
3
|
import { PanelNotifyState } from '../../../constant';
|
|
4
4
|
import { PanelItemState } from './panel-item.state';
|
|
5
|
-
import { PanelController } from './panel.controller';
|
|
6
5
|
export declare class PanelItemController<T extends IPanelItem = IPanelItem> implements IPanelItemController {
|
|
7
6
|
readonly model: T;
|
|
8
|
-
readonly panel:
|
|
9
|
-
readonly parent?:
|
|
7
|
+
readonly panel: IPanelController;
|
|
8
|
+
readonly parent?: IPanelItemController | undefined;
|
|
10
9
|
/**
|
|
11
10
|
* 面板项状态
|
|
12
11
|
*
|
|
13
12
|
* @author chitanda
|
|
14
13
|
* @date 2023-01-04 09:01:04
|
|
15
|
-
* @type {
|
|
14
|
+
* @type {IPanelItemState}
|
|
16
15
|
*/
|
|
17
|
-
state:
|
|
16
|
+
state: IPanelItemState;
|
|
18
17
|
/**
|
|
19
18
|
* 数据父容器
|
|
20
19
|
* @author lxm
|
|
@@ -52,10 +51,10 @@ export declare class PanelItemController<T extends IPanelItem = IPanelItem> impl
|
|
|
52
51
|
* @author lxm
|
|
53
52
|
* @date 2023-04-27 06:37:12
|
|
54
53
|
* @param {T} model 面板成员模型
|
|
55
|
-
* @param {
|
|
56
|
-
* @param {
|
|
54
|
+
* @param {IPanelController} panel 面板控制器
|
|
55
|
+
* @param {IPanelItemController} [parent] 父容器控制器
|
|
57
56
|
*/
|
|
58
|
-
constructor(model: T, panel:
|
|
57
|
+
constructor(model: T, panel: IPanelController, parent?: IPanelItemController | undefined);
|
|
59
58
|
/**
|
|
60
59
|
* 子类不可覆盖或重写此方法,在 init 时需要重写的使用 onInit 方法。
|
|
61
60
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"panel-item.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/panel/panel/panel-item.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EACL,oBAAoB,EACpB,gBAAgB,EAChB,6BAA6B,
|
|
1
|
+
{"version":3,"file":"panel-item.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/panel/panel/panel-item.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EACL,oBAAoB,EACpB,gBAAgB,EAChB,6BAA6B,EAC7B,eAAe,EAChB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,qBAAa,mBAAmB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,CAChE,YAAW,oBAAoB;aAgEb,KAAK,EAAE,CAAC;aACR,KAAK,EAAE,gBAAgB;aACvB,MAAM,CAAC;IAhEzB;;;;;;OAMG;IACH,KAAK,EAAE,eAAe,CAAC;IAEvB;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,gBAAgB,GAAG,6BAA6B,CAEjE;IAED;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED;;;;;;OAMG;IACH,IAAI,cAAc,IAAI,MAAM,EAAE,CAE7B;IAED;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,MAAM,EAAE,CAEzB;IAED;;;;;;;OAOG;gBAEe,KAAK,EAAE,CAAC,EACR,KAAK,EAAE,gBAAgB,EACvB,MAAM,CAAC,kCAAsB;IAK/C;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAoBvC,OAAO,IAAI,IAAI;IAEf;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,IAAI,cAAc;IAIvC;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAatD;;;;;OAKG;IACG,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAa/D;;;;;OAKG;IACH,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAsBnC;;;;;OAKG;IACH,eAAe,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAsBlC;;;;;OAKG;IACH,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAsBnC;;;;;OAKG;IACH,SAAS,CAAC,eAAe,EAAE;QACzB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,CAIC;IAEF;;;;;;;;;;OAUG;IACH,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,GAAE,OAAe,GAAG,IAAI;IAmC5E;;;;;;OAMG;IACH,cAAc,CACZ,KAAK,EAAE,oBAAoB,GAC1B,gBAAgB,GAAG,6BAA6B;IAWnD;;;;;OAKG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAe1C;;;;OAIG;IACH,OAAO,IAAI,IAAI;CAMhB"}
|
|
@@ -48,8 +48,8 @@ export class PanelItemController {
|
|
|
48
48
|
* @author lxm
|
|
49
49
|
* @date 2023-04-27 06:37:12
|
|
50
50
|
* @param {T} model 面板成员模型
|
|
51
|
-
* @param {
|
|
52
|
-
* @param {
|
|
51
|
+
* @param {IPanelController} panel 面板控制器
|
|
52
|
+
* @param {IPanelItemController} [parent] 父容器控制器
|
|
53
53
|
*/
|
|
54
54
|
constructor(model, panel, parent) {
|
|
55
55
|
this.model = model;
|
|
@@ -4,6 +4,7 @@ import { IControlState } from '../../state';
|
|
|
4
4
|
import { IController } from '../i.controller';
|
|
5
5
|
import { IViewController } from '../view/i-view.controller';
|
|
6
6
|
import { IViewLayoutPanelController } from './i-view-layout-panel.controller';
|
|
7
|
+
import { ControlLogicScheduler } from '../../../../logic-scheduler';
|
|
7
8
|
/**
|
|
8
9
|
* 部件控制器
|
|
9
10
|
* @author lxm
|
|
@@ -27,6 +28,14 @@ export interface IControlController<T extends IControl = IControl, S extends ICo
|
|
|
27
28
|
* @type {IViewLayoutPanelController}
|
|
28
29
|
*/
|
|
29
30
|
layoutPanel?: IViewLayoutPanelController;
|
|
31
|
+
/**
|
|
32
|
+
* 部件逻辑调度器
|
|
33
|
+
*
|
|
34
|
+
* @author chitanda
|
|
35
|
+
* @date 2023-11-11 10:11:16
|
|
36
|
+
* @type {ControlLogicScheduler}
|
|
37
|
+
*/
|
|
38
|
+
scheduler?: ControlLogicScheduler;
|
|
30
39
|
/**
|
|
31
40
|
* 开始加载
|
|
32
41
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i-control.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-control.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"i-control.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-control.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAEpE;;;;;;;GAOG;AACH,MAAM,WAAW,kBAAkB,CACjC,CAAC,SAAS,QAAQ,GAAG,QAAQ,EAC7B,CAAC,SAAS,aAAa,GAAG,aAAa,EACvC,CAAC,SAAS,aAAa,GAAG,aAAa,CACvC,SAAQ,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAC5B;;;;;OAKG;IACH,IAAI,EAAE,eAAe,CAAC;IAEtB;;;;;OAKG;IACH,WAAW,CAAC,EAAE,0BAA0B,CAAC;IAEzC;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,qBAAqB,CAAC;IAElC;;;;;OAKG;IACH,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE9B;;;;;OAKG;IACH,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5B;;;;;;OAMG;IACH,mBAAmB,CAAC,IAAI,EAAE;QAAE,OAAO,CAAC,EAAE,QAAQ,CAAC;QAAC,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI,CAAC;CAC3E"}
|
|
@@ -3,6 +3,15 @@ import { IDataAbilityParams } from '../../../common';
|
|
|
3
3
|
import { IEditFormEvent } from '../../event';
|
|
4
4
|
import { IEditFormState } from '../../state';
|
|
5
5
|
import { IFormController } from './i-form.controller';
|
|
6
|
+
export interface FormSaveParams extends IDataAbilityParams {
|
|
7
|
+
/**
|
|
8
|
+
* 保存之后是否不合并后台回来的数据
|
|
9
|
+
* @author lxm
|
|
10
|
+
* @date 2023-11-11 11:28:23
|
|
11
|
+
* @type {boolean}
|
|
12
|
+
*/
|
|
13
|
+
noFillBack?: boolean;
|
|
14
|
+
}
|
|
6
15
|
/**
|
|
7
16
|
* 编辑表单控制器
|
|
8
17
|
* @author lxm
|
|
@@ -25,7 +34,7 @@ export interface IEditFormController extends IFormController<IDEEditForm, IEditF
|
|
|
25
34
|
* @date 2023-05-16 12:59:03
|
|
26
35
|
* @return {*} {Promise<IData>}
|
|
27
36
|
*/
|
|
28
|
-
save(args?:
|
|
37
|
+
save(args?: FormSaveParams): Promise<IData>;
|
|
29
38
|
/**
|
|
30
39
|
* 删除表单数据
|
|
31
40
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i-edit-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-edit-form.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;;;GAOG;AACH,MAAM,WAAW,mBACf,SAAQ,eAAe,CAAC,WAAW,EAAE,cAAc,EAAE,cAAc,CAAC;IACpE;;;;;OAKG;IACH,IAAI,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;IAEhD;;;;;OAKG;IACH,IAAI,CAAC,IAAI,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"i-edit-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-edit-form.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,MAAM,WAAW,cAAe,SAAQ,kBAAkB;IACxD;;;;;OAKG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,mBACf,SAAQ,eAAe,CAAC,WAAW,EAAE,cAAc,EAAE,cAAc,CAAC;IACpE;;;;;OAKG;IACH,IAAI,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;IAEhD;;;;;OAKG;IACH,IAAI,CAAC,IAAI,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;IAE5C;;;;;;;OAOG;IACH,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAEpD;;;;;;;OAOG;IACH,QAAQ,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEnD;;;;;;;OAOG;IACH,OAAO,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACnD"}
|
|
@@ -18,13 +18,6 @@ export interface MDCtrlLoadParams extends IDataAbilityParams {
|
|
|
18
18
|
isLoadMore?: boolean;
|
|
19
19
|
}
|
|
20
20
|
export interface MDCtrlRemoveParams extends IDataAbilityParams {
|
|
21
|
-
/**
|
|
22
|
-
* 是否静默删除
|
|
23
|
-
* @author lxm
|
|
24
|
-
* @date 2023-08-17 06:04:23
|
|
25
|
-
* @type {boolean}
|
|
26
|
-
*/
|
|
27
|
-
silent?: boolean;
|
|
28
21
|
/**
|
|
29
22
|
* 是否不需要刷新(默认为否,如果不需要刷新传true)
|
|
30
23
|
* @author lxm
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i-md-control.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-md-control.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D,MAAM,WAAW,gBAAiB,SAAQ,kBAAkB;IAC1D;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,kBAAmB,SAAQ,kBAAkB;IAC5D;;;;;OAKG;IACH,
|
|
1
|
+
{"version":3,"file":"i-md-control.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-md-control.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D,MAAM,WAAW,gBAAiB,SAAQ,kBAAkB;IAC1D;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,kBAAmB,SAAQ,kBAAkB;IAC5D;;;;;OAKG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,oBAAoB,CACnC,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,eAAe,GAAG,eAAe,EAC3C,CAAC,SAAS,eAAe,GAAG,eAAe,CAC3C,SAAQ,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IACnC;;;;;OAKG;IACH,IAAI,CAAC,IAAI,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;IAEhD;;;;;OAKG;IACH,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjD;;;;;OAKG;IACH,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzB;;;;;OAKG;IACH,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5B;;;;;;OAMG;IACH,UAAU,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAExD;;;;;OAKG;IACH,OAAO,IAAI,KAAK,EAAE,CAAC;IAEnB;;;;;;;OAOG;IACH,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IAEvC;;;;;;OAMG;IACH,SAAS,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACvC"}
|
|
@@ -16,6 +16,14 @@ export interface IPanelItemState extends IColState {
|
|
|
16
16
|
* @type {IPanelItemClass}
|
|
17
17
|
*/
|
|
18
18
|
class: IPanelItemClass;
|
|
19
|
+
/**
|
|
20
|
+
* 是否必填
|
|
21
|
+
*
|
|
22
|
+
* @author chitanda
|
|
23
|
+
* @date 2023-11-11 09:11:53
|
|
24
|
+
* @type {boolean}
|
|
25
|
+
*/
|
|
26
|
+
required: boolean;
|
|
19
27
|
}
|
|
20
28
|
export interface IPanelItemClass {
|
|
21
29
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i-panel-item.state.d.ts","sourceRoot":"","sources":["../../../../../../src/interface/controller/state/control/panel-item/i-panel-item.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,MAAM,WAAW,eAAgB,SAAQ,SAAS;IAChD;;;;;;;OAOG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;;;;OAKG;IACH,KAAK,EAAE,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"i-panel-item.state.d.ts","sourceRoot":"","sources":["../../../../../../src/interface/controller/state/control/panel-item/i-panel-item.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,MAAM,WAAW,eAAgB,SAAQ,SAAS;IAChD;;;;;;;OAOG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;;;;OAKG;IACH,KAAK,EAAE,eAAe,CAAC;IAEvB;;;;;;OAMG;IACH,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,eAAe;IAC9B;;;;;OAKG;IACH,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB;;;;;OAKG;IACH,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB;;;;;OAKG;IACH,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB;;;;;OAKG;IACH,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ibiz-template/runtime",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.16",
|
|
4
4
|
"description": "控制器包",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "out/index.js",
|
|
@@ -58,5 +58,6 @@
|
|
|
58
58
|
"qs": "^6.11.0",
|
|
59
59
|
"qx-util": "^0.4.8",
|
|
60
60
|
"ramda": "^0.29.0"
|
|
61
|
-
}
|
|
61
|
+
},
|
|
62
|
+
"gitHead": "da5f79d37f6d81f1dc34eb4fa2e4b07bb08d6249"
|
|
62
63
|
}
|
|
@@ -17,6 +17,7 @@ import {
|
|
|
17
17
|
IEditViewState,
|
|
18
18
|
IEditViewEvent,
|
|
19
19
|
IDataAbilityParams,
|
|
20
|
+
FormSaveParams,
|
|
20
21
|
} from '../../../../interface';
|
|
21
22
|
import { calcDeCodeNameById, hasDeCodeName } from '../../../../model';
|
|
22
23
|
import { Srfuf, ControlVO } from '../../../../service';
|
|
@@ -231,11 +232,11 @@ export class EditFormController
|
|
|
231
232
|
* @author lxm
|
|
232
233
|
* @date 2022-08-31 22:08:40
|
|
233
234
|
*/
|
|
234
|
-
async save(args?:
|
|
235
|
+
async save(args?: FormSaveParams): Promise<IData> {
|
|
235
236
|
const silent = args?.silent === true;
|
|
236
237
|
// 如果数据正在处理中,则延迟保存
|
|
237
238
|
if (this.state.processing) {
|
|
238
|
-
const data = await awaitTimeout(500, this.save.bind(this));
|
|
239
|
+
const data = await awaitTimeout(500, this.save.bind(this), [args]);
|
|
239
240
|
return data!;
|
|
240
241
|
}
|
|
241
242
|
|
|
@@ -270,9 +271,16 @@ export class EditFormController
|
|
|
270
271
|
}
|
|
271
272
|
}
|
|
272
273
|
|
|
274
|
+
const noFillBack = args?.noFillBack === true;
|
|
273
275
|
// 保存结束后合并修改临时主键
|
|
274
276
|
if (res.data) {
|
|
275
|
-
|
|
277
|
+
// 回填数据的合并后台数据
|
|
278
|
+
if (noFillBack) {
|
|
279
|
+
// 自动保存不回填数据的时候只更新更新时间
|
|
280
|
+
this.data.updatedate = res.data.updatedate;
|
|
281
|
+
} else {
|
|
282
|
+
mergeInLeft(this.data, res.data);
|
|
283
|
+
}
|
|
276
284
|
this.data.tempsrfkey = this.data.srfkey;
|
|
277
285
|
}
|
|
278
286
|
this.state.modified = false;
|
|
@@ -502,7 +510,7 @@ export class EditFormController
|
|
|
502
510
|
if (this.model.enableAutoSave) {
|
|
503
511
|
// 自动保存静默,报错直接控制台输出
|
|
504
512
|
try {
|
|
505
|
-
await this.save({ silent: true });
|
|
513
|
+
await this.save({ silent: true, noFillBack: true });
|
|
506
514
|
} catch (error) {
|
|
507
515
|
ibiz.log.error(error);
|
|
508
516
|
}
|
|
@@ -4,12 +4,12 @@ import {
|
|
|
4
4
|
IPanelItemController,
|
|
5
5
|
IPanelController,
|
|
6
6
|
IPanelDataContainerController,
|
|
7
|
+
IPanelItemState,
|
|
7
8
|
} from '../../../../interface';
|
|
8
9
|
import { calcLayoutHeightWidth, calcDynaClass } from '../../../../model';
|
|
9
10
|
import { verifyPanelGroupLogic } from '../../../../utils';
|
|
10
11
|
import { PanelNotifyState } from '../../../constant';
|
|
11
12
|
import { PanelItemState } from './panel-item.state';
|
|
12
|
-
import { PanelController } from './panel.controller';
|
|
13
13
|
|
|
14
14
|
export class PanelItemController<T extends IPanelItem = IPanelItem>
|
|
15
15
|
implements IPanelItemController
|
|
@@ -19,9 +19,9 @@ export class PanelItemController<T extends IPanelItem = IPanelItem>
|
|
|
19
19
|
*
|
|
20
20
|
* @author chitanda
|
|
21
21
|
* @date 2023-01-04 09:01:04
|
|
22
|
-
* @type {
|
|
22
|
+
* @type {IPanelItemState}
|
|
23
23
|
*/
|
|
24
|
-
state:
|
|
24
|
+
state: IPanelItemState;
|
|
25
25
|
|
|
26
26
|
/**
|
|
27
27
|
* 数据父容器
|
|
@@ -72,13 +72,13 @@ export class PanelItemController<T extends IPanelItem = IPanelItem>
|
|
|
72
72
|
* @author lxm
|
|
73
73
|
* @date 2023-04-27 06:37:12
|
|
74
74
|
* @param {T} model 面板成员模型
|
|
75
|
-
* @param {
|
|
76
|
-
* @param {
|
|
75
|
+
* @param {IPanelController} panel 面板控制器
|
|
76
|
+
* @param {IPanelItemController} [parent] 父容器控制器
|
|
77
77
|
*/
|
|
78
78
|
constructor(
|
|
79
79
|
public readonly model: T,
|
|
80
|
-
public readonly panel:
|
|
81
|
-
public readonly parent?:
|
|
80
|
+
public readonly panel: IPanelController,
|
|
81
|
+
public readonly parent?: IPanelItemController,
|
|
82
82
|
) {
|
|
83
83
|
this.state = this.createState();
|
|
84
84
|
}
|
|
@@ -4,6 +4,7 @@ import { IControlState } from '../../state';
|
|
|
4
4
|
import { IController } from '../i.controller';
|
|
5
5
|
import { IViewController } from '../view/i-view.controller';
|
|
6
6
|
import { IViewLayoutPanelController } from './i-view-layout-panel.controller';
|
|
7
|
+
import { ControlLogicScheduler } from '../../../../logic-scheduler';
|
|
7
8
|
|
|
8
9
|
/**
|
|
9
10
|
* 部件控制器
|
|
@@ -34,6 +35,15 @@ export interface IControlController<
|
|
|
34
35
|
*/
|
|
35
36
|
layoutPanel?: IViewLayoutPanelController;
|
|
36
37
|
|
|
38
|
+
/**
|
|
39
|
+
* 部件逻辑调度器
|
|
40
|
+
*
|
|
41
|
+
* @author chitanda
|
|
42
|
+
* @date 2023-11-11 10:11:16
|
|
43
|
+
* @type {ControlLogicScheduler}
|
|
44
|
+
*/
|
|
45
|
+
scheduler?: ControlLogicScheduler;
|
|
46
|
+
|
|
37
47
|
/**
|
|
38
48
|
* 开始加载
|
|
39
49
|
*
|
|
@@ -4,6 +4,16 @@ import { IEditFormEvent } from '../../event';
|
|
|
4
4
|
import { IEditFormState } from '../../state';
|
|
5
5
|
import { IFormController } from './i-form.controller';
|
|
6
6
|
|
|
7
|
+
export interface FormSaveParams extends IDataAbilityParams {
|
|
8
|
+
/**
|
|
9
|
+
* 保存之后是否不合并后台回来的数据
|
|
10
|
+
* @author lxm
|
|
11
|
+
* @date 2023-11-11 11:28:23
|
|
12
|
+
* @type {boolean}
|
|
13
|
+
*/
|
|
14
|
+
noFillBack?: boolean;
|
|
15
|
+
}
|
|
16
|
+
|
|
7
17
|
/**
|
|
8
18
|
* 编辑表单控制器
|
|
9
19
|
* @author lxm
|
|
@@ -28,7 +38,7 @@ export interface IEditFormController
|
|
|
28
38
|
* @date 2023-05-16 12:59:03
|
|
29
39
|
* @return {*} {Promise<IData>}
|
|
30
40
|
*/
|
|
31
|
-
save(args?:
|
|
41
|
+
save(args?: FormSaveParams): Promise<IData>;
|
|
32
42
|
|
|
33
43
|
/**
|
|
34
44
|
* 删除表单数据
|
|
@@ -21,14 +21,6 @@ export interface MDCtrlLoadParams extends IDataAbilityParams {
|
|
|
21
21
|
}
|
|
22
22
|
|
|
23
23
|
export interface MDCtrlRemoveParams extends IDataAbilityParams {
|
|
24
|
-
/**
|
|
25
|
-
* 是否静默删除
|
|
26
|
-
* @author lxm
|
|
27
|
-
* @date 2023-08-17 06:04:23
|
|
28
|
-
* @type {boolean}
|
|
29
|
-
*/
|
|
30
|
-
silent?: boolean;
|
|
31
|
-
|
|
32
24
|
/**
|
|
33
25
|
* 是否不需要刷新(默认为否,如果不需要刷新传true)
|
|
34
26
|
* @author lxm
|
|
@@ -18,6 +18,15 @@ export interface IPanelItemState extends IColState {
|
|
|
18
18
|
* @type {IPanelItemClass}
|
|
19
19
|
*/
|
|
20
20
|
class: IPanelItemClass;
|
|
21
|
+
|
|
22
|
+
/**
|
|
23
|
+
* 是否必填
|
|
24
|
+
*
|
|
25
|
+
* @author chitanda
|
|
26
|
+
* @date 2023-11-11 09:11:53
|
|
27
|
+
* @type {boolean}
|
|
28
|
+
*/
|
|
29
|
+
required: boolean;
|
|
21
30
|
}
|
|
22
31
|
|
|
23
32
|
export interface IPanelItemClass {
|