@ibiz-template/runtime 0.0.3-beta.6 → 0.0.3-beta.7

package/out/controller/control/control.js

@@ -9,16 +9,33 @@ import { ControlState } from '../state';
  * @class ControlController
  */
 export class ControlController {
+    /**
+     * 获取部件通用的事件参数
+     * @author lxm
+     * @date 2023-03-26 11:42:21
+     * @readonly
+     */
+    get eventArgs() {
+        return {
+            context: this.context,
+            params: this.params,
+            data: this.getData() || [],
+            targetName: this.model.name,
+            neuron: this.nerve.self,
+            view: this.ctx.view,
+            ctx: this.ctx,
+        };
+    }
     /**
      * Creates an instance of ControlController.
      *
      * @author chitanda
      * @date 2022-07-24 17:07:58
      * @param {T} model
-     * @param {IBizContext} context
+     * @param {IContext} context
      * @param {IParams} [params={}]
      */
-    constructor(model, context, params = {}) {
+    constructor(model, context, params, ctx) {
         /**
          * 部件UI状态
          *
@@ -38,6 +55,8 @@ export class ControlController {
         this.context = context;
         this.params = params;
         this.nerve = this.createNerve();
+        this.ctx = ctx;
+        this.ctx.registerControl(this.model.name, this.nerve.self);
         this.app = ibiz.hub.getApp(model.modelService.app);
     }
     /**
@@ -66,6 +85,15 @@ export class ControlController {
             this.nerve.mounted();
         });
     }
+    /**
+     * 获取部件类型
+     * @author lxm
+     * @date 2023-03-28 02:23:37
+     * @return {*}  {string}
+     */
+    getControlType() {
+        return this.model.source.controlType;
+    }
     async onInit() {
         // 异步初始化
         this.emit('neuronInit', this.nerve.self);
@@ -94,6 +122,15 @@ export class ControlController {
         // 在需要向父组件抛事件时，会调用此方法。
         // 可外部覆盖实例的此方法，实现自定义的抛事件逻辑。
     }
+    /**
+     * 获取部件数据，非数据部件没有数据
+     * @author lxm
+     * @date 2023-03-26 11:41:51
+     * @return {*}  {(IDatum[] | null)}
+     */
+    getData() {
+        return null;
+    }
     /**
      * 销毁
      *
@@ -112,7 +149,7 @@ export class ControlController {
      * @return {*}  {Promise<void>}
      */
     async startLoading() {
-        this.nerve.self.evt.emit('beginViewLoading');
+        this.ctx.startLoading();
     }
     /**
      * 加载完毕
@@ -122,6 +159,6 @@ export class ControlController {
      * @return {*}  {Promise<void>}
      */
     async endLoading() {
-        this.nerve.self.evt.emit('endViewLoading');
+        this.ctx.endLoading();
     }
 }

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

@@ -1,9 +1,9 @@
 import { DataViewModel } from '@ibiz-template/model';
-import { DataViewNerve } from '../neuron';
 import { DataViewState } from '../state';
 import { ControlVO, DataViewService } from '../../service';
 import { MDController } from './md';
 import { IControlProvider } from '../interface';
+import { CardNerve } from '../neuron';
 /**
  * 卡片控制器
  *
@@ -15,8 +15,8 @@ import { IControlProvider } from '../interface';
  */
 export declare class DataViewController extends MDController<DataViewModel> {
     state: DataViewState;
-    nerve: DataViewNerve;
-    protected createNerve(): DataViewNerve;
+    nerve: CardNerve;
+    protected createNerve(): CardNerve;
     /**
      * 卡片部件服务
      *
@@ -27,11 +27,6 @@ export declare class DataViewController extends MDController<DataViewModel> {
      *
      */
     get noSort(): boolean;
-    /**
-     * 排序查询条件
-     *
-     */
-    sortQuery?: string;
     /**
      * 面板部件适配器
      *
@@ -45,15 +40,6 @@ export declare class DataViewController extends MDController<DataViewModel> {
      */
     isAddBehind: boolean;
     protected onInit(): Promise<void>;
-    /**
-     * 设置排序
-     *
-     * @author lxm
-     * @date 2022-09-28 13:09:44
-     * @param {string} key 排序字段
-     * @param {string} order 排序顺序
-     */
-    setSort(key: string, order: 'asc' | 'desc'): void;
     /**
      * 加载更多数据
      *

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

@@ -1 +1 @@
-{"version":3,"file":"dataview.d.ts","sourceRoot":"","sources":["../../../src/controller/control/dataview.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAGrD,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAgB,SAAS,EAAE,eAAe,EAAS,MAAM,eAAe,CAAC;AAChF,OAAO,EAAE,YAAY,EAAoB,MAAM,MAAM,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEhD;;;;;;;;GAQG;AACH,qBAAa,kBAAmB,SAAQ,YAAY,CAAC,aAAa,CAAC;IACjE,KAAK,gBAAuB;IAEpB,KAAK,EAAE,aAAa,CAAC;IAE7B,SAAS,CAAC,WAAW,IAAI,aAAa;IAItC;;;OAGG;IACK,OAAO,EAAE,eAAe,CAAC;IAEjC;;;OAGG;IACH,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,gBAAgB,CAAC;IAEvC;;;;OAIG;IACH,WAAW,EAAE,OAAO,CAAS;cAEb,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IA0BvC;;;;;;;OAOG;IACH,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,MAAM;IAI1C;;;OAGG;IACG,QAAQ,CAAC,CAAC,EAAE,UAAU;IAS5B;;;OAGG;IACG,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAM/B;;;OAGG;IACG,SAAS,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAsBzD;;;OAGG;IACG,WAAW,CAAC,KAAK,EAAE,SAAS,EAAE;IAQpC;;;OAGG;IACU,SAAS,CAAC,KAAK,EAAE,SAAS,EAAE;IAoCzC;;;OAGG;IACG,iBAAiB,CAAC,KAAK,EAAE,SAAS,EAAE;IAsD1C;;;OAGG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAU9B;;;OAGG;IACG,IAAI,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IA8B1C;;;;;OAKG;IACG,WAAW,CAAC,IAAI,EAAE,SAAS;IAMjC;;;;;OAKG;IACG,cAAc,CAAC,IAAI,EAAE,SAAS;CAKrC"}
+{"version":3,"file":"dataview.d.ts","sourceRoot":"","sources":["../../../src/controller/control/dataview.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAGrD,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAgB,SAAS,EAAE,eAAe,EAAS,MAAM,eAAe,CAAC;AAChF,OAAO,EAAE,YAAY,EAAoB,MAAM,MAAM,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC;;;;;;;;GAQG;AACH,qBAAa,kBAAmB,SAAQ,YAAY,CAAC,aAAa,CAAC;IACjE,KAAK,gBAAuB;IAEpB,KAAK,EAAE,SAAS,CAAC;IAEzB,SAAS,CAAC,WAAW,IAAI,SAAS;IAIlC;;;OAGG;IACK,OAAO,EAAE,eAAe,CAAC;IAEjC;;;OAGG;IACH,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,gBAAgB,CAAC;IAEvC;;;;OAIG;IACH,WAAW,EAAE,OAAO,CAAS;cAEb,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAqBvC;;;OAGG;IACG,QAAQ,CAAC,CAAC,EAAE,UAAU;IAS5B;;;OAGG;IACG,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAM/B;;;OAGG;IACG,SAAS,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAsBzD;;;OAGG;IACG,WAAW,CAAC,KAAK,EAAE,SAAS,EAAE;IAQpC;;;OAGG;IACU,SAAS,CAAC,KAAK,EAAE,SAAS,EAAE;IAoCzC;;;OAGG;IACG,iBAAiB,CAAC,KAAK,EAAE,SAAS,EAAE;IAsD1C;;;OAGG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAU9B;;;OAGG;IACG,IAAI,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IA8B1C;;;;;OAKG;IACG,WAAW,CAAC,IAAI,EAAE,SAAS;IAMjC;;;;;OAKG;IACG,cAAc,CAAC,IAAI,EAAE,SAAS;CAKrC"}

package/out/controller/control/dataview.js

@@ -1,9 +1,9 @@
 import { RuntimeError } from '@ibiz-template/core';
 import { clone } from 'ramda';
-import { DataViewNerve } from '../neuron';
 import { DataViewState } from '../state';
 import { DataViewService, Srfuf } from '../../service';
 import { MDController, MDItemController } from './md';
+import { CardNerve } from '../neuron';
 /**
  * 卡片控制器
  *
@@ -25,7 +25,7 @@ export class DataViewController extends MDController {
         this.isAddBehind = false;
     }
     createNerve() {
-        return new DataViewNerve(this);
+        return new CardNerve(this);
     }
     /**
      * 是否默认禁用排序
@@ -40,10 +40,6 @@ export class DataViewController extends MDController {
         this.state.singleSelect = this.model.source.singleSelect;
         this.service = new DataViewService(this.model);
         await this.service.init(this.context);
-        // 绑定排序参数，beforeLoad事件
-        this.nerve.self.evt.on('beforeLoad', () => {
-            return this.sortQuery ? { sort: this.sortQuery } : {};
-        });
         // 设置默认排序
         const { defaultSortField, defaultSortDir } = this.model;
         if (defaultSortField && defaultSortDir) {
@@ -54,17 +50,6 @@ export class DataViewController extends MDController {
             this.layoutPanelProvider = await ibiz.register.control.get(this.model.panel);
         }
     }
-    /**
-     * 设置排序
-     *
-     * @author lxm
-     * @date 2022-09-28 13:09:44
-     * @param {string} key 排序字段
-     * @param {string} order 排序顺序
-     */
-    setSort(key, order) {
-        this.sortQuery = `${key},${order}`;
-    }
     /**
      * 加载更多数据
      *
@@ -250,7 +235,7 @@ export class DataViewController extends MDController {
         this.state.items.splice(index, 1, res.data);
         rowController.data = res.data;
         ibiz.message.success(`${res.data.srfmajortext || ''}保存成功`);
-        await this.nerve.self.evt.asyncEmit('afterSave', [res.data], isCreate);
+        await this.nerve.self.emit('onSaveSuccess', undefined);
     }
     /**
      * 单击事件
@@ -260,7 +245,7 @@ export class DataViewController extends MDController {
      */
     async handleClick(item) {
         if (this.mdCtrlActiveMode === 1) {
-            await this.nerve.self.evt.asyncEmit('dataActive', item);
+            await this.onActive(item);
         }
     }
     /**
@@ -271,7 +256,7 @@ export class DataViewController extends MDController {
      */
     async handleDblClick(item) {
         if (this.mdCtrlActiveMode === 2) {
-            await this.nerve.self.evt.asyncEmit('dataActive', item);
+            await this.onActive(item);
         }
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"edit-form.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/form/edit-form.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAGrD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C;;;;;;;;GAQG;AACH,qBAAa,kBAAmB,SAAQ,cAAc,CAAC,aAAa,CAAC;IACnE;;;;;;OAMG;IACH,OAAO,EAAG,eAAe,CAAC;IAE1B,KAAK,gBAAuB;IAE5B;;;;;;OAMG;IACK,KAAK,EAAE,aAAa,CAAC;IAE7B;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAS;IAE3B,SAAS,CAAC,WAAW,IAAI,aAAa;IAItC;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAOvC;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,SAAS,CAAC;IAqBhC;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAgC5B;;;;;;OAMG;IACG,MAAM;IAeZ;;;;;;OAMG;IACG,MAAM;IAeZ;;;;;;;OAOG;IACG,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE;IAgB/D;;;;;;;OAOG;IACG,OAAO,CAAC,WAAW,GAAE,OAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBvD;;;;;;;OAOG;IACG,QAAQ,CAAC,WAAW,GAAE,OAAY,GAAG,OAAO,CAAC,IAAI,CAAC;CAoBzD"}
+{"version":3,"file":"edit-form.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/form/edit-form.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAGrD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C;;;;;;;;GAQG;AACH,qBAAa,kBAAmB,SAAQ,cAAc,CAAC,aAAa,CAAC;IACnE;;;;;;OAMG;IACH,OAAO,EAAG,eAAe,CAAC;IAE1B,KAAK,gBAAuB;IAE5B;;;;;;OAMG;IACK,KAAK,EAAE,aAAa,CAAC;IAE7B;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAS;IAE3B,SAAS,CAAC,WAAW,IAAI,aAAa;IAItC;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAOvC;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,SAAS,CAAC;IA6BhC;;;;;OAKG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAgC5B;;;;;;OAMG;IACG,MAAM;IAeZ;;;;;;OAMG;IACG,MAAM;IAeZ;;;;;;;OAOG;IACG,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE;IAgB/D;;;;;;;OAOG;IACG,OAAO,CAAC,WAAW,GAAE,OAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBvD;;;;;;;OAOG;IACG,QAAQ,CAAC,WAAW,GAAE,OAAY,GAAG,OAAO,CAAC,IAAI,CAAC;CAoBzD"}

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

@@ -51,12 +51,18 @@ export class EditFormController extends FormController {
      */
     async load() {
         this.isNewData = !this.context[this.model.appEntity.deName];
+        const queryParams = Object.assign({}, this.params);
+        // 新建默认值给到graft接口，接口会回来
+        if (this.isNewData) {
+            const params = await this.getDraftParams();
+            Object.assign(queryParams, params);
+        }
         await this.startLoading();
         let res;
         try {
             res = this.isNewData
-                ? await this.service.getDraft(this.context, this.params)
-                : await this.service.get(this.context, this.params);
+                ? await this.service.getDraft(this.context, queryParams)
+                : await this.service.get(this.context, queryParams);
         }
         finally {
             await this.endLoading();
@@ -98,7 +104,7 @@ export class EditFormController extends FormController {
         if (res.data) {
             this.data.mergeOrigin(res.data);
         }
-        await this.nerve.self.evt.asyncEmit('afterSave', this.isNewData, this.data);
+        await this.nerve.self.emit('onSaveSuccess', undefined);
         this.isNewData = false;
         this.formStateNotify(FormNotifyState.SAVE);
         ibiz.message.success(`${this.data.srfmajortext || ''}保存成功`);
@@ -123,7 +129,7 @@ export class EditFormController extends FormController {
                 await this.endLoading();
             }
         }
-        await this.nerve.self.evt.asyncEmit('afterRemove', this.data);
+        await this.nerve.self.emit('onRemoveSuccess', undefined);
         this.state.data = new ControlVO();
         this.force();
     }

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

@@ -1,4 +1,4 @@
-import { FormButtonModel, IPSAppViewLogic } from '@ibiz-template/model';
+import { FormButtonModel } from '@ibiz-template/model';
 import { FormDetailController } from '.';
 import { FormButtonState } from '../../state';
 /**
@@ -14,14 +14,13 @@ export declare class FormButtonController extends FormDetailController<FormButto
     state: FormButtonState;
     protected createState(): FormButtonState;
     /**
-     * 视图逻辑
+     * 表单数据
      *
      * @author lxm
-     * @date 2022-09-28 21:09:32
-     * @type {IPSAppViewLogic}
+     * @date 2022-09-01 22:09:48
+     * @readonly
      */
-    viewLogic?: IPSAppViewLogic;
-    protected onInit(): Promise<void>;
+    get data(): import("../../..").ControlVO;
     /**
      * 按钮点击处理回调
      *

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;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;CAUxC"}
+{"version":3,"file":"form-button.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/form/form-button.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAsB,oBAAoB,EAAE,MAAM,GAAG,CAAC;AAE7D,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,IAAI,IAAI,iCAEP;IAED;;;;;;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;IAiBlD;;;;;;OAMG;IACG,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;CAUxC"}

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

@@ -1,5 +1,6 @@
 import { RuntimeError } from '@ibiz-template/core';
 import { FormDetailController } from '.';
+import { executeViewLogic } from '../../../view-logic';
 import { FormButtonState } from '../../state';
 /**
  * 表单按钮控制器
@@ -15,14 +16,15 @@ export class FormButtonController extends FormDetailController {
         var _a;
         return new FormButtonState((_a = this.parent) === null || _a === void 0 ? void 0 : _a.state);
     }
-    async onInit() {
-        await super.onInit();
-        // 初始化视图逻辑对象
-        const tag1 = this.form.model.source.name.toLowerCase();
-        const tag2 = this.model.source.codeName.toLowerCase();
-        const viewLogicKey = `${tag1}_${tag2}_click`;
-        this.viewLogic =
-            this.form.model.source.findPSAppViewLogic(viewLogicKey) || undefined;
+    /**
+     * 表单数据
+     *
+     * @author lxm
+     * @date 2022-09-01 22:09:48
+     * @readonly
+     */
+    get data() {
+        return this.form.data;
     }
     /**
      * 按钮点击处理回调
@@ -46,10 +48,14 @@ export class FormButtonController extends FormDetailController {
      * @returns {*}  {Promise<void>}
      */
     async doUIAction(event) {
-        if (!this.viewLogic) {
+        if (!this.model.viewLogic) {
             throw new RuntimeError('没有找到按钮对应的视图逻辑');
         }
-        await this.form.nerve.self.evt.asyncEmit('actionClick', this.viewLogic, [this.form.data], event);
+        await executeViewLogic(this.model.viewLogic, this.form.context, [this.data], this.form.params, {
+            event,
+            neuron: this.form.nerve.self,
+            view: this.form.ctx.view,
+        });
     }
     /**
      * 执行表单项更新

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

@@ -35,6 +35,14 @@ export declare class FormDetailController<T extends FormDetailModel = FormDetail
      * @type {FormController}
      */
     readonly parent?: FormContainerController;
+    /**
+     * 表单数据
+     *
+     * @author lxm
+     * @date 2022-09-01 22:09:48
+     * @readonly
+     */
+    get data(): import("../../..").ControlVO;
     /**
      * Creates an instance of FormDetailController.
      * @author lxm

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;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;IAmCvC;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,IAAI,eAAe;IAIxC;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtD;;;;;OAKG;IACG,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAK5D;;;;;;;;;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"}
+{"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;;;;;;OAMG;IACH,IAAI,IAAI,iCAEP;IAED;;;;;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;IAmCvC;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,IAAI,eAAe;IAIxC;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtD;;;;;OAKG;IACG,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAK5D;;;;;;;;;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

@@ -3,6 +3,16 @@ import { FormDetailState } from '../../state';
 import { calcLayoutContentStyle } from '../../utils';
 import { verifyFormGroupLogic } from '../../../utils';
 export class FormDetailController {
+    /**
+     * 表单数据
+     *
+     * @author lxm
+     * @date 2022-09-01 22:09:48
+     * @readonly
+     */
+    get data() {
+        return this.form.data;
+    }
     /**
      * Creates an instance of FormDetailController.
      * @author lxm

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

@@ -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-item.d.ts

@@ -1,4 +1,3 @@
-import { IBizContext } from '@ibiz-template/core';
 import { FormItemModel } from '@ibiz-template/model';
 import { FormDetailController, FormController, FormContainerController } from '.';
 import { EditorController } from '../../editor';
@@ -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;
     /**
      * 视图参数
      *
@@ -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,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,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,WAEP;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;IAezB;;;;;;;OAOG;IACH,cAAc;IAUR,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAiC/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

@@ -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) {
@@ -130,10 +120,18 @@ export class FormItemController extends FormDetailController {
     }
     async dataChangeNotify(name) {
         await super.dataChangeNotify(name);
-        const { resetItemName } = this.model;
+        const { resetItemNames } = this.model;
         const { valueItemName } = this.model.source;
         // 重置项，变更时自己的值置空
-        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);
         }
         // 刚加载初始化时的值不校验,只校验值项和自身值变更
@@ -151,8 +149,8 @@ export class FormItemController extends FormDetailController {
         // 计算启用条件
         this.calcEnableCond();
         // 触发默认值
-        if (state === FormNotifyState.DRAFT || state === FormNotifyState.LOAD) {
-            this.setDefaultValue(state === FormNotifyState.DRAFT);
+        if (state === FormNotifyState.LOAD) {
+            this.setDefaultValue(false);
         }
     }
     calcDynamicLogic(names, state) {

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

@@ -80,6 +80,13 @@ export declare abstract class FormController<T extends FormModel = FormModel> ex
      * @returns {*}  {Promise<void>}
      */
     protected onInit(): Promise<void>;
+    /**
+     * 获取加载草稿额外参数，新建默认值
+     * @author lxm
+     * @date 2023-04-27 10:32:06
+     * @return {*}
+     */
+    getDraftParams(): Promise<IParams>;
     /**
      * 初始化表单成员控制器
      *

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,sBAAsB,CAAC;AAG9B,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;;;;;OAKG;IACG,cAAc;IAWpB;;;;;;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/form.js

@@ -1,4 +1,5 @@
 import { debounceAndAsyncMerge, RuntimeError } from '@ibiz-template/core';
+import { isNil } from 'lodash-es';
 import { MainController } from '../main';
 import { FormState } from '../../state';
 /**
@@ -98,6 +99,22 @@ export class FormController extends MainController {
             return [Array.from(new Set([...arr1[0], ...arr2[0]]))];
         }, 200);
     }
+    /**
+     * 获取加载草稿额外参数，新建默认值
+     * @author lxm
+     * @date 2023-04-27 10:32:06
+     * @return {*}
+     */
+    async getDraftParams() {
+        await Promise.all(this.formItems.map(item => item.setDefaultValue(true)));
+        const result = {};
+        Object.keys(this.data).forEach(key => {
+            if (!isNil(this.data[key])) {
+                result[key] = this.data[key];
+            }
+        });
+        return result;
+    }
     /**
      * 初始化表单成员控制器
      *

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

@@ -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,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;IAe5B;;;;;;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

@@ -36,7 +36,11 @@ export class SearchFormController extends FormController {
      * @returns {*}  {Promise<IData>}
      */
     async load() {
-        const res = await this.service.getDraft(this.context, this.params);
+        const queryParams = Object.assign({}, this.params);
+        // 新建默认值给到graft接口，接口会回来
+        const params = await this.getDraftParams();
+        Object.assign(queryParams, params);
+        const res = await this.service.getDraft(this.context, queryParams);
         this.state.data = res.data;
         this.state.isLoaded = true;
         this.formStateNotify(FormNotifyState.DRAFT);
@@ -53,6 +57,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 +73,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 +83,7 @@ export class SearchFormController extends FormController {
      */
     async reset() {
         await this.load();
-        await this.nerve.self.evt.asyncEmit('search');
+        await this.search();
     }
     /**
      * 通知所有表单成员表单操作过程中的数据变更
@@ -82,7 +95,7 @@ export class SearchFormController extends FormController {
     async dataChangeNotify(names) {
         await super.dataChangeNotify(names);
         if (this.model.source.enableAutoSearch) {
-            this.nerve.self.evt.asyncEmit('search');
+            this.search();
         }
     }
     /**