@ibiz-template/runtime 0.0.3-beta.1 → 0.0.3-beta.3

package/out/controller/control/form/edit-form.js

@@ -3,6 +3,7 @@ import { FormNotifyState } from '../../constant';
 import { EditFormNerve } from '../../neuron';
 import { FormController } from './form';
 import { ControlVO, EditFormService } from '../../../service';
+import { EditFormState } from '../../state';
 /**
  * 编辑表单控制器
  *
@@ -15,6 +16,7 @@ import { ControlVO, EditFormService } from '../../../service';
 export class EditFormController extends FormController {
     constructor() {
         super(...arguments);
+        this.state = new EditFormState();
         /**
          * 是否是新建数据
          *
@@ -60,9 +62,9 @@ export class EditFormController extends FormController {
             await this.endLoading();
         }
         res.data.reactiveInit();
-        this.data = res.data;
+        this.state.data = res.data;
         this.formStateNotify(this.isNewData ? FormNotifyState.DRAFT : FormNotifyState.LOAD);
-        this.isLoaded = true;
+        this.state.isLoaded = true;
         this.force();
         return this.data;
     }
@@ -117,7 +119,29 @@ export class EditFormController extends FormController {
             }
         }
         await this.nerve.self.evt.asyncEmit('afterRemove', this.data);
-        this.data = new ControlVO();
+        this.state.data = new ControlVO();
+        this.force();
+    }
+    /**
+     * 执行返回行为
+     *
+     * @author lxm
+     * @date 2022-09-01 09:09:36
+     * @returns {*}
+     */
+    async goBack() {
+        await this.startLoading();
+        let res;
+        try {
+            res = await this.service.goBack(this.context, this.data);
+        }
+        finally {
+            await this.endLoading();
+        }
+        // 合并后台返回数据
+        if (res.data) {
+            this.data.mergeOrigin(res.data);
+        }
         this.force();
     }
     /**

package/out/controller/control/form/form-button.d.ts

@@ -1,5 +1,6 @@
 import { FormButtonModel, IPSAppViewLogic } from '@ibiz-template/model';
 import { FormDetailController } from '.';
+import { FormButtonState } from '../../state';
 /**
  * 表单按钮控制器
  *
@@ -10,6 +11,8 @@ import { FormDetailController } from '.';
  * @extends {FormDetailController}
  */
 export declare class FormButtonController extends FormDetailController<FormButtonModel> {
+    state: FormButtonState;
+    protected createState(): FormButtonState;
     /**
      * 视图逻辑
      *

package/out/controller/control/form/form-button.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-button.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/form/form-button.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAsB,oBAAoB,EAAE,MAAM,GAAG,CAAC;AAE7D;;;;;;;;GAQG;AACH,qBAAa,oBAAqB,SAAQ,oBAAoB,CAAC,eAAe,CAAC;IAC7E;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,eAAe,CAAC;cAEZ,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAUvC;;;;;;OAMG;IACG,OAAO,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAO/C;;;;;;;OAOG;IACG,UAAU,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAYlD;;;;;;OAMG;IACG,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;CAOxC"}
+{"version":3,"file":"form-button.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/form/form-button.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAsB,oBAAoB,EAAE,MAAM,GAAG,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C;;;;;;;;GAQG;AACH,qBAAa,oBAAqB,SAAQ,oBAAoB,CAAC,eAAe,CAAC;IACrE,KAAK,EAAE,eAAe,CAAC;IAE/B,SAAS,CAAC,WAAW,IAAI,eAAe;IAIxC;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,eAAe,CAAC;cAEZ,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAUvC;;;;;;OAMG;IACG,OAAO,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAO/C;;;;;;;OAOG;IACG,UAAU,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAYlD;;;;;;OAMG;IACG,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;CAOxC"}

package/out/controller/control/form/form-button.js

@@ -1,5 +1,6 @@
 import { RuntimeError } from '@ibiz-template/core';
 import { FormDetailController } from '.';
+import { FormButtonState } from '../../state';
 /**
  * 表单按钮控制器
  *
@@ -10,6 +11,10 @@ import { FormDetailController } from '.';
  * @extends {FormDetailController}
  */
 export class FormButtonController extends FormDetailController {
+    createState() {
+        var _a;
+        return new FormButtonState((_a = this.parent) === null || _a === void 0 ? void 0 : _a.state);
+    }
     async onInit() {
         await super.onInit();
         // 初始化视图逻辑对象

package/out/controller/control/form/form-container.d.ts

@@ -1,5 +1,6 @@
 import { FormGroupPanelModel } from '@ibiz-template/model';
 import { FormDetailController } from '.';
+import { FormContainerState } from '../../state';
 /**
  * 表单容器的控制器
  *
@@ -11,5 +12,7 @@ import { FormDetailController } from '.';
  * @template T
  */
 export declare class FormContainerController<T extends FormGroupPanelModel = FormGroupPanelModel> extends FormDetailController<T> {
+    state: FormContainerState;
+    protected createState(): FormContainerState;
 }
 //# sourceMappingURL=form-container.d.ts.map

package/out/controller/control/form/form-container.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-container.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/form/form-container.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,GAAG,CAAC;AAEzC;;;;;;;;;GASG;AACH,qBAAa,uBAAuB,CAClC,CAAC,SAAS,mBAAmB,GAAG,mBAAmB,CACnD,SAAQ,oBAAoB,CAAC,CAAC,CAAC;CAAG"}
+{"version":3,"file":"form-container.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/form/form-container.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,GAAG,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEjD;;;;;;;;;GASG;AACH,qBAAa,uBAAuB,CAClC,CAAC,SAAS,mBAAmB,GAAG,mBAAmB,CACnD,SAAQ,oBAAoB,CAAC,CAAC,CAAC;IACvB,KAAK,EAAE,kBAAkB,CAAC;IAElC,SAAS,CAAC,WAAW,IAAI,kBAAkB;CAG5C"}

package/out/controller/control/form/form-container.js

@@ -1,4 +1,5 @@
 import { FormDetailController } from '.';
+import { FormContainerState } from '../../state';
 /**
  * 表单容器的控制器
  *
@@ -10,4 +11,8 @@ import { FormDetailController } from '.';
  * @template T
  */
 export class FormContainerController extends FormDetailController {
+    createState() {
+        var _a;
+        return new FormContainerState((_a = this.parent) === null || _a === void 0 ? void 0 : _a.state);
+    }
 }

package/out/controller/control/form/form-detail.d.ts

@@ -1,7 +1,7 @@
 import { FormDetailModel } from '@ibiz-template/model';
 import { FormNotifyState } from '../../constant';
 import { FormController, FormContainerController } from '.';
-import { ILayoutController } from '../../interface';
+import { FormDetailState } from '../../state';
 export declare class FormDetailController<T extends FormDetailModel = FormDetailModel> {
     /**
      * 表单成员模型
@@ -11,6 +11,14 @@ export declare class FormDetailController<T extends FormDetailModel = FormDetail
      * @type {T}
      */
     readonly model: T;
+    /**
+     * 表单项状态
+     *
+     * @author chitanda
+     * @date 2023-01-04 09:01:04
+     * @type {FormDetailState}
+     */
+    state: FormDetailState;
     /**
      * 表单控制器
      *
@@ -27,48 +35,6 @@ export declare class FormDetailController<T extends FormDetailModel = FormDetail
      * @type {FormController}
      */
     readonly parent?: FormContainerController;
-    /**
-     * 自身的逻辑判断是否显示
-     *
-     * @author lxm
-     * @date 2022-09-01 21:09:24
-     * @type {boolean}
-     */
-    $visible: boolean;
-    /**
-     * 实际是否显示，取决于自身和父容器的显示与否
-     *
-     * @author lxm
-     * @date 2022-09-04 16:09:11
-     * @readonly
-     */
-    get visible(): boolean;
-    /**
-     * 是否必填
-     *
-     * @author lxm
-     * @date 2022-09-01 21:09:34
-     * @type {boolean}
-     */
-    required: boolean;
-    $disabled: boolean;
-    /**
-     * 是否禁用
-     *
-     * @author lxm
-     * @date 2022-09-01 21:09:44
-     * @type {boolean}
-     */
-    get disabled(): boolean;
-    set disabled(val: boolean);
-    /**
-     * 布局控制器
-     *
-     * @author lxm
-     * @date 2022-10-20 17:10:27
-     * @type {ILayoutController}
-     */
-    layoutController: ILayoutController;
     /**
      * Creates an instance of FormDetailController.
      * @author lxm
@@ -85,6 +51,15 @@ export declare class FormDetailController<T extends FormDetailModel = FormDetail
      */
     init(): Promise<void>;
     protected onInit(): Promise<void>;
+    /**
+     * 创建表单状态对象
+     *
+     * @author chitanda
+     * @date 2023-01-04 10:01:00
+     * @protected
+     * @return {*}  {FormDetailState}
+     */
+    protected createState(): FormDetailState;
     /**
      * 表单数据变更通知(由表单控制器调用)
      *

package/out/controller/control/form/form-detail.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-detail.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/form/form-detail.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,uBAAuB,EAAE,MAAM,GAAG,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEpD,qBAAa,oBAAoB,CAAC,CAAC,SAAS,eAAe,GAAG,eAAe;IAC3E;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAE9B;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,uBAAuB,CAAC;IAE1C;;;;;;OAMG;IACH,QAAQ,EAAE,OAAO,CAAQ;IAEzB;;;;;;OAMG;IACH,IAAI,OAAO,IAAI,OAAO,CAErB;IAED;;;;;;OAMG;IACH,QAAQ,EAAE,OAAO,CAAS;IAE1B,SAAS,EAAE,OAAO,CAAS;IAE3B;;;;;;OAMG;IACH,IAAI,QAAQ,YAEX;IAED,IAAI,QAAQ,CAAC,GAAG,SAAA,EAEf;IAED;;;;;;OAMG;IACH,gBAAgB,EAAE,iBAAiB,CAKjC;IAEF;;;;;OAKG;gBAED,KAAK,EAAE,CAAC,EACR,IAAI,EAAE,cAAc,EACpB,MAAM,CAAC,EAAE,uBAAuB;IAOlC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IA0BvC;;;;;;OAMG;IACH,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI;IAKvC;;;;;OAKG;IACH,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAK7C;;;;;;;;;OASG;IACH,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,KAAK,CAAC,EAAE,eAAe,GAAG,IAAI;IA+B1E;;;;;;OAMG;IACH,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI;CAIpC"}
+{"version":3,"file":"form-detail.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/form/form-detail.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,uBAAuB,EAAE,MAAM,GAAG,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAI9C,qBAAa,oBAAoB,CAAC,CAAC,SAAS,eAAe,GAAG,eAAe;IAC3E;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;OAMG;IACH,KAAK,EAAE,eAAe,CAAC;IAEvB;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAE9B;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,uBAAuB,CAAC;IAE1C;;;;;OAKG;gBAED,KAAK,EAAE,CAAC,EACR,IAAI,EAAE,cAAc,EACpB,MAAM,CAAC,EAAE,uBAAuB;IAQlC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAiCvC;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,IAAI,eAAe;IAIxC;;;;;;OAMG;IACH,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI;IAKvC;;;;;OAKG;IACH,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAK7C;;;;;;;;;OASG;IACH,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,KAAK,CAAC,EAAE,eAAe,GAAG,IAAI;IAmC1E;;;;;;OAMG;IACH,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI;CAIpC"}

package/out/controller/control/form/form-detail.js

@@ -1,29 +1,8 @@
 import { isOverlap } from '@ibiz-template/core';
-import { IBizVerify } from '../../../service';
+import { FormDetailState } from '../../state';
+import { calcLayoutContentStyle } from '../../utils';
+import { verifyFormGroupLogic } from '../../../utils';
 export class FormDetailController {
-    /**
-     * 实际是否显示，取决于自身和父容器的显示与否
-     *
-     * @author lxm
-     * @date 2022-09-04 16:09:11
-     * @readonly
-     */
-    get visible() {
-        return this.parent.visible && this.$visible;
-    }
-    /**
-     * 是否禁用
-     *
-     * @author lxm
-     * @date 2022-09-01 21:09:44
-     * @type {boolean}
-     */
-    get disabled() {
-        return this.$disabled;
-    }
-    set disabled(val) {
-        this.$disabled = val;
-    }
     /**
      * Creates an instance of FormDetailController.
      * @author lxm
@@ -31,39 +10,10 @@ export class FormDetailController {
      * @param {T} model
      */
     constructor(model, form, parent) {
-        /**
-         * 自身的逻辑判断是否显示
-         *
-         * @author lxm
-         * @date 2022-09-01 21:09:24
-         * @type {boolean}
-         */
-        this.$visible = true;
-        /**
-         * 是否必填
-         *
-         * @author lxm
-         * @date 2022-09-01 21:09:34
-         * @type {boolean}
-         */
-        this.required = false;
-        this.$disabled = false;
-        /**
-         * 布局控制器
-         *
-         * @author lxm
-         * @date 2022-10-20 17:10:27
-         * @type {ILayoutController}
-         */
-        this.layoutController = {
-            width: '100%',
-            height: '100%',
-            extraStyle: {},
-            extraClass: '',
-        };
         this.model = model;
         this.form = form;
         this.parent = parent;
+        this.state = this.createState();
     }
     /**
      * 子类不可覆盖或重写此方法，在 init 时需要重写的使用 onInit 方法。
@@ -77,27 +27,43 @@ export class FormDetailController {
     }
     async onInit() {
         // 初始化布局参数
-        if (this.model.width) {
-            this.layoutController.width = this.model.width;
+        const { width, height, sysCssName, detailType } = this.model;
+        // 初始化布局参数
+        if (width) {
+            this.state.layoutController.width = width;
         }
-        if (this.model.height) {
-            this.layoutController.height = this.model.height;
+        if (height) {
+            this.state.layoutController.height = height;
         }
         // 给col添加各自类型的类名
-        this.layoutController.extraClass = `ibiz-form-col__${this.model.source.detailType.toLowerCase()} `;
-        if (this.model.source.getPSSysCss()) {
-            this.layoutController.extraClass +=
-                this.model.source.getPSSysCss().cssName;
+        this.state.layoutController.extraClass = `ibiz-form-col__${detailType.toLowerCase()} `;
+        if (sysCssName) {
+            this.state.layoutController.extraClass = sysCssName;
         }
-        // eslint-disable-next-line @typescript-eslint/no-this-alias
-        const _this = this;
-        Object.defineProperty(_this.layoutController, 'visible', {
+        // 设置layout的visible关联自身的visible
+        Object.defineProperty(this.state.layoutController, 'visible', {
             configurable: true,
             enumerable: true,
-            get() {
-                return _this.visible;
+            get: () => {
+                return this.state.visible;
             },
         });
+        if (this.model.source.getPSLayoutPos()) {
+            // 设置自身内容样式
+            this.state.layoutController.contentStyle = calcLayoutContentStyle(this.model.source.getPSLayoutPos());
+        }
+    }
+    /**
+     * 创建表单状态对象
+     *
+     * @author chitanda
+     * @date 2023-01-04 10:01:00
+     * @protected
+     * @return {*}  {FormDetailState}
+     */
+    createState() {
+        var _a;
+        return new FormDetailState((_a = this.parent) === null || _a === void 0 ? void 0 : _a.state);
     }
     /**
      * 表单数据变更通知(由表单控制器调用)
@@ -133,7 +99,7 @@ export class FormDetailController {
     calcDynamicLogic(names, state) {
         var _a;
         // 逻辑优化，当父容器存在且为不显示时，不去计算自己的动态逻辑
-        if (this.parent && !this.parent.visible) {
+        if (this.parent && !this.parent.state.visible) {
             return;
         }
         // 根据自身的动态逻辑计算
@@ -141,21 +107,26 @@ export class FormDetailController {
             const relatedNames = logic.getRelatedDetailNames() || [];
             // name是动态逻辑涉及到的时或state存在时
             if (state || isOverlap(relatedNames, names)) {
-                const ok = IBizVerify.verifyGroupLogic(this.form.data, logic);
-                switch (logic.logicCat) {
-                    // 动态空输入，不满足则必填
-                    case 'ITEMBLANK':
-                        this.required = !ok;
-                        break;
-                    // 动态启用，满足则启用
-                    case 'ITEMENABLE':
-                        this.disabled = !ok;
-                        break;
-                    // 动态显示，满足则显示
-                    case 'PANELVISIBLE':
-                        this.$visible = ok;
-                        break;
-                    default:
+                try {
+                    const ok = verifyFormGroupLogic(this.form.data, logic);
+                    switch (logic.logicCat) {
+                        // 动态空输入，不满足则必填
+                        case 'ITEMBLANK':
+                            this.state.required = !ok;
+                            break;
+                        // 动态启用，满足则启用
+                        case 'ITEMENABLE':
+                            this.state.disabled = !ok;
+                            break;
+                        // 动态显示，满足则显示
+                        case 'PANELVISIBLE':
+                            this.state.visible = ok;
+                            break;
+                        default:
+                    }
+                }
+                catch (error) {
+                    ibiz.log.error(error);
                 }
             }
         });

package/out/controller/control/form/form-druipart.d.ts

@@ -2,6 +2,7 @@ import { FormDRUIPartModel } from '@ibiz-template/model';
 import { FormNotifyState } from '../../constant';
 import { ViewNeuron } from '../../neuron/neuron/view';
 import { FormDetailController } from '.';
+import { FormDruipartState } from '../../state';
 /**
  * 表单关系界面控制器
  *
@@ -12,30 +13,8 @@ import { FormDetailController } from '.';
  * @extends {FormDetailController}
  */
 export declare class FormDRUIPartController extends FormDetailController<FormDRUIPartModel> {
-    /**
-     * 关系界面的上下文
-     *
-     * @author lxm
-     * @date 2022-09-14 18:09:32
-     * @type {IContext}
-     */
-    context: IContext;
-    /**
-     * 关系界面的视图参数
-     *
-     * @author lxm
-     * @date 2022-09-14 18:09:42
-     * @type {IParams}
-     */
-    params: IParams;
-    /**
-     * 关系界面组件绑的key，用来触发强制刷新
-     *
-     * @author lxm
-     * @date 2022-09-15 20:09:21
-     * @type {string}
-     */
-    viewComponentKey?: string;
+    state: FormDruipartState;
+    protected createState(): FormDruipartState;
     /**
      * 嵌入视图神经元
      *

package/out/controller/control/form/form-druipart.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-druipart.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/form/form-druipart.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAsB,oBAAoB,EAAE,MAAM,GAAG,CAAC;AAG7D;;;;;;;;GAQG;AACH,qBAAa,sBAAuB,SAAQ,oBAAoB,CAAC,iBAAiB,CAAC;IACjF;;;;;;OAMG;IACH,OAAO,EAAG,QAAQ,CAAC;IAEnB;;;;;;OAMG;IACH,MAAM,EAAG,OAAO,CAAC;IAEjB;;;;;;OAMG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;;;;;OAMG;IACH,MAAM,EAAG,UAAU,CAAC;cAEJ,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAOvC;;;;;;OAMG;IACH,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI;IASvC,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAO7C;;;;;OAKG;IACH,cAAc,IAAI,IAAI;IA8CtB;;;;;;OAMG;IACH,OAAO,CAAC,OAAO,GAAE,OAAe;IAQhC;;;;;;OAMG;IACH,aAAa,CAAC,MAAM,EAAE,UAAU;CAejC"}
+{"version":3,"file":"form-druipart.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/form/form-druipart.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAsB,oBAAoB,EAAE,MAAM,GAAG,CAAC;AAE7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEhD;;;;;;;;GAQG;AACH,qBAAa,sBAAuB,SAAQ,oBAAoB,CAAC,iBAAiB,CAAC;IACzE,KAAK,EAAE,iBAAiB,CAAC;IAEjC,SAAS,CAAC,WAAW,IAAI,iBAAiB;IAI1C;;;;;;OAMG;IACH,MAAM,EAAG,UAAU,CAAC;cAEJ,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAOvC;;;;;;OAMG;IACH,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI;IASvC,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAO7C;;;;;OAKG;IACH,cAAc,IAAI,IAAI;IA8CtB;;;;;;OAMG;IACH,OAAO,CAAC,OAAO,GAAE,OAAe;IAQhC;;;;;;OAMG;IACH,aAAa,CAAC,MAAM,EAAE,UAAU;CAWjC"}

package/out/controller/control/form/form-druipart.js

@@ -2,6 +2,7 @@ import { IBizContext, isOverlap } from '@ibiz-template/core';
 import { notNilEmpty, createUUID } from 'qx-util';
 import { FormDetailController } from '.';
 import { convertNavData } from '../../../utils';
+import { FormDruipartState } from '../../state';
 /**
  * 表单关系界面控制器
  *
@@ -12,9 +13,13 @@ import { convertNavData } from '../../../utils';
  * @extends {FormDetailController}
  */
 export class FormDRUIPartController extends FormDetailController {
+    createState() {
+        var _a;
+        return new FormDruipartState((_a = this.parent) === null || _a === void 0 ? void 0 : _a.state);
+    }
     async onInit() {
         await super.onInit();
-        Object.assign(this.layoutController.extraStyle, {
+        Object.assign(this.state.layoutController.extraStyle, {
             overflow: 'auto',
         });
     }
@@ -59,17 +64,17 @@ export class FormDRUIPartController extends FormDetailController {
         // this.neuron不存在时，关系界面还没有渲染，第一次创建UUID
         // 视图参数或上下文发生改变时变更key，销毁重绘视图
         if (!this.neuron ||
-            !this.context ||
-            JSON.stringify(this.context) !== JSON.stringify(newContext) ||
-            JSON.stringify(this.params) !== JSON.stringify(newParams)) {
+            !this.state.context ||
+            JSON.stringify(this.state.context) !== JSON.stringify(newContext) ||
+            JSON.stringify(this.state.params) !== JSON.stringify(newParams)) {
             this.refresh(true);
         }
         else {
             // 不变的情况重新加载视图的数据
             this.refresh();
         }
-        this.context = newContext;
-        this.params = newParams;
+        this.state.context = newContext;
+        this.state.params = newParams;
         this.force();
     }
     /**
@@ -81,7 +86,7 @@ export class FormDRUIPartController extends FormDetailController {
      */
     refresh(isReset = false) {
         if (isReset) {
-            this.viewComponentKey = createUUID();
+            this.state.viewComponentKey = createUUID();
         }
         else {
             this.neuron.call.refresh();
@@ -96,10 +101,6 @@ export class FormDRUIPartController extends FormDetailController {
      */
     setViewNeuron(neuron) {
         this.neuron = neuron;
-        // 监听mounted事件，如果没有遮罩的时候通知加载
-        neuron.evt.on('mounted', () => {
-            neuron.call.refresh();
-        });
         this.neuron.evt.on('refreshed', data => {
             ibiz.log.debug('接收到关系界面的刷新变更事件', data);
             // 有表单项更新，且是自身变更时，触发表单项更新

package/out/controller/control/form/form-group-panel.d.ts

@@ -1,4 +1,5 @@
 import { FormContainerController } from '.';
+import { FormGroupPanelState } from '../../state';
 /**
  * 表单分组面板控制器
  *
@@ -9,5 +10,7 @@ import { FormContainerController } from '.';
  * @extends {FormContainerController}
  */
 export declare class FormGroupPanelController extends FormContainerController {
+    state: FormGroupPanelState;
+    protected createState(): FormGroupPanelState;
 }
 //# sourceMappingURL=form-group-panel.d.ts.map

package/out/controller/control/form/form-group-panel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-group-panel.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/form/form-group-panel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,GAAG,CAAC;AAE5C;;;;;;;;GAQG;AACH,qBAAa,wBAAyB,SAAQ,uBAAuB;CAAG"}
+{"version":3,"file":"form-group-panel.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/form/form-group-panel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,GAAG,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAElD;;;;;;;;GAQG;AACH,qBAAa,wBAAyB,SAAQ,uBAAuB;IAC3D,KAAK,EAAE,mBAAmB,CAAC;IAEnC,SAAS,CAAC,WAAW,IAAI,mBAAmB;CAG7C"}

package/out/controller/control/form/form-group-panel.js

@@ -1,4 +1,5 @@
 import { FormContainerController } from '.';
+import { FormGroupPanelState } from '../../state';
 /**
  * 表单分组面板控制器
  *
@@ -9,4 +10,8 @@ import { FormContainerController } from '.';
  * @extends {FormContainerController}
  */
 export class FormGroupPanelController extends FormContainerController {
+    createState() {
+        var _a;
+        return new FormGroupPanelState((_a = this.parent) === null || _a === void 0 ? void 0 : _a.state);
+    }
 }

package/out/controller/control/form/form-item.d.ts

@@ -4,7 +4,10 @@ import { FormDetailController, FormController, FormContainerController } from '.
 import { EditorController } from '../../editor';
 import { FormNotifyState } from '../../constant';
 import { IEditorProvider } from '../../interface';
+import { FormItemState } from '../../state';
 export declare class FormItemController extends FormDetailController<FormItemModel> {
+    state: FormItemState;
+    protected createState(): FormItemState;
     /**
      * 上下文
      *
@@ -54,14 +57,6 @@ export declare class FormItemController extends FormDetailController<FormItemMod
      * @type {IData}
      */
     rules: IData;
-    /**
-     * 值规则校验错误信息
-     *
-     * @author lxm
-     * @date 2022-09-01 22:09:02
-     * @type {string}
-     */
-    error: string | null;
     /**
      * 表单项名称
      *
@@ -87,23 +82,6 @@ export declare class FormItemController extends FormDetailController<FormItemMod
      * @readonly
      */
     get data(): import("../../../service").ControlVO;
-    /**
-     * 启用条件的禁用状态
-     *
-     * @author lxm
-     * @date 2022-09-19 16:09:18
-     * @private
-     */
-    private enableCondDisabled;
-    /**
-     * 是否禁用
-     *
-     * @author lxm
-     * @date 2022-09-01 21:09:44
-     * @type {boolean}
-     */
-    get disabled(): boolean;
-    set disabled(val: boolean);
     /**
      * Creates an instance of FormItemController.
      * @author lxm

package/out/controller/control/form/form-item.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-item.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/form/form-item.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAIrD,OAAO,EAEL,oBAAoB,EACpB,cAAc,EACd,uBAAuB,EACxB,MAAM,GAAG,CAAC;AACX,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEhD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,qBAAa,kBAAmB,SAAQ,oBAAoB,CAAC,aAAa,CAAC;IACzE;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC;IAE9B;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEzB;;;;;;OAMG;IACH,MAAM,EAAE,gBAAgB,GAAG,IAAI,CAAQ;IAEvC;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;;;OAOG;IACH,OAAO,CAAC,SAAS,CAAU;IAE3B;;;;;;OAMG;IACH,KAAK,EAAE,KAAK,CAAM;IAElB;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,GAAG,IAAI,CAAQ;IAE5B;;;;;;OAMG;IACH,IAAI,IAAI,WAEP;IAED;;;;;;;OAOG;IACH,IAAI,KAAK,IAAI,OAAO,CAEnB;IAED;;;;;;OAMG;IACH,IAAI,IAAI,yCAEP;IAED;;;;;;OAMG;IACH,OAAO,CAAC,kBAAkB,CAAS;IAEnC;;;;;;OAMG;IACH,IAAI,QAAQ,YAKX;IAED,IAAI,QAAQ,CAAC,GAAG,SAAA,EAEf;IAED;;;;;;;OAOG;gBAED,KAAK,EAAE,aAAa,EACpB,IAAI,EAAE,cAAc,EACpB,MAAM,CAAC,EAAE,uBAAuB;IAOlC;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAkBvC;;;;;;;OAOG;cACa,SAAS;IAezB;;;;;;;OAOG;IACH,cAAc;IAUd,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI;IAsBtC,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAY7C,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,KAAK,CAAC,EAAE,eAAe,GAAG,IAAI;IAO1E;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAwBlC;;;;;;;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;CAsDlC"}
+{"version":3,"file":"form-item.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/form/form-item.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAIrD,OAAO,EAEL,oBAAoB,EACpB,cAAc,EACd,uBAAuB,EACxB,MAAM,GAAG,CAAC;AACX,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEhD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,qBAAa,kBAAmB,SAAQ,oBAAoB,CAAC,aAAa,CAAC;IACjE,KAAK,EAAE,aAAa,CAAC;IAE7B,SAAS,CAAC,WAAW,IAAI,aAAa;IAItC;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC;IAE9B;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEzB;;;;;;OAMG;IACH,MAAM,EAAE,gBAAgB,GAAG,IAAI,CAAQ;IAEvC;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;;;OAOG;IACH,OAAO,CAAC,SAAS,CAAU;IAE3B;;;;;;OAMG;IACH,KAAK,EAAE,KAAK,CAAM;IAElB;;;;;;OAMG;IACH,IAAI,IAAI,WAEP;IAED;;;;;;;OAOG;IACH,IAAI,KAAK,IAAI,OAAO,CAEnB;IAED;;;;;;OAMG;IACH,IAAI,IAAI,yCAEP;IAED;;;;;;;OAOG;gBAED,KAAK,EAAE,aAAa,EACpB,IAAI,EAAE,cAAc,EACpB,MAAM,CAAC,EAAE,uBAAuB;IAOlC;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAkBvC;;;;;;;OAOG;cACa,SAAS;IAezB;;;;;;;OAOG;IACH,cAAc;IAUd,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI;IAsBtC,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAY7C,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,KAAK,CAAC,EAAE,eAAe,GAAG,IAAI;IAO1E;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAwBlC;;;;;;;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;CAsDlC"}