@ibiz-template/runtime 0.2.13 → 0.2.16

package/out/interface/controller/controller/control/i-md-control.controller.d.ts

@@ -19,12 +19,12 @@ export interface MDCtrlLoadParams extends IDataAbilityParams {
 }
 export interface MDCtrlRemoveParams extends IDataAbilityParams {
     /**
-     * 是否静默删除
+     * 是否不需要刷新(默认为否，如果不需要刷新传true)
      * @author lxm
      * @date 2023-08-17 06:04:23
      * @type {boolean}
      */
-    silent?: boolean;
+    notRefresh?: boolean;
 }
 /**
  * 多数据部件控制器

package/out/interface/controller/controller/control/i-md-control.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-md-control.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-md-control.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D,MAAM,WAAW,gBAAiB,SAAQ,kBAAkB;IAC1D;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,kBAAmB,SAAQ,kBAAkB;IAC5D;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,oBAAoB,CACnC,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,eAAe,GAAG,eAAe,EAC3C,CAAC,SAAS,eAAe,GAAG,eAAe,CAC3C,SAAQ,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IACnC;;;;;OAKG;IACH,IAAI,CAAC,IAAI,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;IAEhD;;;;;OAKG;IACH,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjD;;;;;OAKG;IACH,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzB;;;;;OAKG;IACH,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5B;;;;;;OAMG;IACH,UAAU,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAExD;;;;;OAKG;IACH,OAAO,IAAI,KAAK,EAAE,CAAC;IAEnB;;;;;;;OAOG;IACH,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IAEvC;;;;;;OAMG;IACH,SAAS,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACvC"}
+{"version":3,"file":"i-md-control.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-md-control.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D,MAAM,WAAW,gBAAiB,SAAQ,kBAAkB;IAC1D;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,kBAAmB,SAAQ,kBAAkB;IAC5D;;;;;OAKG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,oBAAoB,CACnC,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,eAAe,GAAG,eAAe,EAC3C,CAAC,SAAS,eAAe,GAAG,eAAe,CAC3C,SAAQ,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IACnC;;;;;OAKG;IACH,IAAI,CAAC,IAAI,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;IAEhD;;;;;OAKG;IACH,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjD;;;;;OAKG;IACH,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzB;;;;;OAKG;IACH,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5B;;;;;;OAMG;IACH,UAAU,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAExD;;;;;OAKG;IACH,OAAO,IAAI,KAAK,EAAE,CAAC;IAEnB;;;;;;;OAOG;IACH,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IAEvC;;;;;;OAMG;IACH,SAAS,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACvC"}

package/out/interface/controller/controller/control/i-medit-view-panel.controller.d.ts

@@ -10,5 +10,11 @@ import { IMDControlController } from './i-md-control.controller';
  * @extends {IMDControlController<IDEMultiEditViewPanel, IMEditViewPanelState, IMEditViewPanelEvent>}
  */
 export interface IMEditViewPanelController<T extends IDEMultiEditViewPanel = IDEMultiEditViewPanel, S extends IMEditViewPanelState = IMEditViewPanelState, E extends IMEditViewPanelEvent = IMEditViewPanelEvent> extends IMDControlController<T, S, E> {
+    /**
+     * 处理添加
+     *
+     * @memberof IMEditViewPanelController
+     */
+    handleAdd(): Promise<void>;
 }
 //# sourceMappingURL=i-medit-view-panel.controller.d.ts.map

package/out/interface/controller/controller/control/i-medit-view-panel.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-medit-view-panel.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-medit-view-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;GAMG;AACH,MAAM,WAAW,yBAAyB,CACxC,CAAC,SAAS,qBAAqB,GAAG,qBAAqB,EACvD,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,EACrD,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,CACrD,SAAQ,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;CAAG"}
+{"version":3,"file":"i-medit-view-panel.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-medit-view-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;GAMG;AACH,MAAM,WAAW,yBAAyB,CACxC,CAAC,SAAS,qBAAqB,GAAG,qBAAqB,EACvD,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,EACrD,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,CACrD,SAAQ,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IACrC;;;;OAIG;IACH,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5B"}

package/out/interface/controller/state/control/i-medit-view-panel.state.d.ts

@@ -25,5 +25,10 @@ export interface IMEditViewPanelState extends IMDControlState {
      *
      */
     activeTab: string;
+    /**
+     * 是否需要滚动
+     *
+     */
+    isNeedScroll: boolean;
 }
 //# sourceMappingURL=i-medit-view-panel.state.d.ts.map

package/out/interface/controller/state/control/i-medit-view-panel.state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-medit-view-panel.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-medit-view-panel.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,MAAM,WAAW,YAAY;IAE3B,EAAE,EAAE,MAAM,CAAC;IAEX,OAAO,EAAE,KAAK,CAAC;IAEf,MAAM,EAAE,KAAK,CAAC;IAEd,IAAI,EAAE,SAAS,CAAC;IAEhB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,oBAAqB,SAAQ,eAAe;IAC3D;;;OAGG;IACH,YAAY,EAAE,YAAY,EAAE,CAAC;IAE7B;;;OAGG;IACH,SAAS,EAAE,MAAM,CAAC;CACnB"}
+{"version":3,"file":"i-medit-view-panel.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-medit-view-panel.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,MAAM,WAAW,YAAY;IAE3B,EAAE,EAAE,MAAM,CAAC;IAEX,OAAO,EAAE,KAAK,CAAC;IAEf,MAAM,EAAE,KAAK,CAAC;IAEd,IAAI,EAAE,SAAS,CAAC;IAEhB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,oBAAqB,SAAQ,eAAe;IAC3D;;;OAGG;IACH,YAAY,EAAE,YAAY,EAAE,CAAC;IAE7B;;;OAGG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;;OAGG;IACH,YAAY,EAAE,OAAO,CAAC;CACvB"}

package/out/interface/controller/state/control/panel-item/i-panel-item.state.d.ts

@@ -16,6 +16,14 @@ export interface IPanelItemState extends IColState {
      * @type {IPanelItemClass}
      */
     class: IPanelItemClass;
+    /**
+     * 是否必填
+     *
+     * @author chitanda
+     * @date 2023-11-11 09:11:53
+     * @type {boolean}
+     */
+    required: boolean;
 }
 export interface IPanelItemClass {
     /**

package/out/interface/controller/state/control/panel-item/i-panel-item.state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-panel-item.state.d.ts","sourceRoot":"","sources":["../../../../../../src/interface/controller/state/control/panel-item/i-panel-item.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,MAAM,WAAW,eAAgB,SAAQ,SAAS;IAChD;;;;;;;OAOG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;;;;OAKG;IACH,KAAK,EAAE,eAAe,CAAC;CACxB;AAED,MAAM,WAAW,eAAe;IAC9B;;;;;OAKG;IACH,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB;;;;;OAKG;IACH,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB;;;;;OAKG;IACH,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB;;;;;OAKG;IACH,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB"}
+{"version":3,"file":"i-panel-item.state.d.ts","sourceRoot":"","sources":["../../../../../../src/interface/controller/state/control/panel-item/i-panel-item.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,MAAM,WAAW,eAAgB,SAAQ,SAAS;IAChD;;;;;;;OAOG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;;;;OAKG;IACH,KAAK,EAAE,eAAe,CAAC;IAEvB;;;;;;OAMG;IACH,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,eAAe;IAC9B;;;;;OAKG;IACH,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB;;;;;OAKG;IACH,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB;;;;;OAKG;IACH,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB;;;;;OAKG;IACH,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.2.13",
+  "version": "0.2.16",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,11 +29,11 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.2.13",
+    "@ibiz-template/core": "^0.2.15",
     "@ibiz/model-core": "^0.0.20",
-    "@types/path-browserify": "^1.0.0",
-    "@types/qs": "^6.9.8",
-    "@types/systemjs": "^6.13.3",
+    "@types/path-browserify": "^1.0.2",
+    "@types/qs": "^6.9.10",
+    "@types/systemjs": "^6.13.5",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.10",
     "echarts": "^5.4.3",
@@ -46,7 +46,7 @@
     "ramda": "^0.29.1"
   },
   "peerDependencies": {
-    "@ibiz-template/core": "^0.1.0",
+    "@ibiz-template/core": "^0.2.13",
     "@ibiz/model-core": "^0.0.20",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.7",
@@ -58,5 +58,6 @@
     "qs": "^6.11.0",
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
-  }
+  },
+  "gitHead": "da5f79d37f6d81f1dc34eb4fa2e4b07bb08d6249"
 }

package/src/controller/common/control/md-control.controller.ts

@@ -318,7 +318,7 @@ export class MDControlController<
       }
 
       // 刷新数据，补全这一页缺少的数据
-      if (needRefresh) {
+      if (needRefresh && !args?.notRefresh) {
         await this.refresh();
       }
     } catch (error) {

package/src/controller/control/form/edit-form/edit-form.controller.ts

@@ -17,6 +17,7 @@ import {
   IEditViewState,
   IEditViewEvent,
   IDataAbilityParams,
+  FormSaveParams,
 } from '../../../../interface';
 import { calcDeCodeNameById, hasDeCodeName } from '../../../../model';
 import { Srfuf, ControlVO } from '../../../../service';
@@ -231,10 +232,11 @@ export class EditFormController
    * @author lxm
    * @date 2022-08-31 22:08:40
    */
-  async save(args?: IDataAbilityParams): Promise<IData> {
+  async save(args?: FormSaveParams): Promise<IData> {
+    const silent = args?.silent === true;
     // 如果数据正在处理中，则延迟保存
     if (this.state.processing) {
-      const data = await awaitTimeout(500, this.save.bind(this));
+      const data = await awaitTimeout(500, this.save.bind(this), [args]);
       return data!;
     }
 
@@ -242,7 +244,10 @@ export class EditFormController
     if (!isValid) {
       throw new RuntimeError('请检查表单填写！');
     }
-    await this.startLoading();
+
+    if (!silent) {
+      await this.startLoading();
+    }
     await this.evt.emit('onBeforeSave', undefined);
 
     const { context, data } = this.handlerAbilityParams(args);
@@ -261,20 +266,31 @@ export class EditFormController
       });
       throw error;
     } finally {
-      await this.endLoading();
+      if (!silent) {
+        await this.endLoading();
+      }
     }
 
+    const noFillBack = args?.noFillBack === true;
     // 保存结束后合并修改临时主键
     if (res.data) {
-      mergeInLeft(this.data, res.data);
+      // 回填数据的合并后台数据
+      if (noFillBack) {
+        // 自动保存不回填数据的时候只更新更新时间
+        this.data.updatedate = res.data.updatedate;
+      } else {
+        mergeInLeft(this.data, res.data);
+      }
       this.data.tempsrfkey = this.data.srfkey;
     }
     this.state.modified = false;
     await this.evt.emit('onSaveSuccess', undefined);
     this.formStateNotify(FormNotifyState.SAVE);
-    this.actionNotification(`${isCreate ? 'CREATE' : 'UPDATE'}SUCCESS`, {
-      default: `${this.data.srfmajortext || ''}保存成功`,
-    });
+    if (!silent) {
+      this.actionNotification(`${isCreate ? 'CREATE' : 'UPDATE'}SUCCESS`, {
+        default: `${this.data.srfmajortext || ''}保存成功`,
+      });
+    }
     if (this.view.modal.mode === 'ROUTE') {
       ibiz.mc.command.send(
         this.data.$origin,
@@ -342,7 +358,7 @@ export class EditFormController
    * @date 2022-09-01 09:09:36
    * @returns {*}
    */
-  async goBack(): Promise<void> {
+  async goBack(): Promise<IData> {
     await this.startLoading();
     let res;
     try {
@@ -354,6 +370,7 @@ export class EditFormController
     if (res.data) {
       mergeInLeft(this.data, res.data);
     }
+    return this.data;
   }
 
   /**
@@ -493,7 +510,7 @@ export class EditFormController
     if (this.model.enableAutoSave) {
       // 自动保存静默，报错直接控制台输出
       try {
-        await this.save();
+        await this.save({ silent: true, noFillBack: true });
       } catch (error) {
         ibiz.log.error(error);
       }

package/src/controller/control/grid/grid/grid.controller.ts

@@ -500,7 +500,6 @@ export class GridController
     if (!isValid) {
       throw new RuntimeError('行数据校验不通过，保存取消');
     }
-    await this.startLoading();
     let res;
     const deName = calcDeCodeNameById(this.model.appDataEntityId!);
     const tempContext = this.context.clone();
@@ -516,8 +515,6 @@ export class GridController
         data: rowState.data,
       });
       throw error;
-    } finally {
-      await this.endLoading();
     }
     // 后续处理
     const index = this.findRowStateIndex(data);

package/src/controller/control/medit-view-panel/medit-view-panel.controller.ts

@@ -10,8 +10,7 @@ import {
   IPanelUiItem,
   DataChangeEvent,
 } from '../../../interface';
-import { calcDeCodeNameById } from '../../../model';
-import { ControlVO, Srfuf } from '../../../service';
+import { ControlVO } from '../../../service';
 import { MDControlController } from '../../common';
 import { MEditViewPanelService } from './medit-view-panel.service';
 
@@ -32,12 +31,6 @@ export class MEditViewPanelController
 {
   declare service: MEditViewPanelService;
 
-  /**
-   * 是否显示底部按钮
-   *
-   */
-  showButton: boolean = true;
-
   /**
    * 当前应用视图参数对象
    *
@@ -56,6 +49,7 @@ export class MEditViewPanelController
     this.state.panelUiItems = [];
     this.state.activeTab = '';
     this.state.size = 1000;
+    this.state.isNeedScroll = false;
   }
 
   /**
@@ -99,12 +93,17 @@ export class MEditViewPanelController
     items: ControlVO[],
   ): Promise<ControlVO[]> {
     await super.afterLoad(args, items);
+    // 找出临时UI数据
+    const tempPanelUiItems = this.state.panelUiItems.filter(UiItem => {
+      return UiItem.id.startsWith('mockId:');
+    });
     this.state.panelUiItems = [];
-    this.doItems(items);
+    this.doItems(items, tempPanelUiItems);
     // 设置默认激活
     if (
       this.model.panelStyle === 'TAB_TOP' &&
-      this.state.panelUiItems.length > 0
+      this.state.panelUiItems.length > 0 &&
+      tempPanelUiItems.length === 0
     ) {
       this.state.activeTab = this.state.panelUiItems[0].id;
     }
@@ -158,11 +157,14 @@ export class MEditViewPanelController
    * @author: zhujiamin
    * @Date: 2023-10-16 15:00:02
    */
-  doItems(datas: ControlVO[]): void {
+  doItems(datas: ControlVO[], tempPanelUiItems?: IPanelUiItem[]): void {
     datas.forEach((arg: ControlVO) => {
       const item = this.handlePanelItemParams(arg);
       this.state.panelUiItems.push(item);
     });
+    if (tempPanelUiItems) {
+      this.state.panelUiItems.push(...tempPanelUiItems);
+    }
   }
 
   /**
@@ -172,6 +174,7 @@ export class MEditViewPanelController
    * @Date: 2023-10-16 15:18:01
    */
   async handleAdd(): Promise<void> {
+    this.state.isNeedScroll = true;
     this.doItems([{ srfuf: 0 } as ControlVO]);
     if (this.model.panelStyle === 'TAB_TOP') {
       // 上分页添加后激活最后一个
@@ -188,6 +191,7 @@ export class MEditViewPanelController
    * @Date: 2023-10-16 15:23:59
    */
   async handleDelete(item: IPanelUiItem): Promise<void> {
+    this.state.isNeedScroll = false;
     // 新建的界面上删除即可
     if (item.data.srfuf === 0) {
       // 删除items中已删除的项
@@ -196,7 +200,7 @@ export class MEditViewPanelController
       });
       this.state.panelUiItems.splice(index, 1);
     } else {
-      await this.remove({ data: [item.data] });
+      await this.remove({ data: [item.data], notRefresh: true });
     }
   }
 
@@ -253,53 +257,33 @@ export class MEditViewPanelController
   onViewDataChange(args: DataChangeEvent, id: string): void {
     // 新建的保存成功后该部件需要保存来更新数据
     if (args.eventName === 'onSaveSuccess') {
-      this.save(args.data[0] as ControlVO, id);
+      this.handleDataChange(args.data[0] as ControlVO, id);
     }
   }
 
   /**
-   * 保存
+   * 处理数据变化
    *
    * @param {ControlVO} data
    * @returns {*}  {Promise<void>}
    */
-  async save(data: ControlVO, id: string): Promise<void> {
+  async handleDataChange(data: ControlVO, id: string): Promise<void> {
     const panelUiItemIndex = this.state.panelUiItems.findIndex(
       item => item.id === id,
     );
-    if (!panelUiItemIndex) {
+    if (panelUiItemIndex < 0) {
       throw new RuntimeError('编辑视图面板部件UI数据不存在');
     }
-    await this.startLoading();
-    let res;
-    const isCreate = data.srfuf === Srfuf.CREATE;
-    const deName = calcDeCodeNameById(this.model.appDataEntityId!);
-    const tempContext = this.context.clone();
-    tempContext[deName] = data.srfkey;
-    try {
-      res = isCreate
-        ? await this.service.create(tempContext, data)
-        : await this.service.update(tempContext, data);
-    } catch (error) {
-      await this.evt.emit('onSaveError', undefined);
-      this.actionNotification(`${isCreate ? 'CREATE' : 'UPDATE'}ERROR`, {
-        error: error as Error,
-        data: this.state.panelUiItems[panelUiItemIndex].data,
-      });
-      throw error;
-    } finally {
-      await this.endLoading();
+    const tempUiItem = this.state.panelUiItems[panelUiItemIndex];
+    if (tempUiItem.id.startsWith('mockId:')) {
+      this.state.panelUiItems[panelUiItemIndex] =
+        this.handlePanelItemParams(data);
+    } else {
+      tempUiItem.srfmajortext = data.srfmajortext!;
+    }
+    if (this.model.panelStyle === 'TAB_TOP') {
+      // 上分页保存后激活保存的这一个
+      this.state.activeTab = this.state.panelUiItems[panelUiItemIndex].id;
     }
-    // 后续处理
-    const index = this.state.items.findIndex(
-      item => item.srfkey === data.srfkey,
-    );
-    this.state.items.splice(index, 1, res.data);
-    this.state.panelUiItems.splice(
-      panelUiItemIndex,
-      1,
-      this.handlePanelItemParams(res.data),
-    );
-    await this.evt.emit('onSaveSuccess', undefined);
   }
 }

package/src/controller/control/panel/panel/panel-item.controller.ts

@@ -4,12 +4,12 @@ import {
   IPanelItemController,
   IPanelController,
   IPanelDataContainerController,
+  IPanelItemState,
 } from '../../../../interface';
 import { calcLayoutHeightWidth, calcDynaClass } from '../../../../model';
 import { verifyPanelGroupLogic } from '../../../../utils';
 import { PanelNotifyState } from '../../../constant';
 import { PanelItemState } from './panel-item.state';
-import { PanelController } from './panel.controller';
 
 export class PanelItemController<T extends IPanelItem = IPanelItem>
   implements IPanelItemController
@@ -19,9 +19,9 @@ export class PanelItemController<T extends IPanelItem = IPanelItem>
    *
    * @author chitanda
    * @date 2023-01-04 09:01:04
-   * @type {PanelItemState}
+   * @type {IPanelItemState}
    */
-  state: PanelItemState;
+  state: IPanelItemState;
 
   /**
    * 数据父容器
@@ -72,13 +72,13 @@ export class PanelItemController<T extends IPanelItem = IPanelItem>
    * @author lxm
    * @date 2023-04-27 06:37:12
    * @param {T} model 面板成员模型
-   * @param {PanelController} panel 面板控制器
-   * @param {PanelItemController} [parent] 父容器控制器
+   * @param {IPanelController} panel 面板控制器
+   * @param {IPanelItemController} [parent] 父容器控制器
    */
   constructor(
     public readonly model: T,
-    public readonly panel: PanelController,
-    public readonly parent?: PanelItemController,
+    public readonly panel: IPanelController,
+    public readonly parent?: IPanelItemController,
   ) {
     this.state = this.createState();
   }

package/src/controller/control/wizard-panel/wizard-panel.controller.ts

@@ -207,6 +207,29 @@ export class WizardPanelController
     }
   }
 
+  /**
+   * 根据tag获取应该激活的向导表单
+   * @param {string} tag
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-11-10 18:35:37
+   */
+  getWizardFormByTag(tag: string): IDEWizardForm | undefined {
+    if (!this.model.dewizard?.dewizardForms) {
+      throw new RuntimeError(`没有配置向导表单集合`);
+      return;
+    }
+    const wizardForm = this.model.dewizard.dewizardForms.find(
+      (form: IDEWizardForm) => {
+        return form.formTag === tag;
+      },
+    );
+    if (!wizardForm) {
+      throw new RuntimeError(`找不到标识为${tag}的向导表单`);
+    }
+    return wizardForm;
+  }
+
   /**
    * 执行初始化操作，存在初始化实体行为的时候加载数据并把主键放入上下文
    *
@@ -221,8 +244,22 @@ export class WizardPanelController
       if (res.data && res.data.srfkey) {
         this.context[deName] = res.data.srfkey;
       }
+      // 初始化时状态向导面板根据状态属性去决定当前激活哪个表单
+      if (
+        res.data &&
+        this.model.stateAppDEFieldId &&
+        res.data[this.model.stateAppDEFieldId]
+      ) {
+        const activeForm = this.getWizardFormByTag(
+          res.data[this.model.stateAppDEFieldId],
+        );
+        if (activeForm) {
+          this.state.activeFormTag = activeForm.formTag!;
+        }
+      }
     }
-    if (this.firstForm) {
+    // 没有激活的表单标识就选配置的首表单
+    if (!this.state.activeFormTag && this.firstForm) {
       this.state.activeFormTag = this.firstForm.formTag!;
       this.tagHistory.push(this.firstForm.formTag!);
     }
@@ -250,10 +287,20 @@ export class WizardPanelController
    */
   async onPrevClick(): Promise<void> {
     // 先执行表单返回行为
-    await this.activeFormController.goBack();
-    // 返回上一个表单
-    this.tagHistory.pop();
-    const prevTag = this.tagHistory[this.tagHistory.length - 1];
+    const data = await this.activeFormController.goBack();
+    let prevTag;
+    // 返回上一个表单优先级 stateAppDEFieldId > tagHistory
+    if (this.model.stateAppDEFieldId && data[this.model.stateAppDEFieldId]) {
+      const wizardForm = this.getWizardFormByTag(
+        data[this.model.stateAppDEFieldId],
+      );
+      if (wizardForm) {
+        prevTag = data[this.model.stateAppDEFieldId];
+      }
+    } else {
+      prevTag = this.tagHistory[this.tagHistory.length - 1];
+      this.tagHistory.pop();
+    }
     if (!prevTag) {
       throw new RuntimeError('没有上一个表单');
     }
@@ -272,15 +319,21 @@ export class WizardPanelController
     const data = await this.activeFormController.save();
     let nextTag;
     if (data.srfnextform) {
-      const wizardForm = this.model.dewizard!.dewizardForms!.find(
-        (_wizardForm: IDEWizardForm) => {
-          return _wizardForm.formTag === data.srfnextform;
-        },
+      const wizardForm = this.getWizardFormByTag(data.srfnextform);
+      if (wizardForm) {
+        nextTag = data.srfnextform;
+        this.tagHistory.push(nextTag);
+      }
+    } else if (
+      this.model.stateAppDEFieldId &&
+      data[this.model.stateAppDEFieldId]
+    ) {
+      const wizardForm = this.getWizardFormByTag(
+        data[this.model.stateAppDEFieldId],
       );
-      if (!wizardForm) {
-        throw new RuntimeError(`找不到标识为${data.srfnextform}的向导表单`);
+      if (wizardForm) {
+        nextTag = data[this.model.stateAppDEFieldId];
       }
-      nextTag = data.srfnextform;
     } else {
       // 通过步骤找,找到下一个步骤对应的第一个向导表单
       const { formTag } = this.activeWizardForm!;
@@ -293,12 +346,8 @@ export class WizardPanelController
         if (!nextWizardStep) {
           throw new RuntimeError('找不到下一个向导步骤');
         }
-        const nextWizardForm = this.model.dewizard!.dewizardForms!.find(
-          (wizardForm: IDEWizardForm) => {
-            return wizardForm.formTag === nextWizardStep.stepTag;
-          },
-        );
-        if (nextWizardForm) {
+        const nextWizardForm = this.getWizardFormByTag(nextWizardStep.stepTag!);
+        if (nextWizardForm && nextWizardForm.formTag) {
           nextTag = nextWizardForm.formTag;
         }
       }

package/src/interface/common/i-data-ability-params/i-data-ability-params.ts

@@ -30,4 +30,12 @@ export interface IDataAbilityParams {
    * @type {IData[]}
    */
   data?: IData[] | IData;
+
+  /**
+   * 是否静默执行，不出loading效果，不弹成功提示
+   * @author lxm
+   * @date 2023-11-10 06:35:27
+   * @type {boolean}
+   */
+  silent?: boolean;
 }

package/src/interface/controller/controller/control/i-control.controller.ts

@@ -4,6 +4,7 @@ import { IControlState } from '../../state';
 import { IController } from '../i.controller';
 import { IViewController } from '../view/i-view.controller';
 import { IViewLayoutPanelController } from './i-view-layout-panel.controller';
+import { ControlLogicScheduler } from '../../../../logic-scheduler';
 
 /**
  * 部件控制器
@@ -34,6 +35,15 @@ export interface IControlController<
    */
   layoutPanel?: IViewLayoutPanelController;
 
+  /**
+   * 部件逻辑调度器
+   *
+   * @author chitanda
+   * @date 2023-11-11 10:11:16
+   * @type {ControlLogicScheduler}
+   */
+  scheduler?: ControlLogicScheduler;
+
   /**
    * 开始加载
    *

package/src/interface/controller/controller/control/i-edit-form.controller.ts

@@ -4,6 +4,16 @@ import { IEditFormEvent } from '../../event';
 import { IEditFormState } from '../../state';
 import { IFormController } from './i-form.controller';
 
+export interface FormSaveParams extends IDataAbilityParams {
+  /**
+   * 保存之后是否不合并后台回来的数据
+   * @author lxm
+   * @date 2023-11-11 11:28:23
+   * @type {boolean}
+   */
+  noFillBack?: boolean;
+}
+
 /**
  * 编辑表单控制器
  * @author lxm
@@ -28,7 +38,7 @@ export interface IEditFormController
    * @date 2023-05-16 12:59:03
    * @return {*}  {Promise<IData>}
    */
-  save(args?: IDataAbilityParams): Promise<IData>;
+  save(args?: FormSaveParams): Promise<IData>;
 
   /**
    * 删除表单数据

package/src/interface/controller/controller/control/i-md-control.controller.ts

@@ -22,12 +22,12 @@ export interface MDCtrlLoadParams extends IDataAbilityParams {
 
 export interface MDCtrlRemoveParams extends IDataAbilityParams {
   /**
-   * 是否静默删除
+   * 是否不需要刷新(默认为否，如果不需要刷新传true)
    * @author lxm
    * @date 2023-08-17 06:04:23
    * @type {boolean}
    */
-  silent?: boolean;
+  notRefresh?: boolean;
 }
 
 /**

package/src/interface/controller/controller/control/i-medit-view-panel.controller.ts

@@ -14,4 +14,11 @@ export interface IMEditViewPanelController<
   T extends IDEMultiEditViewPanel = IDEMultiEditViewPanel,
   S extends IMEditViewPanelState = IMEditViewPanelState,
   E extends IMEditViewPanelEvent = IMEditViewPanelEvent,
-> extends IMDControlController<T, S, E> {}
+> extends IMDControlController<T, S, E> {
+  /**
+   * 处理添加
+   *
+   * @memberof IMEditViewPanelController
+   */
+  handleAdd(): Promise<void>;
+}