@ibiz-template/runtime 0.2.11 → 0.2.12
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 +41 -20
- package/dist/index.system.min.js +1 -1
- package/dist/index.system.min.js.map +1 -1
- package/out/controller/control/exp-bar/exp-bar.controller.d.ts.map +1 -1
- package/out/controller/control/exp-bar/exp-bar.controller.js +2 -0
- package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-data-view/form-mdctrl-data-view.controller.d.ts +3 -3
- package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-data-view/form-mdctrl-data-view.controller.d.ts.map +1 -1
- package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-data-view/form-mdctrl-data-view.controller.js +7 -3
- package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form/form-mdctrl-form.controller.d.ts +2 -2
- package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form/form-mdctrl-form.controller.js +2 -2
- package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-grid/form-mdctrl-grid.controller.d.ts +3 -3
- package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-grid/form-mdctrl-grid.controller.d.ts.map +1 -1
- package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-grid/form-mdctrl-grid.controller.js +13 -3
- package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-list/form-mdctrl-list.controller.d.ts +2 -2
- package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-list/form-mdctrl-list.controller.d.ts.map +1 -1
- package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-list/form-mdctrl-list.controller.js +6 -2
- package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/form-mdctrl-repeater-form/form-mdctrl-repeater-form-item.controller.d.ts.map +1 -1
- package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/form-mdctrl-repeater-form/form-mdctrl-repeater-form-item.controller.js +4 -3
- package/out/interface/controller/common/i-nav-view-msg/i-nav-view-msg.d.ts +9 -0
- package/out/interface/controller/common/i-nav-view-msg/i-nav-view-msg.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/controller/control/exp-bar/exp-bar.controller.ts +2 -0
- package/src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-data-view/form-mdctrl-data-view.controller.ts +7 -4
- package/src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form/form-mdctrl-form.controller.ts +2 -2
- package/src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-grid/form-mdctrl-grid.controller.ts +14 -5
- package/src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-list/form-mdctrl-list.controller.ts +6 -3
- package/src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/form-mdctrl-repeater-form/form-mdctrl-repeater-form-item.controller.ts +4 -3
- package/src/interface/controller/common/i-nav-view-msg/i-nav-view-msg.ts +10 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exp-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/exp-bar/exp-bar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,OAAO,EAEP,OAAO,EACP,OAAO,EACP,WAAW,EACX,YAAY,EACb,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,wBAAwB,EACxB,oBAAoB,EACpB,kBAAkB,EAClB,SAAS,EACT,SAAS,EACT,WAAW,EACX,0BAA0B,EAC3B,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,KAAK,iBAAiB,GAAG,OAAO,GAAG,OAAO,GAAG,WAAW,CAAC;AAEzD;;;;;;;;;;;;GAYG;AACH,qBAAa,uBAAuB,CAChC,CAAC,SAAS,OAAO,GAAG,OAAO,EAC3B,CAAC,SAAS,mBAAmB,GAAG,mBAAmB,EACnD,CAAC,SAAS,mBAAmB,GAAG,mBAAmB,CAErD,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,wBAAwB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAE5C,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,mBAAmB,CAAC,CAEzD;IAED;;;;;;;;OAQG;IACH,IAAI,UAAU,IAAI,MAAM,GAAG,SAAS,CAEnC;IAED;;;;;;;OAOG;IACH,SAAS,EAAG,MAAM,CAAC;IAEnB;;;;;;OAMG;IACH,UAAU,SAAY;IAEtB,SAAS,CAAC,SAAS,IAAI,IAAI;IAK3B;;;;;;;OAOG;IACH,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAIxB;;;;;;;;OAQG;IACH,IAAI,eAAe,IAAI,oBAAoB,CAS1C;IAED;;;;;;OAMG;IACH,IAAI,iBAAiB,IAAI,kBAAkB,GAAG,SAAS,CAKtD;IAED;;;;;;;;OAQG;IACH,IAAI,UAAU,IAAI,iBAAiB,GAAG,SAAS,CAO9C;IAED;;;;;;;;OAQG;IACH,IAAI,OAAO,IAAI,OAAO,CAQrB;IAED;;;;;;;;OAQG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA8B1C;;;;;;;;OAQG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA8B1C;;;;;;OAMG;IACH,gBAAgB,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAaxC;;;;;OAKG;IACH,SAAS,CAAC,kBAAkB,IAAI,IAAI;
|
|
1
|
+
{"version":3,"file":"exp-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/exp-bar/exp-bar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,OAAO,EAEP,OAAO,EACP,OAAO,EACP,WAAW,EACX,YAAY,EACb,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,wBAAwB,EACxB,oBAAoB,EACpB,kBAAkB,EAClB,SAAS,EACT,SAAS,EACT,WAAW,EACX,0BAA0B,EAC3B,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,KAAK,iBAAiB,GAAG,OAAO,GAAG,OAAO,GAAG,WAAW,CAAC;AAEzD;;;;;;;;;;;;GAYG;AACH,qBAAa,uBAAuB,CAChC,CAAC,SAAS,OAAO,GAAG,OAAO,EAC3B,CAAC,SAAS,mBAAmB,GAAG,mBAAmB,EACnD,CAAC,SAAS,mBAAmB,GAAG,mBAAmB,CAErD,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,wBAAwB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAE5C,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,mBAAmB,CAAC,CAEzD;IAED;;;;;;;;OAQG;IACH,IAAI,UAAU,IAAI,MAAM,GAAG,SAAS,CAEnC;IAED;;;;;;;OAOG;IACH,SAAS,EAAG,MAAM,CAAC;IAEnB;;;;;;OAMG;IACH,UAAU,SAAY;IAEtB,SAAS,CAAC,SAAS,IAAI,IAAI;IAK3B;;;;;;;OAOG;IACH,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAIxB;;;;;;;;OAQG;IACH,IAAI,eAAe,IAAI,oBAAoB,CAS1C;IAED;;;;;;OAMG;IACH,IAAI,iBAAiB,IAAI,kBAAkB,GAAG,SAAS,CAKtD;IAED;;;;;;;;OAQG;IACH,IAAI,UAAU,IAAI,iBAAiB,GAAG,SAAS,CAO9C;IAED;;;;;;;;OAQG;IACH,IAAI,OAAO,IAAI,OAAO,CAQrB;IAED;;;;;;;;OAQG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA8B1C;;;;;;;;OAQG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA8B1C;;;;;;OAMG;IACH,gBAAgB,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAaxC;;;;;OAKG;IACH,SAAS,CAAC,kBAAkB,IAAI,IAAI;IAgCpC;;;;;;;OAOG;IACH,SAAS,CAAC,qBAAqB,IAAI,IAAI;IAmBvC;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAMnC;;;;;;;;OAQG;IACH,aAAa,CACX,UAAU,EAAE,YAAY,GAAG;QAAE,eAAe,CAAC,EAAE,MAAM,CAAA;KAAE,EACvD,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IA8BzC;;;;;;;OAOG;IACI,eAAe,IAAI,MAAM,GAAG,SAAS;IAS5C;;;;;;;;OAQG;IACI,aAAa,CAClB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,WAAW;IAYd;;;;;;OAMG;IACH,SAAS,CAAC,wBAAwB,IAAI,OAAO;IAe7C,cAAc,CAAC,KAAK,EAAE,0BAA0B,GAAG,IAAI;IAcvD;;;;;OAKG;IACH,cAAc,CAAC,IAAI,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;CAM7D"}
|
|
@@ -225,6 +225,7 @@ export class ExpBarControlController extends ControlController {
|
|
|
225
225
|
this._evt.emit('onNavViewChange', {
|
|
226
226
|
navViewMsg: {
|
|
227
227
|
key: this.state.srfnav,
|
|
228
|
+
isRoutePushed: true,
|
|
228
229
|
isCache: this.isCache,
|
|
229
230
|
},
|
|
230
231
|
context: this.context,
|
|
@@ -252,6 +253,7 @@ export class ExpBarControlController extends ControlController {
|
|
|
252
253
|
this._evt.emit('onNavViewChange', {
|
|
253
254
|
navViewMsg: {
|
|
254
255
|
key: '',
|
|
256
|
+
isRoutePushed: true,
|
|
255
257
|
isCache: this.isCache,
|
|
256
258
|
},
|
|
257
259
|
});
|
|
@@ -19,7 +19,7 @@ export declare class FormMDCtrlDataViewController extends FormMDCtrlControlContr
|
|
|
19
19
|
* @type {IListController}
|
|
20
20
|
* @memberof FormMDCtrlDataViewController
|
|
21
21
|
*/
|
|
22
|
-
dataViewController
|
|
22
|
+
dataViewController?: IListController;
|
|
23
23
|
/**
|
|
24
24
|
* 表格选中数据
|
|
25
25
|
*
|
|
@@ -41,14 +41,14 @@ export declare class FormMDCtrlDataViewController extends FormMDCtrlControlContr
|
|
|
41
41
|
isSelect: boolean;
|
|
42
42
|
};
|
|
43
43
|
/**
|
|
44
|
-
*
|
|
44
|
+
* 卡片挂载后把控制器抛出来
|
|
45
45
|
*
|
|
46
46
|
* @author zk
|
|
47
47
|
* @date 2023-07-30 07:07:25
|
|
48
48
|
* @param {EventBase} event
|
|
49
49
|
* @memberof FormMDCtrlDataViewController
|
|
50
50
|
*/
|
|
51
|
-
|
|
51
|
+
onDataViewCreated(event: EventBase): void;
|
|
52
52
|
/**
|
|
53
53
|
* 表格选中事件
|
|
54
54
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"form-mdctrl-data-view.controller.d.ts","sourceRoot":"","sources":["../../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-data-view/form-mdctrl-data-view.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,EAAE,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AAEpG;;;;;;;;;GASG;AACH,qBAAa,4BAA6B,SAAQ,2BAA2B;IAC3E;;;;;;;OAOG;IACH,kBAAkB,
|
|
1
|
+
{"version":3,"file":"form-mdctrl-data-view.controller.d.ts","sourceRoot":"","sources":["../../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-data-view/form-mdctrl-data-view.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,EAAE,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AAEpG;;;;;;;;;GASG;AACH,qBAAa,4BAA6B,SAAQ,2BAA2B;IAC3E;;;;;;;OAOG;IACH,kBAAkB,CAAC,EAAE,eAAe,CAAC;IAErC;;;;;;;OAOG;IACH,UAAU,EAAE,KAAK,EAAE,CAAM;IAEzB;;;;;;;OAOG;IACH,KAAK,EAAE;QAAE,QAAQ,EAAE,OAAO,CAAA;KAAE,CAAuB;IAEnD;;;;;;;OAOG;IACH,iBAAiB,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAIzC;;;;;;;OAOG;IACH,iBAAiB,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAIzC;;;;;;;OAOG;IACH,YAAY,IAAI,IAAI;IASpB;;;;;;;OAOG;IACH,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI;IAKjC;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAI/B;;;;;;;OAOG;IACG,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;CAKpC"}
|
|
@@ -32,14 +32,14 @@ export class FormMDCtrlDataViewController extends FormMDCtrlControlController {
|
|
|
32
32
|
this.state = { isSelect: false };
|
|
33
33
|
}
|
|
34
34
|
/**
|
|
35
|
-
*
|
|
35
|
+
* 卡片挂载后把控制器抛出来
|
|
36
36
|
*
|
|
37
37
|
* @author zk
|
|
38
38
|
* @date 2023-07-30 07:07:25
|
|
39
39
|
* @param {EventBase} event
|
|
40
40
|
* @memberof FormMDCtrlDataViewController
|
|
41
41
|
*/
|
|
42
|
-
|
|
42
|
+
onDataViewCreated(event) {
|
|
43
43
|
this.dataViewController = event.ctrl;
|
|
44
44
|
}
|
|
45
45
|
/**
|
|
@@ -62,6 +62,9 @@ export class FormMDCtrlDataViewController extends FormMDCtrlControlController {
|
|
|
62
62
|
* @memberof FormMDCtrlController
|
|
63
63
|
*/
|
|
64
64
|
onDataRemove() {
|
|
65
|
+
if (!this.dataViewController) {
|
|
66
|
+
return;
|
|
67
|
+
}
|
|
65
68
|
this.dataViewController.remove();
|
|
66
69
|
this.parent.state.contentCtrlData = this.dataViewController.state.items;
|
|
67
70
|
this.parent.setFormDataValue();
|
|
@@ -86,7 +89,8 @@ export class FormMDCtrlDataViewController extends FormMDCtrlControlController {
|
|
|
86
89
|
* @memberof FormMDCtrlContentTypeController
|
|
87
90
|
*/
|
|
88
91
|
async initData() {
|
|
89
|
-
|
|
92
|
+
var _a;
|
|
93
|
+
(_a = this.dataViewController) === null || _a === void 0 ? void 0 : _a.load();
|
|
90
94
|
}
|
|
91
95
|
/**
|
|
92
96
|
* 数据插入
|
|
@@ -42,14 +42,14 @@ export declare class FormMDCtrlFormController extends FormMDCtrlControlControlle
|
|
|
42
42
|
*/
|
|
43
43
|
service: EditFormService;
|
|
44
44
|
/**
|
|
45
|
-
*
|
|
45
|
+
* 表单初始化后把控制器抛出来
|
|
46
46
|
*
|
|
47
47
|
* @author zk
|
|
48
48
|
* @date 2023-07-30 07:07:25
|
|
49
49
|
* @param {EventBase} event
|
|
50
50
|
* @memberof FormMDCtrlGridController
|
|
51
51
|
*/
|
|
52
|
-
|
|
52
|
+
onControlCreated(event: EventBase, index: number): void;
|
|
53
53
|
/**
|
|
54
54
|
* 初始化
|
|
55
55
|
*
|
|
@@ -35,14 +35,14 @@ export class FormMDCtrlFormController extends FormMDCtrlControlController {
|
|
|
35
35
|
this.state = { data: [] };
|
|
36
36
|
}
|
|
37
37
|
/**
|
|
38
|
-
*
|
|
38
|
+
* 表单初始化后把控制器抛出来
|
|
39
39
|
*
|
|
40
40
|
* @author zk
|
|
41
41
|
* @date 2023-07-30 07:07:25
|
|
42
42
|
* @param {EventBase} event
|
|
43
43
|
* @memberof FormMDCtrlGridController
|
|
44
44
|
*/
|
|
45
|
-
|
|
45
|
+
onControlCreated(event, index) {
|
|
46
46
|
const formController = event.ctrl;
|
|
47
47
|
this.controlControllerArray[index] = formController;
|
|
48
48
|
formController.load();
|
|
@@ -19,7 +19,7 @@ export declare class FormMDCtrlGridController extends FormMDCtrlControlControlle
|
|
|
19
19
|
* @type {IGridController}
|
|
20
20
|
* @memberof FormMDCtrlGridController
|
|
21
21
|
*/
|
|
22
|
-
gridController
|
|
22
|
+
gridController?: IGridController;
|
|
23
23
|
/**
|
|
24
24
|
* 表格选中数据
|
|
25
25
|
*
|
|
@@ -41,14 +41,14 @@ export declare class FormMDCtrlGridController extends FormMDCtrlControlControlle
|
|
|
41
41
|
isSelect: boolean;
|
|
42
42
|
};
|
|
43
43
|
/**
|
|
44
|
-
*
|
|
44
|
+
* 表格初始化后把控制器抛出来
|
|
45
45
|
*
|
|
46
46
|
* @author zk
|
|
47
47
|
* @date 2023-07-30 07:07:25
|
|
48
48
|
* @param {EventBase} event
|
|
49
49
|
* @memberof FormMDCtrlGridController
|
|
50
50
|
*/
|
|
51
|
-
|
|
51
|
+
onGridCreated(event: EventBase): void;
|
|
52
52
|
/**
|
|
53
53
|
* 表格选中事件
|
|
54
54
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"form-mdctrl-grid.controller.d.ts","sourceRoot":"","sources":["../../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-grid/form-mdctrl-grid.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAEzE,OAAO,EAAE,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AAEpG;;;;;;;;;GASG;AACH,qBAAa,wBAAyB,SAAQ,2BAA2B;IACvE;;;;;;;OAOG;IACH,cAAc,
|
|
1
|
+
{"version":3,"file":"form-mdctrl-grid.controller.d.ts","sourceRoot":"","sources":["../../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-grid/form-mdctrl-grid.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAEzE,OAAO,EAAE,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AAEpG;;;;;;;;;GASG;AACH,qBAAa,wBAAyB,SAAQ,2BAA2B;IACvE;;;;;;;OAOG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;;;OAOG;IACH,UAAU,EAAE,KAAK,EAAE,CAAM;IAEzB;;;;;;;OAOG;IACH,KAAK,EAAE;QAAE,QAAQ,EAAE,OAAO,CAAA;KAAE,CAAuB;IAEnD;;;;;;;OAOG;IACH,aAAa,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAIrC;;;;;;;OAOG;IACH,iBAAiB,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAIzC;;;;;;;OAOG;IACH,YAAY,IAAI,IAAI;IASpB;;;;;;;OAOG;IACH,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI;IAKjC;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAI/B;;;;;;;OAOG;IACG,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IASnC;;;;;;;OAOG;IACU,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAcpC;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;CAYnC"}
|
|
@@ -34,14 +34,14 @@ export class FormMDCtrlGridController extends FormMDCtrlControlController {
|
|
|
34
34
|
this.state = { isSelect: false };
|
|
35
35
|
}
|
|
36
36
|
/**
|
|
37
|
-
*
|
|
37
|
+
* 表格初始化后把控制器抛出来
|
|
38
38
|
*
|
|
39
39
|
* @author zk
|
|
40
40
|
* @date 2023-07-30 07:07:25
|
|
41
41
|
* @param {EventBase} event
|
|
42
42
|
* @memberof FormMDCtrlGridController
|
|
43
43
|
*/
|
|
44
|
-
|
|
44
|
+
onGridCreated(event) {
|
|
45
45
|
this.gridController = event.ctrl;
|
|
46
46
|
}
|
|
47
47
|
/**
|
|
@@ -64,6 +64,9 @@ export class FormMDCtrlGridController extends FormMDCtrlControlController {
|
|
|
64
64
|
* @memberof FormMDCtrlController
|
|
65
65
|
*/
|
|
66
66
|
onDataRemove() {
|
|
67
|
+
if (!this.gridController) {
|
|
68
|
+
return;
|
|
69
|
+
}
|
|
67
70
|
this.gridController.remove();
|
|
68
71
|
this.parent.state.contentCtrlData = this.gridController.state.items;
|
|
69
72
|
this.parent.setFormDataValue();
|
|
@@ -88,7 +91,8 @@ export class FormMDCtrlGridController extends FormMDCtrlControlController {
|
|
|
88
91
|
* @memberof FormMDCtrlContentTypeController
|
|
89
92
|
*/
|
|
90
93
|
async initData() {
|
|
91
|
-
|
|
94
|
+
var _a;
|
|
95
|
+
(_a = this.gridController) === null || _a === void 0 ? void 0 : _a.load();
|
|
92
96
|
}
|
|
93
97
|
/**
|
|
94
98
|
* 数据插入
|
|
@@ -99,6 +103,9 @@ export class FormMDCtrlGridController extends FormMDCtrlControlController {
|
|
|
99
103
|
* @memberof FormMDCtrlContentTypeController
|
|
100
104
|
*/
|
|
101
105
|
async onDataInsert() {
|
|
106
|
+
if (!this.gridController) {
|
|
107
|
+
return;
|
|
108
|
+
}
|
|
102
109
|
await this.gridController.newRow();
|
|
103
110
|
this.parent.state.contentCtrlData = this.gridController.state.items;
|
|
104
111
|
this.parent.setFormDataValue();
|
|
@@ -132,6 +139,9 @@ export class FormMDCtrlGridController extends FormMDCtrlControlController {
|
|
|
132
139
|
* @memberof FormMDCtrlFormController
|
|
133
140
|
*/
|
|
134
141
|
async validate() {
|
|
142
|
+
if (!this.gridController) {
|
|
143
|
+
return true;
|
|
144
|
+
}
|
|
135
145
|
const { rows } = this.gridController.state;
|
|
136
146
|
const values = await Promise.all(rows.map(row => this.gridController.validate(row)));
|
|
137
147
|
// 找不到value为false即全部是true
|
|
@@ -19,7 +19,7 @@ export declare class FormMDCtrlListController extends FormMDCtrlControlControlle
|
|
|
19
19
|
* @type {IListController}
|
|
20
20
|
* @memberof FormMDCtrlListController
|
|
21
21
|
*/
|
|
22
|
-
listController
|
|
22
|
+
listController?: IListController;
|
|
23
23
|
/**
|
|
24
24
|
* 表格选中数据
|
|
25
25
|
*
|
|
@@ -48,7 +48,7 @@ export declare class FormMDCtrlListController extends FormMDCtrlControlControlle
|
|
|
48
48
|
* @param {EventBase} event
|
|
49
49
|
* @memberof FormMDCtrlListController
|
|
50
50
|
*/
|
|
51
|
-
|
|
51
|
+
onListCreated(event: EventBase): void;
|
|
52
52
|
/**
|
|
53
53
|
* 表格选中事件
|
|
54
54
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"form-mdctrl-list.controller.d.ts","sourceRoot":"","sources":["../../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-list/form-mdctrl-list.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,EAAE,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AAEpG;;;;;;;;;GASG;AACH,qBAAa,wBAAyB,SAAQ,2BAA2B;IACvE;;;;;;;OAOG;IACH,cAAc,
|
|
1
|
+
{"version":3,"file":"form-mdctrl-list.controller.d.ts","sourceRoot":"","sources":["../../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-list/form-mdctrl-list.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,EAAE,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AAEpG;;;;;;;;;GASG;AACH,qBAAa,wBAAyB,SAAQ,2BAA2B;IACvE;;;;;;;OAOG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;;;OAOG;IACH,UAAU,EAAE,KAAK,EAAE,CAAM;IAEzB;;;;;;;OAOG;IACH,KAAK,EAAE;QAAE,QAAQ,EAAE,OAAO,CAAA;KAAE,CAAuB;IAEnD;;;;;;;OAOG;IACH,aAAa,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAIrC;;;;;;;OAOG;IACH,iBAAiB,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAIzC;;;;;;;OAOG;IACH,YAAY,IAAI,IAAI;IASpB;;;;;;;OAOG;IACH,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI;IAKjC;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAI/B;;;;;;;OAOG;IACG,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;CAKpC"}
|
|
@@ -39,7 +39,7 @@ export class FormMDCtrlListController extends FormMDCtrlControlController {
|
|
|
39
39
|
* @param {EventBase} event
|
|
40
40
|
* @memberof FormMDCtrlListController
|
|
41
41
|
*/
|
|
42
|
-
|
|
42
|
+
onListCreated(event) {
|
|
43
43
|
this.listController = event.ctrl;
|
|
44
44
|
}
|
|
45
45
|
/**
|
|
@@ -62,6 +62,9 @@ export class FormMDCtrlListController extends FormMDCtrlControlController {
|
|
|
62
62
|
* @memberof FormMDCtrlController
|
|
63
63
|
*/
|
|
64
64
|
onDataRemove() {
|
|
65
|
+
if (!this.listController) {
|
|
66
|
+
return;
|
|
67
|
+
}
|
|
65
68
|
this.listController.remove();
|
|
66
69
|
this.parent.state.contentCtrlData = this.listController.state.items;
|
|
67
70
|
this.parent.setFormDataValue();
|
|
@@ -86,7 +89,8 @@ export class FormMDCtrlListController extends FormMDCtrlControlController {
|
|
|
86
89
|
* @memberof FormMDCtrlContentTypeController
|
|
87
90
|
*/
|
|
88
91
|
async initData() {
|
|
89
|
-
|
|
92
|
+
var _a;
|
|
93
|
+
(_a = this.listController) === null || _a === void 0 ? void 0 : _a.load();
|
|
90
94
|
}
|
|
91
95
|
/**
|
|
92
96
|
* 数据插入
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"form-mdctrl-repeater-form-item.controller.d.ts","sourceRoot":"","sources":["../../../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/form-mdctrl-repeater-form/form-mdctrl-repeater-form-item.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAiB,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"form-mdctrl-repeater-form-item.controller.d.ts","sourceRoot":"","sources":["../../../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/form-mdctrl-repeater-form/form-mdctrl-repeater-form-item.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAiB,MAAM,kBAAkB,CAAC;AAE1E,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAGjE,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAGrE;;;;;;;;GAQG;AACH,qBAAa,wBACX,SAAQ,kBACR,YAAW,eAAe;gBAGxB,KAAK,EAAE,QAAQ,EACf,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,KAAK,EACX,IAAI,EAAE,cAAc;cAUN,qBAAqB,CACnC,OAAO,GAAE,aAAa,EAAiD,EACvE,IAAI,GAAE,cAAqB,EAC3B,MAAM,GAAE,wBAAwB,GAAG,SAAqB,GACvD,OAAO,CAAC,IAAI,CAAC;CAiCjB"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { clone } from 'ramda';
|
|
1
2
|
import { findChildFormDetails } from '../../../../../../../model';
|
|
2
3
|
import { getFormDetailProvider } from '../../../../../../../register';
|
|
3
4
|
import { EditFormController } from '../../../../edit-form';
|
|
@@ -12,10 +13,10 @@ import { EditFormController } from '../../../../edit-form';
|
|
|
12
13
|
*/
|
|
13
14
|
export class FormMDCtrlItemController extends EditFormController {
|
|
14
15
|
constructor(model, context, params, ctx, data, form) {
|
|
15
|
-
const
|
|
16
|
+
const tempModel = clone(form.model);
|
|
16
17
|
// 合并父级表单模型 兼容值规则 和 父表单模型
|
|
17
|
-
Object.assign(
|
|
18
|
-
super(
|
|
18
|
+
Object.assign(tempModel, model, { name: undefined });
|
|
19
|
+
super(tempModel, context, params, ctx);
|
|
19
20
|
this.state.data = data;
|
|
20
21
|
this.state.isSimple = true;
|
|
21
22
|
}
|
|
@@ -41,6 +41,15 @@ export interface INavViewMsg {
|
|
|
41
41
|
* @type {IAppView}
|
|
42
42
|
*/
|
|
43
43
|
viewId?: string;
|
|
44
|
+
/**
|
|
45
|
+
* 是否路由已经跳转
|
|
46
|
+
*
|
|
47
|
+
* @author zk
|
|
48
|
+
* @date 2023-09-26 06:09:17
|
|
49
|
+
* @type {string}
|
|
50
|
+
* @memberof INavViewMsg
|
|
51
|
+
*/
|
|
52
|
+
isRoutePushed?: boolean;
|
|
44
53
|
/**
|
|
45
54
|
* 是否缓存
|
|
46
55
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i-nav-view-msg.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/common/i-nav-view-msg/i-nav-view-msg.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,WAAW,WAAW;IAC1B;;;;;OAKG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,QAAQ,CAAC;IAEnB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;;;;OAOG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB"}
|
|
1
|
+
{"version":3,"file":"i-nav-view-msg.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/common/i-nav-view-msg/i-nav-view-msg.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,WAAW,WAAW;IAC1B;;;;;OAKG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,QAAQ,CAAC;IAEnB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;;;;OAOG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;;;;;;OAOG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ibiz-template/runtime",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.12",
|
|
4
4
|
"description": "控制器包",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "out/index.js",
|
|
@@ -59,5 +59,5 @@
|
|
|
59
59
|
"qx-util": "^0.4.8",
|
|
60
60
|
"ramda": "^0.29.0"
|
|
61
61
|
},
|
|
62
|
-
"gitHead": "
|
|
62
|
+
"gitHead": "ec31792dd33f5df963d1dbaadcae589182da96c0"
|
|
63
63
|
}
|
|
@@ -295,6 +295,7 @@ export class ExpBarControlController<
|
|
|
295
295
|
this._evt.emit('onNavViewChange', {
|
|
296
296
|
navViewMsg: {
|
|
297
297
|
key: this.state.srfnav,
|
|
298
|
+
isRoutePushed: true,
|
|
298
299
|
isCache: this.isCache,
|
|
299
300
|
},
|
|
300
301
|
context: this.context,
|
|
@@ -322,6 +323,7 @@ export class ExpBarControlController<
|
|
|
322
323
|
this._evt.emit('onNavViewChange', {
|
|
323
324
|
navViewMsg: {
|
|
324
325
|
key: '',
|
|
326
|
+
isRoutePushed: true,
|
|
325
327
|
isCache: this.isCache,
|
|
326
328
|
},
|
|
327
329
|
});
|
|
@@ -20,7 +20,7 @@ export class FormMDCtrlDataViewController extends FormMDCtrlControlController {
|
|
|
20
20
|
* @type {IListController}
|
|
21
21
|
* @memberof FormMDCtrlDataViewController
|
|
22
22
|
*/
|
|
23
|
-
dataViewController
|
|
23
|
+
dataViewController?: IListController;
|
|
24
24
|
|
|
25
25
|
/**
|
|
26
26
|
* 表格选中数据
|
|
@@ -43,14 +43,14 @@ export class FormMDCtrlDataViewController extends FormMDCtrlControlController {
|
|
|
43
43
|
state: { isSelect: boolean } = { isSelect: false };
|
|
44
44
|
|
|
45
45
|
/**
|
|
46
|
-
*
|
|
46
|
+
* 卡片挂载后把控制器抛出来
|
|
47
47
|
*
|
|
48
48
|
* @author zk
|
|
49
49
|
* @date 2023-07-30 07:07:25
|
|
50
50
|
* @param {EventBase} event
|
|
51
51
|
* @memberof FormMDCtrlDataViewController
|
|
52
52
|
*/
|
|
53
|
-
|
|
53
|
+
onDataViewCreated(event: EventBase): void {
|
|
54
54
|
this.dataViewController = event.ctrl as IListController;
|
|
55
55
|
}
|
|
56
56
|
|
|
@@ -75,6 +75,9 @@ export class FormMDCtrlDataViewController extends FormMDCtrlControlController {
|
|
|
75
75
|
* @memberof FormMDCtrlController
|
|
76
76
|
*/
|
|
77
77
|
onDataRemove(): void {
|
|
78
|
+
if (!this.dataViewController) {
|
|
79
|
+
return;
|
|
80
|
+
}
|
|
78
81
|
this.dataViewController.remove();
|
|
79
82
|
this.parent.state.contentCtrlData = this.dataViewController.state.items;
|
|
80
83
|
this.parent.setFormDataValue();
|
|
@@ -101,7 +104,7 @@ export class FormMDCtrlDataViewController extends FormMDCtrlControlController {
|
|
|
101
104
|
* @memberof FormMDCtrlContentTypeController
|
|
102
105
|
*/
|
|
103
106
|
async initData(): Promise<void> {
|
|
104
|
-
this.dataViewController
|
|
107
|
+
this.dataViewController?.load();
|
|
105
108
|
}
|
|
106
109
|
|
|
107
110
|
/**
|
|
@@ -45,14 +45,14 @@ export class FormMDCtrlFormController extends FormMDCtrlControlController {
|
|
|
45
45
|
service!: EditFormService;
|
|
46
46
|
|
|
47
47
|
/**
|
|
48
|
-
*
|
|
48
|
+
* 表单初始化后把控制器抛出来
|
|
49
49
|
*
|
|
50
50
|
* @author zk
|
|
51
51
|
* @date 2023-07-30 07:07:25
|
|
52
52
|
* @param {EventBase} event
|
|
53
53
|
* @memberof FormMDCtrlGridController
|
|
54
54
|
*/
|
|
55
|
-
|
|
55
|
+
onControlCreated(event: EventBase, index: number): void {
|
|
56
56
|
const formController = event.ctrl as IEditFormController;
|
|
57
57
|
this.controlControllerArray[index] = formController;
|
|
58
58
|
formController.load();
|
|
@@ -22,7 +22,7 @@ export class FormMDCtrlGridController extends FormMDCtrlControlController {
|
|
|
22
22
|
* @type {IGridController}
|
|
23
23
|
* @memberof FormMDCtrlGridController
|
|
24
24
|
*/
|
|
25
|
-
gridController
|
|
25
|
+
gridController?: IGridController;
|
|
26
26
|
|
|
27
27
|
/**
|
|
28
28
|
* 表格选中数据
|
|
@@ -45,14 +45,14 @@ export class FormMDCtrlGridController extends FormMDCtrlControlController {
|
|
|
45
45
|
state: { isSelect: boolean } = { isSelect: false };
|
|
46
46
|
|
|
47
47
|
/**
|
|
48
|
-
*
|
|
48
|
+
* 表格初始化后把控制器抛出来
|
|
49
49
|
*
|
|
50
50
|
* @author zk
|
|
51
51
|
* @date 2023-07-30 07:07:25
|
|
52
52
|
* @param {EventBase} event
|
|
53
53
|
* @memberof FormMDCtrlGridController
|
|
54
54
|
*/
|
|
55
|
-
|
|
55
|
+
onGridCreated(event: EventBase): void {
|
|
56
56
|
this.gridController = event.ctrl as IGridController;
|
|
57
57
|
}
|
|
58
58
|
|
|
@@ -77,6 +77,9 @@ export class FormMDCtrlGridController extends FormMDCtrlControlController {
|
|
|
77
77
|
* @memberof FormMDCtrlController
|
|
78
78
|
*/
|
|
79
79
|
onDataRemove(): void {
|
|
80
|
+
if (!this.gridController) {
|
|
81
|
+
return;
|
|
82
|
+
}
|
|
80
83
|
this.gridController.remove();
|
|
81
84
|
this.parent.state.contentCtrlData = this.gridController.state.items;
|
|
82
85
|
this.parent.setFormDataValue();
|
|
@@ -103,7 +106,7 @@ export class FormMDCtrlGridController extends FormMDCtrlControlController {
|
|
|
103
106
|
* @memberof FormMDCtrlContentTypeController
|
|
104
107
|
*/
|
|
105
108
|
async initData(): Promise<void> {
|
|
106
|
-
this.gridController
|
|
109
|
+
this.gridController?.load();
|
|
107
110
|
}
|
|
108
111
|
|
|
109
112
|
/**
|
|
@@ -115,6 +118,9 @@ export class FormMDCtrlGridController extends FormMDCtrlControlController {
|
|
|
115
118
|
* @memberof FormMDCtrlContentTypeController
|
|
116
119
|
*/
|
|
117
120
|
async onDataInsert(): Promise<void> {
|
|
121
|
+
if (!this.gridController) {
|
|
122
|
+
return;
|
|
123
|
+
}
|
|
118
124
|
await this.gridController.newRow();
|
|
119
125
|
this.parent.state.contentCtrlData = this.gridController.state.items;
|
|
120
126
|
this.parent.setFormDataValue();
|
|
@@ -150,9 +156,12 @@ export class FormMDCtrlGridController extends FormMDCtrlControlController {
|
|
|
150
156
|
* @memberof FormMDCtrlFormController
|
|
151
157
|
*/
|
|
152
158
|
async validate(): Promise<boolean> {
|
|
159
|
+
if (!this.gridController) {
|
|
160
|
+
return true;
|
|
161
|
+
}
|
|
153
162
|
const { rows } = this.gridController.state;
|
|
154
163
|
const values = await Promise.all(
|
|
155
|
-
rows.map(row => this.gridController
|
|
164
|
+
rows.map(row => this.gridController!.validate(row)),
|
|
156
165
|
);
|
|
157
166
|
|
|
158
167
|
// 找不到value为false即全部是true
|
|
@@ -20,7 +20,7 @@ export class FormMDCtrlListController extends FormMDCtrlControlController {
|
|
|
20
20
|
* @type {IListController}
|
|
21
21
|
* @memberof FormMDCtrlListController
|
|
22
22
|
*/
|
|
23
|
-
listController
|
|
23
|
+
listController?: IListController;
|
|
24
24
|
|
|
25
25
|
/**
|
|
26
26
|
* 表格选中数据
|
|
@@ -50,7 +50,7 @@ export class FormMDCtrlListController extends FormMDCtrlControlController {
|
|
|
50
50
|
* @param {EventBase} event
|
|
51
51
|
* @memberof FormMDCtrlListController
|
|
52
52
|
*/
|
|
53
|
-
|
|
53
|
+
onListCreated(event: EventBase): void {
|
|
54
54
|
this.listController = event.ctrl as IListController;
|
|
55
55
|
}
|
|
56
56
|
|
|
@@ -75,6 +75,9 @@ export class FormMDCtrlListController extends FormMDCtrlControlController {
|
|
|
75
75
|
* @memberof FormMDCtrlController
|
|
76
76
|
*/
|
|
77
77
|
onDataRemove(): void {
|
|
78
|
+
if (!this.listController) {
|
|
79
|
+
return;
|
|
80
|
+
}
|
|
78
81
|
this.listController.remove();
|
|
79
82
|
this.parent.state.contentCtrlData = this.listController.state.items;
|
|
80
83
|
this.parent.setFormDataValue();
|
|
@@ -101,7 +104,7 @@ export class FormMDCtrlListController extends FormMDCtrlControlController {
|
|
|
101
104
|
* @memberof FormMDCtrlContentTypeController
|
|
102
105
|
*/
|
|
103
106
|
async initData(): Promise<void> {
|
|
104
|
-
this.listController
|
|
107
|
+
this.listController?.load();
|
|
105
108
|
}
|
|
106
109
|
|
|
107
110
|
/**
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { IControl, IDEFormDetail, IDEFormMDCtrl } from '@ibiz/model-core';
|
|
2
|
+
import { clone } from 'ramda';
|
|
2
3
|
import { IFormController } from '../../../../../../../interface';
|
|
3
4
|
import { findChildFormDetails } from '../../../../../../../model';
|
|
4
5
|
import { getFormDetailProvider } from '../../../../../../../register';
|
|
@@ -29,10 +30,10 @@ export class FormMDCtrlItemController
|
|
|
29
30
|
data: IData,
|
|
30
31
|
form: FormController,
|
|
31
32
|
) {
|
|
32
|
-
const
|
|
33
|
+
const tempModel = clone(form.model);
|
|
33
34
|
// 合并父级表单模型 兼容值规则 和 父表单模型
|
|
34
|
-
Object.assign(
|
|
35
|
-
super(
|
|
35
|
+
Object.assign(tempModel, model, { name: undefined });
|
|
36
|
+
super(tempModel, context, params, ctx);
|
|
36
37
|
this.state.data = data;
|
|
37
38
|
this.state.isSimple = true;
|
|
38
39
|
}
|