@ibiz-template/runtime 0.4.10 → 0.4.12

package/out/service/vo/gantt-node-data/gantt-node-data-util.d.ts

@@ -0,0 +1,9 @@
+import { IDETreeNode } from '@ibiz/model-core';
+/**
+ * 计算数据项
+ * @param nodeModel
+ * @param fieldCodeName
+ * @returns
+ */
+export declare const calcDataItemValue: (fieldCodeName: string | undefined, nodeModel: IDETreeNode, data?: IData) => string;
+//# sourceMappingURL=gantt-node-data-util.d.ts.map

package/out/service/vo/gantt-node-data/gantt-node-data-util.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"gantt-node-data-util.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/gantt-node-data/gantt-node-data-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAuB,MAAM,kBAAkB,CAAC;AAEpE;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,kBACb,MAAM,GAAG,SAAS,aACtB,WAAW,SAChB,KAAK,KACV,MAaF,CAAC"}

package/out/service/vo/gantt-node-data/gantt-node-data-util.js

@@ -0,0 +1,19 @@
+/**
+ * 计算数据项
+ * @param nodeModel
+ * @param fieldCodeName
+ * @returns
+ */
+export const calcDataItemValue = (fieldCodeName, nodeModel, data = {}) => {
+    let result = '';
+    if (!fieldCodeName || !nodeModel.detreeNodeDataItems) {
+        return result;
+    }
+    const targetTreeNodeDataItem = nodeModel.detreeNodeDataItems.find((nodeDataItem) => {
+        return nodeDataItem.id === fieldCodeName;
+    });
+    if (targetTreeNodeDataItem && targetTreeNodeDataItem.appDEFieldId) {
+        result = data[targetTreeNodeDataItem.appDEFieldId];
+    }
+    return result;
+};

package/out/service/vo/gantt-node-data/gantt-static-node-data.d.ts

@@ -0,0 +1,17 @@
+import { IDEGantt, IDETreeNode } from '@ibiz/model-core';
+import { IGanttNodeData } from '../../../interface';
+import { TreeStaticNodeData } from '../tree-node-data';
+export declare class GanttStaticNodeData extends TreeStaticNodeData implements IGanttNodeData {
+    sndataIteValue: string;
+    beginDataItemValue: string;
+    endDataItemValue: string;
+    prevDataItemValue: string | number;
+    finishDataItemValue: string | number;
+    totalDataItemValue: string | number;
+    children?: IGanttNodeData[] | undefined;
+    constructor(model: IDEGantt, nodeModel: IDETreeNode, parentNodeData: IGanttNodeData | undefined, opts: {
+        parentValueLevel?: number;
+        leaf: boolean;
+    });
+}
+//# sourceMappingURL=gantt-static-node-data.d.ts.map

package/out/service/vo/gantt-node-data/gantt-static-node-data.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"gantt-static-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/gantt-node-data/gantt-static-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAGvD,qBAAa,mBACX,SAAQ,kBACR,YAAW,cAAc;IAEzB,cAAc,EAAE,MAAM,CAAC;IAEvB,kBAAkB,EAAE,MAAM,CAAC;IAE3B,gBAAgB,EAAE,MAAM,CAAC;IAEzB,iBAAiB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEnC,mBAAmB,EAAE,MAAM,GAAG,MAAM,CAAC;IAErC,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEpC,QAAQ,CAAC,EAAE,cAAc,EAAE,GAAG,SAAS,CAAC;gBAGtC,KAAK,EAAE,QAAQ,EACf,SAAS,EAAE,WAAW,EACtB,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,IAAI,EAAE;QAAE,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,CAAA;KAAE;CAsBrD"}

package/out/service/vo/gantt-node-data/gantt-static-node-data.js

@@ -0,0 +1,13 @@
+import { TreeStaticNodeData } from '../tree-node-data';
+import { calcDataItemValue } from './gantt-node-data-util';
+export class GanttStaticNodeData extends TreeStaticNodeData {
+    constructor(model, nodeModel, parentNodeData, opts) {
+        super(nodeModel, parentNodeData, opts);
+        this.sndataIteValue = calcDataItemValue(model.sndataItemName, nodeModel);
+        this.beginDataItemValue = calcDataItemValue(model.beginDataItemName, nodeModel);
+        this.endDataItemValue = calcDataItemValue(model.endDataItemName, nodeModel);
+        this.prevDataItemValue = calcDataItemValue(model.prevDataItemName, nodeModel);
+        this.finishDataItemValue = calcDataItemValue(model.finishDataItemName, nodeModel);
+        this.totalDataItemValue = calcDataItemValue(model.totalDataItemName, nodeModel);
+    }
+}

package/out/service/vo/gantt-node-data/index.d.ts

@@ -0,0 +1,4 @@
+export { GanttStaticNodeData } from './gantt-static-node-data';
+export { GanttDataSetNodeData } from './gantt-data-set-node-data';
+export { GanttCodeListNodeData } from './gantt-code-list-node-data';
+//# sourceMappingURL=index.d.ts.map

package/out/service/vo/gantt-node-data/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/gantt-node-data/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC"}

package/out/service/vo/gantt-node-data/index.js

@@ -0,0 +1,3 @@
+export { GanttStaticNodeData } from './gantt-static-node-data';
+export { GanttDataSetNodeData } from './gantt-data-set-node-data';
+export { GanttCodeListNodeData } from './gantt-code-list-node-data';

package/out/service/vo/index.d.ts

@@ -5,4 +5,5 @@ export * from './calendar-item-data';
 export * from './map-data';
 export * from './panel-data';
 export * from './chart-data';
+export * from './gantt-node-data';
 //# sourceMappingURL=index.d.ts.map

package/out/service/vo/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/service/vo/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/service/vo/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC"}

package/out/service/vo/index.js

@@ -5,3 +5,4 @@ export * from './calendar-item-data';
 export * from './map-data';
 export * from './panel-data';
 export * from './chart-data';
+export * from './gantt-node-data';

package/out/ui-action/provider/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;GAMG;AACH,wBAAgB,sBAAsB,IAAI,IAAI,CAkB7C;AAED,OAAO,EACL,qBAAqB,EACrB,mBAAmB,EACnB,uBAAuB,EACvB,0BAA0B,EAC1B,oBAAoB,GACrB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAGjE;;;;;;GAMG;AACH,wBAAgB,sBAAsB,IAAI,IAAI,CAqB7C;AAED,OAAO,EACL,qBAAqB,EACrB,mBAAmB,EACnB,uBAAuB,EACvB,0BAA0B,EAC1B,oBAAoB,GACrB,CAAC"}

package/out/ui-action/provider/index.js

@@ -4,6 +4,7 @@ import { SysUIActionProvider } from './sys-ui-action-provider';
 import { FrontUIActionProvider } from './front-ui-action-provider';
 import { WFWithdrawUIActionProvider } from './wf-withdraw-ui-action-provider';
 import { UIActionProviderBase } from './ui-action-provider-base';
+import { LoginOutUIActionProvider } from './loginout-ui-action-provider';
 /**
  * 预置默认的界面行为适配器
  *
@@ -25,5 +26,8 @@ export function presetUIActionProvider() {
     // 工作流撤回
     const wfWithdrawUIActionProvider = new WFWithdrawUIActionProvider();
     registerUIActionProvider('DEUIACTION_WFWithdraw', () => wfWithdrawUIActionProvider);
+    // 预置登出界面行为适配器
+    const loginOutUIActionProvider = new LoginOutUIActionProvider();
+    registerUIActionProvider('SYS_Logout', () => loginOutUIActionProvider);
 }
 export { FrontUIActionProvider, SysUIActionProvider, BackendUIActionProvider, WFWithdrawUIActionProvider, UIActionProviderBase, };

package/out/ui-action/provider/loginout-ui-action-provider.d.ts

@@ -0,0 +1,16 @@
+import { IAppDEUIAction } from '@ibiz/model-core';
+import { IUIActionResult, IUILogicParams } from '../../interface';
+import { UIActionProviderBase } from './ui-action-provider-base';
+/**
+ * 系统登出界面行为适配器
+ *
+ * @author zk
+ * @date 2023-12-11 07:12:49
+ * @export
+ * @class LoginOutUIActionProvider
+ * @extends {UIActionProviderBase}
+ */
+export declare class LoginOutUIActionProvider extends UIActionProviderBase {
+    execAction(_action: IAppDEUIAction, _params: IUILogicParams): Promise<IUIActionResult>;
+}
+//# sourceMappingURL=loginout-ui-action-provider.d.ts.map

package/out/ui-action/provider/loginout-ui-action-provider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"loginout-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/loginout-ui-action-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,wBAAyB,SAAQ,oBAAoB;IAC1D,UAAU,CACd,OAAO,EAAE,cAAc,EACvB,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,eAAe,CAAC;CAa5B"}

package/out/ui-action/provider/loginout-ui-action-provider.js

@@ -0,0 +1,25 @@
+import { UIActionProviderBase } from './ui-action-provider-base';
+/**
+ * 系统登出界面行为适配器
+ *
+ * @author zk
+ * @date 2023-12-11 07:12:49
+ * @export
+ * @class LoginOutUIActionProvider
+ * @extends {UIActionProviderBase}
+ */
+export class LoginOutUIActionProvider extends UIActionProviderBase {
+    async execAction(_action, _params) {
+        const confirm = await ibiz.confirm.info({
+            title: '确认退出登录',
+            desc: '您确定要退出登录吗？退出后您将无法继续访问已登录状态的功能和信息，请确保您已保存所有未完成的操作。',
+        });
+        if (confirm) {
+            const bol = await ibiz.auth.logout();
+            if (bol) {
+                window.location.reload();
+            }
+        }
+        return {};
+    }
+}

package/out/utils/layout-panel-util/layout-panel-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"layout-panel-util.d.ts","sourceRoot":"","sources":["../../../src/utils/layout-panel-util/layout-panel-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAG7E;;;;;;;GAOG;AACH,qBAAa,eAAe;IAC1B;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAa;IAE3D;;;;;;;OAOG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,GAAG,IAAI;IAIpD;;;;;;OAMG;IACH,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS;IAI9C;;;;;;;OAOG;IACH,IAAI,CAAC,SAAS,EAAE,QAAQ,GAAG,QAAQ;IAgCnC;;;;;;;;OAQG;IACH,SAAS,CAAC,aAAa,CAAC,SAAS,EAAE,QAAQ,GAAG,MAAM;IAUpD;;;;;;;;OAQG;IACH,SAAS,CAAC,sBAAsB,CAAC,SAAS,EAAE,aAAa,GAAG,MAAM;CAcnE"}
+{"version":3,"file":"layout-panel-util.d.ts","sourceRoot":"","sources":["../../../src/utils/layout-panel-util/layout-panel-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAG7E;;;;;;;GAOG;AACH,qBAAa,eAAe;IAC1B;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAa;IAE3D;;;;;;;OAOG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,GAAG,IAAI;IAIpD;;;;;;OAMG;IACH,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS;IAI9C;;;;;;;OAOG;IACH,IAAI,CAAC,SAAS,EAAE,QAAQ,GAAG,QAAQ;IAgCnC;;;;;;;;OAQG;IACH,SAAS,CAAC,aAAa,CAAC,SAAS,EAAE,QAAQ,GAAG,MAAM;IAUpD;;;;;;;;OAQG;IACH,SAAS,CAAC,sBAAsB,CAAC,SAAS,EAAE,aAAa,GAAG,MAAM;CA6BnE"}

package/out/utils/layout-panel-util/layout-panel-util.js

@@ -116,9 +116,23 @@ export class LayoutPanelUtil {
         else if (mainMenuAlign) {
             exTag = mainMenuAlign.toUpperCase();
         }
+        // 计算面板标识
+        let key = '';
         if (exTag !== '') {
-            return `${viewType}_${viewStyle}_${exTag}`;
+            key = `${viewType}_${viewStyle}_${exTag}`;
         }
-        return `${viewType}_${viewStyle}`;
+        else {
+            key = `${viewType}_${viewStyle}`;
+        }
+        // 首页不采用分页导航
+        if (ibiz.config.view.noNavTabs &&
+            [
+                'APPINDEXVIEW_DEFAULT',
+                'APPINDEXVIEW_DEFAULT_LEFT',
+                'APPINDEXVIEW_DEFAULT_TOP',
+            ].includes(key)) {
+            key += '_NO_NAV';
+        }
+        return key;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.4.10",
+  "version": "0.4.12",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,7 +29,7 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.4.9",
+    "@ibiz-template/core": "^0.4.12",
     "@ibiz/model-core": "^0.0.27",
     "@types/path-browserify": "^1.0.2",
     "@types/qs": "^6.9.10",
@@ -59,5 +59,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "88ed67d86d5cb1fe5d8e0683cef777f1c607611f"
+  "gitHead": "df161fe8da63b34ffccd27b30e6cd51769b0a51d"
 }

package/src/config/global-config.ts

@@ -21,6 +21,7 @@ export class GlobalConfig implements IGlobalConfig {
   view: IGlobalViewConfig = {
     enableDataInfoBar: true,
     expCacheMode: 'TABEXPPANEL:',
+    noNavTabs: false,
   };
 
   // 全局表格配置

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

@@ -149,6 +149,7 @@ export class ControlController<
 
   protected initState(): void {
     super.initState();
+    this.state.activated = true;
     this.state.isLoading = false;
   }
 
@@ -269,6 +270,28 @@ export class ControlController<
     this.ctx.endLoading();
   }
 
+  /**
+   * 部件重新激活
+   *
+   * @author chitanda
+   * @date 2023-07-12 17:07:55
+   */
+  onActivated(): void {
+    this.state.activated = true;
+    ibiz.log.debug(`视图[${this.model.name}](${this.model.id})激活`);
+  }
+
+  /**
+   * 部件暂时停用
+   *
+   * @author chitanda
+   * @date 2023-07-12 17:07:06
+   */
+  onDeactivated(): void {
+    this.state.activated = false;
+    ibiz.log.debug(`视图[${this.model.name}](${this.model.id})暂停`);
+  }
+
   /**
    * 处理数据能力方法通用参数，返回能力执行最终使用的参数
    * @author lxm

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

@@ -42,6 +42,15 @@ export class MDControlController<
    */
   service!: MDControlService;
 
+  /**
+   * 在未激活时记录是否有 command 数据变更事件，有就记录。等待激活时刷新
+   *
+   * @author chitanda
+   * @date 2023-12-13 11:12:19
+   * @protected
+   */
+  protected commandDataChange = false;
+
   protected get _evt(): ControllerEvent<IMDControlEvent> {
     return this.evt;
   }
@@ -127,7 +136,19 @@ export class MDControlController<
    */
   protected onDataChange(msg: IData): void {
     if (msg.data && msg.data.srfdecodename === this.dataEntity.codeName) {
+      if (this.state.activated) {
+        this.refresh();
+      } else {
+        this.commandDataChange = true;
+      }
+    }
+  }
+
+  onActivated(): void {
+    super.onActivated();
+    if (this.commandDataChange) {
       this.refresh();
+      this.commandDataChange = false;
     }
   }
 

package/src/controller/common/view/view.controller.ts

@@ -94,10 +94,16 @@ export class ViewController<
     return this.ctx.parent?.view;
   }
 
-  protected _isActive = true;
-
+  /**
+   * 当前是否为激活状态(缓存下的激活状态，一般与框架的生命周期相同)
+   *
+   * @author chitanda
+   * @date 2023-12-13 11:12:48
+   * @readonly
+   * @type {boolean}
+   */
   get isActive(): boolean {
-    return this._isActive;
+    return this.state.activated;
   }
 
   /**
@@ -148,7 +154,7 @@ export class ViewController<
    * @date 2023-07-12 17:07:55
    */
   onActivated(): void {
-    this._isActive = true;
+    this.state.activated = true;
     ibiz.log.debug(`视图[${this.model.name}](${this.model.id})激活`);
   }
 
@@ -159,7 +165,7 @@ export class ViewController<
    * @date 2023-07-12 17:07:06
    */
   onDeactivated(): void {
-    this._isActive = false;
+    this.state.activated = false;
     ibiz.log.debug(`视图[${this.model.name}](${this.model.id})暂停`);
   }
 
@@ -224,6 +230,7 @@ export class ViewController<
 
   protected initState(): void {
     super.initState();
+    this.state.activated = true;
     this.state.isLoading = false;
     this.state.caption = this.model.caption!;
     this.state.srfactiveviewdata = null;

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

@@ -3,7 +3,6 @@ import {
   IHttpResponse,
   mergeInLeft,
   RuntimeError,
-  mergeDefaultInLeft,
 } from '@ibiz-template/core';
 import { IAppDEEditView, IDEEditForm } from '@ibiz/model-core';
 import { debounce } from 'lodash-es';
@@ -92,9 +91,6 @@ export class EditFormController
    */
   async loadDraft(args?: IDataAbilityParams): Promise<IData> {
     const { context, params: queryParams } = this.handlerAbilityParams(args);
-    // 新建默认值给到graft接口，接口会回来
-    const params = await this.getDraftParams(); // 新建默认值
-    Object.assign(queryParams, params);
 
     let res;
     try {
@@ -112,9 +108,6 @@ export class EditFormController
     }
 
     this.state.data = res.data;
-    // 处理后台导致的新建默认值丢失
-    mergeDefaultInLeft(this.data, params);
-
     this.formStateNotify(FormNotifyState.DRAFT);
 
     await this.evt.emit('onLoadDraftSuccess', undefined);
@@ -293,12 +286,10 @@ export class EditFormController
         default: `${this.data.srfmajortext || ''}保存成功`,
       });
     }
-    if (this.view.modal.mode === 'ROUTE') {
-      ibiz.mc.command.send(
-        this.data.$origin,
-        isCreate ? 'OBJECTCREATED' : 'OBJECTUPDATED',
-      );
-    }
+    ibiz.mc.command.send(
+      this.data.$origin,
+      isCreate ? 'OBJECTCREATED' : 'OBJECTUPDATED',
+    );
     return this.data;
   }
 
@@ -346,9 +337,7 @@ export class EditFormController
     await this.evt.emit('onRemoveSuccess', undefined);
     this.actionNotification('REMOVESUCCESS');
 
-    if (this.view.modal.mode === 'ROUTE') {
-      ibiz.mc.command.send(this.data.$origin, 'OBJECTREMOVED');
-    }
+    ibiz.mc.command.send(this.data.$origin, 'OBJECTREMOVED');
 
     return ok;
   }
@@ -392,41 +381,57 @@ export class EditFormController
       throw new RuntimeError(`没找到${formItemUpdateId}表单项更新`);
     }
 
-    const { appDEMethodId, defiupdateDetails, customCode, scriptCode } =
-      formItemUpdate;
+    const {
+      appDEMethodId,
+      defiupdateDetails,
+      customCode,
+      scriptCode,
+      showBusyIndicator,
+    } = formItemUpdate;
     const updateItems = defiupdateDetails?.map(item => item.id!);
 
-    let updateData: IData; // 要修改的数据
-    if (customCode && scriptCode) {
-      // 脚本模式获取修改数据
-      updateData = ScriptFactory.execScriptFn(
-        {
-          ...this.getEventArgs(),
-          data: this.data,
-        },
-        scriptCode,
-        {
-          isAsync: false,
-        },
-      ) as IData;
-    } else {
-      // 后台服务获取修改数据
-      const params = { ...this.params, ...this.data.getOrigin() };
-      const res = await this.service.updateFormItem(
-        appDEMethodId!,
-        this.context,
-        params,
-      );
-      updateData = res.data;
-    }
+    try {
+      if (showBusyIndicator) {
+        this.startLoading();
+      }
+      let updateData: IData; // 要修改的数据
+      if (customCode && scriptCode) {
+        // 脚本模式获取修改数据
+        updateData = ScriptFactory.execScriptFn(
+          {
+            ...this.getEventArgs(),
+            data: this.data,
+          },
+          scriptCode,
+          {
+            isAsync: false,
+          },
+        ) as IData;
+      } else {
+        // 后台服务获取修改数据
+        const params = { ...this.params, ...this.data.getOrigin() };
+        const res = await this.service.updateFormItem(
+          appDEMethodId!,
+          this.context,
+          params,
+        );
+        updateData = res.data;
+      }
+
+      // 修改表单项更新的值
+      if (updateData && updateItems?.length) {
+        await Promise.all(
+          updateItems.map(itemName =>
+            this.setDataValue(itemName, updateData[itemName]),
+          ),
+        );
+      }
 
-    // 修改表单项更新的值
-    if (updateData && updateItems?.length) {
-      await Promise.all(
-        updateItems.map(itemName =>
-          this.setDataValue(itemName, updateData[itemName]),
-        ),
-      );
+      await awaitTimeout(2000);
+    } finally {
+      if (showBusyIndicator) {
+        this.endLoading();
+      }
     }
   }
 
@@ -447,11 +452,9 @@ export class EditFormController
     const { context, params } = this.handlerAbilityParams(args);
     try {
       await this.service.wfStart(context, params, this.data);
-      if (this.view.modal.mode === 'ROUTE') {
-        ibiz.mc.command.send(this.data.$origin, 'OBJECTUPDATED');
-        // 刷新预定义todo实体数据
-        ibiz.mc.command.send({ srfdecodename: 'SysTodo' }, 'OBJECTUPDATED');
-      }
+      ibiz.mc.command.send(this.data.$origin, 'OBJECTUPDATED');
+      // 刷新预定义todo实体数据
+      ibiz.mc.command.send({ srfdecodename: 'SysTodo' }, 'OBJECTUPDATED');
     } catch (error) {
       this.actionNotification('WFSTARTERROR', {
         error: error as Error,
@@ -481,11 +484,9 @@ export class EditFormController
     const { context, params } = this.handlerAbilityParams(args);
     try {
       await this.service.wfSubmit(context, params, this.data);
-      if (this.view.modal.mode === 'ROUTE') {
-        ibiz.mc.command.send(this.data.$origin, 'OBJECTUPDATED');
-        // 刷新预定义todo实体数据
-        ibiz.mc.command.send({ srfdecodename: 'SysTodo' }, 'OBJECTUPDATED');
-      }
+      ibiz.mc.command.send(this.data.$origin, 'OBJECTUPDATED');
+      // 刷新预定义todo实体数据
+      ibiz.mc.command.send({ srfdecodename: 'SysTodo' }, 'OBJECTUPDATED');
     } catch (error) {
       this.actionNotification('WFSUBMITERROR', {
         error: error as Error,

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

@@ -10,11 +10,12 @@ import {
   IDEWizardEditForm,
   IWFEditForm,
 } from '@ibiz/model-core';
-import { ControlService, ControlVO, UIMapField } from '../../../../service';
+import { ControlVO, UIMapField } from '../../../../service';
+import { FormService } from '../form/form.service';
 
 export class EditFormService<
   T extends IDEEditForm = IDEEditForm,
-> extends ControlService<T> {
+> extends FormService<T> {
   /**
    * 执行获取单条数据方法
    *
@@ -35,6 +36,10 @@ export class EditFormService<
       params,
     );
     res = this.handleResponse(res);
+    // 设置默认值
+    if (res.ok && res.data) {
+      this.setDefault(res.data, context, params, 'update');
+    }
     return res as IHttpResponse<ControlVO>;
   }
 
@@ -58,6 +63,10 @@ export class EditFormService<
       params,
     );
     res = this.handleResponse(res);
+    // 设置默认值
+    if (res.ok && res.data) {
+      this.setDefault(res.data, context, params, 'create');
+    }
     return res as IHttpResponse<ControlVO>;
   }
 

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

@@ -158,20 +158,6 @@ export abstract class FormController<
     });
   }
 
-  /**
-   * 获取加载草稿额外参数，新建默认值
-   * @author lxm
-   * @date 2023-04-27 10:32:06
-   * @return {*}
-   */
-  async getDraftParams(): Promise<IData> {
-    const result: IData = {};
-    await Promise.all(
-      this.formItems.map(item => item.setDefaultValue(true, result)),
-    );
-    return result;
-  }
-
   /**
    * 初始化表单成员控制器
    *

package/src/controller/control/form/form/form.service.ts

@@ -0,0 +1,63 @@
+import { IDEEditFormItem, IDEForm } from '@ibiz/model-core';
+import { recursiveIterate } from '@ibiz-template/core';
+import { ControlService } from '../../../../service';
+import { getDefaultValue } from '../../../utils';
+
+/**
+ * 表单的部件服务
+ * @author lxm
+ * @date 2023-12-13 03:04:57
+ * @export
+ * @class FormService
+ * @extends {ControlService<T>}
+ * @template T
+ */
+export class FormService<
+  T extends IDEForm = IDEForm,
+> extends ControlService<T> {
+  /**
+   * 设置表单项的默认值
+   * @author lxm
+   * @date 2023-12-13 03:16:19
+   * @param {IData} data 表单数据
+   * @param {IParams} context 上下文
+   * @param {IParams} params 视图参数
+   * @param {('create' | 'update')} type 新建还是更新
+   */
+  setDefault(
+    data: IData,
+    context: IParams,
+    params: IParams,
+    type: 'create' | 'update',
+  ): void {
+    // 递归所有的表单项，设置默认值
+    recursiveIterate(
+      this.model,
+      (item: IDEEditFormItem) => {
+        if (item.detailType === 'FORMITEM') {
+          const { createDVT, createDV, updateDVT, updateDV, valueFormat } =
+            item;
+          const valueType = type === 'create' ? createDVT : updateDVT;
+          const defaultValue = type === 'create' ? createDV : updateDV;
+          const name = item.id!.toLowerCase();
+
+          const defaultVal = getDefaultValue(
+            {
+              name,
+              valueType,
+              defaultValue,
+              valueFormat,
+            },
+            { data, context, params },
+          );
+          if (defaultVal !== undefined) {
+            data[name] = defaultVal;
+          }
+        }
+      },
+      {
+        childrenFields: ['deformPages', 'deformTabPages', 'deformDetails'],
+      },
+    );
+  }
+}