@ibiz-template/runtime 0.6.13 → 0.6.15

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

@@ -1,11 +1,13 @@
+/// <reference types="node" />
 import { IControl, IControlLogic, IViewLayoutPanel } from '@ibiz/model-core';
-import { IBizParams } from '@ibiz-template/core';
+import { IBizParams, IPortalMessage } from '@ibiz-template/core';
 import { BaseController } from '..';
 import { CTX } from '../../ctx';
 import { EventBase, IControlController, IControlEvent, IControlState, IViewController, IViewLayoutPanelController } from '../../../interface/controller';
 import { ControllerEvent } from '../../utils';
 import { IDataAbilityParams, IProvider } from '../../../interface';
 import { ControlLogicScheduler } from '../../../logic-scheduler';
+export type DEDataChangeType = 'create' | 'update' | 'remove';
 /**
  * 部件控制器
  *
@@ -51,6 +53,28 @@ export declare class ControlController<T extends IControl = IControl, S extends
         [key: string]: IProvider;
     };
     params: IBizParams;
+    /**
+     * 触发源key
+     *
+     * @author tony001
+     * @date 2024-03-28 17:03:03
+     * @type {string}
+     */
+    triggerKey: string;
+    /**
+     * 等到激活的回调函数集合
+     *
+     * @author tony001
+     * @date 2024-03-28 17:03:15
+     */
+    awaitActiveCbs: Map<string, () => void>;
+    /**
+     * 延迟执行（防抖用）
+     *
+     * @author tony001
+     * @date 2024-03-28 17:03:27
+     */
+    delayCbs: Map<string, NodeJS.Timeout>;
     /**
      * Creates an instance of ControlController.
      *
@@ -184,5 +208,38 @@ export declare class ControlController<T extends IControl = IControl, S extends
         data?: IData | IData[];
         error?: Error;
     }): void;
+    /**
+     * 监听实体数据变更
+     *
+     * @author tony001
+     * @date 2024-03-28 18:03:33
+     * @protected
+     * @param {IPortalMessage} msg
+     */
+    protected onDEDataChange(msg: IPortalMessage): void;
+    /**
+     * 触发实体数据变更的通知
+     *
+     * @author tony001
+     * @date 2024-03-28 18:03:44
+     * @param {('create' | 'update' | 'remove')} type
+     * @param {IData} data
+     */
+    emitDEDataChange(type: 'create' | 'update' | 'remove', data: IData): void;
+    /**
+     * 如果当前视图没有激活，则等待激活后执行回调函数
+     * - 在执行之前key相同的会替换
+     * 如果当前视图已经激活，则立即执行回调函数
+     * - delay参数指定延迟执行时间,可以防抖
+     *
+     * @author tony001
+     * @date 2024-03-28 18:03:00
+     * @param {() => void} cb
+     * @param {{ key: string; delay?: number }} opts
+     */
+    doNextActive(cb: () => void, opts: {
+        key: string;
+        delay?: number;
+    }): void;
 }
 //# sourceMappingURL=control.controller.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"control.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/control/control.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,aAAa,EAEb,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAGL,UAAU,EAEX,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,cAAc,EAAE,MAAM,IAAI,CAAC;AACpC,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAChC,OAAO,EACL,SAAS,EACT,kBAAkB,EAClB,aAAa,EACb,aAAa,EACb,eAAe,EACf,0BAA0B,EAC3B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EACL,kBAAkB,EAClB,SAAS,EAEV,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAKjE;;;;;;;GAOG;AACH,qBAAa,iBAAiB,CAC1B,CAAC,SAAS,QAAQ,GAAG,QAAQ,EAC7B,CAAC,SAAS,aAAa,GAAG,aAAa,EACvC,CAAC,SAAS,aAAa,GAAG,aAAa,CAEzC,SAAQ,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAC9B,YAAW,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEtC,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,aAAa,CAAC,CAEnD;IAED,IAAI,IAAI,IAAI,eAAe,CAE1B;IAED;;;;;OAKG;IACH,SAAS,CAAC,EAAE,qBAAqB,CAAC;IAElC;;;;;OAKG;IACH,YAAY,CAAC,EAAE,gBAAgB,CAAC;IAEhC,WAAW,CAAC,EAAE,0BAA0B,CAAC;IAEzC;;;;;;;OAOG;IACH,aAAa,EAAE,KAAK,CAAM;IAE1B;;;;;OAKG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAM;IAErC,MAAM,EAAE,UAAU,CAAC;IAE3B;;;;;;;;OAQG;gBACS,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG;IAuBlE;;;;;OAKG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IAI/B;;;;;OAKG;IACH,YAAY,IAAI,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC;IAS5C,SAAS,CAAC,SAAS,IAAI,IAAI;cAMX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cA0B1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAO1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ5C;;;;;;OAMG;IACH,mBAAmB,CAAC,IAAI,EAAE;QAAE,OAAO,CAAC,EAAE,QAAQ,CAAC;QAAC,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI;IAyBzE;;;;;OAKG;IACH,cAAc,IAAI,MAAM;IAIxB;;;;;OAKG;IACH,OAAO,IAAI,KAAK,EAAE,GAAG,IAAI;IAIzB;;;;;;OAMG;IACG,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAKnC;;;;;;OAMG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAKjC;;;;;OAKG;IACH,WAAW,IAAI,IAAI;IAKnB;;;;;OAKG;IACH,aAAa,IAAI,IAAI;IAKrB;;;;;;;OAOG;IACH,SAAS,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG;QACzD,OAAO,EAAE,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;QAChB,IAAI,EAAE,KAAK,EAAE,CAAC;KACf;IAqBD;;;;;OAKG;IACH,cAAc,CAAC,KAAK,EAAE,0BAA0B,GAAG,IAAI;IAWvD;;;;;;;OAOG;IACH,SAAS,CAAC,mBAAmB,IAAI,IAAI;IAYrC;;;;;;OAMG;IACH,SAAS,CAAC,oBAAoB,CAAC,MAAM,GAAE,aAAa,EAAO,GAAG,IAAI;IAUlE;;;;;;;OAOG;IACH,kBAAkB,CAChB,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,KAAK,CAAA;KAAE,GACjE,IAAI;CAmER"}
+{"version":3,"file":"control.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/control/control.controller.ts"],"names":[],"mappings":"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"}

package/out/controller/common/control/control.controller.js

@@ -1,10 +1,11 @@
-import { HttpError, IBizContext, IBizParams, NoticeError, } from '@ibiz-template/core';
+import { HttpError, IBizContext, IBizParams, NoticeError, RuntimeError, } from '@ibiz-template/core';
 import { clone, isNil } from 'ramda';
 import { notNilEmpty } from 'qx-util';
 import { BaseController } from '..';
 import { getControlProvider } from '../../../register';
 import { convertNavData, ScriptFactory } from '../../../utils';
-import { getControlPanel } from '../../../model';
+import { calcDeCodeNameById, getControlPanel } from '../../../model';
+import { ControlVO } from '../../../service';
 /**
  * 部件控制器
  *
@@ -47,6 +48,28 @@ export class ControlController extends BaseController {
          * @type {{ [key: string]: IProvider }}
          */
         this.providers = {};
+        /**
+         * 触发源key
+         *
+         * @author tony001
+         * @date 2024-03-28 17:03:03
+         * @type {string}
+         */
+        this.triggerKey = '';
+        /**
+         * 等到激活的回调函数集合
+         *
+         * @author tony001
+         * @date 2024-03-28 17:03:15
+         */
+        this.awaitActiveCbs = new Map();
+        /**
+         * 延迟执行（防抖用）
+         *
+         * @author tony001
+         * @date 2024-03-28 17:03:27
+         */
+        this.delayCbs = new Map();
         this.registerToCtx();
         // 初始化部件的布局面板
         this.controlPanel = getControlPanel(model);
@@ -101,6 +124,14 @@ export class ControlController extends BaseController {
                 this.scheduler.triggerControlEvent(event.targetName, event.eventName, event);
             });
         }
+        // 初始化triggerKey
+        if (this.model.appDataEntityId) {
+            const codeName = calcDeCodeNameById(this.model.appDataEntityId);
+            this.triggerKey = `${codeName}@${this.model.controlType}@${this.model.codeName}`;
+        }
+        // 监听实体数据变更
+        this.onDEDataChange = this.onDEDataChange.bind(this);
+        ibiz.mc.command.change.on(this.onDEDataChange);
     }
     async onMounted() {
         var _a;
@@ -109,6 +140,7 @@ export class ControlController extends BaseController {
         (_a = this.scheduler) === null || _a === void 0 ? void 0 : _a.startTimerTrigger();
     }
     async onDestroyed() {
+        ibiz.mc.command.change.off(this.onDEDataChange);
         await super.onDestroyed();
         if (this.scheduler) {
             this.scheduler.destroy();
@@ -192,6 +224,13 @@ export class ControlController extends BaseController {
      */
     onActivated() {
         this.state.activated = true;
+        // 执行等待激活执行的回调集合，执行完后清空
+        if (this.awaitActiveCbs.size > 0) {
+            this.awaitActiveCbs.forEach(cb => {
+                cb();
+            });
+        }
+        this.awaitActiveCbs.clear();
         ibiz.log.debug(`视图[${this.model.name}](${this.model.id})激活`);
     }
     /**
@@ -346,4 +385,74 @@ export class ControlController extends BaseController {
             ibiz.message.success(message, duration, duration === 0);
         }
     }
+    /**
+     * 监听实体数据变更
+     *
+     * @author tony001
+     * @date 2024-03-28 18:03:33
+     * @protected
+     * @param {IPortalMessage} msg
+     */
+    onDEDataChange(msg) {
+        ibiz.log.debug('onDEDataChange', msg);
+    }
+    /**
+     * 触发实体数据变更的通知
+     *
+     * @author tony001
+     * @date 2024-03-28 18:03:44
+     * @param {('create' | 'update' | 'remove')} type
+     * @param {IData} data
+     */
+    emitDEDataChange(type, data) {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const msg = (data instanceof ControlVO ? data.$origin : data);
+        const meta = { triggerKey: this.triggerKey };
+        switch (type) {
+            case 'create':
+                ibiz.mc.command.create.send(msg, meta);
+                break;
+            case 'update':
+                ibiz.mc.command.update.send(msg, meta);
+                break;
+            case 'remove':
+                ibiz.mc.command.remove.send(msg, meta);
+                break;
+            default:
+                throw new RuntimeError(`不支持的实体数据变更类型: ${type}`);
+        }
+    }
+    /**
+     * 如果当前视图没有激活，则等待激活后执行回调函数
+     * - 在执行之前key相同的会替换
+     * 如果当前视图已经激活，则立即执行回调函数
+     * - delay参数指定延迟执行时间,可以防抖
+     *
+     * @author tony001
+     * @date 2024-03-28 18:03:00
+     * @param {() => void} cb
+     * @param {{ key: string; delay?: number }} opts
+     */
+    doNextActive(cb, opts) {
+        if (isNil(opts.delay)) {
+            opts.delay = 300;
+        }
+        if (this.state.activated === false) {
+            this.awaitActiveCbs.set(opts.key, cb);
+        }
+        else if (opts.delay) {
+            // 清除之前的延迟执行
+            const _timer = this.delayCbs.get(opts.key);
+            clearTimeout(_timer);
+            // 设置新的延迟执行
+            const timer = setTimeout(() => {
+                cb();
+                clearTimeout(this.delayCbs.get(opts.key));
+            }, opts.delay);
+            this.delayCbs.set(opts.key, timer);
+        }
+        else {
+            cb();
+        }
+    }
 }

package/out/controller/common/control/md-control.controller.d.ts

@@ -1,3 +1,4 @@
+import { IPortalMessage } from '@ibiz-template/core';
 import { IAppDataEntity, IMDControl } from '@ibiz/model-core';
 import { IMDControlController, IMDControlEvent, IMDControlState, IToolbarController, MDCtrlLoadParams, MDCtrlRemoveParams } from '../../../interface';
 import { MDControlService } from '../../../service';
@@ -22,14 +23,6 @@ export declare class MDControlController<T extends IMDControl = IMDControl, S ex
      * @type {EntityService}
      */
     service: MDControlService;
-    /**
-     * 在未激活时记录是否有 command 数据变更事件，有就记录。等待激活时刷新
-     *
-     * @author chitanda
-     * @date 2023-12-13 11:12:19
-     * @protected
-     */
-    protected commandDataChange: boolean;
     /**
      * 是否设置过排序条件，比如searchBars默认点击分组时设置了
      * @return {*}
@@ -77,17 +70,6 @@ export declare class MDControlController<T extends IMDControl = IMDControl, S ex
     protected get quickToolbarController(): IToolbarController | undefined;
     protected onCreated(): Promise<void>;
     protected onMounted(): Promise<void>;
-    protected onDestroyed(): Promise<void>;
-    /**
-     * 当数据放生变更时，若为当前应用实体数据。则多数据部件进行刷新
-     *
-     * @author chitanda
-     * @date 2023-09-13 17:09:04
-     * @protected
-     * @param {IData} msg
-     */
-    protected onDataChange(msg: IData): void;
-    onActivated(): void;
     /**
      * 获取部件默认排序模型
      * @return {*}
@@ -134,9 +116,11 @@ export declare class MDControlController<T extends IMDControl = IMDControl, S ex
      */
     afterLoad(args: MDCtrlLoadParams, items: IData[]): Promise<IData[]>;
     /**
-     * 部件刷新，走初始加载
-     * @author lxm
-     * @date 2023-05-23 03:42:41
+     * 部件刷新，走初始加载(规避预置后续刷新和通知刷新同时进行)
+     *
+     * @author tony001
+     * @date 2024-03-28 18:03:00
+     * @return {*}  {Promise<void>}
      */
     refresh(): Promise<void>;
     /**
@@ -206,5 +190,15 @@ export declare class MDControlController<T extends IMDControl = IMDControl, S ex
     exportData(_args: {
         event: MouseEvent;
     }): Promise<void>;
+    /**
+     * 检测实体数据变更
+     *
+     * @author tony001
+     * @date 2024-03-28 18:03:30
+     * @protected
+     * @param {IPortalMessage} msg
+     * @return {*}  {void}
+     */
+    protected onDEDataChange(msg: IPortalMessage): void;
 }
 //# sourceMappingURL=md-control.controller.d.ts.map

package/out/controller/common/control/md-control.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"md-control.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/control/md-control.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"md-control.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/control/md-control.controller.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EAGf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,cAAc,EAAoB,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEhF,OAAO,EACL,oBAAoB,EACpB,eAAe,EACf,eAAe,EACf,kBAAkB,EAClB,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,gBAAgB,EAAS,MAAM,kBAAkB,CAAC;AAE3D,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD;;;;;;;;;GASG;AACH,qBAAa,mBAAmB,CAC5B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,eAAe,GAAG,eAAe,EAC3C,CAAC,SAAS,eAAe,GAAG,eAAe,CAE7C,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAExC;;;;;;OAMG;IACH,OAAO,EAAG,gBAAgB,CAAC;IAE3B;;;;;OAKG;IACI,SAAS,UAAS;IAEzB,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,eAAe,CAAC,CAErD;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAgB3B;;;;;OAKG;IACH,SAAS,CAAC,cAAc,sBAA6B;IAErD;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,EAAG,cAAc,CAAC;IAEtC;;;;;;;;OAQG;IACH,SAAS,KAAK,sBAAsB,IAAI,kBAAkB,GAAG,SAAS,CAKrE;IAED;;;;;;;;OAQG;IACH,SAAS,KAAK,sBAAsB,IAAI,kBAAkB,GAAG,SAAS,CAKrE;cAEe,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAkB1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAS1C;;;;;OAKG;IACH,YAAY,IAAI;QACd,qBAAqB,EAAE,MAAM,GAAG,SAAS,CAAC;QAC1C,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;KAClC;IAOD;;;;;;;;OAQG;IACH,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI;IAoCnD;;;;;;OAMG;IACG,cAAc,CAAC,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IA6B7D;;;;;OAKG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IA4DzD;;;;;;;;OAQG;IACG,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAIzE;;;;;;OAMG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAM9B;;;;;;OAMG;IACG,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IA8DtD;;;;;OAKG;IACG,gBAAgB,CACpB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,OAAO,CAAC;IAanB;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAU9B;;;;;;OAMG;IACH,OAAO,IAAI,KAAK,EAAE;IAIlB,SAAS,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAMrC,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI;IAqBtC;;;;;;OAMG;IACG,UAAU,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB5C;;;;;;OAMG;IACG,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAM9C;;;;;;OAMG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAkCjC;;;;;;OAMG;IACG,UAAU,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAmC7D;;;;;;;;OAQG;IACH,SAAS,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;CA0CpD"}

package/out/controller/common/control/md-control.controller.js

@@ -1,6 +1,6 @@
 /* eslint-disable max-classes-per-file */
-import { isElementSame, RuntimeError } from '@ibiz-template/core';
-import { debounce } from 'lodash-es';
+import { isElementSame, RuntimeError, } from '@ibiz-template/core';
+import { isNil } from 'ramda';
 import { calcDeCodeNameById } from '../../../model';
 import { Srfuf } from '../../../service';
 import { handleAllSettled } from '../../../utils';
@@ -18,14 +18,6 @@ import { ControlController } from './control.controller';
 export class MDControlController extends ControlController {
     constructor() {
         super(...arguments);
-        /**
-         * 在未激活时记录是否有 command 数据变更事件，有就记录。等待激活时刷新
-         *
-         * @author chitanda
-         * @date 2023-12-13 11:12:19
-         * @protected
-         */
-        this.commandDataChange = false;
         /**
          * 是否设置过排序条件，比如searchBars默认点击分组时设置了
          * @return {*}
@@ -93,11 +85,6 @@ export class MDControlController extends ControlController {
         (_a = this.dataEntity.appDEFields) === null || _a === void 0 ? void 0 : _a.forEach(field => {
             this.fieldIdNameMap.set(field.id, field.name);
         });
-        const fn = this.onDataChange.bind(this);
-        this.onDataChange = debounce(msg => {
-            fn(msg);
-        }, 300);
-        ibiz.mc.command.change.on(this.onDataChange);
         // 设置默认排序，只有在没设置过排序才走
         if (!this.isSetSort) {
             this.setSort();
@@ -110,35 +97,6 @@ export class MDControlController extends ControlController {
             this.load({ isInitialLoad: true });
         }
     }
-    onDestroyed() {
-        ibiz.mc.command.change.off(this.onDataChange);
-        return super.onDestroyed();
-    }
-    /**
-     * 当数据放生变更时，若为当前应用实体数据。则多数据部件进行刷新
-     *
-     * @author chitanda
-     * @date 2023-09-13 17:09:04
-     * @protected
-     * @param {IData} msg
-     */
-    onDataChange(msg) {
-        if (msg.data && msg.data.srfdecodename === this.dataEntity.codeName) {
-            if (this.state.activated) {
-                this.refresh();
-            }
-            else {
-                this.commandDataChange = true;
-            }
-        }
-    }
-    onActivated() {
-        super.onActivated();
-        if (this.commandDataChange) {
-            this.refresh();
-            this.commandDataChange = false;
-        }
-    }
     /**
      * 获取部件默认排序模型
      * @return {*}
@@ -294,12 +252,16 @@ export class MDControlController extends ControlController {
         return items;
     }
     /**
-     * 部件刷新，走初始加载
-     * @author lxm
-     * @date 2023-05-23 03:42:41
+     * 部件刷新，走初始加载(规避预置后续刷新和通知刷新同时进行)
+     *
+     * @author tony001
+     * @date 2024-03-28 18:03:00
+     * @return {*}  {Promise<void>}
      */
     async refresh() {
-        await this.load({ isInitialLoad: false });
+        this.doNextActive(() => this.load({ isInitialLoad: false }), {
+            key: 'refresh',
+        });
     }
     /**
      * 删除选中的数据
@@ -358,6 +320,10 @@ export class MDControlController extends ControlController {
         }
         this.state.selectedData = [];
         await this._evt.emit('onRemoveSuccess', undefined);
+        // 发送对象删除事件
+        data.forEach(item => {
+            this.emitDEDataChange('remove', item);
+        });
     }
     /**
      * 删除每一项
@@ -529,4 +495,49 @@ export class MDControlController extends ControlController {
         // const fileName = `${appEntity.source.logicName}表.xlsx`;
         // downloadFileFromBlob(file, fileName);
     }
+    /**
+     * 检测实体数据变更
+     *
+     * @author tony001
+     * @date 2024-03-28 18:03:30
+     * @protected
+     * @param {IPortalMessage} msg
+     * @return {*}  {void}
+     */
+    onDEDataChange(msg) {
+        // msg.triggerKey 不为空，且与当前控制器的triggerKey一致时，则不处理
+        if (!isNil(msg.triggerKey) && msg.triggerKey === this.triggerKey) {
+            return;
+        }
+        // 非这个实体的数据变更，则不处理
+        if (!msg.data ||
+            msg.data.srfdecodename !== this.dataEntity.codeName) {
+            return;
+        }
+        let isRefresh = false;
+        const { srfkey } = msg.data;
+        // 新增一定刷新，修改和删除只有当前多数据部件存在的数据命中后才刷新
+        switch (msg.subtype) {
+            case 'OBJECTCREATED':
+                isRefresh = true;
+                break;
+            case 'OBJECTUPDATED':
+                if (this.state.items.findIndex(item => item.srfkey === srfkey) !== -1) {
+                    isRefresh = true;
+                }
+                break;
+            case 'OBJECTREMOVED':
+                if (this.state.items.findIndex(item => item.srfkey === srfkey) !== -1) {
+                    isRefresh = true;
+                }
+                break;
+            default:
+                break;
+        }
+        if (isRefresh) {
+            this.doNextActive(() => this.load({ isInitialLoad: !!ibiz.env.isMob }), {
+                key: 'refresh',
+            });
+        }
+    }
 }

package/out/controller/control/chart/generator/base-series-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base-series-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/base-series-generator.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,cAAc,EACf,MAAM,kBAAkB,CAAC;AAO1B,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5D,OAAO,EACL,qBAAqB,EAEtB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AASnD,cAAc;AACd,MAAM,MAAM,UAAU,GAAG;IACvB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,SAAS,CAAC,EAAE,UAAU,CAAC;CACxB,CAAC;AACF,sBAAsB;AACtB,MAAM,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;AAElD,sBAAsB;AACtB,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAEpD,eAAO,MAAM,aAAa,mBAAmB,CAAC;AAE9C,qBAAa,mBAAmB,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc;IAiG/D,KAAK,EAAE,CAAC;IACf,SAAS,CAAC,cAAc,EAAE,qBAAqB;IAjGjD;;;;;OAKG;IACH,YAAY,EAAE,MAAM,CAAC;IAErB;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IAEtB;;;;;OAKG;IACH,YAAY,EAAE,UAAU,EAAE,CAAM;IAEhC;;;;;OAKG;IACH,aAAa,EAAE,YAAY,CAAM;IAEjC;;;;;OAKG;IACH,eAAe,CAAC,EAAE,YAAY,CAAC;IAE/B;;;;;OAKG;IACH,oBAAoB,EAAE,OAAO,CAAQ;IAErC;;;;;;OAMG;gBAEM,KAAK,EAAE,CAAC,EACL,cAAc,EAAE,qBAAqB;IA+BjD;;;;OAIG;IACH,SAAS,CAAC,iBAAiB,IAAI,YAAY;IAmB3C;;;;;;;;;;;OAWG;IACH,YAAY,CACV,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,SAAS,GAAE,OAAe,GACzB,MAAM,GAAG,SAAS;IAiBrB;;;;;OAKG;IACH,SAAS,CAAC,gBAAgB,CACxB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,KAAK,EACb,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GACZ,IAAI;IAYP;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,SAAS;IAwFjD;;;;;;;OAOG;IACH,SAAS,CAAC,eAAe,CAAC,SAAS,EAAE,SAAS,GAAG,YAAY,EAAE;IAuB/D;;;;;;;OAOG;IAEH,SAAS,CAAC,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,GAAG;IAQvD;;;;;;OAMG;IACH,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,YAAY,EAAE,GAAG,YAAY;IAOxD;;;;;;OAMG;IACH,oBAAoB,CAAC,MAAM,EAAE,cAAc,GAAG,KAAK,GAAG,SAAS;IAO/D;;;;;OAKG;IACH,cAAc,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE;IAmDtC;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;IA+BnC;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;CAgInC"}
+{"version":3,"file":"base-series-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/base-series-generator.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,cAAc,EACf,MAAM,kBAAkB,CAAC;AAO1B,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5D,OAAO,EACL,qBAAqB,EAEtB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AASnD,cAAc;AACd,MAAM,MAAM,UAAU,GAAG;IACvB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,SAAS,CAAC,EAAE,UAAU,CAAC;CACxB,CAAC;AACF,sBAAsB;AACtB,MAAM,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;AAElD,sBAAsB;AACtB,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAEpD,eAAO,MAAM,aAAa,mBAAmB,CAAC;AAE9C,qBAAa,mBAAmB,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc;IAiG/D,KAAK,EAAE,CAAC;IACf,SAAS,CAAC,cAAc,EAAE,qBAAqB;IAjGjD;;;;;OAKG;IACH,YAAY,EAAE,MAAM,CAAC;IAErB;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IAEtB;;;;;OAKG;IACH,YAAY,EAAE,UAAU,EAAE,CAAM;IAEhC;;;;;OAKG;IACH,aAAa,EAAE,YAAY,CAAM;IAEjC;;;;;OAKG;IACH,eAAe,CAAC,EAAE,YAAY,CAAC;IAE/B;;;;;OAKG;IACH,oBAAoB,EAAE,OAAO,CAAQ;IAErC;;;;;;OAMG;gBAEM,KAAK,EAAE,CAAC,EACL,cAAc,EAAE,qBAAqB;IA+BjD;;;;OAIG;IACH,SAAS,CAAC,iBAAiB,IAAI,YAAY;IAmB3C;;;;;;;;;;;OAWG;IACH,YAAY,CACV,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,SAAS,GAAE,OAAe,GACzB,MAAM,GAAG,SAAS;IAkBrB;;;;;OAKG;IACH,SAAS,CAAC,gBAAgB,CACxB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,KAAK,EACb,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GACZ,IAAI;IAYP;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,SAAS;IAwFjD;;;;;;;OAOG;IACH,SAAS,CAAC,eAAe,CAAC,SAAS,EAAE,SAAS,GAAG,YAAY,EAAE;IAuB/D;;;;;;;OAOG;IAEH,SAAS,CAAC,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,GAAG;IAQvD;;;;;;OAMG;IACH,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,YAAY,EAAE,GAAG,YAAY;IAOxD;;;;;;OAMG;IACH,oBAAoB,CAAC,MAAM,EAAE,cAAc,GAAG,KAAK,GAAG,SAAS;IAO/D;;;;;OAKG;IACH,cAAc,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE;IAmDtC;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;IA+BnC;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;CAgInC"}

package/out/controller/control/chart/generator/base-series-generator.js

@@ -118,6 +118,7 @@ export class BaseSeriesGenerator {
             if (find) {
                 return find.text;
             }
+            return '未定义';
         }
         return isExclude ? undefined : val;
     }

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

@@ -1,3 +1,4 @@
+import { IPortalMessage } from '@ibiz-template/core';
 import { IAppDEEditView, IDEEditForm } from '@ibiz/model-core';
 import { IEditFormState, IEditFormEvent, IEditFormController, IViewController, IEditViewState, IEditViewEvent, IDataAbilityParams, FormSaveParams } from '../../../../interface';
 import { FormController } from '../form';
@@ -137,5 +138,15 @@ export declare class EditFormController extends FormController<IDEEditForm, IEdi
      * @param {IData} data
      */
     setSimpleData(data: IData): void;
+    /**
+     * 检测实体数据变更
+     *
+     * @author tony001
+     * @date 2024-03-28 18:03:14
+     * @protected
+     * @param {IPortalMessage} msg
+     * @return {*}  {void}
+     */
+    protected onDEDataChange(msg: IPortalMessage): void;
 }
 //# sourceMappingURL=edit-form.controller.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"edit-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/edit-form/edit-form.controller.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAI/D,OAAO,EACL,cAAc,EACd,cAAc,EACd,mBAAmB,EACnB,eAAe,EACf,cAAc,EACd,cAAc,EACd,kBAAkB,EAClB,cAAc,EACf,MAAM,uBAAuB,CAAC;AAK/B,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;;;;GAQG;AACH,qBAAa,kBACX,SAAQ,cAAc,CAAC,WAAW,EAAE,cAAc,EAAE,cAAc,CAClE,YAAW,mBAAmB;IAE9B;;;;;OAKG;IACH,OAAO,EAAG,eAAe,CAAC;IAE1B,IAAI,IAAI,IAAI,eAAe,CAAC,cAAc,EAAE,cAAc,EAAE,cAAc,CAAC,CAM1E;IAED;;;;;;;;OAQG;IACH,SAAS,CAAC,OAAO,EAAE,KAAK,CAAmB;IAE3C;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAY1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAS1C;;;;;OAKG;IACG,SAAS,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,KAAK,CAAC;IA2B1D;;;;;;OAMG;cACa,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IA+CtC;;;;;OAKG;IACG,IAAI,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,KAAK,CAAC;IA8CrD;;;;;OAKG;IACG,IAAI,CAAC,IAAI,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC;IAuEjD;;;;;;OAMG;IACG,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC;IA0CzD;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,KAAK,CAAC;IAe9B;;;;;;;OAOG;IACG,cAAc,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA6D7D;;;;;;;OAOG;IACG,OAAO,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAuBvD;;;;;;;OAOG;IACG,QAAQ,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAwBlD,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtD;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB/B;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,IAAI,KAAK;IAiB9B;;;;;OAKG;IACH,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;CAqBjC"}
+{"version":3,"file":"edit-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/edit-form/edit-form.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,cAAc,EAIf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAI/D,OAAO,EACL,cAAc,EACd,cAAc,EACd,mBAAmB,EACnB,eAAe,EACf,cAAc,EACd,cAAc,EACd,kBAAkB,EAClB,cAAc,EACf,MAAM,uBAAuB,CAAC;AAK/B,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD;;;;;;;;GAQG;AACH,qBAAa,kBACX,SAAQ,cAAc,CAAC,WAAW,EAAE,cAAc,EAAE,cAAc,CAClE,YAAW,mBAAmB;IAE9B;;;;;OAKG;IACH,OAAO,EAAG,eAAe,CAAC;IAE1B,IAAI,IAAI,IAAI,eAAe,CAAC,cAAc,EAAE,cAAc,EAAE,cAAc,CAAC,CAM1E;IAED;;;;;;;;OAQG;IACH,SAAS,CAAC,OAAO,EAAE,KAAK,CAAmB;IAE3C;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAY1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAS1C;;;;;OAKG;IACG,SAAS,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,KAAK,CAAC;IA2B1D;;;;;;OAMG;cACa,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IA+CtC;;;;;OAKG;IACG,IAAI,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,KAAK,CAAC;IA8CrD;;;;;OAKG;IACG,IAAI,CAAC,IAAI,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC;IAqEjD;;;;;;OAMG;IACG,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC;IA0CzD;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,KAAK,CAAC;IAe9B;;;;;;;OAOG;IACG,cAAc,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA6D7D;;;;;;;OAOG;IACG,OAAO,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAuBvD;;;;;;;OAOG;IACG,QAAQ,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAwBlD,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtD;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB/B;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,IAAI,KAAK;IAiB9B;;;;;OAKG;IACH,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAsBhC;;;;;;;;OAQG;IACH,SAAS,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;CAuBpD"}

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

@@ -1,7 +1,7 @@
 import { awaitTimeout, IBizContext, isElementSame, mergeInLeft, RuntimeError, } from '@ibiz-template/core';
 import { debounce } from 'lodash-es';
 import { createUUID } from 'qx-util';
-import { clone } from 'ramda';
+import { clone, isNil } from 'ramda';
 import { calcDeCodeNameById, hasDeCodeName } from '../../../../model';
 import { Srfuf, ControlVO } from '../../../../service';
 import { ScriptFactory } from '../../../../utils';
@@ -250,7 +250,8 @@ export class EditFormController extends FormController {
                 default: `${this.data.srfmajortext || ''}保存成功`,
             });
         }
-        ibiz.mc.command.send(res.data.$origin, isCreate ? 'OBJECTCREATED' : 'OBJECTUPDATED');
+        // 发送数据变更事件
+        this.emitDEDataChange(isCreate ? 'create' : 'update', res.data);
         return this.data;
     }
     /**
@@ -292,12 +293,12 @@ export class EditFormController extends FormController {
             }
             ok = res.ok;
         }
+        this.emitDEDataChange('remove', this.data);
         // 删除完成后都要置空当前表单数据
         this.state.data = new ControlVO();
         this.state.modified = false;
         await this.evt.emit('onRemoveSuccess', undefined);
         this.actionNotification('REMOVESUCCESS');
-        ibiz.mc.command.send(this.data.$origin, 'OBJECTREMOVED');
         return ok;
     }
     /**
@@ -383,9 +384,9 @@ export class EditFormController extends FormController {
         const { context, params } = this.handlerAbilityParams(args);
         try {
             await this.service.wfStart(context, params, this.data);
-            ibiz.mc.command.send(this.data.$origin, 'OBJECTUPDATED');
+            this.emitDEDataChange('update', this.data);
             // 刷新预定义todo实体数据
-            ibiz.mc.command.send({ srfdecodename: 'SysTodo' }, 'OBJECTUPDATED');
+            this.emitDEDataChange('update', { srfdecodename: 'SysTodo' });
         }
         catch (error) {
             this.actionNotification('WFSTARTERROR', {
@@ -415,9 +416,9 @@ export class EditFormController extends FormController {
         const { context, params } = this.handlerAbilityParams(args);
         try {
             await this.service.wfSubmit(context, params, this.data);
-            ibiz.mc.command.send(this.data.$origin, 'OBJECTUPDATED');
+            this.emitDEDataChange('update', this.data);
             // 刷新预定义todo实体数据
-            ibiz.mc.command.send({ srfdecodename: 'SysTodo' }, 'OBJECTUPDATED');
+            this.emitDEDataChange('update', { srfdecodename: 'SysTodo' });
         }
         catch (error) {
             this.actionNotification('WFSUBMITERROR', {
@@ -515,4 +516,33 @@ export class EditFormController extends FormController {
             this.dataChangeNotify(Object.keys(this.state.data));
         }
     }
+    /**
+     * 检测实体数据变更
+     *
+     * @author tony001
+     * @date 2024-03-28 18:03:14
+     * @protected
+     * @param {IPortalMessage} msg
+     * @return {*}  {void}
+     */
+    onDEDataChange(msg) {
+        var _a;
+        // 表单只关心更新
+        if (msg.subtype !== 'OBJECTUPDATED') {
+            return;
+        }
+        // msg.triggerKey 不为空，且与当前控制器的triggerKey一致时，则不处理
+        if (!isNil(msg.triggerKey) && msg.triggerKey === this.triggerKey) {
+            return;
+        }
+        // 非这个实体的数据变更，则不处理
+        // 非当前主键的变更不处理
+        const dename = calcDeCodeNameById(this.model.appDataEntityId);
+        if (!msg.data ||
+            ((_a = msg.data.srfdecodename) === null || _a === void 0 ? void 0 : _a.toLowerCase()) !== dename ||
+            msg.data.srfkey !== this.data.srfkey) {
+            return;
+        }
+        this.doNextActive(() => this.load(), { key: 'load' });
+    }
 }

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

@@ -1,10 +1,9 @@
-import { IControlLogic, IDEForm, IDEFormDetail, IDEFormGroupBase } from '@ibiz/model-core';
+import { IControlLogic, IDEForm, IDEFormDetail } from '@ibiz/model-core';
 import { IFormState, IFormEvent, IFormController, IFormDetailController, IFormDetailProvider } from '../../../../interface';
 import { AppCounter } from '../../../../service';
 import { ControlController } from '../../../common';
 import { FormNotifyState } from '../../../constant';
 import { ControllerEvent } from '../../../utils';
-import { CTX } from '../../../ctx';
 import type { FormGroupPanelController, FormItemController, FormMDCtrlController } from '../form-detail';
 /**
  * 表单控制器
@@ -73,24 +72,6 @@ export declare abstract class FormController<T extends IDEForm = IDEForm, S exte
      */
     get data(): IData;
     protected initState(): void;
-    constructor(model: T, context: IContext, params: IParams, ctx: CTX);
-    /**
-     * 进行模型预处理
-     *
-     * @author chitanda
-     * @date 2024-02-27 09:02:52
-     * @protected
-     */
-    protected preprocessModel(model: IDEForm): void;
-    /**
-     * 递归将表单模型修改为信息态
-     *
-     * @author chitanda
-     * @date 2024-02-27 11:02:43
-     * @protected
-     * @param {IDEFormGroupBase} model
-     */
-    protected deepPreprocessModel(model: IDEFormGroupBase): void;
     /**
      * 通知所有表单成员表单操作过程中的数据变更
      *