@ibiz-template/runtime 0.6.13 → 0.6.15

package/dist/index.esm.js

@@ -831,6 +831,10 @@ function findAppDEMethod(appDataEntity, id) {
   }
   return null;
 }
+function getCtrlTeleportTag(control) {
+  var _a, _b;
+  return (_b = (_a = control.controlParam) == null ? void 0 : _a.ctrlParams) == null ? void 0 : _b.TELEPORTTAG;
+}
 
 // src/model/layout/layout.ts
 import { isArray as isArray2, isObject, isString } from "lodash-es";
@@ -3327,8 +3331,8 @@ var baseStyle = {
   position: "fixed",
   zIndex: "10000"
 };
-function cloneElement(clone35, teleport = document.body, isRemoveChild = true) {
-  const element = getAnimationElement(clone35);
+function cloneElement(clone34, teleport = document.body, isRemoveChild = true) {
+  const element = getAnimationElement(clone34);
   if (element == null) {
     throw new Error("Cannot clone a null or undefined element.");
   }
@@ -3747,11 +3751,11 @@ function arrayContains(arr, val) {
   });
 }
 function cloneObject(o) {
-  var clone35 = {};
+  var clone34 = {};
   for (var p in o) {
-    clone35[p] = o[p];
+    clone34[p] = o[p];
   }
-  return clone35;
+  return clone34;
 }
 function replaceObjectProps(o1, o2) {
   var o = cloneObject(o1);
@@ -6581,6 +6585,14 @@ var DynamicCodeListCache = class {
     result.cls = cls;
     return result;
   }
+  sortShoworder(arr) {
+    arr.forEach((item) => {
+      if (!("showorder" in item)) {
+        Object.assign(item, { showorder: 1e3 });
+      }
+    });
+    return arr.sort((a, b) => a.showorder - b.showorder);
+  }
   /**
    * 加载服务获取数据，返回代码项
    *
@@ -6626,13 +6638,10 @@ var DynamicCodeListCache = class {
         tempParams
       );
       const presetresultItems = [];
-      if (res2.data.items.every((item) => "showorder" in item)) {
-        return res2.data.items.sort(
-          (a, b) => (b.showorder || 0) - (a.showorder || 0)
-        );
-      }
-      if (res2.data.items.length) {
-        res2.data.items.forEach((item) => {
+      const { items } = res2.data;
+      const sortItems = this.sortShoworder(items);
+      if (sortItems.length) {
+        items.forEach((item) => {
           presetresultItems.push(this.presetconvertData(item));
         });
       }
@@ -12057,6 +12066,7 @@ var TreeNodeData = class {
     this._parent = parentNodeData;
     this._nodeType = model.treeNodeType;
     this._disableSelect = model.disableSelect === true;
+    this._changedOnly = model.enableRowEditChangedOnly === true;
     if (this._parent) {
       this._context = { ...this._parent._context };
     }
@@ -12099,6 +12109,26 @@ var TreeNodeData = class {
     }
     return Object.values(icon).length > 0 ? icon : void 0;
   }
+  /**
+   * 获取改变数据
+   * @author zzq
+   * @date 2024-03-25 14:24:55
+   * @return {*}  {(IData | undefined)}
+   * @memberof TreeNodeData
+   */
+  getDiffData() {
+    if (this._deData && this._oldDeData) {
+      const diffData = {};
+      Object.keys(this._deData).forEach((key) => {
+        if (this._deData[key] !== this._oldDeData[key] || key === this._deData.srfkeyfield) {
+          diffData[key] = this._deData[key];
+        }
+      });
+      diffData.srfkey = this._deData.srfkey;
+      return diffData;
+    }
+    return this._deData;
+  }
 };
 
 // src/service/vo/tree-node-data/tree-code-list-node-data.ts
@@ -12145,6 +12175,7 @@ var TreeDataSetNodeData = class _TreeDataSetNodeData extends TreeNodeData {
     super(model, parentNodeData, opts);
     const { data } = opts;
     this._deData = data;
+    this._oldDeData = data.clone();
     const selfId = "".concat(model.id, "@").concat(data.srfkey).toLowerCase();
     Object.defineProperty(this, "_id", {
       get() {
@@ -13391,7 +13422,7 @@ function installCommand() {
 }
 
 // src/app-hub.ts
-import { RuntimeError as RuntimeError67 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError68 } from "@ibiz-template/core";
 
 // src/application.ts
 import { Net, getToken } from "@ibiz-template/core";
@@ -14651,7 +14682,8 @@ async function asyncImportData(file, appDataEntity, dataImport, context) {
   await listenAsyncAction(res.data.asyncacitonid);
   ibiz.mc.command.send(
     { srfdecodename: appDataEntity.codeName },
-    "OBJECTCREATED"
+    "OBJECTCREATED",
+    "DATAIMPORT"
   );
 }
 async function importData(file, appDataEntity, dataImport, context) {
@@ -15781,7 +15813,8 @@ import {
   HttpError as HttpError6,
   IBizContext as IBizContext3,
   IBizParams,
-  NoticeError as NoticeError2
+  NoticeError as NoticeError2,
+  RuntimeError as RuntimeError35
 } from "@ibiz-template/core";
 import { clone as clone18, isNil as isNil23 } from "ramda";
 import { notNilEmpty as notNilEmpty7 } from "qx-util";
@@ -15818,6 +15851,28 @@ var ControlController = class 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 = /* @__PURE__ */ new Map();
+    /**
+     * 延迟执行（防抖用）
+     *
+     * @author tony001
+     * @date 2024-03-28 17:03:27
+     */
+    this.delayCbs = /* @__PURE__ */ new Map();
     this.registerToCtx();
     this.controlPanel = getControlPanel(model);
     if (!this.controlPanel) {
@@ -15883,6 +15938,12 @@ var ControlController = class extends BaseController {
         );
       });
     }
+    if (this.model.appDataEntityId) {
+      const codeName = calcDeCodeNameById(this.model.appDataEntityId);
+      this.triggerKey = "".concat(codeName, "@").concat(this.model.controlType, "@").concat(this.model.codeName);
+    }
+    this.onDEDataChange = this.onDEDataChange.bind(this);
+    ibiz.mc.command.change.on(this.onDEDataChange);
   }
   async onMounted() {
     var _a;
@@ -15890,6 +15951,7 @@ var ControlController = class extends BaseController {
     (_a = this.scheduler) == null ? void 0 : _a.startTimerTrigger();
   }
   async onDestroyed() {
+    ibiz.mc.command.change.off(this.onDEDataChange);
     await super.onDestroyed();
     if (this.scheduler) {
       this.scheduler.destroy();
@@ -15970,6 +16032,12 @@ var ControlController = class extends BaseController {
    */
   onActivated() {
     this.state.activated = true;
+    if (this.awaitActiveCbs.size > 0) {
+      this.awaitActiveCbs.forEach((cb) => {
+        cb();
+      });
+    }
+    this.awaitActiveCbs.clear();
     ibiz.log.debug("\u89C6\u56FE[".concat(this.model.name, "](").concat(this.model.id, ")\u6FC0\u6D3B"));
   }
   /**
@@ -16118,22 +16186,82 @@ var ControlController = class 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) {
+    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 RuntimeError35("\u4E0D\u652F\u6301\u7684\u5B9E\u4F53\u6570\u636E\u53D8\u66F4\u7C7B\u578B: ".concat(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 (isNil23(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();
+    }
+  }
 };
 
 // src/controller/common/control/md-control.controller.ts
-import { isElementSame, RuntimeError as RuntimeError35 } from "@ibiz-template/core";
-import { debounce } from "lodash-es";
+import {
+  isElementSame,
+  RuntimeError as RuntimeError36
+} from "@ibiz-template/core";
+import { isNil as isNil24 } from "ramda";
 var MDControlController = class extends ControlController {
   constructor() {
     super(...arguments);
-    /**
-     * 在未激活时记录是否有 command 数据变更事件，有就记录。等待激活时刷新
-     *
-     * @author chitanda
-     * @date 2023-12-13 11:12:19
-     * @protected
-     */
-    this.commandDataChange = false;
     /**
      * 是否设置过排序条件，比如searchBars默认点击分组时设置了
      * @return {*}
@@ -16207,11 +16335,6 @@ var MDControlController = class extends ControlController {
     (_a = this.dataEntity.appDEFields) == null ? 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();
     }
@@ -16222,34 +16345,6 @@ var MDControlController = class 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 {*}
@@ -16396,12 +16491,16 @@ var MDControlController = class 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"
+    });
   }
   /**
    * 删除选中的数据
@@ -16413,7 +16512,7 @@ var MDControlController = class extends ControlController {
   async remove(args) {
     const { context, params, data } = this.handlerAbilityParams(args);
     if (!(data == null ? void 0 : data.length)) {
-      throw new RuntimeError35("\u672A\u9009\u4E2D\u6570\u636E");
+      throw new RuntimeError36("\u672A\u9009\u4E2D\u6570\u636E");
     }
     if ((args == null ? void 0 : args.silent) !== true) {
       const del = await ibiz.confirm.error({
@@ -16455,6 +16554,9 @@ var MDControlController = class extends ControlController {
     }
     this.state.selectedData = [];
     await this._evt.emit("onRemoveSuccess", void 0);
+    data.forEach((item) => {
+      this.emitDEDataChange("remove", item);
+    });
   }
   /**
    * 删除每一项
@@ -16573,7 +16675,7 @@ var MDControlController = class extends ControlController {
       (importItem) => importItem.id === dedataImportId
     );
     if (!dataImport) {
-      throw new RuntimeError35("\u65E0\u5BFC\u5165\u6A21\u578B\uFF01");
+      throw new RuntimeError36("\u65E0\u5BFC\u5165\u6A21\u578B\uFF01");
     }
     let importName = "DataImport";
     if (dataImport.enableCustomized) {
@@ -16605,12 +16707,53 @@ var MDControlController = class extends ControlController {
    */
   async exportData(_args) {
   }
+  /**
+   * 检测实体数据变更
+   *
+   * @author tony001
+   * @date 2024-03-28 18:03:30
+   * @protected
+   * @param {IPortalMessage} msg
+   * @return {*}  {void}
+   */
+  onDEDataChange(msg) {
+    if (!isNil24(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"
+      });
+    }
+  }
 };
 
 // src/controller/control/app-menu/app-menu.controller.ts
 import {
   findRecursiveChild,
-  RuntimeError as RuntimeError36,
+  RuntimeError as RuntimeError37,
   RuntimeModelError as RuntimeModelError26
 } from "@ibiz-template/core";
 var AppMenuController = class extends ControlController {
@@ -16679,7 +16822,7 @@ var AppMenuController = class extends ControlController {
       childrenFields: ["appMenuItems"]
     });
     if (!menuItem) {
-      throw new RuntimeError36("\u627E\u4E0D\u5230\u540D\u4E3A".concat(id, "\u7684\u83DC\u5355\u9879"));
+      throw new RuntimeError37("\u627E\u4E0D\u5230\u540D\u4E3A".concat(id, "\u7684\u83DC\u5355\u9879"));
     }
     this.evt.emit("onClick", {
       eventArg: id,
@@ -16809,7 +16952,7 @@ var AppMenuController = class extends ControlController {
 // src/controller/control/app-menu-icon-view/app-menu-icon-view.controller.ts
 import {
   findRecursiveChild as findRecursiveChild2,
-  RuntimeError as RuntimeError37,
+  RuntimeError as RuntimeError38,
   RuntimeModelError as RuntimeModelError27
 } from "@ibiz-template/core";
 var AppMenuIconViewController = class extends AppMenuController {
@@ -16819,7 +16962,7 @@ var AppMenuIconViewController = class extends AppMenuController {
       childrenFields: ["appMenuItems"]
     });
     if (!menuItem) {
-      throw new RuntimeError37("\u627E\u4E0D\u5230\u540D\u4E3A".concat(id, "\u7684\u83DC\u5355\u9879"));
+      throw new RuntimeError38("\u627E\u4E0D\u5230\u540D\u4E3A".concat(id, "\u7684\u83DC\u5355\u9879"));
     }
     this.evt.emit("onClick", {
       eventArg: id,
@@ -16848,7 +16991,7 @@ import dayjs3 from "dayjs";
 import { RuntimeModelError as RuntimeModelError28 } from "@ibiz-template/core";
 
 // src/controller/control/calendar/calendar.service.ts
-import { RuntimeError as RuntimeError38 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError39 } from "@ibiz-template/core";
 import { clone as clone19 } from "ramda";
 var CalendarService = class extends MDControlService {
   /**
@@ -16904,11 +17047,11 @@ var CalendarService = class extends MDControlService {
   setCalendarConfigData(items, index) {
     const { sysCalendarItems } = this.model;
     if (!sysCalendarItems) {
-      throw new RuntimeError38("\u672A\u627E\u5230\u65E5\u5386\u9879\u6A21\u578B");
+      throw new RuntimeError39("\u672A\u627E\u5230\u65E5\u5386\u9879\u6A21\u578B");
     }
     const calendarItem = sysCalendarItems[index];
     if (!calendarItem) {
-      throw new RuntimeError38("\u672A\u627E\u5230\u65E5\u5386\u9879\u6A21\u578B");
+      throw new RuntimeError39("\u672A\u627E\u5230\u65E5\u5386\u9879\u6A21\u578B");
     }
     return items.map((item) => {
       return new CalendarItemData(calendarItem, item);
@@ -17189,11 +17332,11 @@ var CalendarController = class extends MDControlController {
 };
 
 // src/controller/control/chart/chart.controller.ts
-import { RuntimeError as RuntimeError40 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError41 } from "@ibiz-template/core";
 
 // src/controller/control/chart/generator/chart-options-generator.ts
 import { mergeDeepRight as mergeDeepRight3 } from "ramda";
-import { RuntimeError as RuntimeError39 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError40 } from "@ibiz-template/core";
 
 // src/controller/control/chart/generator/line-series-generator.ts
 import { RuntimeModelError as RuntimeModelError30 } from "@ibiz-template/core";
@@ -17206,7 +17349,7 @@ import isSameOrBefore from "dayjs/plugin/isSameOrBefore";
 import quarterOfYear from "dayjs/plugin/quarterOfYear";
 import weekOfYear from "dayjs/plugin/weekOfYear";
 import isoWeek from "dayjs/plugin/isoWeek";
-import { clone as clone20, isNil as isNil24, mergeDeepRight } from "ramda";
+import { clone as clone20, isNil as isNil25, mergeDeepRight } from "ramda";
 dayjs4.extend(minMax2);
 dayjs4.extend(isSameOrBefore);
 dayjs4.extend(quarterOfYear);
@@ -17302,10 +17445,10 @@ var BaseSeriesGenerator = class {
    * @return {*}  {(string | undefined)}
    */
   translateVal(codeListKey, val, isExclude = false) {
-    if (isNil24(val)) {
+    if (isNil25(val)) {
       return void 0;
     }
-    if (isNil24(codeListKey)) {
+    if (isNil25(codeListKey)) {
       return val;
     }
     const codeListItems = this.chartGenerator.codeListMap.get(codeListKey);
@@ -17314,6 +17457,7 @@ var BaseSeriesGenerator = class {
       if (find) {
         return find.text;
       }
+      return "\u672A\u5B9A\u4E49";
     }
     return isExclude ? void 0 : val;
   }
@@ -17354,7 +17498,7 @@ var BaseSeriesGenerator = class {
           seriesCodeListId,
           item[this.groupField]
         );
-        if (isNil24(groupVal)) {
+        if (isNil25(groupVal)) {
           return;
         }
         group = groupVal;
@@ -18202,7 +18346,7 @@ var ChartOptionsGenerator2 = class {
   getChartDataByParams(params) {
     const generator = this.seriesGeneratorIndexMap.get(params.seriesIndex);
     if (!generator) {
-      throw new RuntimeError39("\u627E\u4E0D\u5230".concat(params.seriesIndex, "\u5E8F\u5217\u7684generator\uFF01"));
+      throw new RuntimeError40("\u627E\u4E0D\u5230".concat(params.seriesIndex, "\u5E8F\u5217\u7684generator\uFF01"));
     }
     return generator.getChartDataByParams(params);
   }
@@ -18316,10 +18460,10 @@ var ChartController = class extends MDControlController {
    */
   updateChart() {
     if (!this.chart) {
-      throw new RuntimeError40("chart\u5BF9\u8C61\u6CA1\u6709\u6B63\u786E\u521D\u59CB\u5316");
+      throw new RuntimeError41("chart\u5BF9\u8C61\u6CA1\u6709\u6B63\u786E\u521D\u59CB\u5316");
     }
     if (!this.options) {
-      throw new RuntimeError40("options\u8FD8\u6CA1\u8BA1\u7B97");
+      throw new RuntimeError41("options\u8FD8\u6CA1\u8BA1\u7B97");
     }
     this.chart.setOption(this.options, { notMerge: true });
     this.resizeChart();
@@ -18369,7 +18513,7 @@ var CaptionBarController = class extends ControlController {
 };
 
 // src/controller/control/toolbar/toolbar.controllerr.ts
-import { recursiveIterate as recursiveIterate2, RuntimeError as RuntimeError49 } from "@ibiz-template/core";
+import { recursiveIterate as recursiveIterate2, RuntimeError as RuntimeError50 } from "@ibiz-template/core";
 
 // src/ui-action/provider/backend-ui-action-provider.ts
 import { RuntimeModelError as RuntimeModelError51 } from "@ibiz-template/core";
@@ -18379,7 +18523,7 @@ import { isArray as isArray8 } from "qx-util";
 import { RuntimeModelError as RuntimeModelError50 } from "@ibiz-template/core";
 
 // src/ui-logic/index.ts
-import { RuntimeError as RuntimeError46 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError47 } from "@ibiz-template/core";
 
 // src/ui-logic/ui-logic.ts
 import { ModelError as ModelError25, RuntimeModelError as RuntimeModelError49 } from "@ibiz-template/core";
@@ -18965,7 +19109,7 @@ var EndNode2 = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/prepare-js-param-node/prepare-js-param-node.ts
-import { ModelError as ModelError22, RuntimeError as RuntimeError41 } from "@ibiz-template/core";
+import { ModelError as ModelError22, RuntimeError as RuntimeError42 } from "@ibiz-template/core";
 import { clone as clone22 } from "ramda";
 var PrepareJSParamNode = class extends UILogicNode {
   async exec(ctx) {
@@ -19025,7 +19169,7 @@ var PrepareJSParamNode = class extends UILogicNode {
   setParamValue(nodeParam, ctx) {
     const { dstFieldName, dstDEUILogicParamId } = nodeParam;
     if (!dstDEUILogicParamId) {
-      throw new RuntimeError41("\u6CA1\u6709\u76EE\u6807\u53C2\u6570\u5BF9\u8C61id");
+      throw new RuntimeError42("\u6CA1\u6709\u76EE\u6807\u53C2\u6570\u5BF9\u8C61id");
     }
     let dstField = dstFieldName;
     if (ctx.isEntityParam(dstDEUILogicParamId)) {
@@ -19142,7 +19286,7 @@ var PrepareJSParamNode = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/view-ctrl-invoke-node/view-ctrl-invoke-node.ts
-import { RuntimeError as RuntimeError42, RuntimeModelError as RuntimeModelError37 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError43, RuntimeModelError as RuntimeModelError37 } from "@ibiz-template/core";
 import { isFunction } from "lodash-es";
 var ViewCtrlInvokeNode = class extends UILogicNode {
   async exec(ctx) {
@@ -19159,14 +19303,14 @@ var ViewCtrlInvokeNode = class extends UILogicNode {
     }
     const invokeParam = ctx.params[invokeParamId];
     if (!invokeParam) {
-      throw new RuntimeError42("\u6CA1\u6709\u627E\u5230\u64CD\u4F5C\u53C2\u6570".concat(invokeParamId));
+      throw new RuntimeError43("\u6CA1\u6709\u627E\u5230\u64CD\u4F5C\u53C2\u6570".concat(invokeParamId));
     }
     const invokeCtrl = ctx.params[invokeCtrlId];
     if (!invokeCtrl) {
-      throw new RuntimeError42("\u6CA1\u6709\u627E\u5230\u754C\u9762\u5BF9\u8C61".concat(invokeCtrlId));
+      throw new RuntimeError43("\u6CA1\u6709\u627E\u5230\u754C\u9762\u5BF9\u8C61".concat(invokeCtrlId));
     }
     if (!invokeCtrl[invokeMethod] || !isFunction(invokeCtrl[invokeMethod])) {
-      throw new RuntimeError42("\u6CA1\u6709\u627E\u5230\u8C03\u7528\u65B9\u6CD5".concat(invokeMethod));
+      throw new RuntimeError43("\u6CA1\u6709\u627E\u5230\u8C03\u7528\u65B9\u6CD5".concat(invokeMethod));
     }
     ibiz.log.debug(
       "\u754C\u9762\u903B\u8F91\u8282\u70B9\uFF08\u89C6\u56FE\u90E8\u4EF6\u8C03\u7528\uFF09\uFF1A".concat(this.model.id, "-\u8C03\u7528\u89C6\u56FE\u90E8\u4EF6\u540D\u79F0\uFF1A").concat(invokeCtrlId, "-\u8C03\u7528\u65B9\u6CD5\u540D\u79F0\uFF1A").concat(invokeMethod, "-\u89E6\u53D1\u53C2\u6570\uFF1A"),
@@ -19436,19 +19580,19 @@ var DataSetNode2 = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/throw-exception-node/throw-exception-node.ts
-import { RuntimeError as RuntimeError43 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError44 } from "@ibiz-template/core";
 var ThrowExceptionNode2 = class extends UILogicNode {
   async exec(_ctx) {
     const { errorInfo } = this.model;
     ibiz.log.debug(
       "\u754C\u9762\u903B\u8F91\u8282\u70B9\uFF08\u629B\u51FA\u5F02\u5E38\uFF09\uFF1A".concat(this.model.id, "-\u9519\u8BEF\u4FE1\u606F\uFF1A").concat(errorInfo)
     );
-    throw new RuntimeError43(errorInfo);
+    throw new RuntimeError44(errorInfo);
   }
 };
 
 // src/ui-logic/ui-logic-node/view-ctrl-fire-event-node/view-ctrl-fire-event-node.ts
-import { RuntimeError as RuntimeError44, RuntimeModelError as RuntimeModelError47 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError45, RuntimeModelError as RuntimeModelError47 } from "@ibiz-template/core";
 var ViewCtrlFireEventNode = class extends UILogicNode {
   async exec(ctx) {
     ctx.isEndNode = true;
@@ -19464,11 +19608,11 @@ var ViewCtrlFireEventNode = class extends UILogicNode {
     }
     const invokeCtrl = ctx.params[fireCtrlId];
     if (!invokeCtrl) {
-      throw new RuntimeError44("\u6CA1\u6709\u627E\u5230\u89E6\u53D1\u5BF9\u8C61".concat(fireCtrlId));
+      throw new RuntimeError45("\u6CA1\u6709\u627E\u5230\u89E6\u53D1\u5BF9\u8C61".concat(fireCtrlId));
     }
     const eventParam = ctx.params[eventParamId];
     if (!eventParam) {
-      throw new RuntimeError44("\u6CA1\u6709\u627E\u5230\u4E8B\u4EF6\u53C2\u6570\u5BF9\u8C61".concat(eventParamId));
+      throw new RuntimeError45("\u6CA1\u6709\u627E\u5230\u4E8B\u4EF6\u53C2\u6570\u5BF9\u8C61".concat(eventParamId));
     }
     ibiz.log.debug(
       "\u754C\u9762\u903B\u8F91\u8282\u70B9\uFF08\u89C6\u56FE\u90E8\u4EF6\u4E8B\u4EF6\u89E6\u53D1\u903B\u8F91\uFF09\uFF1A".concat(this.model.id, "-\u8C03\u7528\u89C6\u56FE\u90E8\u4EF6\u540D\u79F0\uFF1A").concat(fireCtrlId, "-\u89E6\u53D1\u4E8B\u4EF6\u540D\u79F0\uFF1A").concat(eventName, "-\u89E6\u53D1\u53C2\u6570\uFF1A"),
@@ -19479,7 +19623,7 @@ var ViewCtrlFireEventNode = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/execute-de-logic-node/execute-de-logic-node.ts
-import { RuntimeError as RuntimeError45, RuntimeModelError as RuntimeModelError48 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError46, RuntimeModelError as RuntimeModelError48 } from "@ibiz-template/core";
 var ExecuteDELogicNode = class extends UILogicNode {
   async exec(ctx) {
     const {
@@ -19499,7 +19643,7 @@ var ExecuteDELogicNode = class extends UILogicNode {
     }
     const dstParam = ctx.params[dstDEUILogicParamId];
     if (!dstParam) {
-      throw new RuntimeError45("\u6CA1\u6709\u627E\u5230\u4F20\u5165\u53C2\u6570".concat(dstDEUILogicParamId));
+      throw new RuntimeError46("\u6CA1\u6709\u627E\u5230\u4F20\u5165\u53C2\u6570".concat(dstDEUILogicParamId));
     }
     const result = await execDELogicById(
       dstAppDELogicId,
@@ -19837,7 +19981,7 @@ async function execUILogic(deUILogicId, appDataEntityId, parameters) {
   const app = ibiz.hub.getApp(parameters.context.srfappid);
   const deUILogic = await app.getDEUILogic(deUILogicId, appDataEntityId);
   if (!deUILogic) {
-    throw new RuntimeError46(
+    throw new RuntimeError47(
       "\u627E\u4E0D\u5230\u5B9E\u4F53".concat(appDataEntityId, "\u7684\u754C\u9762\u903B\u8F91").concat(deUILogicId)
     );
   }
@@ -19856,7 +20000,7 @@ async function execUILogic(deUILogicId, appDataEntityId, parameters) {
 }
 
 // src/ui-action/uiaction-util.ts
-import { RuntimeError as RuntimeError47 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError48 } from "@ibiz-template/core";
 var UIActionUtil = class {
   /**
    * 执行界面行为
@@ -19871,7 +20015,7 @@ var UIActionUtil = class {
   static async exec(actionId, params, appId2) {
     const action = await getUIActionById(actionId, appId2);
     if (!action) {
-      throw new RuntimeError47("\u6CA1\u627E\u5230".concat(actionId, "\u7684\u754C\u9762\u884C\u4E3A\u6A21\u578B"));
+      throw new RuntimeError48("\u6CA1\u627E\u5230".concat(actionId, "\u7684\u754C\u9762\u884C\u4E3A\u6A21\u578B"));
     }
     if (action.actionTarget === "SINGLEDATA") {
       const validateResult = await params.view.call("Validate" /* VALIDATE */);
@@ -20363,7 +20507,7 @@ import {
   StringUtil,
   RuntimeModelError as RuntimeModelError52,
   ModelError as ModelError26,
-  RuntimeError as RuntimeError48
+  RuntimeError as RuntimeError49
 } from "@ibiz-template/core";
 import { mergeRight as mergeRight3 } from "ramda";
 var FrontUIActionProvider = class extends UIActionProviderBase {
@@ -20477,7 +20621,7 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
       if (resultContext && resultContext[appDataEntity.codeName.toLowerCase()]) {
         requestUrl += "/".concat(appDataEntity.deapicodeName2, "/printdata/").concat(resultContext[appDataEntity.codeName.toLowerCase()]);
       } else {
-        throw new RuntimeError48("\u6CA1\u6709\u627E\u5230\u6570\u636E\u4E3B\u952E");
+        throw new RuntimeError49("\u6CA1\u6709\u627E\u5230\u6570\u636E\u4E3B\u952E");
       }
       const res = await ibiz.net.request(requestUrl, {
         method: "get",
@@ -20504,10 +20648,10 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
           window.open(link, "_blank");
         }
       } else {
-        throw new RuntimeError48("\u6253\u5370\u5931\u8D25");
+        throw new RuntimeError49("\u6253\u5370\u5931\u8D25");
       }
     } else {
-      throw new RuntimeError48("\u6CA1\u6709\u627E\u5230\u5B9E\u4F53\u6253\u5370\u9879");
+      throw new RuntimeError49("\u6CA1\u6709\u627E\u5230\u5B9E\u4F53\u6253\u5370\u9879");
     }
   }
   /**
@@ -20558,7 +20702,7 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
         refreshMode: 1
       };
     }
-    throw new RuntimeError48("\u6CA1\u6709\u627E\u5230\u5B9E\u4F53\u5BFC\u5165\u9879");
+    throw new RuntimeError49("\u6CA1\u6709\u627E\u5230\u5B9E\u4F53\u5BFC\u5165\u9879");
   }
   /**
    * 执行导出行为
@@ -20609,10 +20753,10 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
         URL.revokeObjectURL(elink.href);
         document.body.removeChild(elink);
       } else {
-        throw new RuntimeError48("\u5BFC\u51FA\u8BF7\u6C42\u5931\u8D25");
+        throw new RuntimeError49("\u5BFC\u51FA\u8BF7\u6C42\u5931\u8D25");
       }
     } else {
-      throw new RuntimeError48("\u6CA1\u6709\u627E\u5230\u5B9E\u4F53\u5BFC\u51FA\u9879");
+      throw new RuntimeError49("\u6CA1\u6709\u627E\u5230\u5B9E\u4F53\u5BFC\u51FA\u9879");
     }
   }
   /**
@@ -20629,7 +20773,7 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
     const actionResult = {};
     const { context, params, data, event } = args;
     if (!event) {
-      throw new RuntimeError48("\u7F3A\u5C11\u539F\u751FJS\u4E8B\u4EF6\u5BF9\u8C61");
+      throw new RuntimeError49("\u7F3A\u5C11\u539F\u751FJS\u4E8B\u4EF6\u5BF9\u8C61");
     }
     const { resultContext, resultParams } = await this.handleParams(
       action,
@@ -20645,20 +20789,23 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
       options
     );
     let hasSave = false;
-    await ibiz.overlay.popover(
-      event.target,
+    const overlay = ibiz.overlay.createPopover(
       "IBizControlShell",
       {
         context: resultContext,
         params: resultParams,
         modelData: action.deeditForm,
         onSaveSuccess: () => {
-          console.log("\u4FDD\u5B58\u6210\u529F");
+          if (overlay) {
+            overlay.dismiss();
+          }
           hasSave = true;
         }
       },
       popoverOpts
     );
+    overlay.present(event.target);
+    await overlay.onWillDismiss();
     if (!hasSave) {
       actionResult.cancel = true;
     }
@@ -20748,7 +20895,7 @@ var ToolbarController = class extends ControlController {
       const actionId = item.uiactionId;
       const uiAction = await getUIActionById(actionId, item.appId);
       if (!uiAction) {
-        throw new RuntimeError49("\u6CA1\u6709\u627E\u5230\u754C\u9762\u884C\u4E3A\u6A21\u578B".concat(actionId));
+        throw new RuntimeError50("\u6CA1\u6709\u627E\u5230\u754C\u9762\u884C\u4E3A\u6A21\u578B".concat(actionId));
       }
       const enableLoading = ["SYS", "BACKEND", "WFBACKEND"].includes(uiAction.uiactionMode) && uiAction.showBusyIndicator !== false;
       if (enableLoading) {
@@ -21362,7 +21509,7 @@ var RawItemPortletController = class extends PortletPartController {
 
 // src/controller/control/data-view/data-view.controller.ts
 import { RuntimeModelError as RuntimeModelError53 } from "@ibiz-template/core";
-import { isNil as isNil25 } from "ramda";
+import { isNil as isNil26 } from "ramda";
 
 // src/controller/control/data-view/data-view.service.ts
 var DataViewControlService = class extends MDControlService {
@@ -21653,7 +21800,7 @@ var DataViewControlController = class extends MDControlController {
       const groupMap = /* @__PURE__ */ new Map();
       items.forEach((item) => {
         const groupVal = item[groupAppDEFieldId];
-        if (isNil25(groupVal)) {
+        if (isNil26(groupVal)) {
           return;
         }
         if (!groupMap.has(groupVal)) {
@@ -21826,7 +21973,7 @@ var DataViewControlController = class extends MDControlController {
 import { RuntimeModelError as RuntimeModelError55 } from "@ibiz-template/core";
 
 // src/controller/control/exp-bar/exp-bar.controller.ts
-import { RuntimeError as RuntimeError50, RuntimeModelError as RuntimeModelError54 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError51, RuntimeModelError as RuntimeModelError54 } from "@ibiz-template/core";
 var ExpBarControlController = class extends ControlController {
   constructor() {
     super(...arguments);
@@ -22157,7 +22304,7 @@ var ExpBarControlController = class extends ControlController {
     if (["GRID", "DATAVIEW", "LIST"].includes(((_a = this.XDataModel) == null ? void 0 : _a.controlType) || "")) {
       return this.XDataModel.navAppViewId;
     }
-    throw new RuntimeError50("\u591A\u8282\u70B9\u89C6\u56FE\u7531\u5B50\u7C7B\u5B9E\u73B0");
+    throw new RuntimeError51("\u591A\u8282\u70B9\u89C6\u56FE\u7531\u5B50\u7C7B\u5B9E\u73B0");
   }
   /**
    * 获取导航视图
@@ -22300,7 +22447,7 @@ var CalendarExpBarController = class extends ExpBarControlController {
 };
 
 // src/controller/control/exp-bar/tree-exp-bar.controller.ts
-import { RuntimeError as RuntimeError51, RuntimeModelError as RuntimeModelError56 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError52, RuntimeModelError as RuntimeModelError56 } from "@ibiz-template/core";
 var TreeExpBarController = class extends ExpBarControlController {
   constructor() {
     super(...arguments);
@@ -22389,7 +22536,7 @@ var TreeExpBarController = class extends ExpBarControlController {
     const deData = node._deData || node;
     const nodeModel = this.getNodeModel(node._nodeId);
     if (!nodeModel) {
-      throw new RuntimeError51("\u627E\u4E0D\u5230".concat(node._nodeId, "\u7684\u8282\u70B9\u6A21\u578B"));
+      throw new RuntimeError52("\u627E\u4E0D\u5230".concat(node._nodeId, "\u7684\u8282\u70B9\u6A21\u578B"));
     }
     const result = this.prepareParams(nodeModel, deData, context, params);
     result.context.currentSrfNav = nodeId;
@@ -22580,7 +22727,7 @@ var ChartExpBarController = class extends ExpBarControlController {
 };
 
 // src/controller/control/form/search-form/search-form.controller.ts
-import { RuntimeError as RuntimeError52 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError53 } from "@ibiz-template/core";
 
 // src/controller/control/form/form/form.controller.ts
 import {
@@ -22588,13 +22735,9 @@ import {
   debounceAndAsyncMerge,
   recursiveIterate as recursiveIterate3
 } from "@ibiz-template/core";
-import { clone as clone24 } from "ramda";
 var FormController = class extends ControlController {
-  constructor(model, context, params, ctx) {
-    if (context && (context.srfreadonly === true || context.srfreadonly === "true")) {
-      model = clone24(model);
-    }
-    super(model, context, params, ctx);
+  constructor() {
+    super(...arguments);
     /**
      * 所有表单项成员的控制器
      *
@@ -22656,70 +22799,6 @@ var FormController = class extends ControlController {
     this.state.processing = false;
     this.state.modified = false;
   }
-  /**
-   * 进行模型预处理
-   *
-   * @author chitanda
-   * @date 2024-02-27 09:02:52
-   * @protected
-   */
-  preprocessModel(model) {
-    if (this.context && (this.context.srfreadonly === true || this.context.srfreadonly === "true")) {
-      const pages = model.deformPages;
-      if (pages) {
-        pages.forEach((page) => {
-          page.infoGroupMode = true;
-          if (page.deformDetails) {
-            page.deformDetails.forEach((detail) => {
-              this.deepPreprocessModel(detail);
-            });
-          }
-        });
-      }
-    }
-  }
-  /**
-   * 递归将表单模型修改为信息态
-   *
-   * @author chitanda
-   * @date 2024-02-27 11:02:43
-   * @protected
-   * @param {IDEFormGroupBase} model
-   */
-  deepPreprocessModel(model) {
-    if (model.detailType === "GROUPPANEL") {
-      model.infoGroupMode = true;
-    } else if (model.detailType === "FORMITEM") {
-      const { editor } = model;
-      if (editor) {
-        editor.readOnly = true;
-      }
-    }
-    switch (model.detailType) {
-      case "FORMITEM": {
-        const { editor } = model;
-        if (editor) {
-          editor.readOnly = true;
-        }
-        break;
-      }
-      case "MDCTRL": {
-        const detail = model;
-        detail.buildInActions = 0;
-        break;
-      }
-      case "GROUPPANEL":
-        model.infoGroupMode = true;
-        break;
-      default:
-        break;
-    }
-    if (model.deformDetails) {
-      model.deformDetails.forEach((detail) => {
-        this.deepPreprocessModel(detail);
-      });
-    }
-  }
   /**
    * 通知所有表单成员表单操作过程中的数据变更
    *
@@ -23257,7 +23336,7 @@ var SearchFormController = class extends FormController {
   applyStoredFilter(index) {
     const filter = this.state.storedFilters[index];
     if (!filter) {
-      throw new RuntimeError52("\u6CA1\u6709\u627E\u5230\u53EF\u4EE5\u5E94\u7528\u7684\u641C\u7D22\u6761\u4EF6");
+      throw new RuntimeError53("\u6CA1\u6709\u627E\u5230\u53EF\u4EE5\u5E94\u7528\u7684\u641C\u7D22\u6761\u4EF6");
     }
     if (filter.data) {
       Object.assign(this.data, filter.data);
@@ -23273,7 +23352,7 @@ var SearchFormController = class extends FormController {
   async removeStoredFilter(index) {
     const filter = this.state.storedFilters[index];
     if (!filter) {
-      throw new RuntimeError52("\u6CA1\u6709\u627E\u5230\u4FDD\u5B58\u7684\u641C\u7D22\u6761\u4EF6");
+      throw new RuntimeError53("\u6CA1\u6709\u627E\u5230\u4FDD\u5B58\u7684\u641C\u7D22\u6761\u4EF6");
     }
     this.state.storedFilters.splice(index, 1);
     await this.saveConfig();
@@ -23313,6 +23392,14 @@ var FormDetailState = class {
      * @type {(0 | 1 | 2)}
      */
     this.showMoreMode = 0;
+    /**
+     * 是否只读
+     *
+     * @author zhanghengfeng
+     * @date 2024-03-25 17:03:48
+     * @type {boolean}
+     */
+    this.readonly = false;
     let $visible = true;
     Object.defineProperty(this, "visible", {
       enumerable: true,
@@ -23351,6 +23438,18 @@ var FormDetailState = class {
         return true;
       }
     });
+    let $readonly = false;
+    Object.defineProperty(this, "readonly", {
+      enumerable: true,
+      configurable: true,
+      get() {
+        return $readonly;
+      },
+      set(val) {
+        $readonly = val;
+        return true;
+      }
+    });
   }
 };
 
@@ -23483,6 +23582,9 @@ var FormDetailController = class {
         this.model.caption
       );
     }
+    if (this.context.srfreadonly === true || this.context.srfreadonly === "true") {
+      this.state.readonly = true;
+    }
   }
   /**
    * 创建表单状态对象
@@ -24235,12 +24337,16 @@ var FormItemController = class extends FormDetailController {
    * @returns {*}  {Promise<void>}
    */
   async onInit() {
+    var _a;
     await super.onInit();
     this.state.required = !this.model.allowEmpty;
     const { enableCond } = this.model;
     if (!enableCond) {
       this.state.enableCondDisabled = true;
     }
+    if (this.context.srfreadonly !== true && this.context.srfreadonly !== "true") {
+      this.state.readonly = ((_a = this.model.editor) == null ? void 0 : _a.readOnly) || false;
+    }
     if (this.model.editor && this.model.editor.editorType !== "HIDDEN") {
       this.editorProvider = await getEditorProvider(this.model.editor);
       if (this.editorProvider) {
@@ -24337,7 +24443,7 @@ var FormItemController = class extends FormDetailController {
       this.state.error = null;
       return true;
     }
-    if (this.state.required && isNilOrEmpty7(this.data[this.name])) {
+    if (this.state.required && (typeof this.data[this.name] === "string" ? isNilOrEmpty7(this.data[this.name].trimEnd()) : isNilOrEmpty7(this.data[this.name]))) {
       this.state.error = "\u8BF7\u586B\u5199".concat(this.model.caption || "");
       return false;
     }
@@ -24448,7 +24554,7 @@ var FormMDCtrlController = class extends FormDetailController {
    * @type {boolean}
    */
   get enableCreate() {
-    return BitMask.checkPermission(this.model.buildInActions, 1);
+    return !this.state.readonly && BitMask.checkPermission(this.model.buildInActions, 1);
   }
   /**
    * 是否允许更新
@@ -24459,7 +24565,7 @@ var FormMDCtrlController = class extends FormDetailController {
    * @type {boolean}
    */
   get enableUpdate() {
-    return BitMask.checkPermission(this.model.buildInActions, 2);
+    return !this.state.readonly && BitMask.checkPermission(this.model.buildInActions, 2);
   }
   /**
    * 是否允许删除
@@ -24469,7 +24575,7 @@ var FormMDCtrlController = class extends FormDetailController {
    * @type {boolean}
    */
   get enableDelete() {
-    return BitMask.checkPermission(this.model.buildInActions, 4);
+    return !this.state.readonly && BitMask.checkPermission(this.model.buildInActions, 4);
   }
   /**
    * 如果配置了表单项更新，则执行表单项更新
@@ -24627,7 +24733,7 @@ var FormMDCtrlMDController = class extends FormMDCtrlController {
 };
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form.controller.ts
-import { RuntimeError as RuntimeError53, RuntimeModelError as RuntimeModelError59 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError54, RuntimeModelError as RuntimeModelError59 } from "@ibiz-template/core";
 import { createUUID as createUUID11 } from "qx-util";
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form.state.ts
@@ -24744,7 +24850,7 @@ var FormMDCtrlFormController = class extends FormMDCtrlController {
   async remove(id) {
     const controller = this.formMap.get(id);
     if (!controller) {
-      throw new RuntimeError53("\u6CA1\u6709\u627E\u5230\u5BF9\u5E94".concat(id, "\u7684\u8868\u5355\u63A7\u5236\u5668"));
+      throw new RuntimeError54("\u6CA1\u6709\u627E\u5230\u5BF9\u5E94".concat(id, "\u7684\u8868\u5355\u63A7\u5236\u5668"));
     }
     await controller.remove();
     const index = this.state.items.findIndex((item) => item.id === id);
@@ -24802,7 +24908,7 @@ var FormMDCtrlFormController = class extends FormMDCtrlController {
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater.controller.ts
 import { ModelError as ModelError28 } from "@ibiz-template/core";
-import { clone as clone25 } from "ramda";
+import { clone as clone24 } from "ramda";
 var FormMDCtrlRepeaterController = class extends FormMDCtrlController {
   constructor() {
     super(...arguments);
@@ -24886,7 +24992,7 @@ var FormMDCtrlRepeaterController = class extends FormMDCtrlController {
     copyFields.forEach((key) => {
       tempForm[key] = this.form.model[key];
     });
-    this.repeatedForm = clone25(tempForm);
+    this.repeatedForm = clone24(tempForm);
   }
   /**
    * 设置重复器数据（修改主表单里重复器对应属性）
@@ -25061,11 +25167,11 @@ import {
   IBizContext as IBizContext4,
   isElementSame as isElementSame2,
   mergeInLeft as mergeInLeft2,
-  RuntimeError as RuntimeError54
+  RuntimeError as RuntimeError55
 } from "@ibiz-template/core";
-import { debounce as debounce2 } from "lodash-es";
+import { debounce } from "lodash-es";
 import { createUUID as createUUID12 } from "qx-util";
-import { clone as clone26 } from "ramda";
+import { clone as clone25, isNil as isNil27 } from "ramda";
 
 // src/controller/control/form/edit-form/edit-form.service.ts
 import {
@@ -25383,7 +25489,7 @@ var EditFormController = class extends FormController {
     await super.onCreated();
     this.service = new EditFormService(this.model);
     await this.service.init(this.context);
-    this.autoSave = debounce2(this.autoSave.bind(this), 500, {
+    this.autoSave = debounce(this.autoSave.bind(this), 500, {
       trailing: true
     });
   }
@@ -25430,8 +25536,8 @@ var EditFormController = class extends FormController {
    * @return {*}  {Promise<IData>}
    */
   async copy() {
-    const context = clone26(this.context);
-    const queryParams = clone26(this.params);
+    const context = clone25(this.context);
+    const queryParams = clone25(this.params);
     const appDataEntity = await ibiz.hub.getAppDataEntity(
       this.model.appDataEntityId,
       this.model.appId
@@ -25488,7 +25594,7 @@ var EditFormController = class extends FormController {
       return this.loadDraft();
     }
     const { context, params } = this.handlerAbilityParams(args);
-    const queryParams = clone26(params);
+    const queryParams = clone25(params);
     let res;
     try {
       await this.startLoading();
@@ -25526,7 +25632,7 @@ var EditFormController = class extends FormController {
     }
     const isValid = await this.validate();
     if (!isValid) {
-      throw new RuntimeError54("\u8BF7\u68C0\u67E5\u8868\u5355\u586B\u5199\uFF01");
+      throw new RuntimeError55("\u8BF7\u68C0\u67E5\u8868\u5355\u586B\u5199\uFF01");
     }
     if (!silent) {
       await this.startLoading();
@@ -25570,10 +25676,7 @@ var EditFormController = class extends FormController {
         default: "".concat(this.data.srfmajortext || "", "\u4FDD\u5B58\u6210\u529F")
       });
     }
-    ibiz.mc.command.send(
-      res.data.$origin,
-      isCreate ? "OBJECTCREATED" : "OBJECTUPDATED"
-    );
+    this.emitDEDataChange(isCreate ? "create" : "update", res.data);
     return this.data;
   }
   /**
@@ -25610,11 +25713,11 @@ var EditFormController = class extends FormController {
       }
       ok = res.ok;
     }
+    this.emitDEDataChange("remove", this.data);
     this.state.data = new ControlVO();
     this.state.modified = false;
     await this.evt.emit("onRemoveSuccess", void 0);
     this.actionNotification("REMOVESUCCESS");
-    ibiz.mc.command.send(this.data.$origin, "OBJECTREMOVED");
     return ok;
   }
   /**
@@ -25651,7 +25754,7 @@ var EditFormController = class extends FormController {
       (item) => item.id === formItemUpdateId
     );
     if (!formItemUpdate) {
-      throw new RuntimeError54("\u6CA1\u627E\u5230".concat(formItemUpdateId, "\u8868\u5355\u9879\u66F4\u65B0"));
+      throw new RuntimeError55("\u6CA1\u627E\u5230".concat(formItemUpdateId, "\u8868\u5355\u9879\u66F4\u65B0"));
     }
     const {
       appDEMethodId,
@@ -25710,14 +25813,14 @@ var EditFormController = class extends FormController {
   async wfStart(args) {
     const isValid = await this.validate();
     if (!isValid) {
-      throw new RuntimeError54("\u8BF7\u68C0\u67E5\u8868\u5355\u586B\u5199\uFF01");
+      throw new RuntimeError55("\u8BF7\u68C0\u67E5\u8868\u5355\u586B\u5199\uFF01");
     }
     await this.startLoading();
     const { context, params } = this.handlerAbilityParams(args);
     try {
       await this.service.wfStart(context, params, this.data);
-      ibiz.mc.command.send(this.data.$origin, "OBJECTUPDATED");
-      ibiz.mc.command.send({ srfdecodename: "SysTodo" }, "OBJECTUPDATED");
+      this.emitDEDataChange("update", this.data);
+      this.emitDEDataChange("update", { srfdecodename: "SysTodo" });
     } catch (error) {
       this.actionNotification("WFSTARTERROR", {
         error
@@ -25739,14 +25842,14 @@ var EditFormController = class extends FormController {
   async wfSubmit(args) {
     const isValid = await this.validate();
     if (!isValid) {
-      throw new RuntimeError54("\u8BF7\u68C0\u67E5\u8868\u5355\u586B\u5199\uFF01");
+      throw new RuntimeError55("\u8BF7\u68C0\u67E5\u8868\u5355\u586B\u5199\uFF01");
     }
     await this.startLoading();
     const { context, params } = this.handlerAbilityParams(args);
     try {
       await this.service.wfSubmit(context, params, this.data);
-      ibiz.mc.command.send(this.data.$origin, "OBJECTUPDATED");
-      ibiz.mc.command.send({ srfdecodename: "SysTodo" }, "OBJECTUPDATED");
+      this.emitDEDataChange("update", this.data);
+      this.emitDEDataChange("update", { srfdecodename: "SysTodo" });
     } catch (error) {
       this.actionNotification("WFSUBMITERROR", {
         error
@@ -25833,6 +25936,29 @@ var EditFormController = class 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;
+    }
+    if (!isNil27(msg.triggerKey) && msg.triggerKey === this.triggerKey) {
+      return;
+    }
+    const dename = calcDeCodeNameById(this.model.appDataEntityId);
+    if (!msg.data || ((_a = msg.data.srfdecodename) == null ? void 0 : _a.toLowerCase()) !== dename || msg.data.srfkey !== this.data.srfkey) {
+      return;
+    }
+    this.doNextActive(() => this.load(), { key: "load" });
+  }
 };
 
 // src/controller/control/grid/grid/grid-column.controller.ts
@@ -26075,10 +26201,10 @@ import {
   debounceAndAsyncMerge as debounceAndAsyncMerge2,
   mergeDefaultInLeft,
   recursiveIterate as recursiveIterate7,
-  RuntimeError as RuntimeError55,
+  RuntimeError as RuntimeError56,
   RuntimeModelError as RuntimeModelError62
 } from "@ibiz-template/core";
-import { clone as clone27 } from "ramda";
+import { clone as clone26 } from "ramda";
 import dayjs5 from "dayjs";
 
 // src/controller/control/grid/grid/grid.service.ts
@@ -26428,7 +26554,7 @@ var GridController = class extends MDControlController {
     const result = await calcColumnModelBySchema(json, this);
     if (result && result.degridColumns.length > 0) {
       const { degridColumns, degridDataItems } = result;
-      this.model = clone27(this.model);
+      this.model = clone26(this.model);
       this.model.degridColumns = [
         ...(this.model.degridColumns || []).filter((item) => {
           return degridColumns.findIndex((x) => x.id === item.id) === -1;
@@ -26702,7 +26828,7 @@ var GridController = class extends MDControlController {
     if (editShowMode === "row") {
       const editingRow = this.state.rows.find((item) => item.showRowEdit);
       if (editingRow) {
-        throw new RuntimeError55("\u8BF7\u5148\u5B8C\u6210\u5F53\u524D\u884C\u7F16\u8F91\u4E2D\u7684\u884C\u7684\u64CD\u4F5C");
+        throw new RuntimeError56("\u8BF7\u5148\u5B8C\u6210\u5F53\u524D\u884C\u7F16\u8F91\u4E2D\u7684\u884C\u7684\u64CD\u4F5C");
       }
     }
     const queryParams = { ...this.params };
@@ -26743,7 +26869,7 @@ var GridController = class extends MDControlController {
     const isCreate = data.srfuf === 0 /* CREATE */;
     const rowState = this.findRowState(data);
     if (!rowState) {
-      throw new RuntimeError55("\u884C\u6570\u636E\u4E0D\u5B58\u5728");
+      throw new RuntimeError56("\u884C\u6570\u636E\u4E0D\u5B58\u5728");
     }
     if (!rowState.modified) {
       ibiz.log.debug("\u503C\u6CA1\u6709\u53D1\u751F\u6539\u53D8");
@@ -26755,7 +26881,7 @@ var GridController = class extends MDControlController {
     }
     const isValid = await this.validate(rowState);
     if (!isValid) {
-      throw new RuntimeError55("\u884C\u6570\u636E\u6821\u9A8C\u4E0D\u901A\u8FC7\uFF0C\u4FDD\u5B58\u53D6\u6D88");
+      throw new RuntimeError56("\u884C\u6570\u636E\u6821\u9A8C\u4E0D\u901A\u8FC7\uFF0C\u4FDD\u5B58\u53D6\u6D88");
     }
     if (this.model.enableRowEditChangedOnly) {
       data = rowState.getDiffData();
@@ -26781,6 +26907,7 @@ var GridController = class extends MDControlController {
     rowState.modified = false;
     this.gridStateNotify(rowState, "SAVE" /* SAVE */);
     await this._evt.emit("onSaveSuccess", void 0);
+    this.emitDEDataChange(isCreate ? "create" : "update", res.data);
   }
   async saveAll() {
     const needSaveData = this.state.rows.filter((row) => row.modified).map((row) => row.data);
@@ -26977,7 +27104,7 @@ var GridController = class extends MDControlController {
   }
   async toggleRowEdit() {
     if (!this.model.enableRowNew) {
-      throw new RuntimeError55("\u5F53\u524D\u8868\u683C\u4E0D\u652F\u6301\u884C\u7F16\u8F91\uFF0C\u65E0\u6CD5\u5207\u6362\u5F00\u542F\u884C\u7F16\u8F91");
+      throw new RuntimeError56("\u5F53\u524D\u8868\u683C\u4E0D\u652F\u6301\u884C\u7F16\u8F91\uFF0C\u65E0\u6CD5\u5207\u6362\u5F00\u542F\u884C\u7F16\u8F91");
     }
     this.state.rowEditOpen = !this.state.rowEditOpen;
   }
@@ -27010,10 +27137,10 @@ var GridController = class extends MDControlController {
     } else {
       const editingRow = this.state.rows.find((item) => item.showRowEdit);
       if (editingRow) {
-        throw new RuntimeError55("\u540C\u65F6\u53EA\u80FD\u6709\u4E00\u884C\u5F00\u542F\u884C\u7F16\u8F91");
+        throw new RuntimeError56("\u540C\u65F6\u53EA\u80FD\u6709\u4E00\u884C\u5F00\u542F\u884C\u7F16\u8F91");
       }
       if (row.data.srfuf === 1 /* UPDATE */) {
-        row.cacheData = clone27(row.data);
+        row.cacheData = clone26(row.data);
         const defaultVal = this.calcDefaultValue(row.data, false);
         Object.assign(row.data, defaultVal);
       }
@@ -27065,7 +27192,7 @@ var GridController = class extends MDControlController {
       (item) => item.id === updateId
     );
     if (!findUpdate) {
-      throw new RuntimeError55("\u6CA1\u627E\u5230".concat(updateId, "\u7F16\u8F91\u5217\u66F4\u65B0"));
+      throw new RuntimeError56("\u6CA1\u627E\u5230".concat(updateId, "\u7F16\u8F91\u5217\u66F4\u65B0"));
     }
     const { appDEMethodId, degeiupdateDetails, customCode, scriptCode } = findUpdate;
     const updateItems = degeiupdateDetails.map((item) => item.id);
@@ -27152,7 +27279,7 @@ var GridController = class extends MDControlController {
    */
   formatExcelData(data) {
     const { fields = [] } = this.dataExportParam;
-    const cloneData = clone27(
+    const cloneData = clone26(
       data.map((item) => {
         return fields.reduce((obj, key) => {
           obj[key] = item[key];
@@ -27205,7 +27332,7 @@ var GridController = class extends MDControlController {
       data = this.getData();
     }
     if (data.length === 0) {
-      throw new RuntimeError55("\u65E0\u5BFC\u51FA\u6570\u636E");
+      throw new RuntimeError56("\u65E0\u5BFC\u51FA\u6570\u636E");
     }
     return data;
   }
@@ -27219,7 +27346,7 @@ var GridController = class extends MDControlController {
   async exportData(args) {
     const { header } = this.dataExportParam;
     if (!header) {
-      throw new RuntimeError55("\u65E0\u8868\u683C\u5217");
+      throw new RuntimeError56("\u65E0\u8868\u683C\u5217");
     }
     const data = await this.getExportData(args.params);
     const formatData = this.formatExcelData(data);
@@ -27397,8 +27524,8 @@ var GridController = class extends MDControlController {
 // src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts
 import { DataTypes as DataTypes4, ModelError as ModelError29, plus as plus2 } from "@ibiz-template/core";
 import dayjs6 from "dayjs";
-import { debounce as debounce3 } from "lodash-es";
-import { clone as clone28, isNil as isNil26 } from "ramda";
+import { debounce as debounce2 } from "lodash-es";
+import { clone as clone27, isNil as isNil28 } from "ramda";
 var GridFieldColumnController = class extends GridColumnController {
   constructor() {
     super(...arguments);
@@ -27442,7 +27569,7 @@ var GridFieldColumnController = class extends GridColumnController {
   }
   async onInit() {
     await super.onInit();
-    this.loadCodeList = debounce3(this.loadCodeList, 300, {
+    this.loadCodeList = debounce2(this.loadCodeList, 300, {
       leading: true,
       trailing: false
     });
@@ -27536,7 +27663,7 @@ var GridFieldColumnController = class extends GridColumnController {
       srfkey: value,
       ...wfContext
     });
-    const tempParams = clone28(this.params);
+    const tempParams = clone27(this.params);
     const { context: newContext, params: newParams } = this.handlePublicParams(
       row.data,
       tempContext,
@@ -27610,11 +27737,11 @@ var GridFieldColumnController = class extends GridColumnController {
    */
   calcFieldAgg(items) {
     const { aggField, aggMode, aggValueFormat, unitName } = this.model;
-    if (isNil26(aggMode) || aggMode === "NONE") {
+    if (isNil28(aggMode) || aggMode === "NONE") {
       return;
     }
     const fieldName = aggField || this.model.id;
-    items = items.filter((item) => !isNil26(item[fieldName]));
+    items = items.filter((item) => !isNil28(item[fieldName]));
     let aggValue;
     if (this.grid.model.aggMode === "PAGE") {
       switch (aggMode) {
@@ -27765,7 +27892,7 @@ var GridUAColumnController = class extends GridColumnController {
 };
 
 // src/controller/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.controller.ts
-import { RuntimeError as RuntimeError56 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError57 } from "@ibiz-template/core";
 import Schema2 from "async-validator";
 import { isNilOrEmpty as isNilOrEmpty8 } from "qx-util";
 var GridFieldEditColumnController = class extends GridFieldColumnController {
@@ -27905,7 +28032,7 @@ var GridFieldEditColumnController = class extends GridFieldColumnController {
     if (requiredChanged || names.includes(this.fieldName) || names.includes(this.valueItemName)) {
       const result = await this.validate(row);
       if (!result) {
-        throw new RuntimeError56(
+        throw new RuntimeError57(
           "".concat(this.editItem.codeName, "\u6821\u9A8C\u62A5\u9519,").concat(row.errors[this.fieldName])
         );
       }
@@ -28006,7 +28133,7 @@ var GridFieldEditColumnController = class extends GridFieldColumnController {
    */
   async validate(row) {
     const editName = this.fieldName;
-    if (ibiz.config.grid.editShowMode !== "cell" && row.editColStates[editName].required && isNilOrEmpty8(row.data[editName])) {
+    if (ibiz.config.grid.editShowMode !== "cell" && row.editColStates[editName].required === true && (typeof row.data[editName] === "string" ? isNilOrEmpty8(row.data[editName].trimEnd()) : isNilOrEmpty8(row.data[editName]))) {
       row.errors[editName] = "\u8BF7\u586B\u5199".concat(this.model.caption || "");
       return false;
     }
@@ -28203,7 +28330,7 @@ var ListController = class extends MDControlController {
 };
 
 // src/controller/control/panel/panel/panel.controller.ts
-import { recursiveIterate as recursiveIterate8, RuntimeError as RuntimeError57 } from "@ibiz-template/core";
+import { recursiveIterate as recursiveIterate8, RuntimeError as RuntimeError58 } from "@ibiz-template/core";
 var PanelController = class extends ControlController {
   constructor(model, context, params, ctx, container) {
     super(model, context, params, ctx);
@@ -28327,7 +28454,7 @@ var PanelController = class extends ControlController {
     var _a, _b;
     const data = await this.prepareData();
     if (!data) {
-      throw new RuntimeError57("\u672A\u83B7\u53D6\u5230\u9762\u677F\u6570\u636E");
+      throw new RuntimeError58("\u672A\u83B7\u53D6\u5230\u9762\u677F\u6570\u636E");
     }
     const panelData = this.convertData(data);
     (_b = (_a = this.data).destroy) == null ? void 0 : _b.call(_a);
@@ -28506,6 +28633,14 @@ var PanelItemState = class {
      * @type {boolean}
      */
     this.required = false;
+    /**
+     * 是否只读
+     *
+     * @author zhanghengfeng
+     * @date 2024-03-25 17:03:36
+     * @type {boolean}
+     */
+    this.readonly = false;
     let $visible = true;
     Object.defineProperty(this, "visible", {
       enumerable: true,
@@ -28537,6 +28672,18 @@ var PanelItemState = class {
         return true;
       }
     });
+    let $readonly = false;
+    Object.defineProperty(this, "readonly", {
+      enumerable: true,
+      configurable: true,
+      get() {
+        return $readonly;
+      },
+      set(val) {
+        $readonly = val;
+        return true;
+      }
+    });
   }
 };
 
@@ -28637,6 +28784,9 @@ var PanelItemController = class {
     if (labelSysCss == null ? void 0 : labelSysCss.cssName) {
       this.state.class.label.push(labelSysCss.cssName);
     }
+    if (this.panel.context.srfreadonly === true || this.panel.context.srfreadonly === "true") {
+      this.state.readonly = true;
+    }
   }
   destroy() {
   }
@@ -28930,7 +29080,7 @@ var PickupViewPanelController = class extends ControlController {
 
 // src/controller/control/search-bar/search-bar.controller.ts
 import { mergeInLeft as mergeInLeft3, recursiveIterate as recursiveIterate10 } from "@ibiz-template/core";
-import { clone as clone30, isNil as isNil28 } from "ramda";
+import { clone as clone29, isNil as isNil30 } from "ramda";
 import { isString as isString2 } from "lodash-es";
 
 // src/controller/control/search-bar/search-bar-filter.controller.ts
@@ -29373,8 +29523,8 @@ async function calcFilterModelBySchema(json, appDataEntityId, modelAppId) {
 }
 
 // src/controller/control/search-bar/use-searchcond.ts
-import { RuntimeError as RuntimeError58, recursiveIterate as recursiveIterate9 } from "@ibiz-template/core";
-import { isNil as isNil27 } from "ramda";
+import { RuntimeError as RuntimeError59, recursiveIterate as recursiveIterate9 } from "@ibiz-template/core";
+import { isNil as isNil29 } from "ramda";
 var ExcludeOPs2 = ["ISNULL" /* IS_NULL */, "ISNOTNULL" /* IS_NOT_NULL */];
 function getOriginFilterNodes() {
   return [
@@ -29444,14 +29594,14 @@ function parseFilters(data) {
       valueItem: data.valueItem || void 0
     };
   }
-  throw new RuntimeError58("\u65E0\u6548\u7684condtype:".concat(data.condtype));
+  throw new RuntimeError59("\u65E0\u6548\u7684condtype:".concat(data.condtype));
 }
 function calcSearchConds(filterNodes) {
   let hasFilter = false;
   let hasError = false;
   recursiveIterate9(filterNodes[0], (node) => {
     if (node.leaf) {
-      if (node.field && node.valueOP && !isNil27(node.value) || node.field && node.valueOP && ExcludeOPs2.includes(node.valueOP)) {
+      if (node.field && node.valueOP && !isNil29(node.value) || node.field && node.valueOP && ExcludeOPs2.includes(node.valueOP)) {
         hasFilter = true;
       } else {
         hasError = true;
@@ -29465,8 +29615,8 @@ function calcSearchConds(filterNodes) {
 }
 
 // src/controller/control/search-bar/search-bar-filter-items.controller.ts
-import { RuntimeError as RuntimeError59 } from "@ibiz-template/core";
-import { clone as clone29 } from "ramda";
+import { RuntimeError as RuntimeError60 } from "@ibiz-template/core";
+import { clone as clone28 } from "ramda";
 var ExcludeOPs3 = [
   "ISNULL" /* IS_NULL */,
   "ISNOTNULL" /* IS_NOT_NULL */
@@ -29527,7 +29677,7 @@ var SearchBarFilterItemsController = class extends SearchBarFilterController {
       return false;
     });
     if (!minorDEId) {
-      throw new RuntimeError59("\u627E\u4E0D\u5230\u5C5E\u6027".concat(targetField, "\u5BF9\u5E94\u7684\u5173\u8054\u5B9E\u4F53"));
+      throw new RuntimeError60("\u627E\u4E0D\u5230\u5C5E\u6027".concat(targetField, "\u5BF9\u5E94\u7684\u5173\u8054\u5B9E\u4F53"));
     }
     this.minorAppDE = await ibiz.hub.getAppDataEntity(
       minorDEId,
@@ -29558,7 +29708,7 @@ var SearchBarFilterItemsController = class extends SearchBarFilterController {
         });
       }
       fieldMap.get(subField).valueOPs.push(subOP);
-      const cloneItem = clone29(item);
+      const cloneItem = clone28(item);
       cloneItem.defsearchMode.valueOP = subOP;
       this.subFilterCMap.set(
         this.calcKey(subField, subOP),
@@ -29738,7 +29888,7 @@ var SearchBarController = class extends ControlController {
       }
     });
     if (addSearchBarFilters.length > 0) {
-      this.model = clone30(this.model);
+      this.model = clone29(this.model);
       this.model.searchBarFilters = addSearchBarFilters.concat(...mergeFilters);
       this.model.enableFilter = true;
     }
@@ -29905,7 +30055,7 @@ var SearchBarController = class extends ControlController {
       recursiveIterate10(
         searchconds[0],
         (node, parent) => {
-          if (node.condtype === "DEFIELD" && !isNil28(node.value)) {
+          if (node.condtype === "DEFIELD" && !isNil30(node.value)) {
             let controller = this.findFilterController(
               node.fieldname,
               node.condop
@@ -30364,10 +30514,11 @@ var TabExpPanelController = class extends ControlController {
 
 // src/controller/control/tree/tree.controller.ts
 import {
-  RuntimeError as RuntimeError60,
+  RuntimeError as RuntimeError61,
   RuntimeModelError as RuntimeModelError65,
   recursiveIterate as recursiveIterate11
 } from "@ibiz-template/core";
+import { isNil as isNil31 } from "ramda";
 
 // src/controller/control/tree/tree.service.ts
 import { ModelError as ModelError30 } from "@ibiz-template/core";
@@ -31371,7 +31522,10 @@ var TreeController = class extends MDControlController {
     await Promise.all(
       nodeDatas.map(async (node) => {
         const model = this.getNodeModel(node._nodeId);
-        const deData = node._deData;
+        let deData = node._deData;
+        if (node._changedOnly) {
+          deData = node.getDiffData();
+        }
         const deName = calcDeCodeNameById(model.appDataEntityId);
         const tempContext = this.context.clone();
         tempContext[deName] = deData.srfkey;
@@ -31383,6 +31537,7 @@ var TreeController = class extends MDControlController {
         );
         if (res.data) {
           node._deData = res.data;
+          node._oldDeData = res.data.clone();
         }
       })
     );
@@ -31401,10 +31556,11 @@ var TreeController = class extends MDControlController {
       throw new RuntimeModelError65(model, "\u6811\u8282\u70B9\u6CA1\u6709\u914D\u7F6E\u7F16\u8F91\u6A21\u5F0F\uFF1A\u540D\u79F0");
     }
     if (nodeData._nodeType !== "DE") {
-      throw new RuntimeError60("\u4E0D\u662F\u5B9E\u4F53\u6811\u8282\u70B9\u6570\u636E");
+      throw new RuntimeError61("\u4E0D\u662F\u5B9E\u4F53\u6811\u8282\u70B9\u6570\u636E");
     }
     nodeData._text = text;
     await this.updateDeNodeData([nodeData]);
+    this.emitDEDataChange("update", nodeData._deData);
   }
   /**
    * 删除每一项
@@ -31416,7 +31572,7 @@ var TreeController = class extends MDControlController {
     let needRefresh = false;
     const treeNode = this.getNodeModel(item._nodeId);
     if (!treeNode) {
-      throw new RuntimeError60("\u672A\u627E\u5230\u6811\u8282\u70B9");
+      throw new RuntimeError61("\u672A\u627E\u5230\u6811\u8282\u70B9");
     }
     const nodeAppDataEntityId = treeNode.appDataEntityId;
     if (nodeAppDataEntityId) {
@@ -31430,12 +31586,37 @@ var TreeController = class extends MDControlController {
     }
     return needRefresh;
   }
-  onDataChange(_msg) {
+  /**
+   * 检测实体数据变更
+   *
+   * @author tony001
+   * @date 2024-03-28 18:03:09
+   * @protected
+   * @param {IPortalMessage} msg
+   * @return {*}  {void}
+   */
+  onDEDataChange(msg) {
+    if (!isNil31(msg.triggerKey) && msg.triggerKey === this.triggerKey) {
+      return;
+    }
+    if (msg.subtype === "OBJECTCREATED") {
+      return;
+    }
+    const data = msg.data;
+    const findNode = this.state.items.find(
+      (item) => item._nodeType === "DE" && item._deData && item._deData.srfdecodename === data.srfdecodename && item._deData.srfkey === data.srfkey
+    );
+    if (!findNode) {
+      return;
+    }
+    this.doNextActive(() => this.refreshNodeChildren(findNode, true), {
+      key: "refresh".concat(findNode._id)
+    });
   }
 };
 
 // src/controller/control/wizard-panel/wizard-panel.controller.ts
-import { RuntimeError as RuntimeError61 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError62 } from "@ibiz-template/core";
 
 // src/controller/control/wizard-panel/wizard-panel.service.ts
 var WizardPanelService = class extends ControlService {
@@ -31601,7 +31782,7 @@ var WizardPanelController = class extends ControlController {
     const { activeFormTag } = this.state;
     const controller = this.formControllers.get(activeFormTag);
     if (!controller) {
-      throw new RuntimeError61("\u627E\u4E0D\u5230".concat(activeFormTag, "\u7684\u8868\u5355\u63A7\u5236\u5668"));
+      throw new RuntimeError62("\u627E\u4E0D\u5230".concat(activeFormTag, "\u7684\u8868\u5355\u63A7\u5236\u5668"));
     }
     return controller;
   }
@@ -31643,7 +31824,7 @@ var WizardPanelController = class extends ControlController {
   getWizardFormByTag(tag) {
     var _a;
     if (!((_a = this.model.dewizard) == null ? void 0 : _a.dewizardForms)) {
-      throw new RuntimeError61("\u6CA1\u6709\u914D\u7F6E\u5411\u5BFC\u8868\u5355\u96C6\u5408");
+      throw new RuntimeError62("\u6CA1\u6709\u914D\u7F6E\u5411\u5BFC\u8868\u5355\u96C6\u5408");
       return;
     }
     const wizardForm = this.model.dewizard.dewizardForms.find(
@@ -31652,7 +31833,7 @@ var WizardPanelController = class extends ControlController {
       }
     );
     if (!wizardForm) {
-      throw new RuntimeError61("\u627E\u4E0D\u5230\u6807\u8BC6\u4E3A".concat(tag, "\u7684\u5411\u5BFC\u8868\u5355"));
+      throw new RuntimeError62("\u627E\u4E0D\u5230\u6807\u8BC6\u4E3A".concat(tag, "\u7684\u5411\u5BFC\u8868\u5355"));
     }
     return wizardForm;
   }
@@ -31723,7 +31904,7 @@ var WizardPanelController = class extends ControlController {
       prevTag = this.tagHistory[this.tagHistory.length - 1];
     }
     if (!prevTag) {
-      throw new RuntimeError61("\u6CA1\u6709\u4E0A\u4E00\u4E2A\u8868\u5355");
+      throw new RuntimeError62("\u6CA1\u6709\u4E0A\u4E00\u4E2A\u8868\u5355");
     }
     this.state.activeFormTag = prevTag;
   }
@@ -31759,7 +31940,7 @@ var WizardPanelController = class extends ControlController {
         });
         const nextWizardStep = wizardSteps[index + 1];
         if (!nextWizardStep) {
-          throw new RuntimeError61("\u627E\u4E0D\u5230\u4E0B\u4E00\u4E2A\u5411\u5BFC\u6B65\u9AA4");
+          throw new RuntimeError62("\u627E\u4E0D\u5230\u4E0B\u4E00\u4E2A\u5411\u5BFC\u6B65\u9AA4");
         }
         const nextWizardForm = this.getWizardFormByTag(nextWizardStep.stepTag);
         if (nextWizardForm && nextWizardForm.formTag) {
@@ -31768,7 +31949,7 @@ var WizardPanelController = class extends ControlController {
       }
     }
     if (!nextTag) {
-      throw new RuntimeError61("\u627E\u4E0D\u5230\u4E0B\u4E00\u4E2A\u5411\u5BFC\u8868\u5355");
+      throw new RuntimeError62("\u627E\u4E0D\u5230\u4E0B\u4E00\u4E2A\u5411\u5BFC\u8868\u5355");
     }
     this.state.activeFormTag = nextTag;
     this.tagHistory.push(nextTag);
@@ -31788,7 +31969,7 @@ var WizardPanelController = class extends ControlController {
 
 // src/controller/control/md-ctrl/md-ctrl.controller.ts
 import { RuntimeModelError as RuntimeModelError66 } from "@ibiz-template/core";
-import { isNil as isNil29 } from "ramda";
+import { isNil as isNil32 } from "ramda";
 
 // src/controller/control/md-ctrl/md-ctrl.service.ts
 var MDCtrlService = class extends MDControlService {
@@ -31878,7 +32059,9 @@ var MDCtrlController = class extends MDControlController {
    * @memberof MDCtrlController
    */
   async refresh() {
-    await this.load({ isInitialLoad: true });
+    this.doNextActive(() => this.load({ isInitialLoad: true }), {
+      key: "refresh"
+    });
   }
   async afterLoad(args, items) {
     if (args.isInitialLoad) {
@@ -32015,7 +32198,7 @@ var MDCtrlController = class extends MDControlController {
       const groupMap = /* @__PURE__ */ new Map();
       items.forEach((item) => {
         const groupVal = item[groupAppDEFieldId];
-        if (isNil29(groupVal)) {
+        if (isNil32(groupVal)) {
           return;
         }
         if (!groupMap.has(groupVal)) {
@@ -32091,8 +32274,8 @@ var MDCtrlController = class extends MDControlController {
 };
 
 // src/controller/control/kanban/kanban.controller.ts
-import { RuntimeError as RuntimeError62, RuntimeModelError as RuntimeModelError67 } from "@ibiz-template/core";
-import { isNil as isNil30 } from "ramda";
+import { RuntimeError as RuntimeError63, RuntimeModelError as RuntimeModelError67 } from "@ibiz-template/core";
+import { isNil as isNil33 } from "ramda";
 
 // src/controller/control/kanban/kanban.service.ts
 var KanbanService = class extends DataViewControlService {
@@ -32178,12 +32361,12 @@ var KanbanController = class extends DataViewControlController {
     const isAsc = minorSortDir === "ASC";
     items.forEach((item) => {
       const sortValue = item[sortField];
-      if (isNil30(sortValue)) {
+      if (isNil33(sortValue)) {
         item[sortField] = 0;
       } else {
         const toNum = Number(sortValue);
         if (Number.isNaN(toNum)) {
-          throw new RuntimeError62(
+          throw new RuntimeError63(
             "".concat(item.srfmajortext, "\u7684\u6392\u5E8F\u5C5E\u6027\u65E0\u6CD5\u8F6C\u6362\u6210\u6570\u503C")
           );
         }
@@ -32305,7 +32488,7 @@ var KanbanController = class extends DataViewControlController {
   }
   handleDataGroup() {
     if (!this.model.enableGroup || this.model.groupMode === "NONE") {
-      throw new RuntimeError62("\u770B\u677F\u90E8\u4EF6\u5FC5\u987B\u5F00\u542F\u5206\u7EC4");
+      throw new RuntimeError63("\u770B\u677F\u90E8\u4EF6\u5FC5\u987B\u5F00\u542F\u5206\u7EC4");
     }
     return super.handleDataGroup();
   }
@@ -32321,7 +32504,7 @@ var KanbanController = class extends DataViewControlController {
       const groupMap = /* @__PURE__ */ new Map();
       items.forEach((item) => {
         const groupVal = item[groupAppDEFieldId];
-        if (isNil30(groupVal)) {
+        if (isNil33(groupVal)) {
           return;
         }
         if (!groupMap.has(groupVal)) {
@@ -32648,12 +32831,12 @@ var KanbanController = class extends DataViewControlController {
 
 // src/controller/control/tree-grid-ex/tree-grid-ex.controller.ts
 import {
-  RuntimeError as RuntimeError63,
+  RuntimeError as RuntimeError64,
   RuntimeModelError as RuntimeModelError68,
   awaitTimeout as awaitTimeout3,
   recursiveIterate as recursiveIterate12
 } from "@ibiz-template/core";
-import { clone as clone31 } from "ramda";
+import { clone as clone30 } from "ramda";
 
 // src/controller/control/tree-grid-ex/tree-grid-ex.service.ts
 var TreeGridExService = class extends TreeService {
@@ -32908,11 +33091,11 @@ var TreeGridExController = class extends TreeController {
       return;
     }
     if (nodeData._nodeType !== "DE") {
-      throw new RuntimeError63("\u975E\u5B9E\u4F53\u8282\u70B9\u6570\u636E\u4E0D\u80FD\u4FDD\u5B58");
+      throw new RuntimeError64("\u975E\u5B9E\u4F53\u8282\u70B9\u6570\u636E\u4E0D\u80FD\u4FDD\u5B58");
     }
     const rowState = this.state.rows[nodeData._uuid];
     if (!rowState) {
-      throw new RuntimeError63("\u884C\u6570\u636E\u4E0D\u5B58\u5728");
+      throw new RuntimeError64("\u884C\u6570\u636E\u4E0D\u5B58\u5728");
     }
     if (!rowState.modified) {
       ibiz.log.debug("\u503C\u6CA1\u6709\u53D1\u751F\u6539\u53D8");
@@ -32926,7 +33109,7 @@ var TreeGridExController = class extends TreeController {
     const { appDataEntityId, updateAppDEActionId } = nodeModel;
     const isCreate = nodeData._deData.srfuf === 0 /* CREATE */;
     if (isCreate) {
-      throw new RuntimeError63("\u6682\u4E0D\u652F\u6301\u65B0\u5EFA");
+      throw new RuntimeError64("\u6682\u4E0D\u652F\u6301\u65B0\u5EFA");
     }
     if (!updateAppDEActionId) {
       throw new RuntimeModelError68(nodeModel, "\u6811\u8282\u70B9\u6CA1\u6709\u914D\u7F6E\u66F4\u65B0\u5B9E\u4F53\u884C\u4E3A");
@@ -33086,10 +33269,10 @@ var TreeGridExController = class extends TreeController {
         (item) => item.showRowEdit
       );
       if (editingRow) {
-        throw new RuntimeError63("\u540C\u65F6\u53EA\u80FD\u6709\u4E00\u884C\u5F00\u542F\u884C\u7F16\u8F91");
+        throw new RuntimeError64("\u540C\u65F6\u53EA\u80FD\u6709\u4E00\u884C\u5F00\u542F\u884C\u7F16\u8F91");
       }
       if (row.data._deData.srfuf === 1 /* UPDATE */) {
-        row.cacheData = clone31(row.data);
+        row.cacheData = clone30(row.data);
         const defaultVal = this.calcDefaultValue(row.data, false);
         Object.assign(row.data, defaultVal);
       }
@@ -33199,10 +33382,10 @@ var TreeGridExColumnController = class {
 // src/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-field-column/tree-grid-ex-node-column.controller.ts
 import {
   DataTypes as DataTypes5,
-  RuntimeError as RuntimeError64,
+  RuntimeError as RuntimeError65,
   RuntimeModelError as RuntimeModelError69
 } from "@ibiz-template/core";
-import { clone as clone32 } from "ramda";
+import { clone as clone31 } from "ramda";
 import dayjs7 from "dayjs";
 var TreeGridExNodeColumnController = class {
   /**
@@ -33400,7 +33583,7 @@ var TreeGridExNodeColumnController = class {
     const valueItem = this.nodeColumn.linkValueItem || "srfkey";
     const value = row.data[valueItem];
     if (value == null) {
-      throw new RuntimeError64("\u672A\u5728\u884C\u6570\u636E\u4E2D\u53D6\u5230 ".concat(valueItem, " \u7684\u503C"));
+      throw new RuntimeError65("\u672A\u5728\u884C\u6570\u636E\u4E2D\u53D6\u5230 ".concat(valueItem, " \u7684\u503C"));
     }
     const { linkAppViewId } = this.nodeColumn;
     if (!linkAppViewId) {
@@ -33411,7 +33594,7 @@ var TreeGridExNodeColumnController = class {
       srfkey: value,
       ...wfContext
     });
-    const tempParams = clone32(this.params);
+    const tempParams = clone31(this.params);
     const { userParam } = this.nodeColumn;
     if (userParam) {
       const { navigateContexts, navigateParams } = parseUserParams(userParam);
@@ -33813,7 +33996,7 @@ var TreeGridService = class extends GridService {
 };
 
 // src/controller/control/medit-view-panel/medit-view-panel.controller.ts
-import { RuntimeError as RuntimeError65 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError66 } from "@ibiz-template/core";
 import { createUUID as createUUID14 } from "qx-util";
 
 // src/controller/control/medit-view-panel/medit-view-panel.service.ts
@@ -34029,7 +34212,7 @@ var MEditViewPanelController = class extends MDControlController {
       (item) => item.id === id
     );
     if (panelUiItemIndex < 0) {
-      throw new RuntimeError65("\u7F16\u8F91\u89C6\u56FE\u9762\u677F\u90E8\u4EF6UI\u6570\u636E\u4E0D\u5B58\u5728");
+      throw new RuntimeError66("\u7F16\u8F91\u89C6\u56FE\u9762\u677F\u90E8\u4EF6UI\u6570\u636E\u4E0D\u5B58\u5728");
     }
     const tempUiItem = this.state.panelUiItems[panelUiItemIndex];
     if (tempUiItem.id.startsWith("mockId:")) {
@@ -34530,14 +34713,16 @@ var ReportPanelController = class extends ControlController {
    * @date 2023-05-23 03:42:41
    */
   async refresh() {
-    await this.load({ isInitialLoad: false });
+    this.doNextActive(() => this.load({ isInitialLoad: false }), {
+      key: "refresh"
+    });
   }
 };
 
 // src/controller/control/gantt/gantt.controller.ts
 import {
   awaitTimeout as awaitTimeout4,
-  RuntimeError as RuntimeError66,
+  RuntimeError as RuntimeError67,
   RuntimeModelError as RuntimeModelError71
 } from "@ibiz-template/core";
 
@@ -34981,11 +35166,11 @@ var GanttController = class extends TreeGridExController {
    */
   async modifyNodeTime(nodeData, { begin, end }) {
     if (nodeData._nodeType !== "DE") {
-      throw new RuntimeError66("\u4E0D\u662F\u5B9E\u4F53\u7518\u7279\u8282\u70B9\u6570\u636E");
+      throw new RuntimeError67("\u4E0D\u662F\u5B9E\u4F53\u7518\u7279\u8282\u70B9\u6570\u636E");
     }
     const rowState = this.getRowState(nodeData._id);
     if (!rowState) {
-      throw new RuntimeError66("\u884C\u6570\u636E\u4E0D\u5B58\u5728");
+      throw new RuntimeError67("\u884C\u6570\u636E\u4E0D\u5B58\u5728");
     }
     const { beginDataItemName, endDataItemName } = this.model;
     this.setRowValue(rowState, beginDataItemName, begin);
@@ -35005,11 +35190,11 @@ var GanttController = class extends TreeGridExController {
       return;
     }
     if (nodeData._nodeType !== "DE") {
-      throw new RuntimeError66("\u975E\u5B9E\u4F53\u8282\u70B9\u6570\u636E\u4E0D\u80FD\u4FDD\u5B58");
+      throw new RuntimeError67("\u975E\u5B9E\u4F53\u8282\u70B9\u6570\u636E\u4E0D\u80FD\u4FDD\u5B58");
     }
     const rowState = this.state.rows[nodeData._uuid];
     if (!rowState) {
-      throw new RuntimeError66("\u884C\u6570\u636E\u4E0D\u5B58\u5728");
+      throw new RuntimeError67("\u884C\u6570\u636E\u4E0D\u5B58\u5728");
     }
     if (!rowState.modified) {
       ibiz.log.debug("\u503C\u6CA1\u6709\u53D1\u751F\u6539\u53D8");
@@ -35057,7 +35242,7 @@ var GanttController = class extends TreeGridExController {
   async remove(args) {
     const { context, params, data } = this.handlerAbilityParams(args);
     if (!(data == null ? void 0 : data.length)) {
-      throw new RuntimeError66("\u672A\u9009\u4E2D\u6570\u636E");
+      throw new RuntimeError67("\u672A\u9009\u4E2D\u6570\u636E");
     }
     if ((args == null ? void 0 : args.silent) !== true) {
       const del = await ibiz.confirm.error({
@@ -35166,7 +35351,7 @@ var GanttController = class extends TreeGridExController {
         (item) => item.showRowEdit
       );
       if (editingRow) {
-        throw new RuntimeError66("\u8BF7\u5148\u5B8C\u6210\u5F53\u524D\u884C\u7F16\u8F91\u4E2D\u7684\u884C\u7684\u64CD\u4F5C");
+        throw new RuntimeError67("\u8BF7\u5148\u5B8C\u6210\u5F53\u524D\u884C\u7F16\u8F91\u4E2D\u7684\u884C\u7684\u64CD\u4F5C");
       }
     }
     let parentModel;
@@ -35260,8 +35445,8 @@ import { QXEvent as QXEvent9 } from "qx-util";
 
 // src/controller/notification/async-action.controller.ts
 import { QXEvent as QXEvent7 } from "qx-util";
-import { clone as clone33 } from "ramda";
-import { isNil as isNil31, isNumber as isNumber2 } from "lodash-es";
+import { clone as clone32 } from "ramda";
+import { isNil as isNil34, isNumber as isNumber2 } from "lodash-es";
 import dayjs8 from "dayjs";
 var AsyncActionController = class {
   constructor() {
@@ -35336,14 +35521,14 @@ var AsyncActionController = class {
         data[key] = dayjs8(data[key]).format("YYYY-MM-DD HH:mm:ss");
       }
     });
-    if (!isNil31(data.actionresult)) {
+    if (!isNil34(data.actionresult)) {
       try {
         const json = JSON.parse(data.actionresult);
         data.actionresult = json;
       } catch (error) {
       }
     }
-    if (!isNil31(data.completionrate)) {
+    if (!isNil34(data.completionrate)) {
       const num = Number(data.completionrate);
       if (Number.isNaN(num)) {
         data.completionrate = void 0;
@@ -35368,7 +35553,7 @@ var AsyncActionController = class {
     } else {
       this.noticeResult(action);
     }
-    this.evt.emit("add", clone33(action));
+    this.evt.emit("add", clone32(action));
     this.evt.emit("dataChange");
   }
   /**
@@ -35390,7 +35575,7 @@ var AsyncActionController = class {
       }
       this.noticeResult(action);
     }
-    this.evt.emit("change", clone33(action));
+    this.evt.emit("change", clone32(action));
     this.evt.emit("dataChange");
   }
   noticeResult(action) {
@@ -35786,7 +35971,7 @@ var AppHub = class {
       this.registerAppView(appView);
       return appView;
     }
-    throw new RuntimeError67("\u89C6\u56FE[".concat(id, "]\u4E0D\u5B58\u5728"));
+    throw new RuntimeError68("\u89C6\u56FE[".concat(id, "]\u4E0D\u5B58\u5728"));
   }
   /**
    * 根据视图模型路径，加参数重新计算视图模型
@@ -35807,7 +35992,7 @@ var AppHub = class {
       );
       return model;
     }
-    throw new RuntimeError67("\u89C6\u56FE[".concat(modelPath, "]\u4E0D\u5B58\u5728"));
+    throw new RuntimeError68("\u89C6\u56FE[".concat(modelPath, "]\u4E0D\u5B58\u5728"));
   }
   /**
    * 根据应用实体代码名称查找应用视图
@@ -35838,7 +36023,7 @@ var AppHub = class {
       this.registerAppDataEntity(entity, appId2);
       return entity;
     }
-    throw new RuntimeError67("\u672A\u627E\u5230\u5E94\u7528\u5B9E\u4F53[".concat(id, "]"));
+    throw new RuntimeError68("\u672A\u627E\u5230\u5E94\u7528\u5B9E\u4F53[".concat(id, "]"));
   }
   /**
    * 新建 hub 应用
@@ -35853,7 +36038,7 @@ var AppHub = class {
       return this.appMap.get(id);
     }
     if (!this.modelLoaderProvider) {
-      throw new RuntimeError67("\u8BF7\u5148\u6CE8\u518C\u6A21\u578B\u52A0\u8F7D\u9002\u914D\u5668");
+      throw new RuntimeError68("\u8BF7\u5148\u6CE8\u518C\u6A21\u578B\u52A0\u8F7D\u9002\u914D\u5668");
     }
     const appModel = await this.modelLoaderProvider.getApp(id);
     const app = new Application(appModel);
@@ -35984,7 +36169,7 @@ var EngineFactory = class {
 };
 
 // src/engine/view-base.engine.ts
-import { RuntimeError as RuntimeError68, findRecursiveChild as findRecursiveChild3 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError69, findRecursiveChild as findRecursiveChild3 } from "@ibiz-template/core";
 var ViewEngineBase = class {
   /**
    * 构造函数在视图控制器的构造函数逻辑内部执行
@@ -36208,7 +36393,7 @@ var ViewEngineBase = class {
   }
   /**
    * 是否存在模型 并且 布局中有占位
-   *
+   * - 工具栏模型还需判断是否有工具栏项
    * @author zk
    * @date 2024-01-30 11:01:33
    * @param {string} name
@@ -36226,7 +36411,12 @@ var ViewEngineBase = class {
     });
     const { model } = this.view;
     const has = getControl(model, name);
-    return !!(ins && has);
+    let visible = !!(ins && has);
+    if ((has == null ? void 0 : has.controlType) === "TOOLBAR") {
+      const items = has.detoolbarItems;
+      visible = !!(visible && items && items.length > 0);
+    }
+    return visible;
   }
   /**
    * 计算底部的显示与否
@@ -36252,7 +36442,7 @@ var ViewEngineBase = class {
     const { appDataEntityId } = this.view.model;
     const { evt, context, params } = this.view;
     if (!appDataEntityId) {
-      throw new RuntimeError68("\u8BE5\u89C6\u56FE\u6CA1\u6709\u5B9E\u4F53\uFF0C\u65E0\u6CD5\u52A0\u8F7D\u5B9E\u4F53\u6570\u636E");
+      throw new RuntimeError69("\u8BE5\u89C6\u56FE\u6CA1\u6709\u5B9E\u4F53\uFF0C\u65E0\u6CD5\u52A0\u8F7D\u5B9E\u4F53\u6570\u636E");
     }
     const app = ibiz.hub.getApp(context.srfappid);
     const res = await app.deService.exec(
@@ -36274,7 +36464,7 @@ var ViewEngineBase = class {
 
 // src/engine/md-view.engine.ts
 import { RuntimeModelError as RuntimeModelError72 } from "@ibiz-template/core";
-import { clone as clone34 } from "ramda";
+import { clone as clone33 } from "ramda";
 var MDViewEngine = class extends ViewEngineBase {
   /**
    * 多数据部件名称
@@ -36304,6 +36494,35 @@ var MDViewEngine = class extends ViewEngineBase {
   get searchBar() {
     return this.view.getController("searchbar");
   }
+  /**
+   * 获取分页搜索视图上移的工具栏控制器
+   * @author lxm
+   * @date 2023-05-22 03:47:43
+   * @readonly
+   * @protected
+   * @type {(IToolbarController | undefined)}
+   */
+  get tabToolbar() {
+    return this.view.getController("tabtoolbar");
+  }
+  /**
+   * 获取分页搜索视图上移的搜索表单控制器
+   * @author lxm
+   * @date 2023-05-22 01:56:25
+   * @readonly
+   */
+  get tabSearchForm() {
+    return this.view.getController("tabsearchform");
+  }
+  /**
+   * 获取分页搜索视图上移的搜索栏控制器
+   * @author lxm
+   * @date 2023-05-22 01:56:25
+   * @readonly
+   */
+  get tabSearchBar() {
+    return this.view.getController("tabsearchbar");
+  }
   /**
    * 数据部件控制器（多数据）
    * @author lxm
@@ -36319,7 +36538,14 @@ var MDViewEngine = class extends ViewEngineBase {
   async onCreated() {
     await super.onCreated();
     const { childNames } = this.view;
-    childNames.push(this.xdataControlName, "searchform", "searchbar");
+    childNames.push(
+      this.xdataControlName,
+      "searchform",
+      "searchbar",
+      "tabtoolbar",
+      "tabsearchform",
+      "tabsearchbar"
+    );
     if (this.xdataControlName) {
       if (!this.view.slotProps[this.xdataControlName]) {
         this.view.slotProps[this.xdataControlName] = {};
@@ -36332,11 +36558,15 @@ var MDViewEngine = class extends ViewEngineBase {
     const { model } = this.view;
     this.xdataControl.evt.on("onActive", this.onXDataActive.bind(this));
     this.xdataControl.evt.on("onSelectionChange", async (event) => {
-      var _a;
+      var _a, _b;
       (_a = this.toolbar) == null ? void 0 : _a.calcButtonState(
         event.data[0],
         this.xdataControl.model.appDataEntityId
       );
+      (_b = this.tabToolbar) == null ? void 0 : _b.calcButtonState(
+        event.data[0],
+        this.xdataControl.model.appDataEntityId
+      );
     });
     this.xdataControl.evt.on("onBeforeLoad", () => {
       this.xdataControl.state.searchParams = this.getSearchParams();
@@ -36366,9 +36596,20 @@ var MDViewEngine = class extends ViewEngineBase {
         this.reLoad();
       });
     }
+    if (this.tabSearchForm) {
+      this.tabSearchForm.evt.on("onSearch", () => {
+        this.reLoad();
+      });
+    }
+    if (this.tabSearchBar) {
+      this.tabSearchBar.evt.on("onSearch", () => {
+        this.reLoad();
+      });
+    }
     if (!this.view.state.noLoadDefault && model.loadDefault) {
-      if (this.searchBar && this.searchBar.hasDefaultSelect && (this.xdataControlName === "grid" || this.xdataControlName === "treegrid")) {
-        this.searchBar.setDefaultSelect();
+      const searchbar = this.searchBar || this.tabSearchBar;
+      if (searchbar && searchbar.hasDefaultSelect && (this.xdataControlName === "grid" || this.xdataControlName === "treegrid")) {
+        searchbar.setDefaultSelect();
       } else {
         this.load();
       }
@@ -36429,11 +36670,13 @@ var MDViewEngine = class extends ViewEngineBase {
       return null;
     }
     if (key === "Search" /* SEARCH */) {
-      await this.searchForm.search();
+      const searchForm = this.searchForm || this.tabSearchForm;
+      await searchForm.search();
       return null;
     }
     if (key === "Reset" /* RESET */) {
-      await this.searchForm.reset();
+      const searchForm = this.searchForm || this.tabSearchForm;
+      await searchForm.reset();
       return null;
     }
     if (key === "Copy" /* COPY */) {
@@ -36498,7 +36741,7 @@ var MDViewEngine = class extends ViewEngineBase {
     if (!openAppViewLogic) {
       throw new RuntimeModelError72(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
     }
-    const params = clone34(this.view.params);
+    const params = clone33(this.view.params);
     if (copyMode) {
       params.srfcopymode = copyMode;
     }
@@ -36568,6 +36811,12 @@ var MDViewEngine = class extends ViewEngineBase {
     if (this.searchBar) {
       Object.assign(params, this.searchBar.getFilterParams());
     }
+    if (this.tabSearchForm) {
+      Object.assign(params, this.tabSearchForm.getFilterParams());
+    }
+    if (this.tabSearchBar) {
+      Object.assign(params, this.tabSearchBar.getFilterParams());
+    }
     return params;
   }
   /**
@@ -36796,7 +37045,7 @@ var GlobalUtil = class {
 };
 
 // src/logic-scheduler/executor/logic-executor.ts
-import { RuntimeError as RuntimeError69 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError70 } from "@ibiz-template/core";
 var LogicExecutor = class {
   /**
    * @author lxm
@@ -36817,7 +37066,7 @@ var LogicExecutor = class {
    */
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   execute(_executeParams) {
-    throw new RuntimeError69("Method not implemented.");
+    throw new RuntimeError70("Method not implemented.");
   }
   /**
    * 销毁方法
@@ -37254,7 +37503,7 @@ var LogicSchedulerCenter = class {
 };
 
 // src/logic-scheduler/trigger/logic-trigger.ts
-import { RuntimeError as RuntimeError70 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError71 } from "@ibiz-template/core";
 var LogicTrigger = class {
   /**
    * @author lxm
@@ -37314,7 +37563,7 @@ var LogicTrigger = class {
     if (this.executor) {
       return this.executor.execute(executeParams);
     }
-    throw new RuntimeError70("".concat(this.logic.id, "\u6CA1\u6709\u7ED1\u5B9Aexecutor"));
+    throw new RuntimeError71("".concat(this.logic.id, "\u6CA1\u6709\u7ED1\u5B9Aexecutor"));
   }
   /**
    * 销毁方法
@@ -37331,12 +37580,12 @@ var CustomTrigger = class extends LogicTrigger {
 };
 
 // src/logic-scheduler/trigger/item-dyna-logic-trigger.ts
-import { RuntimeError as RuntimeError71 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError72 } from "@ibiz-template/core";
 var ItemDynaLogicTrigger = class extends LogicTrigger {
   bindExecutor(executor) {
     super.bindExecutor(executor);
     if (this.executor.type !== "SCRIPT") {
-      throw new RuntimeError71(
+      throw new RuntimeError72(
         "\u9884\u5B9A\u4E49\u903B\u8F91\u7C7B\u578B".concat(this.type, "\u7684\u89E6\u53D1\u5668\u7C7B\u578B\u53EA\u80FD\u662F\u811A\u672C")
       );
     }
@@ -37373,7 +37622,7 @@ var ItemDynaLogicTrigger = class extends LogicTrigger {
 };
 
 // src/logic-scheduler/trigger/timer-trigger.ts
-import { RuntimeError as RuntimeError72, RuntimeModelError as RuntimeModelError74 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError73, RuntimeModelError as RuntimeModelError74 } from "@ibiz-template/core";
 var TimerTrigger = class extends LogicTrigger {
   constructor() {
     super(...arguments);
@@ -37385,7 +37634,7 @@ var TimerTrigger = class extends LogicTrigger {
     }
     this.timer = setInterval(() => {
       if (!this.scheduler.defaultParamsCb) {
-        throw new RuntimeError72("\u5B9A\u65F6\u5668\u7F3A\u5C11\u9ED8\u8BA4\u53C2\u6570\u56DE\u8C03");
+        throw new RuntimeError73("\u5B9A\u65F6\u5668\u7F3A\u5C11\u9ED8\u8BA4\u53C2\u6570\u56DE\u8C03");
       }
       const params = this.scheduler.defaultParamsCb();
       this.executor.execute(params);
@@ -37402,7 +37651,7 @@ var TimerTrigger = class extends LogicTrigger {
 // src/logic-scheduler/executor/app-ui-logic-executor.ts
 import {
   ModelError as ModelError34,
-  RuntimeError as RuntimeError73,
+  RuntimeError as RuntimeError74,
   RuntimeModelError as RuntimeModelError75
 } from "@ibiz-template/core";
 import { notNilEmpty as notNilEmpty9 } from "qx-util";
@@ -37440,7 +37689,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     const { context, params, ...rest } = parameters;
     const { data } = parameters;
     if (!(data == null ? void 0 : data[0])) {
-      throw new RuntimeError73("opendata\u6CA1\u6709\u53EF\u64CD\u4F5C\u6570\u636E\uFF01");
+      throw new RuntimeError74("opendata\u6CA1\u6709\u53EF\u64CD\u4F5C\u6570\u636E\uFF01");
     }
     const openViewRefs = appUILogic.openDataAppViews;
     let openViewRef;
@@ -37500,7 +37749,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     const openViewRefs = appUILogic.openDataAppViews;
     const findView = openViewRefs == null ? void 0 : openViewRefs.find((item) => item.refMode === formTypeValue);
     if (!findView) {
-      throw new RuntimeError73(
+      throw new RuntimeError74(
         "\u6CA1\u6709\u627E\u5230\u4E0E\u8868\u5355\u7C7B\u578B".concat(formTypeValue, "\u76F8\u5173\u7684\u5B9E\u4F53\u7684\u7F16\u8F91\u89C6\u56FE")
       );
     }
@@ -37625,7 +37874,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     }
     const selectData = (_a = result.data) == null ? void 0 : _a[0];
     if (!selectData) {
-      throw new RuntimeError73("\u8BF7\u9009\u4E2D\u4E00\u6761\u6570\u636E");
+      throw new RuntimeError74("\u8BF7\u9009\u4E2D\u4E00\u6761\u6570\u636E");
     }
     const indexType = selectData.srfkey;
     const findView = newDataAppViews == null ? void 0 : newDataAppViews.find(
@@ -37635,7 +37884,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
       }
     );
     if (!findView) {
-      throw new RuntimeError73(
+      throw new RuntimeError74(
         "\u6CA1\u6709\u627E\u5230\u4E0E\u7D22\u5F15\u7C7B\u578B".concat(indexType, "\u76F8\u5173\u7684\u5B9E\u4F53\u7684\u7F16\u8F91\u89C6\u56FE")
       );
     }
@@ -37672,7 +37921,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
         }
       });
       if (pickParentFieldName === void 0) {
-        throw new RuntimeError73(
+        throw new RuntimeError74(
           "\u6CA1\u6709\u627E\u5230".concat(pickParentDeName, "\u5728\u5F53\u524D\u5B9E\u4F53\u7684\u5916\u952E\u5C5E\u6027")
         );
       }
@@ -38223,6 +38472,7 @@ export {
   getControlPanel,
   getControlProvider,
   getControlsByView,
+  getCtrlTeleportTag,
   getDEMethodProvider,
   getDERedirectToView,
   getDeACMode,