@ibiz-template/runtime 0.2.10 → 0.2.11
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 +11 -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.map +1 -1
- package/out/controller/control/form/edit-form/edit-form.controller.js +4 -0
- package/out/controller/control/form/form-detail/form-item/form-item.controller.d.ts.map +1 -1
- package/out/controller/control/form/form-detail/form-item/form-item.controller.js +6 -5
- package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/form-mdctrl-repeater-form/form-mdctrl-repeater-form-item.controller.d.ts +1 -1
- 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 +5 -2
- package/package.json +2 -2
- package/src/controller/control/form/edit-form/edit-form.controller.ts +4 -0
- package/src/controller/control/form/form-detail/form-item/form-item.controller.ts +6 -4
- package/src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/form-mdctrl-repeater-form/form-mdctrl-repeater-form-item.controller.ts +5 -1
|
@@ -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,EACnB,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,kBAAkB,GAAG,OAAO,CAAC,KAAK,CAAC;IAqDrD;;;;;;OAMG;IACG,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC;IA4CzD;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAc7B;;;;;;;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;
|
|
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,EACnB,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,kBAAkB,GAAG,OAAO,CAAC,KAAK,CAAC;IAqDrD;;;;;;OAMG;IACG,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC;IA4CzD;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAc7B;;;;;;;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"}
|
|
@@ -348,6 +348,8 @@ export class EditFormController extends FormController {
|
|
|
348
348
|
await this.service.wfStart(context, params, this.data);
|
|
349
349
|
if (this.view.modal.mode === 'ROUTE') {
|
|
350
350
|
ibiz.mc.command.send(this.data.$origin, 'OBJECTUPDATED');
|
|
351
|
+
// 刷新预定义todo实体数据
|
|
352
|
+
ibiz.mc.command.send({ srfdecodename: 'SysTodo' }, 'OBJECTUPDATED');
|
|
351
353
|
}
|
|
352
354
|
}
|
|
353
355
|
catch (error) {
|
|
@@ -380,6 +382,8 @@ export class EditFormController extends FormController {
|
|
|
380
382
|
await this.service.wfSubmit(context, params, this.data);
|
|
381
383
|
if (this.view.modal.mode === 'ROUTE') {
|
|
382
384
|
ibiz.mc.command.send(this.data.$origin, 'OBJECTUPDATED');
|
|
385
|
+
// 刷新预定义todo实体数据
|
|
386
|
+
ibiz.mc.command.send({ srfdecodename: 'SysTodo' }, 'OBJECTUPDATED');
|
|
383
387
|
}
|
|
384
388
|
}
|
|
385
389
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"form-item.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-item/form-item.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAoB,MAAM,kBAAkB,CAAC;AAIjE,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EACf,8BAA8B,EAC/B,MAAM,0BAA0B,CAAC;AAIlC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAOvD,qBAAa,kBACX,SAAQ,oBAAoB,CAAC,WAAW,CACxC,YAAW,0BAA0B;IAE7B,KAAK,EAAE,aAAa,CAAC;IAE7B,SAAS,CAAC,WAAW,IAAI,aAAa;IAItC;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC;IAE3B;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEzB;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAE3B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;;;OAOG;IACH,OAAO,CAAC,SAAS,CAAU;IAE3B;;;;;;OAMG;IACH,KAAK,EAAE,KAAK,EAAE,CAAM;IAEpB;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;;;;;;OAOG;IACH,IAAI,KAAK,IAAI,OAAO,CAEnB;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAKtC;IAED;;;;;;;;OAQG;gBAED,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,cAAc,EACpB,MAAM,CAAC,EAAE,8BAA8B;IAOzC;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;;OAOG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"form-item.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-item/form-item.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAoB,MAAM,kBAAkB,CAAC;AAIjE,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EACf,8BAA8B,EAC/B,MAAM,0BAA0B,CAAC;AAIlC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAOvD,qBAAa,kBACX,SAAQ,oBAAoB,CAAC,WAAW,CACxC,YAAW,0BAA0B;IAE7B,KAAK,EAAE,aAAa,CAAC;IAE7B,SAAS,CAAC,WAAW,IAAI,aAAa;IAItC;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC;IAE3B;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEzB;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAE3B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;;;OAOG;IACH,OAAO,CAAC,SAAS,CAAU;IAE3B;;;;;;OAMG;IACH,KAAK,EAAE,KAAK,EAAE,CAAM;IAEpB;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;;;;;;OAOG;IACH,IAAI,KAAK,IAAI,OAAO,CAEnB;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAKtC;IAED;;;;;;;;OAQG;gBAED,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,cAAc,EACpB,MAAM,CAAC,EAAE,8BAA8B;IAOzC;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;;OAOG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAsBvC;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB1C;;;;;;;OAOG;IACH,cAAc,IAAI,IAAI;IAQhB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA8B/C,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAY5D,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,GAAE,OAAe,GAAG,IAAI;IAO5E;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAyBlC;;;;;;;OAOG;IACG,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKhE;;;;;;OAMG;IACH,eAAe,CAAC,QAAQ,EAAE,OAAO,EAAE,IAAI,GAAE,KAAiB,GAAG,IAAI;CAkBlE"}
|
|
@@ -111,6 +111,11 @@ export class FormItemController extends FormDetailController {
|
|
|
111
111
|
await super.onInit();
|
|
112
112
|
// 空输入默认值
|
|
113
113
|
this.state.required = !this.model.allowEmpty;
|
|
114
|
+
const { enableCond } = this.model;
|
|
115
|
+
if (!enableCond) {
|
|
116
|
+
// enableCond为0省略为不存在了
|
|
117
|
+
this.state.enableCondDisabled = true;
|
|
118
|
+
}
|
|
114
119
|
// 初始化编辑器控制器,除了隐藏都会需要适配器
|
|
115
120
|
if (this.model.editor && this.model.editor.editorType !== 'HIDDEN') {
|
|
116
121
|
this.editorProvider = await getEditorProvider(this.model.editor);
|
|
@@ -153,11 +158,7 @@ export class FormItemController extends FormDetailController {
|
|
|
153
158
|
calcEnableCond() {
|
|
154
159
|
const { enableCond } = this.model;
|
|
155
160
|
const isNew = this.data.srfuf === Srfuf.CREATE;
|
|
156
|
-
if (!enableCond) {
|
|
157
|
-
// enableCond为0省略为不存在了
|
|
158
|
-
this.state.enableCondDisabled = true;
|
|
159
|
-
}
|
|
160
|
-
else if ((isNew && enableCond === 2) || (!isNew && enableCond === 1)) {
|
|
161
|
+
if ((isNew && enableCond === 2) || (!isNew && enableCond === 1)) {
|
|
161
162
|
this.state.enableCondDisabled = true;
|
|
162
163
|
}
|
|
163
164
|
}
|
|
@@ -14,7 +14,7 @@ import { FormGroupPanelController } from '../../../form-group-panel';
|
|
|
14
14
|
* @extends {FormController<MDCtrlFormModel>}
|
|
15
15
|
*/
|
|
16
16
|
export declare class FormMDCtrlItemController extends EditFormController implements IFormController {
|
|
17
|
-
constructor(model: IControl, context: IContext, params: IParams, ctx: CTX, data: IData);
|
|
17
|
+
constructor(model: IControl, context: IContext, params: IParams, ctx: CTX, data: IData, form: FormController);
|
|
18
18
|
protected initDetailControllers(details?: IDEFormDetail[], form?: FormController, parent?: FormGroupPanelController | undefined): Promise<void>;
|
|
19
19
|
}
|
|
20
20
|
//# sourceMappingURL=form-mdctrl-repeater-form-item.controller.d.ts.map
|
|
@@ -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;AAC1E,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;
|
|
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;AAC1E,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"}
|
|
@@ -11,8 +11,11 @@ import { EditFormController } from '../../../../edit-form';
|
|
|
11
11
|
* @extends {FormController<MDCtrlFormModel>}
|
|
12
12
|
*/
|
|
13
13
|
export class FormMDCtrlItemController extends EditFormController {
|
|
14
|
-
constructor(model, context, params, ctx, data) {
|
|
15
|
-
|
|
14
|
+
constructor(model, context, params, ctx, data, form) {
|
|
15
|
+
const { model: _model } = form;
|
|
16
|
+
// 合并父级表单模型 兼容值规则 和 父表单模型
|
|
17
|
+
Object.assign(_model, model);
|
|
18
|
+
super(_model, context, params, ctx);
|
|
16
19
|
this.state.data = data;
|
|
17
20
|
this.state.isSimple = true;
|
|
18
21
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ibiz-template/runtime",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.11",
|
|
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": "921d5951f2471e1b32500dc22b9fe7c3fbc440ad"
|
|
63
63
|
}
|
|
@@ -430,6 +430,8 @@ export class EditFormController
|
|
|
430
430
|
await this.service.wfStart(context, params, this.data);
|
|
431
431
|
if (this.view.modal.mode === 'ROUTE') {
|
|
432
432
|
ibiz.mc.command.send(this.data.$origin, 'OBJECTUPDATED');
|
|
433
|
+
// 刷新预定义todo实体数据
|
|
434
|
+
ibiz.mc.command.send({ srfdecodename: 'SysTodo' }, 'OBJECTUPDATED');
|
|
433
435
|
}
|
|
434
436
|
} catch (error) {
|
|
435
437
|
this.actionNotification('WFSTARTERROR', {
|
|
@@ -462,6 +464,8 @@ export class EditFormController
|
|
|
462
464
|
await this.service.wfSubmit(context, params, this.data);
|
|
463
465
|
if (this.view.modal.mode === 'ROUTE') {
|
|
464
466
|
ibiz.mc.command.send(this.data.$origin, 'OBJECTUPDATED');
|
|
467
|
+
// 刷新预定义todo实体数据
|
|
468
|
+
ibiz.mc.command.send({ srfdecodename: 'SysTodo' }, 'OBJECTUPDATED');
|
|
465
469
|
}
|
|
466
470
|
} catch (error) {
|
|
467
471
|
this.actionNotification('WFSUBMITERROR', {
|
|
@@ -188,6 +188,11 @@ export class FormItemController
|
|
|
188
188
|
await super.onInit();
|
|
189
189
|
// 空输入默认值
|
|
190
190
|
this.state.required = !this.model.allowEmpty;
|
|
191
|
+
const { enableCond } = this.model;
|
|
192
|
+
if (!enableCond) {
|
|
193
|
+
// enableCond为0省略为不存在了
|
|
194
|
+
this.state.enableCondDisabled = true;
|
|
195
|
+
}
|
|
191
196
|
// 初始化编辑器控制器,除了隐藏都会需要适配器
|
|
192
197
|
if (this.model.editor && this.model.editor.editorType !== 'HIDDEN') {
|
|
193
198
|
this.editorProvider = await getEditorProvider(this.model.editor);
|
|
@@ -242,10 +247,7 @@ export class FormItemController
|
|
|
242
247
|
calcEnableCond(): void {
|
|
243
248
|
const { enableCond } = this.model;
|
|
244
249
|
const isNew = this.data.srfuf === Srfuf.CREATE;
|
|
245
|
-
if (!enableCond) {
|
|
246
|
-
// enableCond为0省略为不存在了
|
|
247
|
-
this.state.enableCondDisabled = true;
|
|
248
|
-
} else if ((isNew && enableCond === 2) || (!isNew && enableCond === 1)) {
|
|
250
|
+
if ((isNew && enableCond === 2) || (!isNew && enableCond === 1)) {
|
|
249
251
|
this.state.enableCondDisabled = true;
|
|
250
252
|
}
|
|
251
253
|
}
|
|
@@ -27,8 +27,12 @@ export class FormMDCtrlItemController
|
|
|
27
27
|
params: IParams,
|
|
28
28
|
ctx: CTX,
|
|
29
29
|
data: IData,
|
|
30
|
+
form: FormController,
|
|
30
31
|
) {
|
|
31
|
-
|
|
32
|
+
const { model: _model } = form;
|
|
33
|
+
// 合并父级表单模型 兼容值规则 和 父表单模型
|
|
34
|
+
Object.assign(_model, model);
|
|
35
|
+
super(_model, context, params, ctx);
|
|
32
36
|
this.state.data = data;
|
|
33
37
|
this.state.isSimple = true;
|
|
34
38
|
}
|