@ibiz-template/runtime 0.0.3-beta.6 → 0.0.4-beta.2

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;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;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAShD,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAO5D;;;;;OAKG;IACH,cAAc,IAAI,IAAI;IA8CtB;;;;;;OAMG;IACH,OAAO,CAAC,OAAO,GAAE,OAAe;IAQhC;;;;;;OAMG;IACH,aAAa,CAAC,MAAM,EAAE,UAAU;CAWjC"}
+{"version":3,"file":"form-druipart.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/form/form-druipart.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,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;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAShD,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAO5D;;;;;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

@@ -51,12 +51,12 @@ export class FormDRUIPartController extends FormDetailController {
     calcViewParams() {
         // 计算导航上下文
         let newContext = this.form.context.clone();
-        const navContexts = this.model.source.getPSNavigateContexts();
+        const navContexts = this.model.navigateContexts;
         if (notNilEmpty(navContexts)) {
             newContext = Object.assign(newContext, convertNavData(navContexts, this.form.context, this.form.params, this.form.data));
         }
         // 处理导航视图参数
-        const navParams = this.model.source.getPSNavigateParams();
+        const navParams = this.model.navigateParams;
         let newParams = {};
         if (notNilEmpty(navParams)) {
             newParams = convertNavData(navParams, this.form.params, this.form.context, this.form.data);
@@ -89,7 +89,7 @@ export class FormDRUIPartController extends FormDetailController {
             this.state.viewComponentKey = createUUID();
         }
         else {
-            this.neuron.call.refresh();
+            this.neuron.refresh();
         }
     }
     /**
@@ -101,8 +101,8 @@ export class FormDRUIPartController extends FormDetailController {
      */
     setViewNeuron(neuron) {
         this.neuron = neuron;
-        this.neuron.evt.on('refreshed', data => {
-            ibiz.log.debug('接收到关系界面的刷新变更事件', data);
+        this.neuron.on('onRefreshed', event => {
+            ibiz.log.debug('接收到关系界面的刷新变更事件', event);
             // 有表单项更新，且是自身变更时，触发表单项更新
             if (this.model.formItemUpdate) {
                 const { methodName, itemNames } = this.model.formItemUpdate;

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

@@ -1,4 +1,4 @@
-import { IPSUIActionGroupDetail } from '@ibiz-template/model';
+import { IUIActionGroupDetail } from '@ibiz/model-core';
 import { FormContainerController } from '.';
 import { FormNotifyState } from '../../constant';
 import { FormGroupPanelState } from '../../state';
@@ -28,9 +28,9 @@ export declare class FormGroupPanelController extends FormContainerController {
      *
      * @author lxm
      * @date 2022-09-07 22:09:46
-     * @param {IPSUIActionGroupDetail} detail
+     * @param {IUIActionGroupDetail} detail
      * @param {MouseEvent} event
      */
-    onActionClick(detail: IPSUIActionGroupDetail, event: MouseEvent): Promise<void>;
+    onActionClick(detail: IUIActionGroupDetail, event: MouseEvent): Promise<void>;
 }
 //# 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,EAAoB,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAChF,OAAO,EAAE,uBAAuB,EAAE,MAAM,GAAG,CAAC;AAG5C,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAGlD;;;;;;;;GAQG;AACH,qBAAa,wBAAyB,SAAQ,uBAAuB;IAC3D,KAAK,EAAE,mBAAmB,CAAC;IAEnC,SAAS,CAAC,WAAW,IAAI,mBAAmB;cAI5B,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAKjC,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ5D;;;;;OAKG;IACH,gBAAgB;IAkBhB;;;;;;;OAOG;IACG,aAAa,CACjB,MAAM,EAAE,sBAAsB,EAC9B,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;CA0BjB"}
+{"version":3,"file":"form-group-panel.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/form/form-group-panel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,uBAAuB,EAAE,MAAM,GAAG,CAAC;AAE5C,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,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;cAI5B,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAKjC,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ5D;;;;;OAKG;IACH,gBAAgB;IAmBhB;;;;;;;OAOG;IACG,aAAa,CACjB,MAAM,EAAE,oBAAoB,EAC5B,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;CA2BjB"}

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

@@ -1,8 +1,6 @@
 import { FormContainerController } from '.';
-import { AppDEUIActionUtil } from '../../../utils';
 import { executeViewLogic } from '../../../view-logic';
 import { FormGroupPanelState } from '../../state';
-import { ButtonContainerState, ButtonState } from '../../utils';
 /**
  * 表单分组面板控制器
  *
@@ -35,28 +33,29 @@ export class FormGroupPanelController extends FormContainerController {
      * @date 2022-09-07 21:09:43
      */
     initActionStates() {
+        // todo
         // 操作列按钮状态控制
-        const { uiActionGroupDetails } = this.model;
-        if (!uiActionGroupDetails) {
-            return;
-        }
-        const containerState = new ButtonContainerState();
-        uiActionGroupDetails.forEach(detail => {
-            const action = detail.getPSUIAction();
-            if (action) {
-                const buttonState = new ButtonState(detail.name, action);
-                containerState.addState(detail.name, buttonState);
-            }
-        });
-        containerState.update();
-        this.state.actionGroupState = containerState;
+        // const { uiActionGroupDetails } = this.model;
+        // if (!uiActionGroupDetails) {
+        //   return;
+        // }
+        // const containerState = new ButtonContainerState();
+        // uiActionGroupDetails.forEach(detail => {
+        //   const action = detail.getPSUIAction();
+        //   if (action) {
+        //     const buttonState = new ButtonState(detail.name, action);
+        //     containerState.addState(detail.name, buttonState);
+        //   }
+        // });
+        // containerState.update();
+        // this.state.actionGroupState = containerState;
     }
     /**
      * 触发操作列点击事件
      *
      * @author lxm
      * @date 2022-09-07 22:09:46
-     * @param {IPSUIActionGroupDetail} detail
+     * @param {IUIActionGroupDetail} detail
      * @param {MouseEvent} event
      */
     async onActionClick(detail, event) {
@@ -68,10 +67,17 @@ export class FormGroupPanelController extends FormContainerController {
             });
         }
         else {
-            await AppDEUIActionUtil.exec(detail.getPSUIAction(), this.form.context, this.form.getData(), this.form.params, {
-                event,
-                neuron: {},
-            });
+            // todo
+            // await AppDEUIActionUtil.exec(
+            //   detail.getPSUIAction()! as IAppDEUIAction,
+            //   this.form.context,
+            //   this.form.getData(),
+            //   this.form.params,
+            //   {
+            //     event,
+            //     neuron: {},
+            //   },
+            // );
         }
     }
 }

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

@@ -1,5 +1,4 @@
-import { IBizContext } from '@ibiz-template/core';
-import { FormItemModel } from '@ibiz-template/model';
+import { FormItemModel } from '@ibiz/model-core';
 import { FormDetailController, FormController, FormContainerController } from '.';
 import { EditorController } from '../../editor';
 import { FormNotifyState } from '../../constant';
@@ -13,9 +12,9 @@ export declare class FormItemController extends FormDetailController<FormItemMod
      *
      * @author lxm
      * @date 2022-08-24 20:08:55
-     * @type {IBizContext}
+     * @type {IContext}
      */
-    readonly context: IBizContext;
+    readonly context: IContext;
     /**
      * 视图参数
      *
@@ -64,7 +63,7 @@ export declare class FormItemController extends FormDetailController<FormItemMod
      * @date 2022-09-04 18:09:32
      * @readonly
      */
-    get name(): string;
+    get name(): any;
     /**
      * 表单项对应属性的值
      *
@@ -74,20 +73,12 @@ export declare class FormItemController extends FormDetailController<FormItemMod
      * @type {unknown}
      */
     get value(): unknown;
-    /**
-     * 表单数据
-     *
-     * @author lxm
-     * @date 2022-09-01 22:09:48
-     * @readonly
-     */
-    get data(): import("../../../service").ControlVO;
     /**
      * Creates an instance of FormItemController.
      * @author lxm
      * @date 2022-08-24 20:08:24
      * @param {FormItemModel} model 表单项模型
-     * @param {IBizContext} context 上下对象
+     * @param {IContext} context 上下对象
      * @param {IParams} [params={}] 视图参数
      */
     constructor(model: FormItemModel, form: FormController, parent?: FormContainerController);

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;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;IAUR,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAyB/C,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAY5D,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,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAIjD,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,QAAQ,CAAC;IAE3B;;;;;;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,QAEP;IAED;;;;;;;OAOG;IACH,IAAI,KAAK,IAAI,OAAO,CAEnB;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;IAiBzB;;;;;;;OAOG;IACH,cAAc;IAUR,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAkC/C,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAY5D,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"}

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

@@ -19,7 +19,7 @@ export class FormItemController extends FormDetailController {
      * @readonly
      */
     get name() {
-        return this.model.source.name;
+        return this.model.name;
     }
     /**
      * 表单项对应属性的值
@@ -32,22 +32,12 @@ export class FormItemController extends FormDetailController {
     get value() {
         return this.form.data[this.name];
     }
-    /**
-     * 表单数据
-     *
-     * @author lxm
-     * @date 2022-09-01 22:09:48
-     * @readonly
-     */
-    get data() {
-        return this.form.data;
-    }
     /**
      * Creates an instance of FormItemController.
      * @author lxm
      * @date 2022-08-24 20:08:24
      * @param {FormItemModel} model 表单项模型
-     * @param {IBizContext} context 上下对象
+     * @param {IContext} context 上下对象
      * @param {IParams} [params={}] 视图参数
      */
     constructor(model, form, parent) {
@@ -82,7 +72,7 @@ export class FormItemController extends FormDetailController {
     async onInit() {
         await super.onInit();
         // 空输入默认值
-        this.state.required = !this.model.source.allowEmpty;
+        this.state.required = !this.model.allowEmpty;
         // 初始化编辑器控制器
         if (this.model.editor && this.model.editor.editorType !== 'HIDDEN') {
             this.editorProvider = await ibiz.register.editor.get(this.model.editor);
@@ -106,7 +96,10 @@ export class FormItemController extends FormDetailController {
         if (!formItemsVRs) {
             return;
         }
-        this.rules = generateRules(formItemsVRs, this.name, this.model.source.valueItemName);
+        this.rules = generateRules(formItemsVRs, this.name, 
+        // todo
+        // this.model.valueItemName,
+        '');
         // 初始化async-validator实例
         this.validator = new Schema({ [this.name]: this.rules });
     }
@@ -119,7 +112,7 @@ export class FormItemController extends FormDetailController {
      * @returns {*}
      */
     calcEnableCond() {
-        const { enableCond } = this.model.source;
+        const { enableCond } = this.model;
         const isNew = this.data.srfuf === Srfuf.CREATE;
         if (enableCond === 0) {
             this.state.enableCondDisabled = true;
@@ -130,10 +123,19 @@ export class FormItemController extends FormDetailController {
     }
     async dataChangeNotify(name) {
         await super.dataChangeNotify(name);
-        const { resetItemName } = this.model;
-        const { valueItemName } = this.model.source;
+        const { resetItemNames } = this.model;
+        // const { valueItemName } = this.model;
+        const valueItemName = '';
         // 重置项，变更时自己的值置空
-        if (name.includes(resetItemName)) {
+        let isReset = false;
+        if (resetItemNames && resetItemNames.length > 0) {
+            resetItemNames.forEach((resetItemName) => {
+                if (name.includes(resetItemName)) {
+                    isReset = true;
+                }
+            });
+        }
+        if (isReset) {
             this.setDataValue(null, this.name);
         }
         // 刚加载初始化时的值不校验,只校验值项和自身值变更
@@ -157,7 +159,7 @@ export class FormItemController extends FormDetailController {
     }
     calcDynamicLogic(names, state) {
         // 隐藏表单项不计算动态逻辑
-        if (!this.model.source.hidden) {
+        if (!this.model.hidden) {
             super.calcDynamicLogic(names, state);
         }
     }
@@ -175,7 +177,7 @@ export class FormItemController extends FormDetailController {
         }
         // 必填校验
         if (this.state.required && isNilOrEmpty(this.data[this.name])) {
-            this.state.error = `请填写${this.model.source.caption}`;
+            this.state.error = `请填写${this.model.caption}`;
             return false;
         }
         if (this.validator) {
@@ -210,7 +212,7 @@ export class FormItemController extends FormDetailController {
      * @param {boolean} isCreate 新建默认值还是更新默认值
      */
     setDefaultValue(isCreate) {
-        const { createDVT, createDV, updateDVT, updateDV } = this.model.source;
+        const { createDVT, createDV, updateDVT, updateDV } = this.model;
         const valueType = isCreate ? createDVT : updateDVT;
         const defaultValue = isCreate ? createDV : updateDV;
         // 置空

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

@@ -1,4 +1,4 @@
-import { FormPageModel, FormTabPageModel } from '@ibiz-template/model';
+import { FormPageModel, FormTabPageModel } from '@ibiz/model-core';
 import { FormContainerController, FormController } from '.';
 import { FormPageState } from '../../state';
 /**

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

@@ -1 +1 @@
-{"version":3,"file":"form-page.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/form/form-page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAAE,uBAAuB,EAAE,cAAc,EAAE,MAAM,GAAG,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C;;;;;;;;GAQG;AACH,qBAAa,kBAAmB,SAAQ,uBAAuB,CAAC,aAAa,CAAC;IACpE,KAAK,EAAE,aAAa,CAAC;IAE7B;;;;;;OAMG;gBACS,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,cAAc;IAIzD,SAAS,CAAC,WAAW,IAAI,aAAa;CAGvC"}
+{"version":3,"file":"form-page.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/form/form-page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAE,cAAc,EAAE,MAAM,GAAG,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C;;;;;;;;GAQG;AACH,qBAAa,kBAAmB,SAAQ,uBAAuB,CAAC,aAAa,CAAC;IACpE,KAAK,EAAE,aAAa,CAAC;IAE7B;;;;;;OAMG;gBACS,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,cAAc;IAIzD,SAAS,CAAC,WAAW,IAAI,aAAa;CAGvC"}

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

@@ -1,4 +1,4 @@
-import { FormRawItemModel } from '@ibiz-template/model';
+import { FormRawItemModel } from '@ibiz/model-core';
 import { FormDetailController } from '.';
 import { FormRawItemState } from '../../state';
 /**

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

@@ -1 +1 @@
-{"version":3,"file":"form-raw-item.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/form/form-raw-item.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,GAAG,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,qBAAsB,SAAQ,oBAAoB,CAAC,gBAAgB,CAAC;IACvE,KAAK,EAAE,gBAAgB,CAAC;IAEhC,SAAS,CAAC,WAAW,IAAI,gBAAgB;CAG1C"}
+{"version":3,"file":"form-raw-item.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/form/form-raw-item.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,GAAG,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,qBAAsB,SAAQ,oBAAoB,CAAC,gBAAgB,CAAC;IACvE,KAAK,EAAE,gBAAgB,CAAC;IAEhC,SAAS,CAAC,WAAW,IAAI,gBAAgB;CAG1C"}

package/out/controller/control/form/form-tab-page.d.ts

@@ -1,4 +1,4 @@
-import { FormTabPageModel } from '@ibiz-template/model';
+import { FormTabPageModel } from '@ibiz/model-core';
 import { FormContainerController } from '.';
 import { FormTabPageState } from '../../state';
 /**

package/out/controller/control/form/form-tab-page.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-tab-page.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/form/form-tab-page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,uBAAuB,EAAE,MAAM,GAAG,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,qBAAsB,SAAQ,uBAAuB,CAAC,gBAAgB,CAAC;IAC1E,KAAK,EAAE,gBAAgB,CAAC;IAEhC,SAAS,CAAC,WAAW,IAAI,gBAAgB;CAG1C"}
+{"version":3,"file":"form-tab-page.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/form/form-tab-page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,GAAG,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,qBAAsB,SAAQ,uBAAuB,CAAC,gBAAgB,CAAC;IAC1E,KAAK,EAAE,gBAAgB,CAAC;IAEhC,SAAS,CAAC,WAAW,IAAI,gBAAgB;CAG1C"}

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

@@ -1,4 +1,4 @@
-import { FormTabPanelModel } from '@ibiz-template/model';
+import { FormTabPanelModel } from '@ibiz/model-core';
 import { FormDetailController } from '.';
 import { FormTabPanelState } from '../../state';
 /**

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

@@ -1 +1 @@
-{"version":3,"file":"form-tab-panel.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/form/form-tab-panel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,GAAG,CAAC;AACzC,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;CAG3C"}
+{"version":3,"file":"form-tab-panel.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/form/form-tab-panel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,GAAG,CAAC;AACzC,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;CAG3C"}

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

@@ -1,4 +1,4 @@
-import { FormDetailModel, FormModel } from '@ibiz-template/model';
+import { FormDetailModel, FormModel } from '@ibiz/model-core';
 import { FormItemController, FormDetailController, FormContainerController } from '.';
 import { MainController } from '../main';
 import { FormNotifyState } from '../../constant';

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

@@ -1 +1 @@
-{"version":3,"file":"form.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/form/form.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAEf,SAAS,EACV,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,uBAAuB,EACxB,MAAM,GAAG,CAAC;AACX,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C;;;;;;;;;GASG;AACH,8BAAsB,cAAc,CAClC,CAAC,SAAS,SAAS,GAAG,SAAS,CAC/B,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB,KAAK,YAAmB;IAEhB,KAAK,EAAE,SAAS,CAAC;IAEzB;;;;;;OAMG;IACH,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,CAAA;KAAE,CAAM;IAEtD;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,mBAAmB,CAAA;KAAE,CAAM;IAEvD;;;;;;OAMG;IACH,SAAS,EAAE,kBAAkB,EAAE,CAAM;IAErC;;;;;;;OAOG;IACH,IAAI,IAAI,IAAI,SAAS,CAEpB;IAED;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAatD;;;;;OAKG;IACH,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAM7C;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAkBvC;;;;;;OAMG;cACa,qBAAqB,CACnC,OAAO,GAAE,eAAe,EAAwB,EAChD,IAAI,GAAE,cAAqB,EAC3B,MAAM,GAAE,uBAAuB,GAAG,SAAqB;IAmCzD;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC;IAEhC;;;;;;OAMG;IACH,OAAO,IAAI,MAAM,EAAE;IAInB;;;;;;;OAOG;IACG,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;IAuB/C;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;CAQnC"}
+{"version":3,"file":"form.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/form/form.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAEf,SAAS,EACV,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,uBAAuB,EACxB,MAAM,GAAG,CAAC;AACX,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C;;;;;;;;;GASG;AACH,8BAAsB,cAAc,CAClC,CAAC,SAAS,SAAS,GAAG,SAAS,CAC/B,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB,KAAK,YAAmB;IAEhB,KAAK,EAAE,SAAS,CAAC;IAEzB;;;;;;OAMG;IACH,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,CAAA;KAAE,CAAM;IAEtD;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,mBAAmB,CAAA;KAAE,CAAM;IAEvD;;;;;;OAMG;IACH,SAAS,EAAE,kBAAkB,EAAE,CAAM;IAErC;;;;;;;OAOG;IACH,IAAI,IAAI,IAAI,SAAS,CAEpB;IAED;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAatD;;;;;OAKG;IACH,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAM7C;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAkBvC;;;;;;OAMG;cACa,qBAAqB,CACnC,OAAO,GAAE,eAAe,EAAwB,EAChD,IAAI,GAAE,cAAqB,EAC3B,MAAM,GAAE,uBAAuB,GAAG,SAAqB;IAmCzD;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC;IAEhC;;;;;;OAMG;IACH,OAAO,IAAI,MAAM,EAAE;IAInB;;;;;;;OAOG;IACG,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;IAuB/C;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;CAQnC"}

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

@@ -1,4 +1,4 @@
-import { SearchFormModel } from '@ibiz-template/model';
+import { IDESearchForm } from '@ibiz/model-core';
 import { SearchFormService } from '../../../service';
 import { FormController } from './form';
 import { SearchFormNerve } from '../../neuron';
@@ -10,9 +10,9 @@ import { SearchFormState } from '../../state';
  * @date 2022-08-03 11:08:14
  * @export
  * @class SearchFormController
- * @extends {FormController<SearchFormModel>}
+ * @extends {FormController<IDESearchForm>}
  */
-export declare class SearchFormController extends FormController<SearchFormModel> {
+export declare class SearchFormController extends FormController<IDESearchForm> {
     /**
      * 搜索表单部件服务
      *
@@ -41,6 +41,13 @@ export declare class SearchFormController extends FormController<SearchFormModel
      * @returns {*}  {IParams}
      */
     getParams(): IParams;
+    /**
+     * 执行搜索行为
+     * @author lxm
+     * @date 2023-03-26 02:27:23
+     * @return {*}  {Promise<void>}
+     */
+    search(): Promise<void>;
     /**
      * 搜索表单按钮回调
      *

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

@@ -1 +1 @@
-{"version":3,"file":"search-form.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/form/search-form.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C;;;;;;;;GAQG;AACH,qBAAa,oBAAqB,SAAQ,cAAc,CAAC,eAAe,CAAC;IACvE;;;;;;OAMG;IACH,OAAO,EAAG,iBAAiB,CAAC;IAEpB,KAAK,EAAE,eAAe,CAAC;IAE/B,KAAK,kBAAyB;IAE9B,SAAS,CAAC,WAAW,IAAI,eAAe;cAIxB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IASvC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAS5B;;;;;;OAMG;IACH,SAAS,IAAI,OAAO;IAIpB;;;;;OAKG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1C;;;;;OAKG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAK5B;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAOtD;;;;;;OAMG;IACG,OAAO,CAAC,KAAK,EAAE,aAAa;CAOnC"}
+{"version":3,"file":"search-form.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/form/search-form.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C;;;;;;;;GAQG;AACH,qBAAa,oBAAqB,SAAQ,cAAc,CAAC,aAAa,CAAC;IACrE;;;;;;OAMG;IACH,OAAO,EAAG,iBAAiB,CAAC;IAEpB,KAAK,EAAE,eAAe,CAAC;IAE/B,KAAK,kBAAyB;IAE9B,SAAS,CAAC,WAAW,IAAI,eAAe;cAIxB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IASvC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAS5B;;;;;;OAMG;IACH,SAAS,IAAI,OAAO;IAIpB;;;;;OAKG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAI7B;;;;;OAKG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1C;;;;;OAKG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAK5B;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAOtD;;;;;;OAMG;IACG,OAAO,CAAC,KAAK,EAAE,aAAa;CAOnC"}

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

@@ -10,7 +10,7 @@ import { SearchFormState } from '../../state';
  * @date 2022-08-03 11:08:14
  * @export
  * @class SearchFormController
- * @extends {FormController<SearchFormModel>}
+ * @extends {FormController<IDESearchForm>}
  */
 export class SearchFormController extends FormController {
     constructor() {
@@ -53,6 +53,15 @@ export class SearchFormController extends FormController {
     getParams() {
         return Object.assign({}, this.data.getRequestData());
     }
+    /**
+     * 执行搜索行为
+     * @author lxm
+     * @date 2023-03-26 02:27:23
+     * @return {*}  {Promise<void>}
+     */
+    async search() {
+        await this.nerve.self.emit('onSearch', undefined);
+    }
     /**
      * 搜索表单按钮回调
      *
@@ -60,7 +69,7 @@ export class SearchFormController extends FormController {
      * @date 2022-09-22 19:09:07
      */
     async onSearchButtonClick() {
-        await this.nerve.self.evt.asyncEmit('search');
+        await this.search();
     }
     /**
      * 重置搜索表单
@@ -70,7 +79,7 @@ export class SearchFormController extends FormController {
      */
     async reset() {
         await this.load();
-        await this.nerve.self.evt.asyncEmit('search');
+        await this.search();
     }
     /**
      * 通知所有表单成员表单操作过程中的数据变更
@@ -81,8 +90,8 @@ export class SearchFormController extends FormController {
      */
     async dataChangeNotify(names) {
         await super.dataChangeNotify(names);
-        if (this.model.source.enableAutoSearch) {
-            this.nerve.self.evt.asyncEmit('search');
+        if (this.model.enableAutoSearch) {
+            this.search();
         }
     }
     /**

package/out/controller/control/grid/grid-column.d.ts

@@ -1,5 +1,4 @@
-import { IBizContext } from '@ibiz-template/core';
-import { GridColumnModel } from '@ibiz-template/model';
+import { GridColumnModel } from '@ibiz/model-core';
 import { GridController } from '.';
 import { Application } from '../../../application';
 /**
@@ -32,9 +31,9 @@ export declare class GridColumnController<T extends GridColumnModel = GridColumn
      * @author lxm
      * @date 2022-09-05 19:09:24
      * @readonly
-     * @type {IBizContext}
+     * @type {IContext}
      */
-    get context(): IBizContext;
+    get context(): IContext;
     /**
      * 视图参数
      *
@@ -51,7 +50,7 @@ export declare class GridColumnController<T extends GridColumnModel = GridColumn
      * @date 2022-09-06 11:09:58
      * @readonly
      */
-    get enableRowEdit(): boolean;
+    get enableRowEdit(): any;
     /**
      * Creates an instance of GridFieldColumnController.
      * @author lxm

package/out/controller/control/grid/grid-column.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grid-column.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/grid/grid-column.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,GAAG,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD;;;;;GAKG;AACH,qBAAa,oBAAoB,CAAC,CAAC,SAAS,eAAe,GAAG,eAAe;IAC3E,SAAS,CAAC,GAAG,EAAE,WAAW,CAAC;IAE3B;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAE9B;;;;;;;OAOG;IACH,IAAI,OAAO,IAAI,WAAW,CAEzB;IAED;;;;;;;OAOG;IACH,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED;;;;;;OAMG;IACH,IAAI,aAAa,YAIhB;IAED;;;;;OAKG;gBACS,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,cAAc;IAM1C;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;CAGxC"}
+{"version":3,"file":"grid-column.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/grid/grid-column.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,GAAG,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD;;;;;GAKG;AACH,qBAAa,oBAAoB,CAAC,CAAC,SAAS,eAAe,GAAG,eAAe;IAC3E,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAE9B;;;;;;;OAOG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;;;;;;OAOG;IACH,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED;;;;;;OAMG;IACH,IAAI,aAAa,QAEhB;IAED;;;;;OAKG;gBACS,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,cAAc;IAO1C;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;CAGxC"}

package/out/controller/control/grid/grid-column.js

@@ -11,7 +11,7 @@ export class GridColumnController {
      * @author lxm
      * @date 2022-09-05 19:09:24
      * @readonly
-     * @type {IBizContext}
+     * @type {IContext}
      */
     get context() {
         return this.grid.context;
@@ -35,7 +35,7 @@ export class GridColumnController {
      * @readonly
      */
     get enableRowEdit() {
-        return (this.grid.model.source.enableRowEdit && this.model.source.enableRowEdit);
+        return this.grid.model.source.enableRowEdit && this.model.enableRowEdit;
     }
     /**
      * Creates an instance of GridFieldColumnController.
@@ -46,7 +46,8 @@ export class GridColumnController {
     constructor(model, grid) {
         this.model = model;
         this.grid = grid;
-        this.app = ibiz.hub.getApp(model.modelService.app);
+        // todo
+        // this.app = ibiz.hub.getApp(model.modelService.app);
     }
     /**
      * 子类不可覆盖或重写此方法，在 init 时需要重写的使用 onInit 方法。

package/out/controller/control/grid/grid-edit-item.d.ts

@@ -1,5 +1,4 @@
-import { IBizContext } from '@ibiz-template/core';
-import { GridEditItemModel } from '@ibiz-template/model';
+import { GridEditItemModel } from '@ibiz/model-core';
 import { GridNotifyState } from '../../constant';
 import { EditorController } from '../../editor';
 import { GridRowController, GridController } from '.';
@@ -74,9 +73,9 @@ export declare class GridEditItemController {
      * @author lxm
      * @date 2022-09-05 19:09:24
      * @readonly
-     * @type {IBizContext}
+     * @type {IContext}
      */
-    get context(): IBizContext;
+    get context(): IContext;
     /**
      * 视图参数
      *

package/out/controller/control/grid/grid-edit-item.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grid-edit-item.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/grid/grid-edit-item.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAgB,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEhD,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,GAAG,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAGlD;;;;;GAKG;AACH,qBAAa,sBAAsB;IACjC;;;;;;OAMG;IACH,KAAK,EAAE,iBAAiB,CAAC;IAEzB;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,CAAM;IAEnB;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAE9B;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAE1B;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;;OAMG;IACH,KAAK,EAAE,KAAK,CAAM;IAElB;;;;;;;OAOG;IACH,OAAO,CAAC,SAAS,CAAU;IAE3B;;;;;;;OAOG;IACH,IAAI,OAAO,IAAI,WAAW,CAEzB;IAED;;;;;;;OAOG;IACH,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED;;;;;;OAMG;IACH,IAAI,QAAQ,YAEX;IAED;;;;;;OAMG;gBACS,KAAK,EAAE,iBAAiB,EAAE,IAAI,EAAE,cAAc;IAK1D;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBvC;;;;;;;OAOG;cACa,SAAS;IAezB;;;;;;;;OAQG;IACG,WAAW,CAAC,GAAG,EAAE,iBAAiB,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,MAAM;IAKvE;;;;;;;OAOG;IACG,gBAAgB,CACpB,GAAG,EAAE,iBAAiB,EACtB,KAAK,EAAE,MAAM,EAAE,GACd,OAAO,CAAC,IAAI,CAAC;IAoBhB;;;;;OAKG;IACH,eAAe,CAAC,GAAG,EAAE,iBAAiB,EAAE,MAAM,EAAE,eAAe,GAAG,IAAI;IAItE;;;;;;OAMG;IACH,cAAc,CAAC,GAAG,EAAE,iBAAiB;IAUrC;;;;;;OAMG;IACG,QAAQ,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;CAmBzD"}
+{"version":3,"file":"grid-edit-item.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/grid/grid-edit-item.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEhD,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,GAAG,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAGlD;;;;;GAKG;AACH,qBAAa,sBAAsB;IACjC;;;;;;OAMG;IACH,KAAK,EAAE,iBAAiB,CAAC;IAEzB;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,CAAM;IAEnB;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAE9B;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAE1B;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;;OAMG;IACH,KAAK,EAAE,KAAK,CAAM;IAElB;;;;;;;OAOG;IACH,OAAO,CAAC,SAAS,CAAU;IAE3B;;;;;;;OAOG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;;;;;;OAOG;IACH,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED;;;;;;OAMG;IACH,IAAI,QAAQ,YAEX;IAED;;;;;;OAMG;gBACS,KAAK,EAAE,iBAAiB,EAAE,IAAI,EAAE,cAAc;IAK1D;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBvC;;;;;;;OAOG;cACa,SAAS;IAiBzB;;;;;;;;OAQG;IACG,WAAW,CAAC,GAAG,EAAE,iBAAiB,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,MAAM;IAKvE;;;;;;;OAOG;IACG,gBAAgB,CACpB,GAAG,EAAE,iBAAiB,EACtB,KAAK,EAAE,MAAM,EAAE,GACd,OAAO,CAAC,IAAI,CAAC;IAoBhB;;;;;OAKG;IACH,eAAe,CAAC,GAAG,EAAE,iBAAiB,EAAE,MAAM,EAAE,eAAe,GAAG,IAAI;IAItE;;;;;;OAMG;IACH,cAAc,CAAC,GAAG,EAAE,iBAAiB;IAUrC;;;;;;OAMG;IACG,QAAQ,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;CAmBzD"}

package/out/controller/control/grid/grid-edit-item.js

@@ -15,7 +15,7 @@ export class GridEditItemController {
      * @author lxm
      * @date 2022-09-05 19:09:24
      * @readonly
-     * @type {IBizContext}
+     * @type {IContext}
      */
     get context() {
         return this.grid.context;
@@ -39,7 +39,7 @@ export class GridEditItemController {
      * @readonly
      */
     get required() {
-        return !this.model.source.allowEmpty;
+        return !this.model.allowEmpty;
     }
     /**
      * Creates an instance of GridEditItemController.
@@ -104,7 +104,10 @@ export class GridEditItemController {
         if (!editItemsVRs) {
             return;
         }
-        this.rules = generateRules(editItemsVRs, this.model.codeName, this.model.source.valueItemName);
+        this.rules = generateRules(editItemsVRs, this.model.codeName, 
+        // todo
+        // this.model.valueItemName,
+        '');
         // 初始化async-validator实例
         this.validator = new Schema({ [this.model.codeName]: this.rules });
     }
@@ -131,8 +134,9 @@ export class GridEditItemController {
      */
     async dataChangeNotify(row, names) {
         // 刚加载初始化时的值不校验,只校验值项和自身值变更
-        if (names.includes(this.model.codeName) ||
-            names.includes(this.model.source.valueItemName)) {
+        if (names.includes(this.model.codeName)
+        // names.includes(this.model.valueItemName)
+        ) {
             const result = await this.validate(row);
             // todo校验不通过是否报错
             if (!result) {
@@ -162,7 +166,7 @@ export class GridEditItemController {
      * @returns {*}
      */
     calcEnableCond(row) {
-        const { enableCond } = this.model.source;
+        const { enableCond } = this.model;
         const isNew = row.data.srfuf === Srfuf.CREATE;
         if (enableCond === 0) {
             row.columnState[this.model.codeName].disabled = true;