@ibiz-template/runtime 0.5.3-beta.1 → 0.5.3-beta.11

package/dist/index.esm.js

@@ -1501,7 +1501,7 @@ var ScriptFunction = class {
       try {
         return fn.apply({}, args);
       } catch (error) {
-        console.log("\u62A5\u9519\u811A\u672C", code);
+        ibiz.log.error("\u62A5\u9519\u811A\u672C", code);
         throw error;
       }
     };
@@ -2850,6 +2850,95 @@ var ThemeUtil = class {
 
 // src/utils/ui-domain/ui-domain.ts
 import { createUUID } from "qx-util";
+
+// src/utils/ui-domain/transaction.ts
+var Transaction = class {
+  constructor() {
+    /**
+     * 待提交队列
+     *
+     * @author chitanda
+     * @date 2024-01-17 15:01:38
+     * @protected
+     */
+    this.commitQueue = /* @__PURE__ */ new Map();
+    /**
+     * 事务状态
+     *
+     * @author chitanda
+     * @date 2024-01-17 15:01:45
+     * @type {ITransactionState}
+     */
+    this.state = {
+      isOpen: false,
+      isChange: false
+    };
+  }
+  /**
+   * 开启事务
+   *
+   * @description 事务开启后，所有的数据操作都会被缓存，直到事务提交或者回滚
+   * @author chitanda
+   * @date 2024-01-17 15:01:46
+   */
+  open() {
+    if (this.state.isOpen) {
+      ibiz.log.warn("\u4E8B\u52A1\u5DF2\u7ECF\u5F00\u542F, \u5355\u4E2A\u754C\u9762\u57DF\u53EA\u80FD\u5F00\u542F\u4E00\u4E2A\u4E8B\u52A1");
+      return;
+    }
+    this.state.isOpen = true;
+  }
+  /**
+   * 新增变更事务回调，事务提交时会按照添加顺序倒序执行
+   *
+   * @author chitanda
+   * @date 2024-01-17 16:01:50
+   * @param {string} id 回调标识，用于去重。一个数据只能有一个回调
+   * @param {() => void} commit
+   */
+  change(id, commit) {
+    this.state.isChange = true;
+    this.commitQueue.set(id, commit);
+  }
+  /**
+   * 提交事务
+   *
+   * @author chitanda
+   * @date 2024-01-17 15:01:05
+   */
+  commit() {
+    const commitQueue = Array.from(this.commitQueue.values()).reverse();
+    for (const commit of commitQueue) {
+      commit();
+    }
+    this.commitQueue.clear();
+    this.state.isChange = false;
+  }
+  /**
+   * 回滚事务
+   *
+   * @author chitanda
+   * @date 2024-01-17 19:01:43
+   */
+  rollback() {
+    this.commitQueue.clear();
+    this.state.isChange = false;
+  }
+  /**
+   * 关闭事务
+   *
+   * @author chitanda
+   * @date 2024-01-17 15:01:02
+   */
+  close() {
+    if (this.state.isChange) {
+      throw new Error("\u5F53\u524D\u4E8B\u52A1\u672A\u63D0\u4EA4\uFF0C\u4E0D\u53EF\u4EE5\u76F4\u63A5\u5173\u95ED\u4E8B\u52A1");
+    }
+    this.state.isOpen = false;
+  }
+};
+
+// src/utils/ui-domain/ui-domain.ts
 var UIDomain = class {
   /**
    * Creates an instance of UIDomain.
@@ -2861,14 +2950,39 @@ var UIDomain = class {
    */
   constructor(id) {
     /**
-     * DTO 父子关系映射
+     * 状态
+     *
+     * @author chitanda
+     * @date 2024-01-15 19:01:51
+     * @type {{ rsInit: boolean }} 关系是否已经初始化
+     */
+    this.state = { rsInit: false };
+    /**
+     * DTO 子父关系映射
      *
      * @author chitanda
      * @date 2023-12-26 15:12:13
      * @protected
-     * @type {Map<string, IAppDERS[]>}
+     * @type {Map<string, IAppDERS[]>} Map<子实体, 当前实体的父关系>
      */
     this.rsMap = /* @__PURE__ */ new Map();
+    /**
+     * DTO 父子关系映射
+     *
+     * @author chitanda
+     * @date 2024-01-15 17:01:42
+     * @protected
+     * @type {Map<string, IAppDERS[]>}
+     */
+    this.rs2Map = /* @__PURE__ */ new Map();
+    /**
+     * 当前界面域下唯一事务
+     *
+     * @author chitanda
+     * @date 2024-01-17 15:01:07
+     * @type {Transaction}
+     */
+    this.transaction = new Transaction();
     if (id) {
       this.id = id;
     } else {
@@ -2880,26 +2994,59 @@ var UIDomain = class {
    *
    * @author chitanda
    * @date 2023-12-26 15:12:31
-   * @param {string} entity
+   * @param {string} appDataEntityId
    * @param {IAppDERS} configs
    */
-  setDERConfig(deCodeName, configs) {
-    this.rsMap.set(deCodeName, configs);
+  setDERConfig(appDataEntityId, configs) {
+    this.rsMap.set(appDataEntityId, configs);
   }
   /**
    * 获取当前界面域下，具体实体的关系(在数据加载完成之后才有值)
    *
    * @author chitanda
    * @date 2023-12-26 16:12:07
-   * @param {string} deCodeName
+   * @param {string} appDataEntityId
+   * @return {*}  {IAppDERS[]}
+   */
+  getDERConfig(appDataEntityId) {
+    if (this.rsMap.has(appDataEntityId)) {
+      return this.rsMap.get(appDataEntityId);
+    }
+    return [];
+  }
+  /**
+   * 查询指定主实体下的所有子实体关系
+   *
+   * @author chitanda
+   * @date 2024-01-17 16:01:21
+   * @param {string} appDataEntityId
    * @return {*}  {IAppDERS[]}
    */
-  getDERConfig(deCodeName) {
-    if (this.rsMap.has(deCodeName)) {
-      return this.rsMap.get(deCodeName);
+  getDERConfigByMajor(appDataEntityId) {
+    if (this.rs2Map.has(appDataEntityId)) {
+      return this.rs2Map.get(appDataEntityId);
     }
     return [];
   }
+  /**
+   * 根据模型给的子实体中的父关系模型，计算每个实体的子关系模型
+   *
+   * @author chitanda
+   * @date 2024-01-15 19:01:49
+   */
+  calcParentRs() {
+    this.rs2Map.clear();
+    this.rsMap.forEach((configs, appDataEntityId) => {
+      configs.forEach((config) => {
+        config.minorAppDataEntityId = appDataEntityId;
+        const major = config.majorAppDataEntityId;
+        if (!this.rs2Map.has(major)) {
+          this.rs2Map.set(major, []);
+        }
+        this.rs2Map.get(major).push(config);
+      });
+    });
+  }
   /**
    * 界面域销毁
    *
@@ -3003,6 +3150,47 @@ var RawValueUtil = class {
   }
 };
 
+// src/utils/view-stack/view-stack.ts
+var ViewStack = class {
+  constructor() {
+    this.stackMap = /* @__PURE__ */ new Map();
+    this.stack = [];
+    this.activeStack = [];
+  }
+  add(id, view) {
+    this.stack.push(view);
+    this.stackMap.set(id, view);
+    this.recalculateActiveStack();
+  }
+  remove(id) {
+    const view = this.stackMap.get(id);
+    if (view) {
+      this.stack.splice(this.stack.indexOf(view), 1);
+      this.stackMap.delete(id);
+      this.recalculateActiveStack();
+    }
+  }
+  getActives() {
+    return this.activeStack;
+  }
+  active(_id) {
+    this.recalculateActiveStack();
+  }
+  deactivate(_id) {
+    this.recalculateActiveStack();
+  }
+  /**
+   * 重新计算激活视图堆栈
+   *
+   * @author chitanda
+   * @date 2024-01-18 14:01:23
+   * @protected
+   */
+  recalculateActiveStack() {
+    this.activeStack = this.stack.filter((item) => item.isActive === true);
+  }
+};
+
 // src/utils/promise/promise.ts
 async function handleAllSettled(values, isThrow = true) {
   const allResults = await Promise.allSettled(values);
@@ -3028,7 +3216,7 @@ async function handleAllSettled(values, isThrow = true) {
 
 // src/command/app/open-app-view/open-app-view.ts
 import { ModelError as ModelError15, RuntimeError as RuntimeError23 } from "@ibiz-template/core";
-import { clone as clone15 } from "ramda";
+import { clone as clone17 } from "ramda";
 
 // src/service/utils/de-dq-cond/ps-de-dq-cond-engine.ts
 import { isEmpty as isEmpty3 } from "ramda";
@@ -3077,6 +3265,9 @@ var PSModelCondEngineBase = class {
         return objValue != null;
       }
       if ("EQ" /* CONDOP_EQ */ === strCondOp || "ABSEQ" /* CONDOP_ABSEQ */ === strCondOp || "GT" /* CONDOP_GT */ === strCondOp || "GTANDEQ" /* CONDOP_GTANDEQ */ === strCondOp || "LT" /* CONDOP_LT */ === strCondOp || "LTANDEQ" /* CONDOP_LTANDEQ */ === strCondOp || "NOTEQ" /* CONDOP_NOTEQ */ === strCondOp) {
+        if (objValue == null || objCondValue == null) {
+          return false;
+        }
         let nRet = -1;
         if (objValue == objCondValue) {
           nRet = 0;
@@ -3652,7 +3843,7 @@ function getProvider6(key) {
 async function getPanelItemProvider(model) {
   var _a;
   let provider;
-  const { itemType, sysPFPluginId, appId: appId2 } = model;
+  const { itemType, sysPFPluginId, appId: appId2, controlRenders } = model;
   if (sysPFPluginId) {
     const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId2);
     if (pluginKey) {
@@ -3664,41 +3855,45 @@ async function getPanelItemProvider(model) {
       return provider;
     }
   }
-  if (itemType === "CONTAINER") {
-    const predefinedType = model.predefinedType || "DEFAULT";
-    const key = "CONTAINER_".concat(predefinedType);
-    provider = getProvider6(key);
-    if (!provider) {
-      ibiz.log.error(
-        "\u627E\u4E0D\u5230\u9762\u677F\u5BB9\u5668\u9884\u7F6E\u7C7B\u578B\u4E3A".concat(predefinedType, "\u7684\u9002\u914D\u5668\uFF0C\u6CE8\u518Ckey\u4E3A").concat(key)
-      );
-    } else {
-      return provider;
-    }
-  }
-  if (itemType === "RAWITEM") {
-    const predefinedType = ((_a = model.rawItem) == null ? void 0 : _a.predefinedType) || "DEFAULT";
-    const key = "RAWITEM_".concat(predefinedType);
-    provider = getProvider6(key);
-    if (!provider) {
-      ibiz.log.error(
-        "\u627E\u4E0D\u5230\u9762\u677F\u6210\u5458\u76F4\u63A5\u5185\u5BB9\u9884\u7F6E\u7C7B\u578B\u4E3A".concat(predefinedType, "\u7684\u9002\u914D\u5668\uFF0C\u6CE8\u518Ckey\u4E3A").concat(key)
-      );
-    } else {
-      return provider;
+  if (controlRenders && controlRenders.length > 0) {
+    provider = getProvider6("PREDEFINE_RENDER");
+  } else {
+    if (itemType === "CONTAINER") {
+      const predefinedType = model.predefinedType || "DEFAULT";
+      const key = "CONTAINER_".concat(predefinedType);
+      provider = getProvider6(key);
+      if (!provider) {
+        ibiz.log.error(
+          "\u627E\u4E0D\u5230\u9762\u677F\u5BB9\u5668\u9884\u7F6E\u7C7B\u578B\u4E3A".concat(predefinedType, "\u7684\u9002\u914D\u5668\uFF0C\u6CE8\u518Ckey\u4E3A").concat(key)
+        );
+      } else {
+        return provider;
+      }
     }
-  }
-  if (itemType === "FIELD") {
-    const { editor } = model;
-    if (editor && editor.predefinedType) {
-      const key = "FIELD_".concat(editor.predefinedType.toUpperCase());
+    if (itemType === "RAWITEM") {
+      const predefinedType = ((_a = model.rawItem) == null ? void 0 : _a.predefinedType) || "DEFAULT";
+      const key = "RAWITEM_".concat(predefinedType);
       provider = getProvider6(key);
-      if (provider) {
+      if (!provider) {
+        ibiz.log.error(
+          "\u627E\u4E0D\u5230\u9762\u677F\u6210\u5458\u76F4\u63A5\u5185\u5BB9\u9884\u7F6E\u7C7B\u578B\u4E3A".concat(predefinedType, "\u7684\u9002\u914D\u5668\uFF0C\u6CE8\u518Ckey\u4E3A").concat(key)
+        );
+      } else {
         return provider;
       }
     }
+    if (itemType === "FIELD") {
+      const { editor } = model;
+      if (editor && editor.predefinedType) {
+        const key = "FIELD_".concat(editor.predefinedType.toUpperCase());
+        provider = getProvider6(key);
+        if (provider) {
+          return provider;
+        }
+      }
+    }
+    provider = getProvider6(itemType);
   }
-  provider = getProvider6(itemType);
   if (!provider) {
     ibiz.log.error("\u627E\u4E0D\u5230\u9762\u677F\u6210\u5458\u7C7B\u578B".concat(itemType, "\u5BF9\u5E94\u7684\u9002\u914D\u5668"));
   } else {
@@ -4050,11 +4245,7 @@ async function getAppMenuItemProvider(model) {
     }
   }
   provider = getProvider14(itemType);
-  if (!provider) {
-    ibiz.log.error("\u627E\u4E0D\u5230\u5E94\u7528\u83DC\u5355\u9879\u7C7B\u578B".concat(itemType, "\u5BF9\u5E94\u7684\u9002\u914D\u5668"));
-  } else {
-    return provider;
-  }
+  return provider;
 }
 
 // src/service/utils/app-counter/app-counter.ts
@@ -4439,7 +4630,9 @@ var DynamicCodeListCache = class {
       iconPathAppDEFieldId,
       iconPathXAppDEFieldId,
       disableAppDEFieldId,
-      dataAppDEFieldId
+      dataAppDEFieldId,
+      clsAppDEFieldId,
+      colorAppDEFieldId
     } = this.codeList;
     const value = valueAppDEFieldId ? data[valueAppDEFieldId] : data.srfkey;
     result.id = value;
@@ -4463,6 +4656,12 @@ var DynamicCodeListCache = class {
     if (disableAppDEFieldId) {
       result.disableSelect = fieldValueToBoolean(data[disableAppDEFieldId]);
     }
+    if (clsAppDEFieldId) {
+      result.textCls = data[clsAppDEFieldId];
+    }
+    if (colorAppDEFieldId) {
+      result.color = data[colorAppDEFieldId];
+    }
     if (dataAppDEFieldId && data[dataAppDEFieldId]) {
       try {
         result.data = ScriptFactory.execSingleLine(
@@ -4532,16 +4731,16 @@ var DynamicCodeListCache = class {
     );
     let resultItems = [];
     if (res.data.length) {
-      res.data.forEach((item) => {
-        if (pvalueAppDEFieldId) {
-          const tempItems = this.prepareTreeData(res.data);
-          if (tempItems) {
-            resultItems = tempItems;
-          }
-        } else {
-          resultItems.push(this.convertData(item));
+      if (pvalueAppDEFieldId) {
+        const tempItems = this.prepareTreeData(res.data);
+        if (tempItems) {
+          resultItems = tempItems;
         }
-      });
+      } else {
+        res.data.forEach((item) => {
+          resultItems.push(this.convertData(item));
+        });
+      }
     }
     return Object.freeze(resultItems);
   }
@@ -4550,26 +4749,23 @@ var DynamicCodeListCache = class {
    *
    * @return {codeListItem[] | undefined}
    */
-  prepareTreeData(items, pValue) {
-    const { pvalueAppDEFieldId } = this.codeList;
-    let filteredData = [];
-    filteredData = items.filter((item) => {
-      if (pValue) {
-        return item[pvalueAppDEFieldId] === pValue;
+  prepareTreeData(items) {
+    const { valueAppDEFieldId, pvalueAppDEFieldId } = this.codeList;
+    const map = {};
+    const nestedList = [];
+    items.forEach((data) => {
+      map[data[valueAppDEFieldId]] = this.convertData(data);
+    });
+    items.forEach((data) => {
+      const parent = map[data[pvalueAppDEFieldId]];
+      if (parent) {
+        parent.children = parent.children || [];
+        parent.children.push(map[data[valueAppDEFieldId]]);
+      } else {
+        nestedList.push(map[data[valueAppDEFieldId]]);
       }
-      return !item[pvalueAppDEFieldId];
-    });
-    if (filteredData.length === 0) {
-      return;
-    }
-    return filteredData.map((data) => {
-      const tempCodeListItem = this.convertData(data);
-      tempCodeListItem.children = this.prepareTreeData(
-        items,
-        tempCodeListItem.value
-      );
-      return tempCodeListItem;
     });
+    return nestedList;
   }
   /**
    * 获取动态的代码项
@@ -4729,8 +4925,18 @@ var DECache = class {
         entity.srfkey = createUUID2();
       }
       entity.srftempdate = (/* @__PURE__ */ new Date()).getTime();
-      this.cacheMap.set(entity.srfkey, clone4(entity));
-      ibiz.log.warn("add", entity.srfkey, entity);
+      const commit = () => {
+        this.cacheMap.set(entity.srfkey, clone4(entity));
+        ibiz.log.warn("add", entity.srfkey, entity);
+      };
+      const t = this.getTransaction(context);
+      if (t) {
+        t.change(entity.srfkey, () => {
+          commit();
+        });
+      } else {
+        commit();
+      }
       return entity;
     } catch (err) {
       ibiz.log.error(err);
@@ -4780,10 +4986,25 @@ var DECache = class {
       entity.srftempdate = (/* @__PURE__ */ new Date()).getTime();
       const data = this.cacheMap.get(oldKey);
       if (data) {
-        data.assign(entity);
-        this.cacheMap.set(oldKey, data);
-        ibiz.log.warn("update", oldKey, entity);
-        return clone4(data);
+        const _data = clone4(data);
+        _data.assign(entity);
+        const commit = () => {
+          data.assign(entity);
+          if (oldKey !== entity.srfkey) {
+            this.cacheMap.delete(oldKey);
+          }
+          this.cacheMap.set(entity.srfkey, data);
+          ibiz.log.warn("update", entity.srfkey, entity);
+        };
+        const t = this.getTransaction(context);
+        if (t) {
+          t.change(entity.srfkey, () => {
+            commit();
+          });
+        } else {
+          commit();
+        }
+        return _data;
       }
       throw new Error("\u6570\u636E\u4E0D\u5B58\u5728\uFF0C\u65E0\u6CD5\u66F4\u65B0!");
     } catch (err) {
@@ -4805,9 +5026,18 @@ var DECache = class {
       const key = srfKey;
       if (this.cacheMap.has(key)) {
         const data = this.cacheMap.get(key);
-        data.srftempdate = (/* @__PURE__ */ new Date()).getTime();
-        this.cacheMap.delete(key);
-        ibiz.log.warn("delete", key);
+        const commit = () => {
+          this.cacheMap.delete(key);
+          ibiz.log.warn("delete", key);
+        };
+        const t = this.getTransaction(context);
+        if (t) {
+          t.change(key, () => {
+            commit();
+          });
+        } else {
+          commit();
+        }
         return data;
       }
       return null;
@@ -4828,6 +5058,11 @@ var DECache = class {
   createBatch(context, entities) {
     try {
       isExistSessionId("add", context);
+      const commit = (entity) => {
+        this.cacheMap.set(entity.srfkey, entity);
+        ibiz.log.warn("add", entity.srfkey, entity);
+      };
+      const t = this.getTransaction(context);
       for (let i = 0; i < entities.length; i++) {
         const entity = entities[i];
         if (isNil5(entity.srfkey) || isEmpty5(entity.srfkey)) {
@@ -4835,9 +5070,13 @@ var DECache = class {
         }
         entity.srftempdate = (/* @__PURE__ */ new Date()).getTime();
         const data = clone4(entity);
-        this.cacheMap.set(entity.srfkey, data);
-        entities[i] = data;
-        ibiz.log.warn("add", entity.srfkey, entity);
+        if (t) {
+          t.change(data.srfkey, () => {
+            commit(data);
+          });
+        } else {
+          commit(data);
+        }
       }
       return entities;
     } catch (err) {
@@ -4857,16 +5096,41 @@ var DECache = class {
   updateBatch(context, entities) {
     try {
       isExistSessionId("update", context);
+      const commit = (entity, oldKey) => {
+        if (oldKey !== entity.srfkey) {
+          this.cacheMap.delete(oldKey);
+        }
+        this.cacheMap.set(entity.srfkey, entity);
+        ibiz.log.warn("update", entity.srfkey, entity);
+      };
+      const t = this.getTransaction(context);
       for (let i = 0; i < entities.length; i++) {
         const entity = entities[i];
         isExistSrfKey("update", entity);
+        const oldKey = entity.srfkey;
+        if (this.isUnionKey) {
+          this.calcUnionKey(entity);
+          if (oldKey !== entity.srfkey && this.checkData(context, entity.srfkey)) {
+            throw new RuntimeError14(
+              "\u66F4\u65B0\u8054\u5408\u4E3B\u952E\u6570\u636E\u5931\u8D25\uFF0C\u5DF2\u6709\u4E3B\u952E\u4E3A".concat(entity.srfkey, "\u7684\u6570\u636E")
+            );
+          }
+        }
         entity.srftempdate = (/* @__PURE__ */ new Date()).getTime();
         const data = this.cacheMap.get(entity.srfkey);
         if (data) {
-          data.assign(entity);
-          this.cacheMap.set(entity.srfkey, data);
-          ibiz.log.warn("update", entity.srfkey, entity);
-          entities[i] = clone4(data);
+          const _data = clone4(data);
+          _data.assign(entity);
+          entities[i] = _data;
+          if (t) {
+            t.change(entity.srfkey, () => {
+              data.assign(entity);
+              commit(data, oldKey);
+            });
+          } else {
+            data.assign(entity);
+            commit(data, oldKey);
+          }
         } else {
           throw new Error(
             "\u6570\u636E[".concat(entity.srfdename, "-").concat(entity.srfmajortext, "(").concat(entity.srfkey, ")]\u4E0D\u5B58\u5728\uFF0C\u65E0\u6CD5\u66F4\u65B0!")
@@ -4907,10 +5171,20 @@ var DECache = class {
         "\u672A\u627E\u5230\u4EE5\u4E0B\u6570\u636E\u300C".concat(notRemoveKeys.join("\u3001"), "\u300D\uFF0C\u65E0\u6CD5\u5220\u9664!")
       );
     }
-    for (let i = 0; i < srfKeys.length; i++) {
-      const key = srfKeys[i];
+    const commit = (key) => {
       this.cacheMap.delete(key);
       ibiz.log.warn("delete", key);
+    };
+    const t = this.getTransaction(context);
+    for (let i = 0; i < srfKeys.length; i++) {
+      const key = srfKeys[i];
+      if (t) {
+        t.change(key, () => {
+          commit(key);
+        });
+      } else {
+        commit(key);
+      }
     }
     return [];
   }
@@ -4989,6 +5263,22 @@ var DECache = class {
     });
     data.srfkey = unionValues.join("||");
   }
+  /**
+   * 根据上下文，获取已经开启的事务
+   *
+   * @author chitanda
+   * @date 2024-01-17 15:01:28
+   * @protected
+   * @param {IContext} context
+   * @return {*}  {(ITransaction | null)}
+   */
+  getTransaction(context) {
+    const uiDomain = ibiz.uiDomainManager.get(context.srfsessionid);
+    if (uiDomain && uiDomain.transaction.state.isOpen === true) {
+      return uiDomain.transaction;
+    }
+    return null;
+  }
 };
 
 // src/service/utils/res-path/res-path.ts
@@ -5404,7 +5694,8 @@ CounterService.counterMap = /* @__PURE__ */ new Map();
 // src/service/service/entity/de.service.ts
 import {
   ModelError as ModelError7,
-  RuntimeError as RuntimeError17
+  RuntimeError as RuntimeError17,
+  RuntimeModelError as RuntimeModelError10
 } from "@ibiz-template/core";
 
 // src/service/service/work-flow/work-flow.service.ts
@@ -5980,24 +6271,13 @@ var MethodDto = class {
    * @param {IAppDataEntity} entity
    * @param {boolean} [isLocalMode]
    * @param {IAppDEMethodDTO} [dto]
-   * @param {boolean} [inSelfLoop] 是否在自关系循环中
    */
-  constructor(service, entity, isLocalMode, dto, inSelfLoop) {
+  constructor(service, entity, isLocalMode, dto) {
     this.service = service;
     this.entity = entity;
     this.isLocalMode = isLocalMode;
     this.dto = dto;
-    this.inSelfLoop = inSelfLoop;
     this.dtoMap = /* @__PURE__ */ new Map();
-    /**
-     * 当前 DTO 是否已经计算过关系相关逻辑
-     *
-     * @link this.calcRs
-     * @author chitanda
-     * @date 2023-12-26 16:12:18
-     * @protected
-     */
-    this.isCalcRs = false;
     if (dto) {
       this.app = ibiz.hub.getApp(entity.appId);
       this.fields = dto.appDEMethodDTOFields || [];
@@ -6126,10 +6406,12 @@ var MethodDto = class {
    * @return {*}  {Promise<IDataEntity[]>}
    */
   async sets(context, data) {
-    if (this.isLocalMode && !this.inSelfLoop) {
-      this.service.local.clear();
+    const uiDomain = ibiz.uiDomainManager.get(context.srfsessionid);
+    if (uiDomain && uiDomain.state.rsInit !== true) {
+      await this.calcRs(context);
+      uiDomain.calcParentRs();
+      uiDomain.state.rsInit = true;
     }
-    await this.calcRs(context);
     return Promise.all(
       data.map(async (datum) => {
         const all = this.fields.filter((field) => field.type === "DTOS").map(async (field) => {
@@ -6142,7 +6424,7 @@ var MethodDto = class {
             }
             const dto = await this.getFieldDto(context, field);
             const items = datum[key];
-            if (items) {
+            if (items && items.length > 0) {
               const pKey = datum[this.entity.keyAppDEFieldId];
               if (field.refPickupAppDEFieldId) {
                 items.forEach((item) => {
@@ -6177,10 +6459,9 @@ var MethodDto = class {
    * @return {*}  {Promise<void>}
    */
   async calcRs(context, depth = 0) {
-    if (this.isCalcRs || depth > 10) {
+    if (depth > 10) {
       return;
     }
-    this.isCalcRs = true;
     depth += 1;
     const uiDomain = ibiz.uiDomainManager.get(context.srfsessionid);
     const dtoFields = this.fields.filter((field) => field.type === "DTOS");
@@ -6224,12 +6505,10 @@ var MethodDto = class {
       entity.appDEMethodDTOs || [],
       field.refAppDEMethodDTOId
     );
-    const inSelfLoop = this.entity.codeName === entity.codeName;
     const service = await this.app.deService.getService(context, entity.id);
     service.isLocalMode = true;
     const dto = service.createMethodDto(methodDto, {
-      isLocalMode: true,
-      inSelfLoop
+      isLocalMode: true
     });
     this.dtoMap.set(field.codeName, dto);
     return dto;
@@ -6291,6 +6570,9 @@ var DEService = class {
       return this.methodMap.get(cacheId);
     }
     const model = findModelChild(this.model.appDEMethods, id);
+    if (!model) {
+      throw new RuntimeModelError10(this.model, "\u672A\u627E\u5230\u670D\u52A1\u65B9\u6CD5: ".concat(id));
+    }
     const provider = await getDEMethodProvider(model);
     if (!provider) {
       throw new ModelError7(model, "\u672A\u652F\u6301\u7684\u670D\u52A1\u65B9\u6CD5\u7C7B\u578B: ".concat(model.methodType));
@@ -6475,13 +6757,7 @@ var DEService = class {
     this.local.clear();
   }
   createMethodDto(dto, opts) {
-    return new MethodDto(
-      this,
-      this.model,
-      opts == null ? void 0 : opts.isLocalMode,
-      dto,
-      opts == null ? void 0 : opts.inSelfLoop
-    );
+    return new MethodDto(this, this.model, opts == null ? void 0 : opts.isLocalMode, dto);
   }
 };
 
@@ -7157,9 +7433,13 @@ var V7AuthService = class {
       const token = getCookie(CoreConst.TOKEN);
       const expirein = getCookie(CoreConst.TOKEN_EXPIRES);
       const remember = getCookie(CoreConst.TOKEN_REMEMBER);
+      const refreshToken = getCookie(CoreConst.REFRESH_TOKEN);
       setCookie(CoreConst.TOKEN, token, 0, true);
       setCookie(CoreConst.TOKEN_EXPIRES, expirein, 0, true);
       setCookie(CoreConst.TOKEN_REMEMBER, remember, 0, true);
+      if (refreshToken) {
+        setCookie(CoreConst.REFRESH_TOKEN, refreshToken, 0, true);
+      }
     }
     return result;
   }
@@ -7172,17 +7452,21 @@ var V7AuthService = class {
       });
       const { data } = res;
       if (data && data.token) {
+        const cacheDays = remember ? 7 : 0;
         if (remember) {
-          setCookie(CoreConst.TOKEN_REMEMBER, "1", 7, true);
+          setCookie(CoreConst.TOKEN_REMEMBER, "1", cacheDays, true);
         }
-        setCookie(CoreConst.TOKEN, data.token, remember ? 7 : 0, true);
+        setCookie(CoreConst.TOKEN, data.token, cacheDays, true);
         const expiredDate = (/* @__PURE__ */ new Date()).getTime() + (data.expirein || 7199) * 1e3;
-        setCookie(
-          CoreConst.TOKEN_EXPIRES,
-          "".concat(expiredDate),
-          remember ? 7 : 0,
-          true
-        );
+        setCookie(CoreConst.TOKEN_EXPIRES, "".concat(expiredDate), cacheDays, true);
+        if (data.refresh_token) {
+          setCookie(
+            CoreConst.REFRESH_TOKEN,
+            data.refresh_token,
+            cacheDays,
+            true
+          );
+        }
         clearCookie(CoreConst.IS_ANONYMOUS);
       }
       return true;
@@ -7200,7 +7484,10 @@ var V7AuthService = class {
       clearCookie(CoreConst.TOKEN);
       clearCookie(CoreConst.TOKEN_EXPIRES);
       clearCookie(CoreConst.TOKEN_REMEMBER);
+      clearCookie(CoreConst.REFRESH_TOKEN);
       clearCookie(CoreConst.IS_ANONYMOUS);
+      ibiz.appData = void 0;
+      ibiz.orgData = void 0;
       return true;
     } catch (err) {
       ibiz.notification.error({
@@ -7216,22 +7503,32 @@ var V7AuthService = class {
     }
     const token = getCookie(CoreConst.TOKEN);
     const expirein = getCookie(CoreConst.TOKEN_EXPIRES);
-    const remember = getCookie(CoreConst.TOKEN_REMEMBER);
     if (token && expirein) {
       let wait = Number(expirein) - (/* @__PURE__ */ new Date()).getTime();
       const early = 5 * 60 * 1e3;
       wait = wait > early ? wait - early : 0;
       setTimeout(async () => {
-        const res = await ibiz.net.get("/uaa/refreshtoken2");
+        const remember = getCookie(CoreConst.TOKEN_REMEMBER);
+        const refreshToken = getCookie(CoreConst.REFRESH_TOKEN);
+        const cacheDay = remember ? 7 : 0;
+        let res;
+        if (refreshToken != null && refreshToken !== "") {
+          res = await ibiz.net.get("/uaa/refresh_token/".concat(refreshToken));
+        } else {
+          res = await ibiz.net.get("/uaa/refreshtoken2");
+        }
         if (res.ok) {
-          setCookie(CoreConst.TOKEN, res.data.token, remember ? 7 : 0, true);
+          setCookie(CoreConst.TOKEN, res.data.token, cacheDay, true);
           const expiredDate = (/* @__PURE__ */ new Date()).getTime() + (res.data.expirein || 7199) * 1e3;
-          setCookie(
-            CoreConst.TOKEN_EXPIRES,
-            "".concat(expiredDate),
-            remember ? 7 : 0,
-            true
-          );
+          setCookie(CoreConst.TOKEN_EXPIRES, "".concat(expiredDate), cacheDay, true);
+          if (res.data.refresh_token) {
+            setCookie(
+              CoreConst.REFRESH_TOKEN,
+              res.data.refresh_token,
+              cacheDay,
+              true
+            );
+          }
         }
         this.extendLogin();
       }, wait);
@@ -7282,12 +7579,14 @@ import {
   HttpError as HttpError5,
   HttpResponse as HttpResponse3,
   RuntimeError as RuntimeError21,
-  RuntimeModelError as RuntimeModelError21
+  RuntimeModelError as RuntimeModelError22
 } from "@ibiz-template/core";
 import { isArray as isArray6, isNil as isNil10 } from "lodash-es";
+import { ascSort } from "qx-util";
+import { clone as clone14 } from "ramda";
 
 // src/service/service/entity/method/method.ts
-import { RuntimeModelError as RuntimeModelError10 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError11 } from "@ibiz-template/core";
 
 // src/service/service/entity/method/method-input.ts
 var MethodInput = class {
@@ -7378,6 +7677,11 @@ var MethodReturn = class {
    */
   async handle(context, data) {
     if (this.dto) {
+      const app = ibiz.hub.getApp(this.entity.appId);
+      app.deService.clearTempCache({
+        srfappid: app.appId,
+        srfsessionid: context.srfsessionid
+      });
       const items = await this.dto.sets(context, [data]);
       return items[0];
     }
@@ -7453,17 +7757,17 @@ var Method = class {
           break;
         default:
           if (requestMethod) {
-            throw new RuntimeModelError10(
+            throw new RuntimeModelError11(
               this.method,
               "\u672A\u652F\u6301\u7684\u8BF7\u6C42\u65B9\u5F0F: ".concat(requestMethod)
             );
           } else {
-            throw new RuntimeModelError10(this.method, "\u672A\u914D\u7F6E\u8BF7\u6C42\u65B9\u5F0F");
+            throw new RuntimeModelError11(this.method, "\u672A\u914D\u7F6E\u8BF7\u6C42\u65B9\u5F0F");
           }
       }
       return res;
     }
-    throw new RuntimeModelError10(this.method, "\u672A\u652F\u6301\u7684\u884C\u4E3A\u7C7B\u578B[".concat(actionType, "]"));
+    throw new RuntimeModelError11(this.method, "\u672A\u652F\u6301\u7684\u884C\u4E3A\u7C7B\u578B[".concat(actionType, "]"));
   }
   mergeRequestPath(path2, methodName) {
     return "".concat(path2, "/").concat(methodName);
@@ -7501,7 +7805,7 @@ import { isArray as isArray5 } from "lodash-es";
 import { clone as clone13 } from "ramda";
 
 // src/de-logic/de-logic.ts
-import { ModelError as ModelError13, RuntimeModelError as RuntimeModelError20 } from "@ibiz-template/core";
+import { ModelError as ModelError13, RuntimeModelError as RuntimeModelError21 } from "@ibiz-template/core";
 
 // src/de-logic/de-logic-context.ts
 import { isArray as isArray4 } from "lodash-es";
@@ -7633,17 +7937,17 @@ var DELogicContext = class {
 };
 
 // src/de-logic/de-logic-node/de-action-node/de-action-node.ts
-import { RuntimeModelError as RuntimeModelError13 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError14 } from "@ibiz-template/core";
 
 // src/de-logic/de-logic-link/de-logic-link-group-cond/de-logic-link-group-cond.ts
-import { RuntimeModelError as RuntimeModelError12 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError13 } from "@ibiz-template/core";
 
 // src/de-logic/de-logic-link/de-logic-link-cond/de-logic-link-cond.ts
 var DELogicLinkCond = class {
 };
 
 // src/de-logic/de-logic-link/de-logic-link-single-cond/de-logic-link-single-cond.ts
-import { ModelError as ModelError8, RuntimeModelError as RuntimeModelError11 } from "@ibiz-template/core";
+import { ModelError as ModelError8, RuntimeModelError as RuntimeModelError12 } from "@ibiz-template/core";
 var DELogicLinkSingleCond = class extends DELogicLinkCond {
   constructor(model) {
     super();
@@ -7690,7 +7994,7 @@ var DELogicLinkSingleCond = class extends DELogicLinkCond {
     switch (this.type) {
       case "ENTITYFIELD": {
         if (!this.value) {
-          throw new RuntimeModelError11(
+          throw new RuntimeModelError12(
             this.model,
             "\u5F53\u524D\u6761\u4EF6\u503C\u7C7B\u578B\u4E3A[\u6570\u636E\u5BF9\u8C61\u5C5E\u6027],\u7F3A\u5C11\u914D\u7F6E\u6761\u4EF6\u503C"
           );
@@ -7700,7 +8004,7 @@ var DELogicLinkSingleCond = class extends DELogicLinkCond {
       }
       case "SRCENTITYFIELD": {
         if (!this.value) {
-          throw new RuntimeModelError11(
+          throw new RuntimeModelError12(
             this.model,
             "\u5F53\u524D\u6761\u4EF6\u503C\u7C7B\u578B\u4E3A[\u6E90\u6570\u636E\u5BF9\u8C61\u5C5E\u6027],\u7F3A\u5C11\u914D\u7F6E\u6761\u4EF6\u503C"
           );
@@ -7763,7 +8067,7 @@ var DELogicLinkGroupCond = class _DELogicLinkGroupCond extends DELogicLinkCond {
   test(ctx, context, data) {
     let bol = true;
     if (this.conds.length === 0) {
-      throw new RuntimeModelError12(this.model, "\u754C\u9762\u8FDE\u63A5\u6761\u4EF6\u903B\u8F91\u7EC4\u672A\u914D\u7F6E\u903B\u8F91\u9879");
+      throw new RuntimeModelError13(this.model, "\u754C\u9762\u8FDE\u63A5\u6761\u4EF6\u903B\u8F91\u7EC4\u672A\u914D\u7F6E\u903B\u8F91\u9879");
     }
     for (let i = 0; i < this.conds.length; i++) {
       const cond = this.conds[i];
@@ -7866,10 +8170,10 @@ var DEActionNode = class extends DELogicNode {
       retDELogicParamId
     } = this.model;
     if (!dstAppDataEntityId) {
-      throw new RuntimeModelError13(this.model, "\u672A\u6307\u5B9A\u5E94\u7528\u5B9E\u4F53");
+      throw new RuntimeModelError14(this.model, "\u672A\u6307\u5B9A\u5E94\u7528\u5B9E\u4F53");
     }
     if (!dstAppDEActionId) {
-      throw new RuntimeModelError13(this.model, "\u672A\u6307\u5B9A\u5B9E\u4F53\u884C\u4E3A");
+      throw new RuntimeModelError14(this.model, "\u672A\u6307\u5B9A\u5B9E\u4F53\u884C\u4E3A");
     }
     const requestData = ctx.params[dstDELogicParamId];
     const app = ibiz.hub.getApp(ctx.context.srfappid);
@@ -7933,7 +8237,7 @@ import { clone as clone10 } from "ramda";
 import { ModelError as ModelError10 } from "@ibiz-template/core";
 import { clone as clone9 } from "ramda";
 function handleSrcVal(ctx, srcValParams) {
-  const { srcDELogicParamId, srcFieldName, srcValue } = srcValParams;
+  const { srcDELogicParamId, srcFieldName, srcValue, expression } = srcValParams;
   const srcValueType = srcValParams.srcValueType || "SRCDLPARAM";
   let srcField = srcFieldName;
   let value;
@@ -7963,6 +8267,15 @@ function handleSrcVal(ctx, srcValParams) {
     case "ENVPARAM":
       value = clone9(ibiz.env);
       break;
+    case "EXPRESSION":
+      if (!expression) {
+        throw new ModelError10(srcValParams, "\u8868\u8FBE\u5F0F\u4E3A\u7A7A");
+      }
+      value = ScriptFactory.execScriptFn(ctx, expression, {
+        singleRowReturn: true,
+        isAsync: false
+      });
+      break;
     default:
       throw new ModelError10(srcValParams, "\u6682\u672A\u652F\u6301\u6E90\u503C\u7C7B\u578B".concat(srcValueType));
   }
@@ -8153,12 +8466,12 @@ var DataSetNode = class extends DELogicNode {
 };
 
 // src/de-logic/de-logic-node/bind-param-node/bind-param-node.ts
-import { RuntimeModelError as RuntimeModelError14 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError15 } from "@ibiz-template/core";
 var BindParamNode = class extends DELogicNode {
   async exec(ctx) {
     const { dstDELogicParamId, srcDELogicParamId } = this.model;
     if (!dstDELogicParamId || !srcDELogicParamId) {
-      throw new RuntimeModelError14(
+      throw new RuntimeModelError15(
         this.model,
         "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u6216\u8005\u6E90\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E"
       );
@@ -8169,37 +8482,37 @@ var BindParamNode = class extends DELogicNode {
 };
 
 // src/de-logic/de-logic-node/reset-param-node/reset-param-node.ts
-import { RuntimeModelError as RuntimeModelError15 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError16 } from "@ibiz-template/core";
 var ResetParamNode = class extends DELogicNode {
   async exec(ctx) {
     const { dstDELogicParamId } = this.model;
     if (!dstDELogicParamId) {
-      throw new RuntimeModelError15(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E");
+      throw new RuntimeModelError16(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E");
     }
     ctx.resetParam(dstDELogicParamId);
   }
 };
 
 // src/de-logic/de-logic-node/renew-param-node/renew-param-node.ts
-import { RuntimeModelError as RuntimeModelError16 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError17 } from "@ibiz-template/core";
 var RenewParamNode = class extends DELogicNode {
   async exec(ctx) {
     const { dstDELogicParamId } = this.model;
     if (!dstDELogicParamId) {
-      throw new RuntimeModelError16(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E");
+      throw new RuntimeModelError17(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E");
     }
     ctx.renewParam(dstDELogicParamId);
   }
 };
 
 // src/de-logic/de-logic-node/copy-param-node/copy-param-node.ts
-import { RuntimeModelError as RuntimeModelError17 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError18 } from "@ibiz-template/core";
 import { clone as clone11 } from "ramda";
 var CopyParamNode = class extends DELogicNode {
   async exec(ctx) {
     const { dstDELogicParamId, srcDELogicParamId } = this.model;
     if (!dstDELogicParamId || !srcDELogicParamId) {
-      throw new RuntimeModelError17(
+      throw new RuntimeModelError18(
         this.model,
         "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u6216\u8005\u6E90\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E"
       );
@@ -8210,12 +8523,12 @@ var CopyParamNode = class extends DELogicNode {
 };
 
 // src/de-logic/de-logic-node/sort-param-node/sort-param-node.ts
-import { RuntimeModelError as RuntimeModelError18 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError19 } from "@ibiz-template/core";
 var SortParamNode = class extends DELogicNode {
   async exec(ctx) {
     const { dstDELogicParamId, dstSortDir, dstFieldName } = this.model;
     if (!dstDELogicParamId || !dstFieldName) {
-      throw new RuntimeModelError18(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u6216\u76EE\u6807\u5C5E\u6027\u914D\u7F6E");
+      throw new RuntimeModelError19(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u6216\u76EE\u6807\u5C5E\u6027\u914D\u7F6E");
     }
     const key = dstFieldName.toLowerCase();
     const arr = ctx.params[dstDELogicParamId];
@@ -8226,7 +8539,7 @@ var SortParamNode = class extends DELogicNode {
 };
 
 // src/de-logic/de-logic-node/append-param-node/append-param-node.ts
-import { RuntimeModelError as RuntimeModelError19 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError20 } from "@ibiz-template/core";
 var AppendParamNode = class extends DELogicNode {
   async exec(ctx) {
     const {
@@ -8237,7 +8550,7 @@ var AppendParamNode = class extends DELogicNode {
       srcSize
     } = this.model;
     if (!dstDELogicParamId || !srcDELogicParamId) {
-      throw new RuntimeModelError19(
+      throw new RuntimeModelError20(
         this.model,
         "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u6216\u8005\u6E90\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E"
       );
@@ -8386,7 +8699,7 @@ var DELogic = class {
     var _a, _b;
     if (model.customCode) {
       if (!model.scriptCode) {
-        throw new RuntimeModelError20(model, "\u811A\u672C\u4EE3\u7801\u6A21\u5F0F\u6CA1\u6709\u914D\u7F6E\u811A\u672C\u4EE3\u7801");
+        throw new RuntimeModelError21(model, "\u811A\u672C\u4EE3\u7801\u6A21\u5F0F\u6CA1\u6709\u914D\u7F6E\u811A\u672C\u4EE3\u7801");
       }
       this.scriptFn = ScriptFactory.createScriptFn([], model.scriptCode, {
         isAsync: true
@@ -8394,7 +8707,7 @@ var DELogic = class {
       return;
     }
     if (!((_a = model.delogicNodes) == null ? void 0 : _a.length)) {
-      throw new RuntimeModelError20(model, "\u5B9E\u4F53\u903B\u8F91\u6CA1\u6709\u914D\u7F6E\u903B\u8F91\u8282\u70B9");
+      throw new RuntimeModelError21(model, "\u5B9E\u4F53\u903B\u8F91\u6CA1\u6709\u914D\u7F6E\u903B\u8F91\u8282\u70B9");
     }
     model.delogicNodes.forEach((node) => {
       const { logicNodeType } = node;
@@ -8493,7 +8806,7 @@ var DELogic = class {
       const start = this.nodes.get(startDELogicNodeId);
       await this.deepExec(start, ctx);
     } else {
-      throw new RuntimeModelError20(this.model, "\u672A\u8BBE\u7F6E\u8D77\u59CB\u8282\u70B9");
+      throw new RuntimeModelError21(this.model, "\u672A\u8BBE\u7F6E\u8D77\u59CB\u8282\u70B9");
     }
     if (ctx.isEndNode) {
       return ctx.result;
@@ -8612,66 +8925,64 @@ var DEActionMethod = class extends Method {
     return this.input.handle(context, data);
   }
   async exec(context, data, params) {
-    if (data) {
+    let result;
+    if (data && !["READ", "GETDRAFT"].includes(this.method.actionMode)) {
       await execFieldLogics(this.entity, "change", context, data, params);
     }
     if (this.method.actionType === "DELOGIC") {
       const deLogic = findDELogic(this.method.appDELogicId, this.entity);
       if (!deLogic) {
-        throw new RuntimeModelError21(this.method, "\u7F3A\u5C11\u5B9E\u4F53\u5904\u7406\u903B\u8F91");
+        throw new RuntimeModelError22(this.method, "\u7F3A\u5C11\u5B9E\u4F53\u5904\u7406\u903B\u8F91");
       }
-      return execDELogicAction(deLogic, context, data, params);
-    }
-    if (data && !this.isLocalMode) {
-      data = await this.inputHandle(context, data);
-    }
-    if (data && !["READ", "GETDRAFT"].includes(this.method.actionMode)) {
-      await execFieldLogics(this.entity, "change", context, data, params);
-    }
-    let result;
-    switch (this.method.codeName) {
-      case "Create":
-        result = await this.create(context, data, params || {});
-        break;
-      case "Get":
-        result = await this.get(context, params);
-        break;
-      case "GetDraft":
-        result = await this.getDraft(context, params);
-        break;
-      case "Remove":
-        result = await this.remove(context, params);
-        break;
-      case "Update":
-        result = await this.update(context, data, params);
-        break;
-      case "CreateTemp":
-        result = await this.createTemp(context, data);
-        break;
-      case "GetTemp":
-        result = await this.getTemp(context, data);
-        break;
-      case "GetDraftTemp":
-        result = await this.getDraftTemp(context, params);
-        break;
-      case "RemoveTemp":
-        result = await this.removeTemp(context, data);
-        break;
-      case "UpdateTemp":
-        result = await this.updateTemp(context, data);
-        break;
-      default: {
-        let path2 = this.calcPath(context);
-        if (this.method.needResourceKey) {
-          let srfkey = context[this.entity.codeName.toLowerCase()];
-          if (isNil10(srfkey)) {
-            srfkey = isArray6(data) ? null : data == null ? void 0 : data[this.entity.keyAppDEFieldId];
+      result = await execDELogicAction(deLogic, context, data, params);
+    } else {
+      if (data && !this.isLocalMode) {
+        data = await this.inputHandle(context, data);
+      }
+      switch (this.method.codeName) {
+        case "Create":
+          result = await this.create(context, data, params || {});
+          break;
+        case "Get":
+          result = await this.get(context, params);
+          break;
+        case "GetDraft":
+          result = await this.getDraft(context, params);
+          break;
+        case "Remove":
+          result = await this.remove(context, params);
+          break;
+        case "Update":
+          result = await this.update(context, data, params);
+          break;
+        case "CreateTemp":
+          result = await this.createTemp(context, data);
+          break;
+        case "GetTemp":
+          result = await this.getTemp(context, data);
+          break;
+        case "GetDraftTemp":
+          result = await this.getDraftTemp(context, params);
+          break;
+        case "RemoveTemp":
+          result = await this.removeTemp(context, data);
+          break;
+        case "UpdateTemp":
+          result = await this.updateTemp(context, data);
+          break;
+        default: {
+          let path2 = this.calcPath(context);
+          if (this.method.needResourceKey) {
+            let srfkey = context[this.entity.codeName.toLowerCase()];
+            if (isNil10(srfkey)) {
+              srfkey = isArray6(data) ? null : data == null ? void 0 : data[this.entity.keyAppDEFieldId];
+            }
+            path2 = "".concat(path2, "/").concat(srfkey);
           }
-          path2 = "".concat(path2, "/").concat(srfkey);
+          const res = await this.request(path2, context, data, params);
+          res.data = await this.result.handle(context, res.data);
+          result = res;
         }
-        const res = await this.request(path2, context, data, params);
-        res.data = await this.result.handle(context, res.data);
-        result = res;
       }
     }
     if (result.data) {
@@ -8859,6 +9170,13 @@ var DEActionMethod = class extends Method {
       if (!key && context) {
         key = context[this.entity.codeName.toLowerCase()];
       }
+      try {
+        await this.associationDeletion(key, context, params);
+      } catch (error) {
+        throw new HttpError5({
+          response: new HttpResponse3(null, 500, error.message)
+        });
+      }
       const data = this.service.local.delete(context, key);
       if (data) {
         return new HttpResponse3(data);
@@ -8868,6 +9186,100 @@ var DEActionMethod = class extends Method {
       throw new HttpError5(err);
     }
   }
+  /**
+   * 关联删除
+   *
+   * @author chitanda
+   * @date 2024-01-17 16:01:47
+   * @protected
+   * @param {string} key
+   * @param {IContext} context
+   * @param {IParams} [params]
+   * @return {*}  {Promise<void>}
+   */
+  async associationDeletion(key, context, _params) {
+    const uiDomain = ibiz.uiDomainManager.get(context.srfsessionid);
+    const t = uiDomain.transaction;
+    let selfOpenTransaction = false;
+    if (t.state.isOpen === false) {
+      t.open();
+      selfOpenTransaction = true;
+    }
+    try {
+      let configs = uiDomain.getDERConfigByMajor(this.entity.id);
+      if (configs.length > 0) {
+        const data = this.service.local.get(context, key);
+        configs = ascSort(configs, "removeOrder");
+        for (const config of configs) {
+          if (config.rstype !== "DER1N") {
+            throw new RuntimeModelError22(
+              config,
+              "\u76EE\u524D\u53EA\u652F\u6301[DER1N]\u5173\u7CFB\u7C7B\u578B\u5173\u8054\u5220\u9664\u5220\u9664"
+            );
+          }
+          const {
+            removeActionType,
+            removeRejectMsg,
+            minorAppDataEntityId,
+            nestedAppDEDataSetId = "FetchDefault"
+          } = config;
+          const app = ibiz.hub.getApp(this.entity.appId);
+          const minorService = await app.deService.getService(
+            context,
+            minorAppDataEntityId
+          );
+          const _context = clone14(context);
+          _context[this.entity.codeName.toLowerCase()] = key;
+          const res = await minorService.exec(nestedAppDEDataSetId, _context);
+          const items = res.data || [];
+          switch (removeActionType) {
+            case 1: {
+              for (let i = 0; i < items.length; i++) {
+                const item = items[i];
+                _context[minorService.model.codeName.toLowerCase()] = item.srfkey;
+                const res2 = await minorService.remove(_context, item);
+                if (res2.ok === false) {
+                  throw new Error(res2.statusText);
+                }
+              }
+              break;
+            }
+            case 2:
+              for (let i = 0; i < items.length; i++) {
+                const item = items[i];
+                _context[minorService.model.codeName.toLowerCase()] = item.srfkey;
+                item[config.parentAppDEFieldId.toLowerCase()] = void 0;
+                const res2 = await minorService.updateTemp(_context, item);
+                if (res2.ok === false) {
+                  throw new Error(res2.statusText);
+                }
+              }
+              break;
+            case 3:
+              if (items.length > 0) {
+                const msg = items.map((item) => item.srfmajortext).join("\u3001");
+                const message = "\u65E0\u6CD5\u5220\u9664[".concat(this.entity.logicName, "-").concat(data.srfmajortext, "], \u6570\u636E\u88AB[").concat(minorService.model.logicName, "-").concat(msg, "]\u5F15\u7528");
+                throw new Error(removeRejectMsg || message);
+              }
+              break;
+            default:
+          }
+        }
+      }
+      if (selfOpenTransaction && t.state.isOpen) {
+        t.commit();
+      }
+    } catch (error) {
+      if (selfOpenTransaction && t.state.isOpen) {
+        t.rollback();
+      }
+      throw error;
+    } finally {
+      if (selfOpenTransaction && t.state.isOpen) {
+        t.close();
+      }
+    }
+  }
   /**
    * 更新临时数据
    *
@@ -8955,8 +9367,9 @@ var DEActionMethod = class extends Method {
     if (configs.length > 0) {
       configs.forEach((config) => {
         if (config.parentAppDEFieldId) {
-          const { majorDECodeName, parentAppDEFieldId } = config;
-          const majorLowerCodeName = majorDECodeName.toLowerCase();
+          const { majorAppDataEntityId, parentAppDEFieldId } = config;
+          const majorDECodeName = calcDeCodeNameById(majorAppDataEntityId);
+          const majorLowerCodeName = majorDECodeName;
           const pickupLowerDEFName = parentAppDEFieldId.toLowerCase();
           const majorkey = context[majorLowerCodeName];
           if (majorkey && majorkey !== data.srfkey) {
@@ -8980,43 +9393,42 @@ var DeActionDeMethodProvider = class {
 import {
   HttpResponse as HttpResponse4,
   ModelError as ModelError14,
-  RuntimeModelError as RuntimeModelError22
+  RuntimeModelError as RuntimeModelError23
 } from "@ibiz-template/core";
 import { isArray as isArray7 } from "lodash-es";
-import { clone as clone14, isEmpty as isEmpty7, isNil as isNil11 } from "ramda";
-import { ascSort, descSort } from "qx-util";
+import { clone as clone15, isEmpty as isEmpty7, isNil as isNil11 } from "ramda";
+import { ascSort as ascSort2, descSort } from "qx-util";
 var FetchMethod = class extends Method {
   async exec(context, params, params2) {
     const searchParams = params && !isArray7(params) ? params : params2 || {};
+    let res;
     if (this.isLocalMode) {
       const cond = DEDQCondUtil.getCond(this.method);
-      const items2 = await this.searchLocal(
-        cond,
-        new SearchFilter(context, searchParams)
-      );
-      return new HttpResponse4(items2, 200);
-    }
-    let res;
-    switch (this.method.dataSetType) {
-      case "INDEXDE":
-      case "CODELIST":
-      case "MULTIFORM":
-        res = await this.fetchCodeListSet(context, searchParams);
-        break;
-      case "REMOTE":
-        {
-          const path2 = this.calcPath(context);
-          res = await this.request(path2, context, params, params2);
-        }
-        break;
-      default:
-        throw new ModelError14(
-          this.method,
-          "\u6570\u636E\u6765\u6E90\u7C7B\u578B".concat(this.method.dataSetType, "\u6682\u672A\u652F\u6301")
-        );
+      const filter = new SearchFilter(context, searchParams);
+      const items = await this.searchLocal(cond, filter);
+      res = new HttpResponse4(items, 200);
+    } else {
+      switch (this.method.dataSetType) {
+        case "INDEXDE":
+        case "CODELIST":
+        case "MULTIFORM":
+          res = await this.fetchCodeListSet(context, searchParams);
+          break;
+        case "REMOTE":
+          {
+            const path2 = this.calcPath(context);
+            res = await this.request(path2, context, params, params2);
+          }
+          break;
+        default:
+          throw new ModelError14(
+            this.method,
+            "\u6570\u636E\u6765\u6E90\u7C7B\u578B".concat(this.method.dataSetType, "\u6682\u672A\u652F\u6301")
+          );
+      }
+      const items = res.data || [];
+      res.data = items.map((item) => this.createEntity(item));
     }
-    const items = res.data || [];
-    res.data = items.map((item) => this.createEntity(item));
     if (res.data) {
       await execFieldLogics(
         this.entity,
@@ -9065,13 +9477,13 @@ var FetchMethod = class extends Method {
       if (filter.sortMode === "DESC") {
         list = descSort(list, filter.sortField);
       } else {
-        list = ascSort(list, filter.sortField);
+        list = ascSort2(list, filter.sortField);
       }
     }
     const { page, size } = filter;
     const start = page * size;
     const end = (page + 1) * size - 1;
-    const items = list.slice(start, end).map((item) => clone14(item));
+    const items = list.slice(start, end).map((item) => clone15(item));
     return items;
   }
   /**
@@ -9085,7 +9497,7 @@ var FetchMethod = class extends Method {
   async fetchCodeListSet(context, params) {
     const { appCodeListId } = this.method;
     if (!appCodeListId) {
-      throw new RuntimeModelError22(this.method, "\u6CA1\u6709\u6307\u5B9A\u6570\u636E\u6765\u6E90\u4EE3\u7801\u8868");
+      throw new RuntimeModelError23(this.method, "\u6CA1\u6709\u6307\u5B9A\u6570\u636E\u6765\u6E90\u4EE3\u7801\u8868");
     }
     const codeItems = await this.app.codeList.get(
       appCodeListId,
@@ -9165,6 +9577,9 @@ var TreeNodeData = class {
       if (sysImage.imagePath) {
         icon.imagePath = sysImage.imagePath;
       }
+      if (sysImage.rawContent) {
+        icon.htmlStr = sysImage.rawContent;
+      }
     }
     return Object.values(icon).length > 0 ? icon : void 0;
   }
@@ -9199,15 +9614,14 @@ var TreeCodeListNodeData = class extends TreeNodeData {
 
 // src/service/vo/tree-node-data/tree-data-set-node-data.ts
 import { updateKeyDefine } from "@ibiz-template/core";
-import { isNil as isNil12 } from "ramda";
-var TreeDataSetNodeData = class extends TreeNodeData {
+import { clone as clone16, isNil as isNil12 } from "ramda";
+var CloneExcludeKeys = ["_id", "_value", "_text", "_deData", "clone"];
+var TreeDataSetNodeData = class _TreeDataSetNodeData extends TreeNodeData {
   constructor(model, parentNodeData, opts) {
     var _a, _b;
     super(model, parentNodeData, opts);
     const { data } = opts;
     this._deData = data;
-    this._text = model.textAppDEFieldId ? data[model.textAppDEFieldId] : data.srfmajortext;
-    this._value = model.idAppDEFieldId ? data[model.idAppDEFieldId] : data.srfkey;
     const selfId = "".concat(model.id, "@").concat(data.srfkey).toLowerCase();
     Object.defineProperty(this, "_id", {
       get() {
@@ -9216,6 +9630,20 @@ var TreeDataSetNodeData = class extends TreeNodeData {
       enumerable: true,
       configurable: true
     });
+    Object.defineProperty(this, "_text", {
+      get() {
+        return model.textAppDEFieldId ? data[model.textAppDEFieldId] : data.srfmajortext;
+      },
+      enumerable: true,
+      configurable: true
+    });
+    Object.defineProperty(this, "_value", {
+      get() {
+        return model.idAppDEFieldId ? data[model.idAppDEFieldId] : data.srfkey;
+      },
+      enumerable: true,
+      configurable: true
+    });
     if (model.appDataEntityId) {
       const deName = calcDeCodeNameById(model.appDataEntityId);
       this._context = Object.assign(this._context || {}, {
@@ -9228,14 +9656,13 @@ var TreeDataSetNodeData = class extends TreeNodeData {
       this._leaf = fieldValueToBoolean(data[model.leafFlagAppDEFieldId]);
     }
     const dataItemKeyMap = /* @__PURE__ */ new Map();
-    dataItemKeyMap.set("srfkey", "srfkey");
-    dataItemKeyMap.set("srfmajortext", "srfmajortext");
+    const dataItemDefaultMap = /* @__PURE__ */ new Map();
     (_a = model.detreeNodeDataItems) == null ? void 0 : _a.forEach((dataItem) => {
-      const uiKey = dataItem.id.toLowerCase();
+      const dataItemKey = dataItem.id.toLowerCase();
       const deFieldKey = dataItem.appDEFieldId.toLowerCase();
-      dataItemKeyMap.set(uiKey, deFieldKey);
-      if (dataItem.defaultValue && isNil12(data[deFieldKey])) {
-        data[deFieldKey] = dataItem.defaultValue;
+      dataItemKeyMap.set(dataItemKey, deFieldKey);
+      if (dataItem.defaultValue) {
+        dataItemDefaultMap.set(dataItemKey, dataItem.defaultValue);
       }
     });
     const nodeColumnKeyMap = /* @__PURE__ */ new Map();
@@ -9245,35 +9672,60 @@ var TreeDataSetNodeData = class extends TreeNodeData {
       if (!columnKey || !dataItemKey) {
         ibiz.log.error("\u6A21\u578B\u5F02\u5E38\u7F3A\u5C11detreeColumnId\u6216\u8005dataItemName", column);
       } else {
-        nodeColumnKeyMap.set(columnKey, dataItemKeyMap.get(dataItemKey));
+        nodeColumnKeyMap.set(columnKey, dataItemKey);
       }
     });
+    const getDeKey = (key) => {
+      if (nodeColumnKeyMap.has(key)) {
+        return dataItemKeyMap.get(nodeColumnKeyMap.get(key));
+      }
+      if (dataItemKeyMap.has(key)) {
+        return dataItemKeyMap.get(key);
+      }
+      if (Object.prototype.hasOwnProperty.call(this._deData, key)) {
+        return key;
+      }
+    };
+    const getKeyDefault = (key) => {
+      if (nodeColumnKeyMap.has(key)) {
+        return dataItemDefaultMap.get(nodeColumnKeyMap.get(key));
+      }
+      if (dataItemDefaultMap.has(key)) {
+        return dataItemDefaultMap.get(key);
+      }
+    };
+    this.clone = () => {
+      const cloneData = clone16(this._deData);
+      const cloneNodeData = new _TreeDataSetNodeData(model, this._parent, {
+        data: cloneData,
+        leaf: this._leaf,
+        navContext: this._context,
+        navParams: this._params
+      });
+      Object.keys(this).forEach((key) => {
+        const deKey = getDeKey(key);
+        if (isNil12(deKey) && !CloneExcludeKeys.includes(key)) {
+          cloneNodeData[key] = this[key];
+        }
+      });
+      return cloneNodeData;
+    };
     return new Proxy(this, {
       set(target, p, value) {
-        if (nodeColumnKeyMap.has(p)) {
-          target._deData[nodeColumnKeyMap.get(p)] = value;
-        } else if (dataItemKeyMap.has(p)) {
-          target._deData[dataItemKeyMap.get(p)] = value;
-        } else if (Object.prototype.hasOwnProperty.call(target._deData, p)) {
-          target._deData[p] = value;
+        const deKey = getDeKey(p);
+        if (!isNil12(deKey)) {
+          target._deData[deKey] = value;
         } else {
           target[p] = value;
         }
         return true;
       },
       get(target, p, _receiver) {
-        if (target[p] !== void 0) {
-          return target[p];
-        }
-        if (nodeColumnKeyMap.has(p)) {
-          return target._deData[nodeColumnKeyMap.get(p)];
-        }
-        if (dataItemKeyMap.has(p)) {
-          return target._deData[dataItemKeyMap.get(p)];
-        }
-        if (target._deData[p] !== void 0) {
-          return target._deData[p];
+        const deKey = getDeKey(p);
+        if (!isNil12(deKey)) {
+          return isNil12(target._deData[deKey]) ? getKeyDefault(p) : target._deData[deKey];
         }
+        return target[p];
       },
       ownKeys(target) {
         const allKeys = [
@@ -9896,10 +10348,10 @@ var MqttService = class {
       ibiz.log.debug("mqtt message", topic, payload.toString());
     });
     this.client.on("reconnect", () => {
-      ibiz.log.debug("mqtt reconnect");
+      ibiz.log.warn("mqtt reconnect");
     });
     this.client.on("close", () => {
-      console.debug("mqtt close");
+      ibiz.log.warn("mqtt close");
     });
   }
   /**
@@ -10061,7 +10513,7 @@ var _OpenAppViewCommand = class _OpenAppViewCommand {
    * @return {*}  {(Promise<IModalData | void>)}
    */
   async exec(appViewId, _context, params = {}, opts = {}) {
-    const context = clone15(_context);
+    const context = clone17(_context);
     const appView = await ibiz.hub.config.view.get(appViewId);
     if (!appView) {
       throw new RuntimeError23("\u5E94\u7528\u89C6\u56FE[".concat(appViewId, "]\u4E0D\u5B58\u5728"));
@@ -10087,7 +10539,13 @@ var _OpenAppViewCommand = class _OpenAppViewCommand {
       );
     }
     const { openMode = "INDEXVIEWTAB" } = appView;
-    switch (opts.openMode || openMode) {
+    const viewOpenMode = opts.openMode || openMode;
+    if (viewOpenMode !== void 0 && viewOpenMode !== "INDEXVIEWTAB") {
+      if (context.toRouteDepth) {
+        context.toRouteDepth = void 0;
+      }
+    }
+    switch (viewOpenMode) {
       case "INDEXVIEWTAB":
         if (opts.noWaitRoute) {
           this.openIndexViewTab(appView, context, params);
@@ -10326,7 +10784,7 @@ function installCommand() {
 }
 
 // src/app-hub.ts
-import { RuntimeError as RuntimeError61 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError63 } from "@ibiz-template/core";
 
 // src/application.ts
 import { Net, getToken } from "@ibiz-template/core";
@@ -10381,7 +10839,7 @@ var Application = class {
   async init() {
     await this.authority.init();
     await this.loadAppModelStyle();
-    if (ibiz.env.enableMqtt && ibiz.appData) {
+    if (ibiz.env.enableMqtt && ibiz.appData && ibiz.auth.isAnonymous !== true) {
       this.mqtt = new MqttService(
         ibiz.appData.mqtttopic,
         getToken(),
@@ -10615,6 +11073,13 @@ var PanelNotifyState = /* @__PURE__ */ ((PanelNotifyState2) => {
   return PanelNotifyState2;
 })(PanelNotifyState || {});
 
+// src/controller/constant/control/tree-grid-ex/tree-grid-ex-notify.state.ts
+var TreeGridExNotifyState = /* @__PURE__ */ ((TreeGridExNotifyState2) => {
+  TreeGridExNotifyState2["LOAD"] = "LOAD";
+  TreeGridExNotifyState2["SAVE"] = "SAVE";
+  return TreeGridExNotifyState2;
+})(TreeGridExNotifyState || {});
+
 // src/controller/common/view/view.controller.ts
 import { notNilEmpty as notNilEmpty6 } from "qx-util";
 import { IBizContext as IBizContext2, RuntimeError as RuntimeError32 } from "@ibiz-template/core";
@@ -11570,7 +12035,10 @@ async function exportData(header, data, fileName) {
 async function getEntitySchema(entityId, context) {
   const app = ibiz.hub.getApp(context.srfappid);
   const entity = await ibiz.hub.getAppDataEntity(entityId, context.srfappid);
-  const url = "/jsonschema/".concat(entity.name);
+  let url = "/jsonschema/".concat(entity.name);
+  if (entity.dynaSysMode === 0 && ibiz.appData) {
+    url += "?dynamodeltag=".concat(ibiz.appData.dynamodeltag);
+  }
   const res = await app.net.get(url);
   return res.data;
 }
@@ -11792,7 +12260,7 @@ var BaseController = class {
 };
 
 // src/controller/utils/view-msg/view-msg-controller.ts
-import { RuntimeError as RuntimeError31, RuntimeModelError as RuntimeModelError23 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError31, RuntimeModelError as RuntimeModelError24 } from "@ibiz-template/core";
 import { isNil as isNil18, mergeRight as mergeRight2 } from "ramda";
 var ViewMsgController = class _ViewMsgController {
   constructor(msgGroupId) {
@@ -11857,7 +12325,7 @@ var ViewMsgController = class _ViewMsgController {
   static async fetchDataSet(msgModel, context, params) {
     const { appDataEntityId, appDEDataSetId } = msgModel;
     if (!appDEDataSetId) {
-      throw new RuntimeModelError23(msgModel, "\u672A\u914D\u7F6E\u5B9E\u4F53\u6570\u636E\u96C6");
+      throw new RuntimeModelError24(msgModel, "\u672A\u914D\u7F6E\u5B9E\u4F53\u6570\u636E\u96C6");
     }
     const res = await ibiz.hub.getApp(context.srfappid).deService.exec(appDataEntityId, appDEDataSetId, context, params);
     if (res.data.length) {
@@ -11951,7 +12419,7 @@ var ViewMsgController = class _ViewMsgController {
       msgPosAppDEFieldId
     } = msgModel;
     if (!appDataEntityId) {
-      throw new RuntimeModelError23(msgModel, "\u672A\u914D\u7F6E\u5E94\u7528\u5B9E\u4F53");
+      throw new RuntimeModelError24(msgModel, "\u672A\u914D\u7F6E\u5E94\u7528\u5B9E\u4F53");
     }
     const entity = await ibiz.hub.getAppDataEntity(
       appDataEntityId,
@@ -12203,17 +12671,19 @@ var ViewController = class extends BaseController {
     (_a = this.scheduler) == null ? void 0 : _a.startTimerTrigger();
   }
   async onDestroyed() {
+    const srfSessionId = this.context.srfsessionid;
     await super.onDestroyed();
     if (this.engines.length) {
       await Promise.all(this.engines.map((engine) => engine.onDestroyed()));
     }
+    Object.values(this.counters).forEach((counter) => counter.destroy());
     this.ctx.destroy();
     this.engines = [];
     if (this.scheduler) {
       this.scheduler.destroy();
     }
-    if (this.id === this.context.srfsessionid) {
-      ibiz.uiDomainManager.destroy(this.context.srfsessionid);
+    if (this.id === srfSessionId) {
+      ibiz.uiDomainManager.destroy(srfSessionId);
     }
     this.context.destroy();
     ibiz.log.debug("\u89C6\u56FE[".concat(this.model.name, "](").concat(this.model.id, ")\u9500\u6BC1"));
@@ -12401,6 +12871,8 @@ var WFStepTraceViewController = class extends ViewController {
 };
 
 // src/controller/common/editor/editor.controller.ts
+import { DataTypes as DataTypes3 } from "@ibiz-template/core";
+import dayjs2 from "dayjs";
 var EditorController = class {
   /**
    * Creates an instance of EditorController.
@@ -12446,6 +12918,26 @@ var EditorController = class {
   get readonly() {
     return !!this.model.readOnly;
   }
+  /**
+   * 值格式化
+   * @author lxm
+   * @date 2024-01-11 10:18:33
+   * @readonly
+   * @type {(string | undefined)}
+   */
+  get valueFormat() {
+    return this.parent.valueFormat;
+  }
+  /**
+   * 数据类型
+   * @author lxm
+   * @date 2024-01-11 10:18:55
+   * @readonly
+   * @type {(number  | undefined)}
+   */
+  get dataType() {
+    return this.parent.dataType;
+  }
   /**
    * 子类不可覆盖或重写此方法，在 init 时需要重写的使用 onInit 方法。
    *
@@ -12528,10 +13020,35 @@ var EditorController = class {
   toBoolean(value) {
     return Object.is("true", value);
   }
+  /**
+   * 值格式化
+   * @author lxm
+   * @date 2023-08-25 05:18:11
+   * @param {unknown} value
+   * @return {*}  {string}
+   */
+  formatValue(value = "") {
+    if (this.model.valueType !== "SIMPLE") {
+      return ValueExUtil.toText(this.model, value);
+    }
+    const strVal = "".concat(value);
+    if (!this.valueFormat) {
+      return strVal;
+    }
+    const isDate = DataTypes3.isDate(this.dataType);
+    if (isDate) {
+      const formatVal = dayjs2(strVal).format(this.valueFormat);
+      if (formatVal !== "Invalid Date") {
+        return formatVal;
+      }
+      return strVal;
+    }
+    return ibiz.util.text.format(strVal, this.valueFormat);
+  }
 };
 
 // src/controller/common/editor/code-list-editor.controller.ts
-import { RuntimeModelError as RuntimeModelError24 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError25 } from "@ibiz-template/core";
 var CodeListEditorController = class extends EditorController {
   /**
    * 加载代码表数据
@@ -12555,7 +13072,7 @@ var CodeListEditorController = class extends EditorController {
       );
       return dataItems;
     }
-    throw new RuntimeModelError24(
+    throw new RuntimeModelError25(
       this.model,
       "\u7F16\u8F91\u5668\u7C7B\u578B[".concat(this.model.editorType, "]\uFF0C\u672A\u914D\u7F6E\u4EE3\u7801\u8868")
     );
@@ -12564,7 +13081,7 @@ var CodeListEditorController = class extends EditorController {
 
 // src/controller/common/control/control.controller.ts
 import { IBizContext as IBizContext3, IBizParams, NoticeError as NoticeError2 } from "@ibiz-template/core";
-import { clone as clone16, isNil as isNil20 } from "ramda";
+import { clone as clone18, isNil as isNil20 } from "ramda";
 import { notNilEmpty as notNilEmpty7 } from "qx-util";
 var ControlController = class extends BaseController {
   /**
@@ -12606,7 +13123,7 @@ var ControlController = class extends BaseController {
         "".concat(model.controlType, "_DEFAULT")
       );
       if (panelModel) {
-        this.controlPanel = clone16(panelModel);
+        this.controlPanel = clone18(panelModel);
       }
     }
     this.updateContextParams({});
@@ -13358,7 +13875,7 @@ var MDControlController = class extends ControlController {
 import {
   findRecursiveChild,
   RuntimeError as RuntimeError34,
-  RuntimeModelError as RuntimeModelError25
+  RuntimeModelError as RuntimeModelError26
 } from "@ibiz-template/core";
 var AppMenuController = class extends ControlController {
   constructor(model, context, params, ctx) {
@@ -13437,7 +13954,7 @@ var AppMenuController = class extends ControlController {
       return provider.onClick(menuItem, event, this);
     }
     if (!menuItem.appFuncId) {
-      throw new RuntimeModelError25(menuItem, "\u6CA1\u6709\u914D\u7F6E\u5E94\u7528\u529F\u80FD");
+      throw new RuntimeModelError26(menuItem, "\u6CA1\u6709\u914D\u7F6E\u5E94\u7528\u529F\u80FD");
     }
     const tempContext = this.context.clone();
     tempContext.srfappid = menuItem.appId;
@@ -13556,7 +14073,7 @@ var AppMenuController = class extends ControlController {
 import {
   findRecursiveChild as findRecursiveChild2,
   RuntimeError as RuntimeError35,
-  RuntimeModelError as RuntimeModelError26
+  RuntimeModelError as RuntimeModelError27
 } from "@ibiz-template/core";
 var AppMenuIconViewController = class extends AppMenuController {
   async onClickMenuItem(id, event) {
@@ -13572,7 +14089,7 @@ var AppMenuIconViewController = class extends AppMenuController {
       event
     });
     if (!menuItem.appFuncId) {
-      throw new RuntimeModelError26(menuItem, "\u6CA1\u6709\u914D\u7F6E\u5E94\u7528\u529F\u80FD");
+      throw new RuntimeModelError27(menuItem, "\u6CA1\u6709\u914D\u7F6E\u5E94\u7528\u529F\u80FD");
     }
     const tempContext = this.context.clone();
     if (this.routeDepth === 1) {
@@ -13590,7 +14107,7 @@ var AppMenuIconViewController = class extends AppMenuController {
 };
 
 // src/controller/control/calendar/calendar.controller.ts
-import dayjs2 from "dayjs";
+import dayjs3 from "dayjs";
 
 // src/controller/control/calendar/calendar.service.ts
 import { RuntimeError as RuntimeError36 } from "@ibiz-template/core";
@@ -13748,9 +14265,9 @@ var CalendarController = class extends MDControlController {
         const x = a.beginTime;
         const y = b.beginTime;
         let result = 0;
-        if (dayjs2(x).isAfter(y)) {
+        if (dayjs3(x).isAfter(y)) {
           result = -1;
-        } else if (dayjs2(x).isBefore(y)) {
+        } else if (dayjs3(x).isBefore(y)) {
           result = 1;
         }
         return result;
@@ -13782,8 +14299,8 @@ var CalendarController = class extends MDControlController {
         1
       );
       return {
-        srfstartdate: dayjs2(firstDayOfMonth).format("YYYY-MM-DD HH:mm:ss"),
-        srfenddate: dayjs2(lastDayOfMonth).format("YYYY-MM-DD HH:mm:ss")
+        srfstartdate: dayjs3(firstDayOfMonth).format("YYYY-MM-DD HH:mm:ss"),
+        srfenddate: dayjs3(lastDayOfMonth).format("YYYY-MM-DD HH:mm:ss")
       };
     }
     return { srfstartdate, srfenddate };
@@ -13868,22 +14385,22 @@ import { mergeDeepRight as mergeDeepRight3 } from "ramda";
 import { RuntimeError as RuntimeError37 } from "@ibiz-template/core";
 
 // src/controller/control/chart/generator/line-series-generator.ts
-import { RuntimeModelError as RuntimeModelError28 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError29 } from "@ibiz-template/core";
 
 // src/controller/control/chart/generator/base-series-generator.ts
-import { plus, RuntimeModelError as RuntimeModelError27, toNumberOrNil } from "@ibiz-template/core";
-import dayjs3 from "dayjs";
+import { plus, RuntimeModelError as RuntimeModelError28, toNumberOrNil } from "@ibiz-template/core";
+import dayjs4 from "dayjs";
 import minMax from "dayjs/plugin/minMax";
 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 clone17, isNil as isNil21, mergeDeepRight } from "ramda";
-dayjs3.extend(minMax);
-dayjs3.extend(isSameOrBefore);
-dayjs3.extend(quarterOfYear);
-dayjs3.extend(weekOfYear);
-dayjs3.extend(isoWeek);
+import { clone as clone19, isNil as isNil21, mergeDeepRight } from "ramda";
+dayjs4.extend(minMax);
+dayjs4.extend(isSameOrBefore);
+dayjs4.extend(quarterOfYear);
+dayjs4.extend(weekOfYear);
+dayjs4.extend(isoWeek);
 var DEFAULT_GROUP = "$default_group";
 var BaseSeriesGenerator = class {
   /**
@@ -13921,10 +14438,10 @@ var BaseSeriesGenerator = class {
     this.chartGenerator = chartGenerator;
     const { chartSeriesEncode, caption, id, userParam } = model;
     if (!model.catalogField) {
-      throw new RuntimeModelError27(model, "\u7F3A\u5C11\u5206\u7C7B\u5C5E\u6027\u914D\u7F6E");
+      throw new RuntimeModelError28(model, "\u7F3A\u5C11\u5206\u7C7B\u5C5E\u6027\u914D\u7F6E");
     }
     if (!model.valueField) {
-      throw new RuntimeModelError27(model, "\u7F3A\u5C11\u503C\u5C5E\u6027\u914D\u7F6E");
+      throw new RuntimeModelError28(model, "\u7F3A\u5C11\u503C\u5C5E\u6027\u914D\u7F6E");
     }
     this.catalogField = chartGenerator.getFieldKey(model.catalogField);
     this.valueField = chartGenerator.getFieldKey(model.valueField);
@@ -14153,7 +14670,7 @@ var BaseSeriesGenerator = class {
   dataPreprocess(data) {
     const tempData = [];
     data.forEach((singleData) => {
-      tempData.push(clone17(singleData));
+      tempData.push(clone19(singleData));
     });
     const { groupMode } = this.model;
     if (groupMode) {
@@ -14168,25 +14685,25 @@ var BaseSeriesGenerator = class {
             format = "YYYY-MM";
           }
           if (singleData[this.catalogField]) {
-            const formattedDate = dayjs3(singleData[this.catalogField]).format(
+            const formattedDate = dayjs4(singleData[this.catalogField]).format(
               format
             );
             singleData[this.catalogField] = formattedDate;
           }
         } else if (groupMode === "QUARTER") {
           if (singleData[this.catalogField]) {
-            const formattedDate = "".concat(dayjs3(
+            const formattedDate = "".concat(dayjs4(
               singleData[this.catalogField]
-            ).format("YYYY"), "-").concat(dayjs3(
+            ).format("YYYY"), "-").concat(dayjs4(
               singleData[this.catalogField]
             ).quarter());
             singleData[this.catalogField] = formattedDate;
           }
         } else if (groupMode === "YEARWEEK") {
           if (singleData[this.catalogField]) {
-            const formattedDate = "".concat(dayjs3(
+            const formattedDate = "".concat(dayjs4(
               singleData[this.catalogField]
-            ).format("YYYY"), "-").concat(dayjs3(singleData[this.catalogField]).week());
+            ).format("YYYY"), "-").concat(dayjs4(singleData[this.catalogField]).week());
             singleData[this.catalogField] = formattedDate;
           }
         }
@@ -14208,7 +14725,7 @@ var BaseSeriesGenerator = class {
       let sortedKeys = [];
       if (groupMode === "DAY" || groupMode === "YEAR" || groupMode === "MONTH") {
         sortedKeys = Array.from(dateMap.keys()).sort(
-          (a, b) => dayjs3(a).diff(dayjs3(b))
+          (a, b) => dayjs4(a).diff(dayjs4(b))
         );
       } else if (groupMode === "QUARTER" || groupMode === "YEARWEEK") {
         sortedKeys = Array.from(dateMap.keys()).sort((a, b) => {
@@ -14242,11 +14759,11 @@ var BaseSeriesGenerator = class {
     const dates = [];
     Object.keys(data).forEach((key) => {
       data[key].forEach((_val, date) => {
-        dates.push(dayjs3(date));
+        dates.push(dayjs4(date));
       });
     });
-    const maxDate = dayjs3.max(dates);
-    const minDate = dayjs3.min(dates);
+    const maxDate = dayjs4.max(dates);
+    const minDate = dayjs4.min(dates);
     if (groupMode === "DAY") {
       let currentDate = minDate;
       const endDate = maxDate;
@@ -14328,7 +14845,7 @@ var BaseSeriesGenerator = class {
       const [minYear] = minYearWeek.split("-");
       const [maxYear] = maxYearWeek.split("-");
       for (let year = parseInt(minYear, 10); year <= parseInt(maxYear, 10); year++) {
-        const numWeeks = dayjs3("".concat(year, "-12-31")).isoWeek();
+        const numWeeks = dayjs4("".concat(year, "-12-31")).isoWeek();
         for (let week = 1; week <= numWeeks; week++) {
           const yearWeek = "".concat(year, "-").concat(week);
           Object.keys(data).forEach((key) => {
@@ -14347,10 +14864,10 @@ var BaseSeriesGenerator = class {
 var LineSeriesGenerator = class extends BaseSeriesGenerator {
   calcStaticOptions() {
     if (this.xAxisIndex === void 0) {
-      throw new RuntimeModelError28(this.model, "\u5E8F\u5217\u6CA1\u6709\u914D\u7F6EX\u5750\u6807\u8F74");
+      throw new RuntimeModelError29(this.model, "\u5E8F\u5217\u6CA1\u6709\u914D\u7F6EX\u5750\u6807\u8F74");
     }
     if (this.yAxisIndex === void 0) {
-      throw new RuntimeModelError28(this.model, "\u5E8F\u5217\u6CA1\u6709\u914D\u7F6EY\u5750\u6807\u8F74");
+      throw new RuntimeModelError29(this.model, "\u5E8F\u5217\u6CA1\u6709\u914D\u7F6EY\u5750\u6807\u8F74");
     }
     const options = super.calcStaticOptions();
     options.xAxisIndex = this.xAxisIndex;
@@ -14366,14 +14883,14 @@ var LineSeriesGenerator = class extends BaseSeriesGenerator {
 };
 
 // src/controller/control/chart/generator/bar-series-generator.ts
-import { RuntimeModelError as RuntimeModelError29 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError30 } from "@ibiz-template/core";
 var BarSeriesGenerator = class extends BaseSeriesGenerator {
   calcStaticOptions() {
     if (this.xAxisIndex === void 0) {
-      throw new RuntimeModelError29(this.model, "\u5E8F\u5217\u6CA1\u6709\u914D\u7F6EX\u5750\u6807\u8F74");
+      throw new RuntimeModelError30(this.model, "\u5E8F\u5217\u6CA1\u6709\u914D\u7F6EX\u5750\u6807\u8F74");
     }
     if (this.yAxisIndex === void 0) {
-      throw new RuntimeModelError29(this.model, "\u5E8F\u5217\u6CA1\u6709\u914D\u7F6EY\u5750\u6807\u8F74");
+      throw new RuntimeModelError30(this.model, "\u5E8F\u5217\u6CA1\u6709\u914D\u7F6EY\u5750\u6807\u8F74");
     }
     const options = super.calcStaticOptions();
     options.xAxisIndex = this.xAxisIndex;
@@ -14426,14 +14943,14 @@ var PieSeriesGenerator = class extends BaseSeriesGenerator {
 };
 
 // src/controller/control/chart/generator/scatter-series-generator.ts
-import { RuntimeModelError as RuntimeModelError30 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError31 } from "@ibiz-template/core";
 var ScatterSeriesGenerator = class extends BaseSeriesGenerator {
   calcStaticOptions() {
     if (this.xAxisIndex === void 0) {
-      throw new RuntimeModelError30(this.model, "\u5E8F\u5217\u6CA1\u6709\u914D\u7F6EX\u5750\u6807\u8F74");
+      throw new RuntimeModelError31(this.model, "\u5E8F\u5217\u6CA1\u6709\u914D\u7F6EX\u5750\u6807\u8F74");
     }
     if (this.yAxisIndex === void 0) {
-      throw new RuntimeModelError30(this.model, "\u5E8F\u5217\u6CA1\u6709\u914D\u7F6EY\u5750\u6807\u8F74");
+      throw new RuntimeModelError31(this.model, "\u5E8F\u5217\u6CA1\u6709\u914D\u7F6EY\u5750\u6807\u8F74");
     }
     const options = super.calcStaticOptions();
     options.xAxisIndex = this.xAxisIndex;
@@ -14992,7 +15509,7 @@ var ChartController = class extends MDControlController {
     if (!this.options) {
       throw new RuntimeError38("options\u8FD8\u6CA1\u8BA1\u7B97");
     }
-    this.chart.setOption(this.options);
+    this.chart.setOption(this.options, { notMerge: true });
     this.resizeChart();
   }
   /**
@@ -15031,17 +15548,17 @@ var CaptionBarController = class extends ControlController {
 import { recursiveIterate as recursiveIterate2, RuntimeError as RuntimeError47 } from "@ibiz-template/core";
 
 // src/ui-action/provider/backend-ui-action-provider.ts
-import { RuntimeModelError as RuntimeModelError49 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError50 } from "@ibiz-template/core";
 import { isArray as isArray8 } from "qx-util";
 
 // src/ui-action/provider/ui-action-provider-base.ts
-import { RuntimeModelError as RuntimeModelError48 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError49 } from "@ibiz-template/core";
 
 // src/ui-logic/index.ts
 import { RuntimeError as RuntimeError44 } from "@ibiz-template/core";
 
 // src/ui-logic/ui-logic.ts
-import { ModelError as ModelError25, RuntimeModelError as RuntimeModelError47 } from "@ibiz-template/core";
+import { ModelError as ModelError25, RuntimeModelError as RuntimeModelError48 } from "@ibiz-template/core";
 
 // src/ui-logic/ui-logic-context.ts
 var UILogicContext = class {
@@ -15187,24 +15704,24 @@ var UILogicContext = class {
 };
 
 // src/ui-logic/ui-logic-node/de-action-node/de-action-node.ts
-import { RuntimeModelError as RuntimeModelError33 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError34 } from "@ibiz-template/core";
 
 // src/ui-logic/ui-logic-link/ui-logic-link.ts
 import { ModelError as ModelError20 } from "@ibiz-template/core";
 
 // src/ui-logic/ui-logic-link/ui-logic-link-group-cond/ui-logic-link-group-cond.ts
-import { RuntimeModelError as RuntimeModelError32 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError33 } from "@ibiz-template/core";
 
 // src/ui-logic/ui-logic-link/ui-logic-link-cond/ui-logic-link-cond.ts
 var UILogicLinkCond = class {
 };
 
 // src/ui-logic/ui-logic-link/ui-logic-link-single-cond/ui-logic-link-single-cond.ts
-import { ModelError as ModelError19, RuntimeModelError as RuntimeModelError31 } from "@ibiz-template/core";
+import { ModelError as ModelError19, RuntimeModelError as RuntimeModelError32 } from "@ibiz-template/core";
 
 // src/ui-logic/utils/handle-src-val.ts
 import { ModelError as ModelError18 } from "@ibiz-template/core";
-import { clone as clone18 } from "ramda";
+import { clone as clone20 } from "ramda";
 function handleSrcVal2(ctx, srcValParams) {
   const { srcDEUILogicParamId, srcFieldName, srcValue } = srcValParams;
   const srcValueType = srcValParams.srcValueType || "SRCDLPARAM";
@@ -15231,7 +15748,7 @@ function handleSrcVal2(ctx, srcValParams) {
       value = ctx.parameters.context;
       break;
     case "ENVPARAM":
-      value = clone18(ibiz.env);
+      value = clone20(ibiz.env);
       break;
     default:
       throw new ModelError18(srcValParams, "\u6682\u672A\u652F\u6301\u6E90\u503C\u7C7B\u578B".concat(srcValueType));
@@ -15296,7 +15813,7 @@ var UILogicLinkSingleCond = class extends UILogicLinkCond {
     switch (this.type) {
       case "ENTITYFIELD": {
         if (!this.value) {
-          throw new RuntimeModelError31(
+          throw new RuntimeModelError32(
             this.model,
             "\u5F53\u524D\u6761\u4EF6\u503C\u7C7B\u578B\u4E3A[\u6570\u636E\u5BF9\u8C61\u5C5E\u6027],\u7F3A\u5C11\u914D\u7F6E\u6761\u4EF6\u503C"
           );
@@ -15306,7 +15823,7 @@ var UILogicLinkSingleCond = class extends UILogicLinkCond {
       }
       case "SRCENTITYFIELD": {
         if (!this.value) {
-          throw new RuntimeModelError31(
+          throw new RuntimeModelError32(
             this.model,
             "\u5F53\u524D\u6761\u4EF6\u503C\u7C7B\u578B\u4E3A[\u6E90\u6570\u636E\u5BF9\u8C61\u5C5E\u6027],\u7F3A\u5C11\u914D\u7F6E\u6761\u4EF6\u503C"
           );
@@ -15372,7 +15889,7 @@ var UILogicLinkGroupCond = class _UILogicLinkGroupCond extends UILogicLinkCond {
   test(ctx, context, data) {
     let bol = true;
     if (this.conds.length === 0) {
-      throw new RuntimeModelError32(this.model, "\u754C\u9762\u8FDE\u63A5\u6761\u4EF6\u903B\u8F91\u7EC4\u672A\u914D\u7F6E\u903B\u8F91\u9879");
+      throw new RuntimeModelError33(this.model, "\u754C\u9762\u8FDE\u63A5\u6761\u4EF6\u903B\u8F91\u7EC4\u672A\u914D\u7F6E\u903B\u8F91\u9879");
     }
     for (let i = 0; i < this.conds.length; i++) {
       const cond = this.conds[i];
@@ -15498,10 +16015,10 @@ var DEActionNode2 = class extends UILogicNode {
       retDEUILogicParamId
     } = this.model;
     if (!dstAppDataEntityId) {
-      throw new RuntimeModelError33(this.model, "\u672A\u6307\u5B9A\u5E94\u7528\u5B9E\u4F53");
+      throw new RuntimeModelError34(this.model, "\u672A\u6307\u5B9A\u5E94\u7528\u5B9E\u4F53");
     }
     if (!dstAppDEActionId) {
-      throw new RuntimeModelError33(this.model, "\u672A\u6307\u5B9A\u5B9E\u4F53\u884C\u4E3A");
+      throw new RuntimeModelError34(this.model, "\u672A\u6307\u5B9A\u5B9E\u4F53\u884C\u4E3A");
     }
     const requestData = ctx.params[dstDEUILogicParamId];
     const app = ibiz.hub.getApp(ctx.context.srfappid);
@@ -15519,13 +16036,13 @@ var DEActionNode2 = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/de-ui-action-node/de-ui-action-node.ts
-import { RuntimeModelError as RuntimeModelError34 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError35 } from "@ibiz-template/core";
 var DEUIActionNode = class extends UILogicNode {
   async exec(ctx) {
     const { dstAppDEUIActionId, dstDEUILogicParamId } = this.model;
     const { data, parameters } = ctx;
     if (!dstAppDEUIActionId) {
-      throw new RuntimeModelError34(this.model, "\u672A\u914D\u7F6E\u754C\u9762\u884C\u4E3A");
+      throw new RuntimeModelError35(this.model, "\u672A\u914D\u7F6E\u754C\u9762\u884C\u4E3A");
     }
     let actionData = [data];
     if (dstDEUILogicParamId) {
@@ -15590,7 +16107,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 RuntimeError39 } from "@ibiz-template/core";
-import { clone as clone19 } from "ramda";
+import { clone as clone21 } from "ramda";
 var PrepareJSParamNode = class extends UILogicNode {
   async exec(ctx) {
     const nodeParams = this.model.deuilogicNodeParams;
@@ -15679,7 +16196,7 @@ var PrepareJSParamNode = class extends UILogicNode {
   copyParam(nodeParam, ctx) {
     const { dstDEUILogicParamId } = nodeParam;
     const srcVal = handleSrcVal2(ctx, nodeParam);
-    ctx.params[dstDEUILogicParamId] = clone19(srcVal);
+    ctx.params[dstDEUILogicParamId] = clone21(srcVal);
   }
   /**
    * 绑定参数
@@ -15756,20 +16273,20 @@ var PrepareJSParamNode = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/view-ctrl-invoke-node/view-ctrl-invoke-node.ts
-import { RuntimeError as RuntimeError40, RuntimeModelError as RuntimeModelError35 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError40, RuntimeModelError as RuntimeModelError36 } from "@ibiz-template/core";
 import { isFunction } from "lodash-es";
 var ViewCtrlInvokeNode = class extends UILogicNode {
   async exec(ctx) {
     ctx.isEndNode = true;
     const { invokeMethod, invokeCtrlId, invokeParamId } = this.model;
     if (!invokeCtrlId) {
-      throw new RuntimeModelError35(this.model, "\u6CA1\u6709\u914D\u7F6E\u754C\u9762\u5BF9\u8C61");
+      throw new RuntimeModelError36(this.model, "\u6CA1\u6709\u914D\u7F6E\u754C\u9762\u5BF9\u8C61");
     }
     if (!invokeParamId) {
-      throw new RuntimeModelError35(this.model, "\u6CA1\u6709\u914D\u7F6E\u64CD\u4F5C\u53C2\u6570");
+      throw new RuntimeModelError36(this.model, "\u6CA1\u6709\u914D\u7F6E\u64CD\u4F5C\u53C2\u6570");
     }
     if (!invokeMethod) {
-      throw new RuntimeModelError35(this.model, "\u6CA1\u6709\u914D\u7F6E\u8C03\u7528\u65B9\u6CD5");
+      throw new RuntimeModelError36(this.model, "\u6CA1\u6709\u914D\u7F6E\u8C03\u7528\u65B9\u6CD5");
     }
     const invokeParam = ctx.params[invokeParamId];
     if (!invokeParam) {
@@ -15787,12 +16304,12 @@ var ViewCtrlInvokeNode = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/bind-param-node/bind-param-node.ts
-import { RuntimeModelError as RuntimeModelError36 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError37 } from "@ibiz-template/core";
 var BindParamNode2 = class extends UILogicNode {
   async exec(ctx) {
     const { dstDEUILogicParamId, srcDEUILogicParamId } = this.model;
     if (!dstDEUILogicParamId || !srcDEUILogicParamId) {
-      throw new RuntimeModelError36(
+      throw new RuntimeModelError37(
         this.model,
         "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u6216\u8005\u6E90\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E"
       );
@@ -15803,7 +16320,7 @@ var BindParamNode2 = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/msg-box-node/msg-box-node.ts
-import { ModelError as ModelError23, RuntimeModelError as RuntimeModelError37 } from "@ibiz-template/core";
+import { ModelError as ModelError23, RuntimeModelError as RuntimeModelError38 } from "@ibiz-template/core";
 var MsgBoxNode = class extends UILogicNode {
   constructor() {
     super(...arguments);
@@ -15817,10 +16334,10 @@ var MsgBoxNode = class extends UILogicNode {
   async exec(ctx) {
     const { msgBoxType, buttonsType, msgBoxParamId } = this.model;
     if (!msgBoxType) {
-      throw new RuntimeModelError37(this.model, "\u7F3A\u5C11\u6D88\u606F\u7C7B\u578B\u7684\u914D\u7F6E");
+      throw new RuntimeModelError38(this.model, "\u7F3A\u5C11\u6D88\u606F\u7C7B\u578B\u7684\u914D\u7F6E");
     }
     if (!buttonsType) {
-      throw new RuntimeModelError37(this.model, "\u7F3A\u5C11\u6309\u94AE\u7C7B\u578B\u7684\u914D\u7F6E");
+      throw new RuntimeModelError38(this.model, "\u7F3A\u5C11\u6309\u94AE\u7C7B\u578B\u7684\u914D\u7F6E");
     }
     let { title } = this.model;
     let { message } = this.model;
@@ -15880,49 +16397,49 @@ var PFPluginNode = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/debug-param-node/debug-param-node.ts
-import { RuntimeModelError as RuntimeModelError38 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError39 } from "@ibiz-template/core";
 var DebugParamNode = class extends UILogicNode {
   async exec(ctx) {
     const { dstDEUILogicParamId, name } = this.model;
     if (!dstDEUILogicParamId) {
-      throw new RuntimeModelError38(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E");
+      throw new RuntimeModelError39(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E");
     }
     const param = ctx.params[dstDEUILogicParamId];
-    console.log("\u903B\u8F91\u8282\u70B9".concat(name, "\u64CD\u4F5C\u53C2\u6570\u503C:"), param);
+    ibiz.log.debug("\u903B\u8F91\u8282\u70B9".concat(name, "\u64CD\u4F5C\u53C2\u6570\u503C:"), param);
   }
 };
 
 // src/ui-logic/ui-logic-node/reset-param-node/reset-param-node.ts
-import { RuntimeModelError as RuntimeModelError39 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError40 } from "@ibiz-template/core";
 var ResetParamNode2 = class extends UILogicNode {
   async exec(ctx) {
     const { dstDEUILogicParamId } = this.model;
     if (!dstDEUILogicParamId) {
-      throw new RuntimeModelError39(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E");
+      throw new RuntimeModelError40(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E");
     }
     ctx.resetParam(dstDEUILogicParamId);
   }
 };
 
 // src/ui-logic/ui-logic-node/copy-param-node/copy-param-node.ts
-import { RuntimeModelError as RuntimeModelError40 } from "@ibiz-template/core";
-import { clone as clone20 } from "ramda";
+import { RuntimeModelError as RuntimeModelError41 } from "@ibiz-template/core";
+import { clone as clone22 } from "ramda";
 var CopyParamNode2 = class extends UILogicNode {
   async exec(ctx) {
     const { dstDEUILogicParamId, srcDEUILogicParamId } = this.model;
     if (!dstDEUILogicParamId || !srcDEUILogicParamId) {
-      throw new RuntimeModelError40(
+      throw new RuntimeModelError41(
         this.model,
         "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u6216\u8005\u6E90\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E"
       );
     }
     const srcVal = handleSrcVal2(ctx, this.model);
-    ctx.params[dstDEUILogicParamId] = clone20(srcVal);
+    ctx.params[dstDEUILogicParamId] = clone22(srcVal);
   }
 };
 
 // src/ui-logic/ui-logic-node/append-param-node/append-param-node.ts
-import { RuntimeModelError as RuntimeModelError41 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError42 } from "@ibiz-template/core";
 var AppendParamNode2 = class extends UILogicNode {
   async exec(ctx) {
     const {
@@ -15933,7 +16450,7 @@ var AppendParamNode2 = class extends UILogicNode {
       srcSize
     } = this.model;
     if (!dstDEUILogicParamId || !srcDEUILogicParamId) {
-      throw new RuntimeModelError41(
+      throw new RuntimeModelError42(
         this.model,
         "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u6216\u8005\u6E90\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E"
       );
@@ -15951,12 +16468,12 @@ var AppendParamNode2 = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/sort-param-node/sort-param-node.ts
-import { RuntimeModelError as RuntimeModelError42 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError43 } from "@ibiz-template/core";
 var SortParamNode2 = class extends UILogicNode {
   async exec(ctx) {
     const { dstDEUILogicParamId, dstSortDir, dstFieldName } = this.model;
     if (!dstDEUILogicParamId || !dstFieldName) {
-      throw new RuntimeModelError42(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u6216\u76EE\u6807\u5C5E\u6027\u914D\u7F6E");
+      throw new RuntimeModelError43(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u6216\u76EE\u6807\u5C5E\u6027\u914D\u7F6E");
     }
     const key = dstFieldName;
     const arr = ctx.params[dstDEUILogicParamId];
@@ -15967,19 +16484,19 @@ var SortParamNode2 = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/renew-param-node/renew-param-node.ts
-import { RuntimeModelError as RuntimeModelError43 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError44 } from "@ibiz-template/core";
 var RenewParamNode2 = class extends UILogicNode {
   async exec(ctx) {
     const { dstDEUILogicParamId } = this.model;
     if (!dstDEUILogicParamId) {
-      throw new RuntimeModelError43(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E");
+      throw new RuntimeModelError44(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E");
     }
     ctx.renewParam(dstDEUILogicParamId);
   }
 };
 
 // src/ui-logic/ui-logic-node/data-set-node/data-set-node.ts
-import { RuntimeModelError as RuntimeModelError44 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError45 } from "@ibiz-template/core";
 var DataSetNode2 = class extends UILogicNode {
   async exec(ctx) {
     const {
@@ -15989,7 +16506,7 @@ var DataSetNode2 = class extends UILogicNode {
       retDEUILogicParamId
     } = this.model;
     if (!dstDEUILogicParamId) {
-      throw new RuntimeModelError44(this.model, "\u7F3A\u5C11\u914D\u7F6E\u8FC7\u6EE4\u53C2\u6570");
+      throw new RuntimeModelError45(this.model, "\u7F3A\u5C11\u914D\u7F6E\u8FC7\u6EE4\u53C2\u6570");
     }
     const queryParams = ctx.params[dstDEUILogicParamId];
     const app = ibiz.hub.getApp(ctx.context.srfappid);
@@ -16015,19 +16532,19 @@ var ThrowExceptionNode2 = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/view-ctrl-fire-event-node/view-ctrl-fire-event-node.ts
-import { RuntimeError as RuntimeError42, RuntimeModelError as RuntimeModelError45 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError42, RuntimeModelError as RuntimeModelError46 } from "@ibiz-template/core";
 var ViewCtrlFireEventNode = class extends UILogicNode {
   async exec(ctx) {
     ctx.isEndNode = true;
     const { eventName, eventParamId, fireCtrlId } = this.model;
     if (!fireCtrlId) {
-      throw new RuntimeModelError45(this.model, "\u6CA1\u6709\u914D\u7F6E\u89E6\u53D1\u5BF9\u8C61");
+      throw new RuntimeModelError46(this.model, "\u6CA1\u6709\u914D\u7F6E\u89E6\u53D1\u5BF9\u8C61");
     }
     if (!eventName) {
-      throw new RuntimeModelError45(this.model, "\u6CA1\u6709\u914D\u7F6E\u4E8B\u4EF6\u540D\u79F0\u53C2\u6570");
+      throw new RuntimeModelError46(this.model, "\u6CA1\u6709\u914D\u7F6E\u4E8B\u4EF6\u540D\u79F0\u53C2\u6570");
     }
     if (!eventParamId) {
-      throw new RuntimeModelError45(this.model, "\u6CA1\u6709\u914D\u7F6E\u4E8B\u4EF6\u53C2\u6570");
+      throw new RuntimeModelError46(this.model, "\u6CA1\u6709\u914D\u7F6E\u4E8B\u4EF6\u53C2\u6570");
     }
     const invokeCtrl = ctx.params[fireCtrlId];
     if (!invokeCtrl) {
@@ -16042,7 +16559,7 @@ var ViewCtrlFireEventNode = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/execute-de-logic-node/execute-de-logic-node.ts
-import { RuntimeError as RuntimeError43, RuntimeModelError as RuntimeModelError46 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError43, RuntimeModelError as RuntimeModelError47 } from "@ibiz-template/core";
 var ExecuteDELogicNode = class extends UILogicNode {
   async exec(ctx) {
     const {
@@ -16052,13 +16569,13 @@ var ExecuteDELogicNode = class extends UILogicNode {
       retDEUILogicParamId
     } = this.model;
     if (!dstAppDataEntityId) {
-      throw new RuntimeModelError46(this.model, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53");
+      throw new RuntimeModelError47(this.model, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53");
     }
     if (!dstAppDELogicId) {
-      throw new RuntimeModelError46(this.model, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u903B\u8F91");
+      throw new RuntimeModelError47(this.model, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u903B\u8F91");
     }
     if (!dstDEUILogicParamId) {
-      throw new RuntimeModelError46(this.model, "\u6CA1\u6709\u914D\u7F6E\u4F20\u5165\u903B\u8F91\u53C2\u6570");
+      throw new RuntimeModelError47(this.model, "\u6CA1\u6709\u914D\u7F6E\u4F20\u5165\u903B\u8F91\u53C2\u6570");
     }
     const dstParam = ctx.params[dstDEUILogicParamId];
     if (!dstParam) {
@@ -16080,7 +16597,6 @@ var ExecuteDELogicNode = class extends UILogicNode {
 // src/ui-logic/ui-logic-node/raw-js-code-node/raw-js-code-node.ts
 var RawJSCodeNode = class extends UILogicNode {
   async exec(ctx) {
-    console.log(ctx);
     ScriptFactory.execScriptFn(
       {
         view: ctx.view,
@@ -16220,7 +16736,7 @@ var UILogic = class {
     this.params = /* @__PURE__ */ new Map();
     var _a;
     if (!((_a = model.deuilogicNodes) == null ? void 0 : _a.length)) {
-      throw new RuntimeModelError47(model, "\u754C\u9762\u903B\u8F91\u6CA1\u6709\u914D\u7F6E\u903B\u8F91\u8282\u70B9");
+      throw new RuntimeModelError48(model, "\u754C\u9762\u903B\u8F91\u6CA1\u6709\u914D\u7F6E\u903B\u8F91\u8282\u70B9");
     }
     model.deuilogicNodes.forEach((node) => {
       const { logicNodeType } = node;
@@ -16340,7 +16856,7 @@ var UILogic = class {
       const start = this.nodes.get(startDEUILogicNodeId);
       await this.deepExec(start, ctx);
     } else {
-      throw new RuntimeModelError47(this.model, "\u672A\u8BBE\u7F6E\u8D77\u59CB\u8282\u70B9");
+      throw new RuntimeModelError48(this.model, "\u672A\u8BBE\u7F6E\u8D77\u59CB\u8282\u70B9");
     }
     if (ctx.isEndNode) {
       return ctx.result;
@@ -16475,7 +16991,7 @@ var UIActionProviderBase = class {
     const { appDEUILogicId, appDataEntityId, uilogicAttachMode } = action;
     if (uilogicAttachMode === "REPLACE") {
       if (!appDEUILogicId) {
-        throw new RuntimeModelError48(action, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u754C\u9762\u903B\u8F91");
+        throw new RuntimeModelError49(action, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u754C\u9762\u903B\u8F91");
       }
       await execUILogic(appDEUILogicId, appDataEntityId, args);
       return result;
@@ -16490,7 +17006,7 @@ var UIActionProviderBase = class {
     }
     if (action.uilogicAttachMode === "AFTER") {
       if (!appDEUILogicId) {
-        throw new RuntimeModelError48(action, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u754C\u9762\u903B\u8F91");
+        throw new RuntimeModelError49(action, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u754C\u9762\u903B\u8F91");
       }
       await execUILogic(
         appDEUILogicId,
@@ -16715,7 +17231,7 @@ var BackendUIActionProvider = class extends UIActionProviderBase {
     const entityName = action.appDataEntityId;
     const methodName = action.appDEMethodId;
     if (!entityName || !methodName) {
-      throw new RuntimeModelError49(action, "\u672A\u914D\u7F6E\u5B9E\u4F53\u6216\u5B9E\u4F53\u884C\u4E3A");
+      throw new RuntimeModelError50(action, "\u672A\u914D\u7F6E\u5B9E\u4F53\u6216\u5B9E\u4F53\u884C\u4E3A");
     }
     const { resultContext, resultParams, resultData } = await this.handleParams(
       action,
@@ -16840,7 +17356,7 @@ var SysUIActionProvider = class extends UIActionProviderBase {
 // src/ui-action/provider/front-ui-action-provider.ts
 import {
   StringUtil,
-  RuntimeModelError as RuntimeModelError50,
+  RuntimeModelError as RuntimeModelError51,
   ModelError as ModelError26,
   RuntimeError as RuntimeError46
 } from "@ibiz-template/core";
@@ -16858,7 +17374,7 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
       case "WIZARD": {
         const frontPSAppView = action.frontAppViewId;
         if (!frontPSAppView) {
-          throw new RuntimeModelError50(action, "\u672A\u914D\u7F6E\u6253\u5F00\u89C6\u56FE");
+          throw new RuntimeModelError51(action, "\u672A\u914D\u7F6E\u6253\u5F00\u89C6\u56FE");
         }
         const { resultContext, resultParams } = await this.handleParams(
           action,
@@ -16923,7 +17439,7 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
       );
       return result || {};
     }
-    throw new RuntimeModelError50(action, "\u81EA\u5B9A\u4E49\u7C7B\u578B\u7F3A\u5C11\u914D\u7F6E\u811A\u672C\u4EE3\u7801");
+    throw new RuntimeModelError51(action, "\u81EA\u5B9A\u4E49\u7C7B\u578B\u7F3A\u5C11\u914D\u7F6E\u811A\u672C\u4EE3\u7801");
   }
   /**
    * 执行打印行为
@@ -16992,8 +17508,14 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
    * @param {IUILogicParams} args
    * @return {*}
    */
-  async executeDataImport(action, _args) {
+  async executeDataImport(action, args) {
     var _a;
+    const { resultContext, resultParams } = await this.handleParams(
+      action,
+      args.context,
+      args.data,
+      args.params
+    );
     const appDataEntity = await ibiz.hub.getAppDataEntity(
       action.appDataEntityId,
       action.appId
@@ -17011,7 +17533,9 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
         {
           dismiss: () => modal.dismiss(),
           appDataEntity,
-          dataImport: appDEDataImport
+          dataImport: appDEDataImport,
+          context: resultContext,
+          params: resultParams
         },
         {
           width: "auto",
@@ -17764,7 +18288,7 @@ var RawItemPortletController = class extends PortletPartController {
 };
 
 // src/controller/control/data-view/data-view.controller.ts
-import { RuntimeModelError as RuntimeModelError51 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError52 } from "@ibiz-template/core";
 import { isNil as isNil22 } from "ramda";
 
 // src/controller/control/data-view/data-view.service.ts
@@ -17979,7 +18503,7 @@ var DataViewControlController = class extends MDControlController {
     const optItemModel = this.getOptItemModel();
     if (optItemModel) {
       if (!optItemModel.deuiactionGroup) {
-        throw new RuntimeModelError51(this.model, "\u64CD\u4F5C\u9879\u6CA1\u6709\u914D\u7F6E\u754C\u9762\u884C\u4E3A\u7EC4");
+        throw new RuntimeModelError52(this.model, "\u64CD\u4F5C\u9879\u6CA1\u6709\u914D\u7F6E\u754C\u9762\u884C\u4E3A\u7EC4");
       }
       if (!((_a = optItemModel.deuiactionGroup.uiactionGroupDetails) == null ? void 0 : _a.length)) {
         ibiz.log.debug("\u64CD\u4F5C\u9879\u754C\u9762\u884C\u4E3A\u7EC4\u6CA1\u6709\u914D\u7F6E\u754C\u9762\u884C\u4E3A");
@@ -18032,7 +18556,7 @@ var DataViewControlController = class extends MDControlController {
     const { enableGroup, groupMode, groupAppDEFieldId } = this.model;
     if (enableGroup && groupMode) {
       if (!groupAppDEFieldId) {
-        throw new RuntimeModelError51(this.model, "\u5206\u7EC4\u5C5E\u6027\u6CA1\u6709\u914D\u7F6E");
+        throw new RuntimeModelError52(this.model, "\u5206\u7EC4\u5C5E\u6027\u6CA1\u6709\u914D\u7F6E");
       }
       if (groupMode === "AUTO") {
         this.handleAutoGroup();
@@ -18099,7 +18623,7 @@ var DataViewControlController = class extends MDControlController {
   async handleCodeListGroup() {
     const { groupAppDEFieldId, groupCodeListId } = this.model;
     if (!groupCodeListId) {
-      throw new RuntimeModelError51(this.model, "\u5206\u7EC4\u4EE3\u7801\u8868\u6CA1\u6709\u914D\u7F6E");
+      throw new RuntimeModelError52(this.model, "\u5206\u7EC4\u4EE3\u7801\u8868\u6CA1\u6709\u914D\u7F6E");
     }
     const { items } = this.state;
     const groupMap = /* @__PURE__ */ new Map();
@@ -18205,7 +18729,7 @@ var DataViewControlController = class extends MDControlController {
         caption = ibiz.i18n.t(item.capLanguageRes.lanResTag, item.caption);
       }
       if (!item.appDEFieldId) {
-        throw new RuntimeModelError51(item, "\u542F\u7528\u6392\u5E8F\u7684\u9879\u5FC5\u987B\u5173\u8054\u5B9E\u4F53\u5C5E\u6027");
+        throw new RuntimeModelError52(item, "\u542F\u7528\u6392\u5E8F\u7684\u9879\u5FC5\u987B\u5173\u8054\u5B9E\u4F53\u5C5E\u6027");
       }
       const tempItem = {
         caption,
@@ -18223,10 +18747,10 @@ var DataViewControlController = class extends MDControlController {
 };
 
 // src/controller/control/exp-bar/calendar-exp-bar.controller.ts
-import { RuntimeModelError as RuntimeModelError53 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError54 } from "@ibiz-template/core";
 
 // src/controller/control/exp-bar/exp-bar.controller.ts
-import { RuntimeError as RuntimeError48, RuntimeModelError as RuntimeModelError52 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError48, RuntimeModelError as RuntimeModelError53 } from "@ibiz-template/core";
 var ExpBarControlController = class extends ControlController {
   constructor() {
     super(...arguments);
@@ -18281,7 +18805,7 @@ var ExpBarControlController = class extends ControlController {
   get xDataController() {
     const controller = this.view.getController(this.model.xdataControlName);
     if (!controller) {
-      throw new RuntimeModelError52(
+      throw new RuntimeModelError53(
         this.model,
         "\u65E0\u6CD5\u83B7\u53D6\u591A\u6570\u636E\u90E8\u4EF6[".concat(this.model.xdataControlName, "]\u63A7\u5236\u5668")
       );
@@ -18640,7 +19164,7 @@ var CalendarExpBarController = class extends ExpBarControlController {
   get xDataController() {
     const controller = this.view.getController(this.model.xdataControlName);
     if (!controller) {
-      throw new RuntimeModelError53(
+      throw new RuntimeModelError54(
         this.model,
         "\u65E0\u6CD5\u83B7\u53D6\u591A\u6570\u636E\u90E8\u4EF6[".concat(this.model.xdataControlName, "]\u63A7\u5236\u5668")
       );
@@ -18695,7 +19219,7 @@ var CalendarExpBarController = class extends ExpBarControlController {
 };
 
 // src/controller/control/exp-bar/tree-exp-bar.controller.ts
-import { RuntimeError as RuntimeError49, RuntimeModelError as RuntimeModelError54 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError49, RuntimeModelError as RuntimeModelError55 } from "@ibiz-template/core";
 var TreeExpBarController = class extends ExpBarControlController {
   constructor() {
     super(...arguments);
@@ -18718,7 +19242,7 @@ var TreeExpBarController = class extends ExpBarControlController {
   get xDataController() {
     const controller = this.view.getController(this.model.xdataControlName);
     if (!controller) {
-      throw new RuntimeModelError54(
+      throw new RuntimeModelError55(
         this.model,
         "\u65E0\u6CD5\u83B7\u53D6\u591A\u6570\u636E\u90E8\u4EF6[".concat(this.model.xdataControlName, "]\u63A7\u5236\u5668")
       );
@@ -18963,7 +19487,11 @@ var ChartExpBarController = class extends ExpBarControlController {
 import { RuntimeError as RuntimeError50 } from "@ibiz-template/core";
 
 // src/controller/control/form/form/form.controller.ts
-import { debounceAndAsyncMerge, recursiveIterate as recursiveIterate3 } from "@ibiz-template/core";
+import {
+  RuntimeModelError as RuntimeModelError56,
+  debounceAndAsyncMerge,
+  recursiveIterate as recursiveIterate3
+} from "@ibiz-template/core";
 var FormController = class extends ControlController {
   constructor() {
     super(...arguments);
@@ -19087,6 +19615,12 @@ var FormController = class extends ControlController {
         if (!detailProvider) {
           return;
         }
+        if (form.details[detail.id]) {
+          throw new RuntimeModelError56(
+            detail,
+            "\u521D\u59CB\u5316\u5F02\u5E38: \u8868\u5355\u6210\u5458[".concat(detail.id, "](").concat(detail.detailType, ")\u5DF2\u5B58\u5728\uFF0C\u8868\u5355\u9879\u6807\u8BC6\u91CD\u590D\u8BF7\u68C0\u67E5\u914D\u7F6E")
+          );
+        }
         form.providers[detail.id] = detailProvider;
         const detailController = await detailProvider.createController(
           detail,
@@ -19919,6 +20453,9 @@ var FormDetailController = class {
    * @date 2023-10-11 05:03:26
    */
   async onClick(event) {
+    if (event) {
+      event.stopPropagation();
+    }
     this.form.evt.emit("onFormDetailEvent", {
       formDetailName: this.model.id,
       formDetailEventName: "onClick" /* CLICK */,
@@ -20724,7 +21261,7 @@ var FormMDCtrlController = class extends FormDetailController {
 import {
   mergeInLeft,
   ModelError as ModelError27,
-  RuntimeModelError as RuntimeModelError55
+  RuntimeModelError as RuntimeModelError57
 } from "@ibiz-template/core";
 var FormMDCtrlMDController = class extends FormMDCtrlController {
   constructor() {
@@ -20750,7 +21287,7 @@ var FormMDCtrlMDController = class extends FormMDCtrlController {
     await super.onInit();
     const { contentControl } = this.model;
     if (!contentControl) {
-      throw new RuntimeModelError55(this.model, "\u591A\u6570\u636E\u90E8\u4EF6\u672A\u914D\u7F6E\u5185\u5BB9\u90E8\u4EF6");
+      throw new RuntimeModelError57(this.model, "\u591A\u6570\u636E\u90E8\u4EF6\u672A\u914D\u7F6E\u5185\u5BB9\u90E8\u4EF6");
     }
     if (contentControl.controlType === "GRID") {
       mergeInLeft(contentControl, {
@@ -20847,7 +21384,7 @@ var FormMDCtrlMDController = class extends FormMDCtrlController {
 };
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form.controller.ts
-import { RuntimeError as RuntimeError51, RuntimeModelError as RuntimeModelError56 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError51, RuntimeModelError as RuntimeModelError58 } from "@ibiz-template/core";
 import { createUUID as createUUID11 } from "qx-util";
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form.state.ts
@@ -20888,7 +21425,7 @@ var FormMDCtrlFormController = class extends FormMDCtrlController {
     super.onInit();
     const { contentControl } = this.model;
     if (!contentControl) {
-      throw new RuntimeModelError56(this.model, "\u591A\u6570\u636E\u90E8\u4EF6\u672A\u914D\u7F6E\u5185\u5BB9\u90E8\u4EF6");
+      throw new RuntimeModelError58(this.model, "\u591A\u6570\u636E\u90E8\u4EF6\u672A\u914D\u7F6E\u5185\u5BB9\u90E8\u4EF6");
     }
     contentControl.enableAutoSave = this.enableCreate || this.enableUpdate;
     const controlProvider = await getControlProvider(contentControl);
@@ -21022,7 +21559,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 clone21 } from "ramda";
+import { clone as clone23 } from "ramda";
 var FormMDCtrlRepeaterController = class extends FormMDCtrlController {
   constructor() {
     super(...arguments);
@@ -21106,7 +21643,7 @@ var FormMDCtrlRepeaterController = class extends FormMDCtrlController {
     copyFields.forEach((key) => {
       tempForm[key] = this.form.model[key];
     });
-    this.repeatedForm = clone21(tempForm);
+    this.repeatedForm = clone23(tempForm);
   }
   /**
    * 设置重复器数据（修改主表单里重复器对应属性）
@@ -21214,10 +21751,30 @@ var FormTabPageController = class extends FormDetailController {
     var _a;
     return new FormTabPageState((_a = this.parent) == null ? void 0 : _a.state);
   }
+  /**
+   * 是否激活的分页
+   * @author lxm
+   * @date 2024-01-17 03:16:24
+   * @readonly
+   * @type {boolean}
+   */
+  get isActive() {
+    return this.parent.state.activeTab === this.model.id;
+  }
 };
 
 // src/controller/control/form/form-detail/form-tab-panel/form-tab-panel.state.ts
 var FormTabPanelState = class extends FormDetailState {
+  constructor() {
+    super(...arguments);
+    /**
+     * 当前激活的分页
+     * @author lxm
+     * @date 2024-01-17 02:05:58
+     * @type {string}
+     */
+    this.activeTab = "";
+  }
 };
 
 // src/controller/control/form/form-detail/form-tab-panel/form-tab-panel.controller.ts
@@ -21226,6 +21783,20 @@ var FormTabPanelController = class extends FormDetailController {
     var _a;
     return new FormTabPanelState((_a = this.parent) == null ? void 0 : _a.state);
   }
+  async onInit() {
+    var _a;
+    await super.onInit();
+    this.state.activeTab = ((_a = this.model.deformTabPages) == null ? void 0 : _a[0].id) || "";
+  }
+  /**
+   * 分页点击切换处理
+   * @author lxm
+   * @date 2024-01-17 02:59:38
+   * @param {string} tabId
+   */
+  onTabChange(tabId) {
+    this.state.activeTab = tabId;
+  }
 };
 
 // src/controller/control/form/edit-form/edit-form.controller.ts
@@ -21236,12 +21807,12 @@ import {
 } from "@ibiz-template/core";
 import { debounce as debounce2 } from "lodash-es";
 import { createUUID as createUUID12 } from "qx-util";
-import { clone as clone22 } from "ramda";
+import { clone as clone24 } from "ramda";
 
 // src/controller/control/form/edit-form/edit-form.service.ts
 import {
   recursiveIterate as recursiveIterate6,
-  RuntimeModelError as RuntimeModelError57
+  RuntimeModelError as RuntimeModelError59
 } from "@ibiz-template/core";
 var EditFormService = class extends FormService {
   /**
@@ -21365,7 +21936,7 @@ var EditFormService = class extends FormService {
     const wizardForm = this.model;
     const methodName = (_a = wizardForm.goBackControlAction) == null ? void 0 : _a.appDEMethodId;
     if (!methodName) {
-      throw new RuntimeModelError57(this.model, "\u7F3A\u5C11\u8FD4\u56DE\u64CD\u4F5C\u5B9E\u4F53\u884C\u4E3A");
+      throw new RuntimeModelError59(this.model, "\u7F3A\u5C11\u8FD4\u56DE\u64CD\u4F5C\u5B9E\u4F53\u884C\u4E3A");
     }
     let res = await this.exec(
       methodName,
@@ -21601,8 +22172,8 @@ var EditFormController = class extends FormController {
    * @return {*}  {Promise<IData>}
    */
   async copy() {
-    const context = clone22(this.context);
-    const queryParams = clone22(this.params);
+    const context = clone24(this.context);
+    const queryParams = clone24(this.params);
     const appDataEntity = await ibiz.hub.getAppDataEntity(
       this.model.appDataEntityId,
       this.model.appId
@@ -21659,7 +22230,7 @@ var EditFormController = class extends FormController {
       return this.loadDraft();
     }
     const { context, params } = this.handlerAbilityParams(args);
-    const queryParams = clone22(params);
+    const queryParams = clone24(params);
     let res;
     try {
       await this.startLoading();
@@ -21740,7 +22311,7 @@ var EditFormController = class extends FormController {
       });
     }
     ibiz.mc.command.send(
-      this.data.$origin,
+      res.data,
       isCreate ? "OBJECTCREATED" : "OBJECTUPDATED"
     );
     return this.data;
@@ -22225,12 +22796,12 @@ import {
   mergeDefaultInLeft,
   recursiveIterate as recursiveIterate7,
   RuntimeError as RuntimeError53,
-  RuntimeModelError as RuntimeModelError59
+  RuntimeModelError as RuntimeModelError61
 } from "@ibiz-template/core";
-import { clone as clone23 } from "ramda";
+import { clone as clone25 } from "ramda";
 
 // src/controller/control/grid/grid/grid.service.ts
-import { RuntimeModelError as RuntimeModelError58 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError60 } from "@ibiz-template/core";
 var GridService = class extends MDControlService {
   /**
    * 初始化属性映射
@@ -22258,7 +22829,7 @@ var GridService = class extends MDControlService {
               dataType: dataItem.dataType
             });
           } else {
-            throw new RuntimeModelError58(
+            throw new RuntimeModelError60(
               column,
               "\u672A\u627E\u5230\u5BF9\u5E94\u7684\u8868\u683C\u6570\u636E\u9879[".concat(deField, "]")
             );
@@ -22537,7 +23108,7 @@ var GridController = class extends MDControlController {
     const result = await calcColumnModelBySchema(json, this);
     if (result && result.degridColumns.length > 0) {
       const { degridColumns, degridDataItems } = result;
-      this.model = clone23(this.model);
+      this.model = clone25(this.model);
       this.model.degridColumns = [
         ...(this.model.degridColumns || []).filter((item) => {
           return degridColumns.findIndex((x) => x.id === item.id) === -1;
@@ -22568,11 +23139,11 @@ var GridController = class extends MDControlController {
       (item) => item.model.appDEFieldId === groupAppDEFieldId
     );
     if (!this.groupFieldColumn) {
-      throw new RuntimeModelError59(this.model, "\u6CA1\u6709\u914D\u7F6E\u5206\u7EC4\u5C5E\u6027\u7684\u5C5E\u6027\u5217");
+      throw new RuntimeModelError61(this.model, "\u6CA1\u6709\u914D\u7F6E\u5206\u7EC4\u5C5E\u6027\u7684\u5C5E\u6027\u5217");
     }
     const groupFieldName = this.groupFieldColumn.model.id;
     if (!this.groupFieldColumn.model.appCodeListId) {
-      throw new RuntimeModelError59(
+      throw new RuntimeModelError61(
         this.groupFieldColumn.model,
         "\u5206\u7EC4\u5C5E\u6027\u7684\u5C5E\u6027\u5217".concat(groupFieldName, "\u6CA1\u6709\u914D\u7F6E\u4EE3\u7801\u8868")
       );
@@ -22582,7 +23153,7 @@ var GridController = class extends MDControlController {
     );
     if (index !== -1 && index !== 0) {
       if (this.isMultistageHeader) {
-        throw new RuntimeModelError59(
+        throw new RuntimeModelError61(
           this.model,
           "\u8BF7\u5C06\u5206\u7EC4\u5C5E\u6027\u5217".concat(groupFieldName, "\u914D\u7F6E\u4E3A\u7B2C\u4E00\u5217")
         );
@@ -22592,10 +23163,10 @@ var GridController = class extends MDControlController {
     }
     if (groupMode === "CODELIST") {
       if (!groupCodeListId) {
-        throw new RuntimeModelError59(this.model, "\u4EE3\u7801\u8868\u5206\u7EC4\u6A21\u5F0F\u9700\u8981\u914D\u7F6E\u4EE3\u7801\u8868");
+        throw new RuntimeModelError61(this.model, "\u4EE3\u7801\u8868\u5206\u7EC4\u6A21\u5F0F\u9700\u8981\u914D\u7F6E\u4EE3\u7801\u8868");
       }
       if (this.groupFieldColumn.model.appCodeListId !== groupCodeListId) {
-        throw new RuntimeModelError59(
+        throw new RuntimeModelError61(
           this.model,
           "\u5206\u7EC4\u4EE3\u7801\u8868\u4E0E\u5C5E\u6027\u5217".concat(groupFieldName, "\u7684\u4EE3\u7801\u8868\u4E0D\u4E00\u81F4")
         );
@@ -22682,7 +23253,7 @@ var GridController = class extends MDControlController {
       return;
     }
     if (!aggAppDEDataSetId || !aggAppDataEntityId) {
-      throw new RuntimeModelError59(this.model, "\u7F3A\u5C11\u914D\u7F6E\u805A\u5408\u5B9E\u4F53\u6216\u805A\u5408\u6570\u636E\u96C6");
+      throw new RuntimeModelError61(this.model, "\u7F3A\u5C11\u914D\u7F6E\u805A\u5408\u5B9E\u4F53\u6216\u805A\u5408\u6570\u636E\u96C6");
     }
     const params = await this.getFetchParams();
     const app = ibiz.hub.getApp(this.context.srfappid);
@@ -23052,7 +23623,7 @@ var GridController = class extends MDControlController {
         throw new RuntimeError53("\u540C\u65F6\u53EA\u80FD\u6709\u4E00\u884C\u5F00\u542F\u884C\u7F16\u8F91");
       }
       if (row.data.srfuf === 1 /* UPDATE */) {
-        row.cacheData = clone23(row.data);
+        row.cacheData = clone25(row.data);
         const defaultVal = this.calcDefaultValue(row.data, false);
         Object.assign(row.data, defaultVal);
       }
@@ -23221,7 +23792,7 @@ var GridController = class extends MDControlController {
           }
         });
       }
-      const cloneData = clone23(
+      const cloneData = clone25(
         data2.map((item) => {
           return item.getOrigin();
         })
@@ -23456,10 +24027,10 @@ var GridController = class extends MDControlController {
 };
 
 // src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts
-import { DataTypes as DataTypes3, ModelError as ModelError29, plus as plus2 } from "@ibiz-template/core";
-import dayjs4 from "dayjs";
+import { DataTypes as DataTypes4, ModelError as ModelError29, plus as plus2 } from "@ibiz-template/core";
+import dayjs5 from "dayjs";
 import { debounce as debounce3 } from "lodash-es";
-import { clone as clone24, isNil as isNil23 } from "ramda";
+import { clone as clone26, isNil as isNil23 } from "ramda";
 var GridFieldColumnController = class extends GridColumnController {
   constructor() {
     super(...arguments);
@@ -23492,9 +24063,18 @@ var GridFieldColumnController = class extends GridColumnController {
   get hasAction() {
     return !!this.model.deuiactionId;
   }
-  async onInit() {
-    await super.onInit();
-    this.loadCodeList = debounce3(this.loadCodeList, 300, {
+  /**
+   * 属性列对应值在数据里的属性字段名称
+   * @author lxm
+   * @date 2023-06-25 09:26:04
+   * @readonly
+   */
+  get fieldName() {
+    return this.model.id.toLowerCase();
+  }
+  async onInit() {
+    await super.onInit();
+    this.loadCodeList = debounce3(this.loadCodeList, 300, {
       leading: true,
       trailing: false
     });
@@ -23533,7 +24113,7 @@ var GridFieldColumnController = class extends GridColumnController {
    * @readonly
    */
   clickable(row) {
-    const value = row.data[this.model.codeName];
+    const value = row.data[this.fieldName];
     return (this.isLinkColumn || this.hasAction) && value;
   }
   /**
@@ -23570,7 +24150,7 @@ var GridFieldColumnController = class extends GridColumnController {
    * @returns {*}  {Promise<void>}
    */
   async openLinkView(row, event) {
-    const curValue = row.data[this.model.codeName];
+    const curValue = row.data[this.fieldName];
     if (!curValue) {
       return;
     }
@@ -23588,7 +24168,7 @@ var GridFieldColumnController = class extends GridColumnController {
       srfkey: value,
       ...wfContext
     });
-    const tempParams = clone24(this.params);
+    const tempParams = clone26(this.params);
     const { context: newContext, params: newParams } = this.handlePublicParams(
       row.data,
       tempContext,
@@ -23721,9 +24301,9 @@ var GridFieldColumnController = class extends GridColumnController {
     if (!this.valueFormat) {
       return strVal;
     }
-    const isDate = DataTypes3.isDate(this.dataType);
+    const isDate = DataTypes4.isDate(this.dataType);
     if (isDate) {
-      const formatVal = dayjs4(strVal).format(this.valueFormat);
+      const formatVal = dayjs5(strVal).format(this.valueFormat);
       if (formatVal !== "Invalid Date") {
         return formatVal;
       }
@@ -23759,7 +24339,7 @@ var GridFieldColumnController = class extends GridColumnController {
 };
 
 // src/controller/control/grid/grid-column/grid-ua-column/grid-ua-column.controller.ts
-import { RuntimeModelError as RuntimeModelError60 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError62 } from "@ibiz-template/core";
 var GridUAColumnController = class extends GridColumnController {
   /**
    * 给rowController初始化操作列的状态
@@ -23772,7 +24352,7 @@ var GridUAColumnController = class extends GridColumnController {
     var _a;
     const { deuiactionGroup } = this.model;
     if (!deuiactionGroup) {
-      throw new RuntimeModelError60(this.model, "\u64CD\u4F5C\u5217\u6CA1\u6709\u914D\u7F6E\u754C\u9762\u884C\u4E3A\u7EC4");
+      throw new RuntimeModelError62(this.model, "\u64CD\u4F5C\u5217\u6CA1\u6709\u914D\u7F6E\u754C\u9762\u884C\u4E3A\u7EC4");
     }
     if (!((_a = deuiactionGroup.uiactionGroupDetails) == null ? void 0 : _a.length)) {
       ibiz.log.debug("\u64CD\u4F5C\u5217\u754C\u9762\u884C\u4E3A\u7EC4\u6CA1\u6709\u914D\u7F6E\u754C\u9762\u884C\u4E3A");
@@ -23865,15 +24445,6 @@ var GridFieldEditColumnController = class extends GridFieldColumnController {
     }
     return void 0;
   }
-  /**
-   * 列数据属性字段名称
-   * @author lxm
-   * @date 2023-06-25 09:26:04
-   * @readonly
-   */
-  get fieldName() {
-    return this.model.dataItemName;
-  }
   /**
    * 初始化方法，生成表格编辑项控制器
    *
@@ -24988,10 +25559,10 @@ import {
   mergeInLeft as mergeInLeft3,
   recursiveIterate as recursiveIterate9
 } from "@ibiz-template/core";
-import { clone as clone25, isNil as isNil24 } from "ramda";
+import { clone as clone27, isNil as isNil24 } from "ramda";
 
 // src/controller/control/search-bar/search-bar-filter.controller.ts
-import { RuntimeModelError as RuntimeModelError61 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError63 } from "@ibiz-template/core";
 var ExcludeOPs = [
   "ISNULL" /* IS_NULL */,
   "ISNOTNULL" /* IS_NOT_NULL */
@@ -25032,7 +25603,7 @@ var SearchBarFilterController = class {
   async init() {
     if (!this.noEditor) {
       if (!this.model.editor) {
-        throw new RuntimeModelError61(this.model, "\u7F3A\u5C11\u7F16\u8F91\u5668\u6A21\u578B");
+        throw new RuntimeModelError63(this.model, "\u7F3A\u5C11\u7F16\u8F91\u5668\u6A21\u578B");
       }
       this.editorProvider = await getEditorProvider(this.model.editor);
       if (this.editorProvider) {
@@ -25492,7 +26063,7 @@ var SearchBarController = class extends ControlController {
       }
     });
     if (addSearchBarFilters.length > 0) {
-      this.model = clone25(this.model);
+      this.model = clone27(this.model);
       this.model.searchBarFilters = addSearchBarFilters.concat(...mergeFilters);
       this.model.enableFilter = true;
     }
@@ -26076,7 +26647,7 @@ var TabExpPanelController = class extends ControlController {
 // src/controller/control/tree/tree.controller.ts
 import {
   RuntimeError as RuntimeError57,
-  RuntimeModelError as RuntimeModelError62,
+  RuntimeModelError as RuntimeModelError64,
   recursiveIterate as recursiveIterate10
 } from "@ibiz-template/core";
 
@@ -26429,6 +27000,7 @@ var TreeController = class extends MDControlController {
     this.initDropNodeRss();
     this.initNodeClickTBUIActionItem();
     await this.initService();
+    await this.initCounter();
     this.model.detreeNodes.forEach((node) => {
       var _a2, _b2;
       if ((_b2 = (_a2 = node.decontextMenu) == null ? void 0 : _a2.detoolbarItems) == null ? void 0 : _b2.length) {
@@ -26444,6 +27016,12 @@ var TreeController = class extends MDControlController {
       Object.values(this.contextMenus).map((menu) => menu.created())
     );
   }
+  async onDestroyed() {
+    await super.onDestroyed();
+    if (this.counter) {
+      this.counter.destroy();
+    }
+  }
   /**
    * 初始化对应类型的部件服务
    * @author lxm
@@ -26455,6 +27033,23 @@ var TreeController = class extends MDControlController {
     this.service = new TreeService(this.model);
     await this.service.init(this.context);
   }
+  /**
+   * 初始化计数器
+   * @author lxm
+   * @date 2024-01-18 05:12:02
+   * @protected
+   * @return {*}  {Promise<void>}
+   */
+  async initCounter() {
+    const { appCounterRefs } = this.model;
+    const appCounterRef = appCounterRefs == null ? void 0 : appCounterRefs[0];
+    if (appCounterRef) {
+      this.counter = await CounterService.getCounterByRef(
+        appCounterRef,
+        this.context
+      );
+    }
+  }
   /**
    * 初始化节点拖入关系处理
    * @author lxm
@@ -26947,7 +27542,7 @@ var TreeController = class extends MDControlController {
     const { sortAppDEFieldId, sortDir, allowOrder } = orderNodeModel;
     if (allowOrder === true) {
       if (!sortAppDEFieldId) {
-        throw new RuntimeModelError62(orderNodeModel, "\u7F3A\u5C11\u914D\u7F6E\u6392\u5E8F\u5C5E\u6027");
+        throw new RuntimeModelError64(orderNodeModel, "\u7F3A\u5C11\u914D\u7F6E\u6392\u5E8F\u5C5E\u6027");
       }
       const sortField = sortAppDEFieldId.toLowerCase();
       const isAsc = sortDir === "ASC";
@@ -27028,7 +27623,7 @@ var TreeController = class extends MDControlController {
   async modifyNodeText(nodeData, text) {
     const model = this.getNodeModel(nodeData._nodeId);
     if (!model.allowEditText) {
-      throw new RuntimeModelError62(model, "\u6811\u8282\u70B9\u6CA1\u6709\u914D\u7F6E\u7F16\u8F91\u6A21\u5F0F\uFF1A\u540D\u79F0");
+      throw new RuntimeModelError64(model, "\u6811\u8282\u70B9\u6CA1\u6709\u914D\u7F6E\u7F16\u8F91\u6A21\u5F0F\uFF1A\u540D\u79F0");
     }
     if (!nodeData._deData) {
       throw new RuntimeError57("\u4E0D\u662F\u5B9E\u4F53\u6811\u8282\u70B9\u6570\u636E");
@@ -27392,7 +27987,7 @@ var WizardPanelController = class extends ControlController {
 };
 
 // src/controller/control/md-ctrl/md-ctrl.controller.ts
-import { RuntimeModelError as RuntimeModelError63 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError65 } from "@ibiz-template/core";
 import { isNil as isNil25 } from "ramda";
 
 // src/controller/control/md-ctrl/md-ctrl.service.ts
@@ -27599,7 +28194,7 @@ var MDCtrlController = class extends MDControlController {
     const { enableGroup, groupMode, groupAppDEFieldId } = this.model;
     if (enableGroup && groupMode) {
       if (!groupAppDEFieldId) {
-        throw new RuntimeModelError63(this.model, "\u5206\u7EC4\u5C5E\u6027\u6CA1\u6709\u914D\u7F6E");
+        throw new RuntimeModelError65(this.model, "\u5206\u7EC4\u5C5E\u6027\u6CA1\u6709\u914D\u7F6E");
       }
       if (groupMode === "AUTO") {
         this.handleAutoGroup();
@@ -27666,7 +28261,7 @@ var MDCtrlController = class extends MDControlController {
   async handleCodeListGroup() {
     const { groupAppDEFieldId, groupCodeListId } = this.model;
     if (!groupCodeListId) {
-      throw new RuntimeModelError63(this.model, "\u5206\u7EC4\u4EE3\u7801\u8868\u6CA1\u6709\u914D\u7F6E");
+      throw new RuntimeModelError65(this.model, "\u5206\u7EC4\u4EE3\u7801\u8868\u6CA1\u6709\u914D\u7F6E");
     }
     const { items } = this.state;
     const groupMap = /* @__PURE__ */ new Map();
@@ -27696,7 +28291,7 @@ var MDCtrlController = class extends MDControlController {
 };
 
 // src/controller/control/kanban/kanban.controller.ts
-import { RuntimeError as RuntimeError59, RuntimeModelError as RuntimeModelError64 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError59, RuntimeModelError as RuntimeModelError66 } from "@ibiz-template/core";
 import { isNil as isNil26 } from "ramda";
 
 // src/controller/control/kanban/kanban.service.ts
@@ -27774,10 +28369,10 @@ var KanbanController = class extends DataViewControlController {
     const sortField = this.model.minorSortAppDEFieldId;
     const { minorSortDir } = this.model;
     if (!sortField) {
-      throw new RuntimeModelError64(this.model, "\u6392\u5E8F\u5C5E\u6027\u6CA1\u914D\u7F6E");
+      throw new RuntimeModelError66(this.model, "\u6392\u5E8F\u5C5E\u6027\u6CA1\u914D\u7F6E");
     }
     if (!minorSortDir) {
-      throw new RuntimeModelError64(this.model, "\u6392\u5E8F\u65B9\u5411\u6CA1\u914D\u7F6E");
+      throw new RuntimeModelError66(this.model, "\u6392\u5E8F\u65B9\u5411\u6CA1\u914D\u7F6E");
     }
     const isAsc = minorSortDir === "ASC";
     items.forEach((item) => {
@@ -27921,7 +28516,7 @@ var KanbanController = class extends DataViewControlController {
   async handleCodeListGroup() {
     const { groupAppDEFieldId, groupCodeListId } = this.model;
     if (!groupCodeListId) {
-      throw new RuntimeModelError64(this.model, "\u5206\u7EC4\u4EE3\u7801\u8868\u6CA1\u6709\u914D\u7F6E");
+      throw new RuntimeModelError66(this.model, "\u5206\u7EC4\u4EE3\u7801\u8868\u6CA1\u6709\u914D\u7F6E");
     }
     const { items } = this.state;
     const groupMap = /* @__PURE__ */ new Map();
@@ -28215,7 +28810,13 @@ var KanbanController = class extends DataViewControlController {
 };
 
 // src/controller/control/tree-grid-ex/tree-grid-ex.controller.ts
-import { recursiveIterate as recursiveIterate11 } from "@ibiz-template/core";
+import {
+  RuntimeError as RuntimeError60,
+  RuntimeModelError as RuntimeModelError67,
+  awaitTimeout as awaitTimeout3,
+  recursiveIterate as recursiveIterate11
+} from "@ibiz-template/core";
+import { clone as clone28 } from "ramda";
 
 // src/controller/control/tree-grid-ex/tree-grid-ex.service.ts
 var TreeGridExService = class extends TreeService {
@@ -28224,18 +28825,29 @@ var TreeGridExService = class extends TreeService {
 // src/controller/control/tree-grid-ex/tree-grid-ex-row.state.ts
 var TreeGridExRowState = class {
   constructor(data, treeGrid) {
-    /**
-     * 操作列状态(p是操作列的标识)
-     *
-     * @author lxm
-     * @date 2022-09-07 22:09:38
-     * @type {({ [p: string]: IButtonContainerState })}
-     */
-    this.uaColStates = {};
+    this.errors = {};
+    this.columnActionsStates = {};
+    this.editColStates = {};
+    this.modified = false;
+    this.showRowEdit = false;
+    this.processing = false;
     this.data = data;
-    Object.values(treeGrid.uaColumns).forEach((column) => {
-      column.initActionStates(this);
-    });
+    if (data._nodeType === "DE") {
+      Object.values(treeGrid.uaColumns).forEach((column) => {
+        column.initActionStates(this);
+      });
+      Object.values(treeGrid.fieldColumns).forEach((column) => {
+        column.initActionStates(this);
+      });
+      Object.values(treeGrid.fieldColumns).forEach((fieldColumn) => {
+        this.editColStates[fieldColumn.name] = {
+          disabled: false,
+          readonly: false,
+          editable: ibiz.config.grid.editShowMode === "all",
+          required: false
+        };
+      });
+    }
   }
 };
 
@@ -28280,6 +28892,9 @@ var TreeGridExController = class extends TreeController {
      */
     this.uaColumns = {};
   }
+  get _evt() {
+    return this.evt;
+  }
   /**
    * 是否有配置宽度自适应列
    *
@@ -28299,11 +28914,22 @@ var TreeGridExController = class extends TreeController {
   get overflowMode() {
     return ibiz.config.grid.overflowMode;
   }
+  /**
+   * 允许使用行编辑
+   * @author lxm
+   * @date 2023-08-17 02:52:07
+   * @readonly
+   * @type {boolean}
+   */
+  get allowRowEdit() {
+    return this.state.rowEditOpen;
+  }
   initState() {
     super.initState();
     this.state.columnStates = [];
     this.state.rootNodes = [];
     this.state.rows = {};
+    this.state.rowEditOpen = true;
   }
   async onCreated() {
     await super.onCreated();
@@ -28439,6 +29065,204 @@ var TreeGridExController = class extends TreeController {
       convertColumnCaption(this.model.detreeColumns);
     }
   }
+  async save(nodeData) {
+    if (this.state.isSimple) {
+      ibiz.log.debug("\u7B80\u5355\u6A21\u5F0F\uFF0C\u4E0D\u4FDD\u5B58");
+      return;
+    }
+    if (nodeData._nodeType !== "DE") {
+      throw new RuntimeError60("\u975E\u5B9E\u4F53\u8282\u70B9\u6570\u636E\u4E0D\u80FD\u4FDD\u5B58");
+    }
+    const rowState = this.state.rows[nodeData._uuid];
+    if (!rowState) {
+      throw new RuntimeError60("\u884C\u6570\u636E\u4E0D\u5B58\u5728");
+    }
+    if (!rowState.modified) {
+      ibiz.log.debug("\u503C\u6CA1\u6709\u53D1\u751F\u6539\u53D8");
+      return;
+    }
+    if (rowState.processing) {
+      await awaitTimeout3(500, this.save.bind(this), [nodeData]);
+      return;
+    }
+    const nodeModel = this.getNodeModel(nodeData._nodeId);
+    const { appDataEntityId, updateAppDEActionId } = nodeModel;
+    const isCreate = nodeData._deData.srfuf === 0 /* CREATE */;
+    if (isCreate) {
+      throw new RuntimeError60("\u6682\u4E0D\u652F\u6301\u65B0\u5EFA");
+    }
+    if (!updateAppDEActionId) {
+      throw new RuntimeModelError67(nodeModel, "\u6811\u8282\u70B9\u6CA1\u6709\u914D\u7F6E\u66F4\u65B0\u5B9E\u4F53\u884C\u4E3A");
+    }
+    const deName = calcDeCodeNameById(appDataEntityId);
+    const tempContext = this.context.clone();
+    tempContext[deName] = nodeData._deData.srfkey;
+    const app = ibiz.hub.getApp(this.context.srfappid);
+    let res;
+    try {
+      res = await app.deService.exec(
+        appDataEntityId,
+        updateAppDEActionId,
+        tempContext,
+        nodeData._deData
+      );
+    } catch (error) {
+      await this._evt.emit("onSaveError", void 0);
+      this.actionNotification("".concat(isCreate ? "CREATE" : "UPDATE", "ERROR"), {
+        error,
+        data: rowState.data
+      });
+      throw error;
+    }
+    rowState.data._deData = res.data;
+    rowState.modified = false;
+    this.gridStateNotify(rowState, "SAVE" /* SAVE */);
+    await this._evt.emit("onSaveSuccess", void 0);
+  }
+  async saveAll() {
+    const needSaveData = Object.values(this.state.rows).filter((row) => row.modified).map((row) => row.data);
+    if (!needSaveData.length) {
+      return;
+    }
+    await handleAllSettled(
+      needSaveData.map((data) => {
+        return this.save(data);
+      })
+    );
+  }
+  /**
+   * 树表格状态变更通知
+   *
+   * @author lxm
+   * @date 2022-09-20 18:09:07
+   */
+  gridStateNotify(row, state) {
+    Object.values(this.columns).forEach((column) => {
+      column.gridStateNotify(row, state);
+    });
+  }
+  /**
+   * 设置行属性的值
+   *
+   * @author lxm
+   * @date 2022-08-24 10:08:40
+   * @param {GridRowState} row 行状态控制器
+   * @param {unknown} value 要设置的值
+   * @param {string} name 要设置的表单数据的属性名称
+   */
+  async setRowValue(row, name, value) {
+    if (Object.prototype.hasOwnProperty.call(row.data, name) && !isValueChange(row.data[name], value)) {
+      return;
+    }
+    row.data[name] = value;
+    row.modified = true;
+    row.processing = true;
+    try {
+      await this.dataChangeNotify(row, [name]);
+    } finally {
+      row.processing = false;
+    }
+  }
+  /**
+   * 通知所有表格编辑项成员表格编辑项数据变更
+   *
+   * @author lxm
+   * @date 2022-09-20 22:09:49
+   * @param {GridRowState} row 行数据
+   * @param {string[]} names 更新的属性
+   */
+  async dataChangeNotify(row, names) {
+    await handleAllSettled(
+      Object.values(this.columns).map(async (column) => {
+        return column.dataChangeNotify(row, names);
+      })
+    );
+  }
+  async toggleRowEdit() {
+    this.state.rowEditOpen = !this.state.rowEditOpen;
+  }
+  /**
+   * 计算默认值并返回一个对象，对象里的属性就是要填充的默认值
+   * 没有的属性就是不需要填充默认值的属性
+   * @author lxm
+   * @date 2023-09-18 04:01:06
+   * @param {IData} data
+   * @param {boolean} isCreate
+   * @return {*}  {IData}
+   */
+  calcDefaultValue(data, isCreate) {
+    const result = {};
+    Object.values(this.fieldColumns).forEach((c) => {
+      const nodeColumn = c.nodeColumnControllerMap.get(data._nodeId);
+      if (!nodeColumn || !nodeColumn.nodeEditItem) {
+        return;
+      }
+      const { createDV, createDVT, updateDV, updateDVT } = nodeColumn.nodeEditItem;
+      const valueType = isCreate ? createDVT : updateDVT;
+      const defaultValue = isCreate ? createDV : updateDV;
+      const defaultVal = getDefaultValue(
+        {
+          name: c.name,
+          valueType,
+          defaultValue,
+          valueFormat: nodeColumn.valueFormat
+        },
+        { data, context: this.context, params: this.params }
+      );
+      if (defaultVal !== void 0) {
+        result[c.name] = defaultVal;
+      }
+    });
+    return result;
+  }
+  /**
+   * 切换单行的编辑状态
+   * @author lxm
+   * @date 2023-08-08 06:45:54
+   * @param {GridRowState} row
+   * @param {boolean} [editable]
+   */
+  async switchRowEdit(row, editable, isSave = true) {
+    if (!this.allowRowEdit) {
+      return;
+    }
+    if (row.data._nodeType !== "DE") {
+      return;
+    }
+    const toState = editable === void 0 ? !row.showRowEdit : editable;
+    if (row.showRowEdit === toState) {
+      return;
+    }
+    if (toState === false) {
+      if (isSave) {
+        await this.save(row.data);
+      } else if (row.data._deData.srfuf === 0 /* CREATE */) {
+        row.showRowEdit = false;
+        this._evt.emit("onRowEditChange", { row });
+        return this.remove({ data: [row.data], silent: true });
+      } else if (row.cacheData) {
+        row.data = row.cacheData;
+        delete row.cacheData;
+      }
+    } else {
+      const editingRow = Object.values(this.state.rows).find(
+        (item) => item.showRowEdit
+      );
+      if (editingRow) {
+        throw new RuntimeError60("\u540C\u65F6\u53EA\u80FD\u6709\u4E00\u884C\u5F00\u542F\u884C\u7F16\u8F91");
+      }
+      if (row.data._deData.srfuf === 1 /* UPDATE */) {
+        row.cacheData = clone28(row.data);
+        const defaultVal = this.calcDefaultValue(row.data, false);
+        Object.assign(row.data, defaultVal);
+      }
+    }
+    row.showRowEdit = toState;
+    Object.values(this.fieldColumns).forEach((column) => {
+      row.editColStates[column.name].editable = toState;
+    });
+    this._evt.emit("onRowEditChange", { row });
+  }
 };
 
 // src/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-column/tree-grid-ex-column.controller.ts
@@ -28523,30 +29347,485 @@ var TreeGridExColumnController = class {
    */
   async onInit() {
   }
+  /**
+   * 表格状态变更通知
+   *
+   * @author lxm
+   * @date 2022-09-20 18:09:07
+   */
+  gridStateNotify(_row, _state) {
+  }
+  async dataChangeNotify(_row, _names) {
+  }
 };
 
-// src/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-field-column/tree-grid-ex-field-column.controller.ts
-var TreeGridExFieldColumnController = class extends TreeGridExColumnController {
-};
-
-// src/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-ua-column/tree-grid-ex-ua-column.controller.ts
-import { RuntimeModelError as RuntimeModelError65 } from "@ibiz-template/core";
-var TreeGridExUAColumnController = class extends TreeGridExColumnController {
+// 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 RuntimeError61,
+  RuntimeModelError as RuntimeModelError68
+} from "@ibiz-template/core";
+import { clone as clone29 } from "ramda";
+import dayjs6 from "dayjs";
+var TreeGridExNodeColumnController = class {
   /**
-   * 给rowController初始化操作列的状态
-   *
    * @author lxm
-   * @date 2022-09-07 21:09:43
-   * @param {ITreeGridExRowState} row
+   * @date 2024-01-09 10:04:05
+   * @param {TreeGridExFieldColumnController} fieldColumn 树表格属性列控制器
+   * @param {IDETreeNode} nodeModel 对应实体节点模型
    */
-  initActionStates(row) {
-    var _a;
-    const { deuiactionGroup } = this.model;
-    if (!deuiactionGroup) {
-      throw new RuntimeModelError65(this.model, "\u64CD\u4F5C\u5217\u6CA1\u6709\u914D\u7F6E\u754C\u9762\u884C\u4E3A\u7EC4");
-    }
-    if (!((_a = deuiactionGroup.uiactionGroupDetails) == null ? void 0 : _a.length)) {
-      ibiz.log.debug("\u64CD\u4F5C\u5217\u754C\u9762\u884C\u4E3A\u7EC4\u6CA1\u6709\u914D\u7F6E\u754C\u9762\u884C\u4E3A");
+  constructor(fieldColumn, nodeModel) {
+    this.fieldColumn = fieldColumn;
+    this.nodeModel = nodeModel;
+    /**
+     * 代码表模型
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2023-05-24 10:55:50
+     */
+    this.codeList = void 0;
+    const { detreeNodeColumns, detreeNodeDataItems, detreeNodeEditItems } = nodeModel;
+    const nodeColumn = detreeNodeColumns == null ? void 0 : detreeNodeColumns.find((column) => {
+      return column.detreeColumnId === this.fieldColumn.model.id;
+    });
+    const nodeDataItem = detreeNodeDataItems == null ? void 0 : detreeNodeDataItems.find(
+      (treeNodeDataItem) => {
+        return treeNodeDataItem.id === nodeColumn.dataItemName;
+      }
+    );
+    if (!nodeColumn || !nodeDataItem) {
+      throw new RuntimeModelError68(
+        nodeModel,
+        "\u8282\u70B9\u6CA1\u6709\u914D\u7F6E\u5BF9\u5E94\u8868\u683C\u5217".concat(this.fieldColumn.name, "\u7684\u6570\u636E\u9879")
+      );
+    }
+    this.nodeColumn = nodeColumn;
+    this.nodeDataItem = nodeDataItem;
+    if (nodeColumn.enableRowEdit) {
+      const nodeEditItem = detreeNodeEditItems == null ? void 0 : detreeNodeEditItems.find(
+        (treeNodeEditItem) => {
+          return treeNodeEditItem.id === nodeColumn.id;
+        }
+      );
+      if (!nodeEditItem) {
+        throw new RuntimeModelError68(
+          nodeModel,
+          "\u6CA1\u6709\u627E\u5230\u5BF9\u5E94\u8868\u683C\u5217".concat(this.fieldColumn.name, "\u7684\u7F16\u8F91\u9879\u6A21\u578B")
+        );
+      }
+      this.nodeEditItem = nodeEditItem;
+    }
+  }
+  get unitName() {
+    var _a;
+    return (_a = this.nodeEditItem) == null ? void 0 : _a.unitName;
+  }
+  get valueFormat() {
+    return this.nodeColumn.valueFormat;
+  }
+  get context() {
+    return this.fieldColumn.context;
+  }
+  get params() {
+    return this.fieldColumn.params;
+  }
+  get dataType() {
+    var _a;
+    return (_a = this.nodeDataItem) == null ? void 0 : _a.dataType;
+  }
+  /**
+   * 树表格列标识（用于取数和各种比较判断）
+   * @author lxm
+   * @date 2024-01-09 11:33:37
+   * @readonly
+   * @type {string}
+   */
+  get name() {
+    return this.fieldColumn.name;
+  }
+  /**
+   *树表格增强部件
+   * @author lxm
+   * @date 2024-01-10 11:49:23
+   * @readonly
+   * @type {TreeGridExController}
+   */
+  get treeGrid() {
+    return this.fieldColumn.treeGrid;
+  }
+  /**
+   * 是否是链接列
+   *
+   * @author lxm
+   * @date 2022-09-28 17:09:15
+   * @returns {*}
+   */
+  get isLinkColumn() {
+    return !!this.nodeColumn.enableLinkView && !!this.nodeColumn.linkAppViewId;
+  }
+  /**
+   * 是否有触发界面行为
+   *
+   * @author lxm
+   * @date 2022-12-08 14:12:37
+   * @readonly
+   * @type {boolean}
+   */
+  get hasClickAction() {
+    return !!this.nodeColumn.deuiactionId;
+  }
+  /**
+   * 单元格超出呈现模式
+   * @author lxm
+   * @date 2024-01-09 05:36:36
+   * @readonly
+   * @type {('wrap' | 'ellipsis')}
+   */
+  get overflowMode() {
+    return this.fieldColumn.treeGrid.overflowMode;
+  }
+  /**
+   * 初始化
+   * @author lxm
+   * @date 2024-01-09 10:02:16
+   * @return {*}  {Promise<void>}
+   */
+  async init() {
+    var _a;
+    if (((_a = this.nodeEditItem) == null ? void 0 : _a.editor) && this.nodeEditItem.editor.editorType !== "HIDDEN") {
+      this.editorProvider = await getEditorProvider(this.nodeEditItem.editor);
+      if (this.editorProvider) {
+        this.editor = await this.editorProvider.createController(
+          this.nodeEditItem.editor,
+          this
+        );
+      }
+    }
+    if (!this.nodeEditItem) {
+      await this.loadCodeList();
+    }
+  }
+  /**
+   * 初始化属性列界面行为组按钮状态
+   *
+   * @author lxm
+   * @date 2022-09-07 21:09:43
+   * @param {GridRowState} row
+   */
+  initActionStates(row) {
+    const { deuiactionGroup } = this.nodeColumn;
+    if (deuiactionGroup && deuiactionGroup.uiactionGroupDetails) {
+      const containerState = new ButtonContainerState();
+      deuiactionGroup.uiactionGroupDetails.forEach((detail) => {
+        const actionid = detail.uiactionId;
+        if (actionid) {
+          const buttonState = new UIActionButtonState(
+            detail.id,
+            this.context.srfappid,
+            actionid
+          );
+          containerState.addState(detail.id, buttonState);
+        }
+      });
+      row.columnActionsStates[this.name] = containerState;
+    }
+  }
+  /**
+   * 文本点击事件
+   *
+   * @author zk
+   * @date 2023-07-13 12:07:53
+   * @param {MouseEvent} event
+   */
+  onTextClick(row, event) {
+    if (this.isLinkColumn) {
+      event.stopPropagation();
+      this.openLinkView(row, event);
+    } else if (this.hasClickAction) {
+      event.stopPropagation();
+      this.triggerAction(row, event);
+    }
+  }
+  /**
+   * 打开链接视图
+   *
+   * @author lxm
+   * @date 2024-01-09 02:45:34
+   * @param {ITreeGridExRowState} row
+   * @param {MouseEvent} event
+   * @return {*}  {Promise<void>}
+   */
+  async openLinkView(row, event) {
+    const curValue = row.data[this.fieldColumn.name];
+    if (!curValue) {
+      return;
+    }
+    const valueItem = this.nodeColumn.linkValueItem || "srfkey";
+    const value = row.data[valueItem];
+    if (value == null) {
+      throw new RuntimeError61("\u672A\u5728\u884C\u6570\u636E\u4E2D\u53D6\u5230 ".concat(valueItem, " \u7684\u503C"));
+    }
+    const { linkAppViewId } = this.nodeColumn;
+    if (!linkAppViewId) {
+      return;
+    }
+    const wfContext = getWFContext(row.data);
+    const tempContext = Object.assign(this.context.clone(), {
+      srfkey: value,
+      ...wfContext
+    });
+    const tempParams = clone29(this.params);
+    const { userParam } = this.nodeColumn;
+    if (userParam) {
+      const { navigateContexts, navigateParams } = parseUserParams(userParam);
+      let selfContext = {};
+      if (navigateContexts && row.data) {
+        selfContext = convertNavData(
+          navigateContexts,
+          row.data,
+          tempParams,
+          tempContext
+        );
+      }
+      Object.assign(tempContext, selfContext);
+      let selfParams = {};
+      if (navigateParams && row.data) {
+        selfParams = convertNavData(
+          navigateParams,
+          row.data,
+          tempParams,
+          tempContext
+        );
+      }
+      Object.assign(tempParams, selfParams);
+    }
+    const res = await ibiz.commands.execute(
+      OpenAppViewCommand.TAG,
+      linkAppViewId,
+      tempContext,
+      tempParams,
+      { event }
+    );
+    if (res == null ? void 0 : res.ok) {
+      this.fieldColumn.treeGrid.refresh();
+    }
+  }
+  /**
+   * 触发表格列附加界面行为
+   *
+   * @author lxm
+   * @date 2022-12-08 15:12:35
+   * @param {GridRowState} row 行数据
+   * @param {MouseEvent} event 鼠标事件
+   * @returns {*}  {Promise<void>}
+   */
+  async triggerAction(row, event) {
+    const actionId = this.nodeColumn.deuiactionId;
+    await UIActionUtil.execAndResolved(
+      actionId,
+      {
+        context: this.context,
+        params: this.params,
+        data: [row.data],
+        view: this.treeGrid.view,
+        event
+      },
+      this.nodeColumn.appId
+    );
+  }
+  /**
+   * 触发界面行为组点击事件
+   *
+   * @author lxm
+   * @date 2024-01-11 02:26:12
+   * @param {IUIActionGroupDetail} detail
+   * @param {ITreeGridExRowState} row
+   * @param {MouseEvent} event
+   * @return {*}  {Promise<void>}
+   */
+  async onActionClick(detail, row, event) {
+    const actionId = detail.uiactionId;
+    await UIActionUtil.execAndResolved(
+      actionId,
+      {
+        context: this.context,
+        params: this.params,
+        data: [row.data],
+        view: this.treeGrid.view,
+        event
+      },
+      detail.appId
+    );
+  }
+  /**
+   * 值格式化
+   * @author lxm
+   * @date 2024-01-09 03:37:34
+   * @param {unknown} [value='']
+   * @return {*}  {string}
+   */
+  formatValue(value = "") {
+    if (this.nodeColumn.valueType !== "SIMPLE") {
+      return ValueExUtil.toText(this.nodeColumn, value);
+    }
+    const strVal = "".concat(value);
+    if (!this.valueFormat) {
+      return strVal;
+    }
+    const isDate = DataTypes5.isDate(this.dataType);
+    if (isDate || this.fieldColumn.name === "createdate") {
+      const formatVal = dayjs6(strVal).format(this.valueFormat);
+      if (formatVal !== "Invalid Date") {
+        return formatVal;
+      }
+      return strVal;
+    }
+    return ibiz.util.text.format(strVal, this.valueFormat);
+  }
+  /**
+   * 加载代码表数据
+   *
+   * @author lxm
+   * @date 2022-09-28 15:09:38
+   * @returns {*}
+   */
+  async loadCodeList() {
+    const appCodeListId = this.nodeColumn.appCodeListId;
+    if (!appCodeListId) {
+      return;
+    }
+    const app = ibiz.hub.getApp(this.context.srfappid);
+    if (!this.codeList) {
+      this.codeList = app.codeList.getCodeList(appCodeListId);
+    }
+    const dataItems = await app.codeList.get(
+      appCodeListId,
+      this.context,
+      this.params
+    );
+    this.codeListItems = dataItems;
+    return dataItems;
+  }
+  gridStateNotify(row, state) {
+    if (state === "LOAD" /* LOAD */ || state === "SAVE" /* SAVE */) {
+      const uaColState = row.columnActionsStates[this.name];
+      if (uaColState && row.data._nodeType === "DE") {
+        uaColState.update(row.data._deData);
+      }
+    }
+  }
+  /**
+   * 设置行属性的值
+   *
+   * @author lxm
+   * @date 2022-08-24 10:08:40
+   * @param {GridRowState} row 行状态控制器
+   * @param {unknown} value 要设置的值
+   * @param {string} name 要设置的表单数据的属性名称
+   */
+  async setRowValue(row, value, name) {
+    name = name || this.name;
+    await this.treeGrid.setRowValue(row, name, value);
+  }
+};
+
+// src/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-field-column/tree-grid-ex-field-column.controller.ts
+var TreeGridExFieldColumnController = class extends TreeGridExColumnController {
+  constructor() {
+    super(...arguments);
+    /**
+     * 该树表格列对应不同节点模型的节点列控制器
+     * @author lxm
+     * @date 2024-01-08 05:40:56
+     * @type {Map<string, IDETreeNodeColumn>}
+     */
+    this.nodeColumnControllerMap = /* @__PURE__ */ new Map();
+  }
+  /**
+   * 树表格列标识（用于取数和各种比较判断）
+   * @author lxm
+   * @date 2024-01-09 11:33:37
+   * @readonly
+   * @type {string}
+   */
+  get name() {
+    return this.model.id;
+  }
+  async init() {
+    await this.onInit();
+    await this.initNodeColumnController();
+  }
+  /**
+   * 解析模型并初始化相关属性
+   * @author lxm
+   * @date 2024-01-08 05:59:12
+   * @return {*}  {Promise<void>}
+   */
+  async initNodeColumnController() {
+    var _a;
+    (_a = this.treeGrid.model.detreeNodes) == null ? void 0 : _a.forEach((node) => {
+      var _a2;
+      if (node.treeNodeType !== "DE") {
+        return;
+      }
+      const nodeColumn = (_a2 = node.detreeNodeColumns) == null ? void 0 : _a2.find(
+        (column) => {
+          return column.detreeColumnId === this.model.id;
+        }
+      );
+      if (nodeColumn) {
+        this.nodeColumnControllerMap.set(
+          node.id,
+          new TreeGridExNodeColumnController(this, node)
+        );
+      }
+    });
+    await Promise.all(
+      Array.from(this.nodeColumnControllerMap.values()).map(
+        (controller) => controller.init()
+      )
+    );
+  }
+  /**
+   * 初始化属性列界面行为组按钮状态
+   * @author lxm
+   * @date 2024-01-11 01:48:38
+   * @param {ITreeGridExRowState} row
+   */
+  initActionStates(row) {
+    const nodeColumn = this.nodeColumnControllerMap.get(row.data._nodeId);
+    if (nodeColumn) {
+      nodeColumn.initActionStates(row);
+    }
+  }
+  gridStateNotify(row, state) {
+    super.gridStateNotify(row, state);
+    const nodeColumn = this.nodeColumnControllerMap.get(row.data._nodeId);
+    if (nodeColumn) {
+      nodeColumn.gridStateNotify(row, state);
+    }
+  }
+};
+
+// src/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-ua-column/tree-grid-ex-ua-column.controller.ts
+import { RuntimeModelError as RuntimeModelError69 } from "@ibiz-template/core";
+var TreeGridExUAColumnController = class extends TreeGridExColumnController {
+  /**
+   * 给rowController初始化操作列的状态
+   *
+   * @author lxm
+   * @date 2022-09-07 21:09:43
+   * @param {ITreeGridExRowState} row
+   */
+  initActionStates(row) {
+    var _a;
+    const { deuiactionGroup } = this.model;
+    if (!deuiactionGroup) {
+      return;
+      throw new RuntimeModelError69(this.model, "\u64CD\u4F5C\u5217\u6CA1\u6709\u914D\u7F6E\u754C\u9762\u884C\u4E3A\u7EC4");
+    }
+    if (!((_a = deuiactionGroup.uiactionGroupDetails) == null ? void 0 : _a.length)) {
+      ibiz.log.debug("\u64CD\u4F5C\u5217\u754C\u9762\u884C\u4E3A\u7EC4\u6CA1\u6709\u914D\u7F6E\u754C\u9762\u884C\u4E3A");
       return;
     }
     const containerState = new ButtonContainerState();
@@ -28561,7 +29840,7 @@ var TreeGridExUAColumnController = class extends TreeGridExColumnController {
         containerState.addState(detail.id, buttonState);
       }
     });
-    row.uaColStates[this.model.codeName] = containerState;
+    row.columnActionsStates[this.model.id] = containerState;
   }
   /**
    * 触发操作列点击事件
@@ -28585,10 +29864,19 @@ var TreeGridExUAColumnController = class extends TreeGridExColumnController {
       detail.appId
     );
   }
+  gridStateNotify(row, state) {
+    super.gridStateNotify(row, state);
+    if (state === "LOAD" /* LOAD */ || state === "SAVE" /* SAVE */) {
+      const uaColState = row.columnActionsStates[this.model.id];
+      if (uaColState && row.data._nodeType === "DE") {
+        uaColState.update(row.data._deData);
+      }
+    }
+  }
 };
 
 // src/controller/control/tree-grid/tree-grid.controller.ts
-import { RuntimeModelError as RuntimeModelError66 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError70 } from "@ibiz-template/core";
 var TreeGridController = class extends GridController {
   constructor() {
     super(...arguments);
@@ -28633,10 +29921,10 @@ var TreeGridController = class extends GridController {
       return item.treeColumnMode === 2 || item.treeColumnMode === 3;
     });
     if (!treeGridParent) {
-      throw new RuntimeModelError66(this.model, "\u6811\u8868\u683C\u65E0\u503C\u5217\u6A21\u5F0F");
+      throw new RuntimeModelError70(this.model, "\u6811\u8868\u683C\u65E0\u503C\u5217\u6A21\u5F0F");
     }
     if (!treeGridValue) {
-      throw new RuntimeModelError66(this.model, "\u6811\u8868\u683C\u65E0\u7236\u503C\u5217\u6A21\u5F0F");
+      throw new RuntimeModelError70(this.model, "\u6811\u8868\u683C\u65E0\u7236\u503C\u5217\u6A21\u5F0F");
     }
     this.treeGridValueField = treeGridValue.appDEFieldId.toLowerCase();
     this.treeGridParentField = treeGridParent.appDEFieldId.toLowerCase();
@@ -28656,7 +29944,7 @@ var TreeGridService = class extends GridService {
 };
 
 // src/controller/control/medit-view-panel/medit-view-panel.controller.ts
-import { RuntimeError as RuntimeError60 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError62 } from "@ibiz-template/core";
 import { createUUID as createUUID13 } from "qx-util";
 
 // src/controller/control/medit-view-panel/medit-view-panel.service.ts
@@ -28872,7 +30160,7 @@ var MEditViewPanelController = class extends MDControlController {
       (item) => item.id === id
     );
     if (panelUiItemIndex < 0) {
-      throw new RuntimeError60("\u7F16\u8F91\u89C6\u56FE\u9762\u677F\u90E8\u4EF6UI\u6570\u636E\u4E0D\u5B58\u5728");
+      throw new RuntimeError62("\u7F16\u8F91\u89C6\u56FE\u9762\u677F\u90E8\u4EF6UI\u6570\u636E\u4E0D\u5B58\u5728");
     }
     const tempUiItem = this.state.panelUiItems[panelUiItemIndex];
     if (tempUiItem.id.startsWith("mockId:")) {
@@ -29788,6 +31076,15 @@ var AppHub = class {
      * @type {Map<string, string>} Map<视图 id, 视图所属应用>
      */
     this.view2appMap = /* @__PURE__ */ new Map();
+    /**
+     * 当前注册的应用视图优先级
+     *
+     * @author chitanda
+     * @date 2024-01-15 15:01:57
+     * @protected
+     * @type {Map<string, number>}
+     */
+    this.view2appPriorityMap = /* @__PURE__ */ new Map();
     /**
      * 实例化的应用视图模型
      *
@@ -29879,13 +31176,23 @@ var AppHub = class {
    * 设置应用视图所属应用
    *
    * @author chitanda
-   * @date 2023-04-17 23:04:37
+   * @date 2024-01-15 15:01:41
    * @param {string} tag 视图 codeName 或者视图 id
    * @param {string} [appId=ibiz.env.appId]
+   * @param {number} [priority=-1] 视图的优先级，值越小优先级越高。1为最高优先级
    */
-  setAppView(tag, appId2 = ibiz.env.appId) {
+  setAppView(tag, appId2 = ibiz.env.appId, priority = -1) {
     const id = this.calcAppViewId(tag);
+    if (this.view2appMap.has(id)) {
+      const _priority = this.view2appPriorityMap.get(id);
+      if (_priority && _priority < priority) {
+        return;
+      }
+    }
     this.view2appMap.set(id, appId2);
+    if (priority !== -1) {
+      this.view2appPriorityMap.set(id, priority);
+    }
   }
   /**
    * 判断应用视图是否存在
@@ -29935,7 +31242,7 @@ var AppHub = class {
       this.registerAppView(appView);
       return appView;
     }
-    throw new RuntimeError61("\u89C6\u56FE[".concat(id, "]\u4E0D\u5B58\u5728"));
+    throw new RuntimeError63("\u89C6\u56FE[".concat(id, "]\u4E0D\u5B58\u5728"));
   }
   /**
    * 根据视图模型路径，加参数重新计算视图模型
@@ -29956,7 +31263,7 @@ var AppHub = class {
       );
       return model;
     }
-    throw new RuntimeError61("\u89C6\u56FE[".concat(modelPath, "]\u4E0D\u5B58\u5728"));
+    throw new RuntimeError63("\u89C6\u56FE[".concat(modelPath, "]\u4E0D\u5B58\u5728"));
   }
   /**
    * 根据应用实体代码名称查找应用视图
@@ -29987,7 +31294,7 @@ var AppHub = class {
       this.registerAppDataEntity(entity, appId2);
       return entity;
     }
-    throw new RuntimeError61("\u672A\u627E\u5230\u5E94\u7528\u5B9E\u4F53[".concat(id, "]"));
+    throw new RuntimeError63("\u672A\u627E\u5230\u5E94\u7528\u5B9E\u4F53[".concat(id, "]"));
   }
   /**
    * 新建 hub 应用
@@ -30002,7 +31309,7 @@ var AppHub = class {
       return this.appMap.get(id);
     }
     if (!this.modelLoaderProvider) {
-      throw new RuntimeError61("\u8BF7\u5148\u6CE8\u518C\u6A21\u578B\u52A0\u8F7D\u9002\u914D\u5668");
+      throw new RuntimeError63("\u8BF7\u5148\u6CE8\u518C\u6A21\u578B\u52A0\u8F7D\u9002\u914D\u5668");
     }
     const appModel = await this.modelLoaderProvider.getApp(id);
     const app = new Application(appModel);
@@ -30133,7 +31440,7 @@ var EngineFactory = class {
 };
 
 // src/engine/view-base.engine.ts
-import { RuntimeError as RuntimeError62 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError64 } from "@ibiz-template/core";
 var ViewEngineBase = class {
   /**
    * 构造函数在视图控制器的构造函数逻辑内部执行
@@ -30321,7 +31628,7 @@ var ViewEngineBase = class {
     const { appDataEntityId } = this.view.model;
     const { evt, context, params } = this.view;
     if (!appDataEntityId) {
-      throw new RuntimeError62("\u8BE5\u89C6\u56FE\u6CA1\u6709\u5B9E\u4F53\uFF0C\u65E0\u6CD5\u52A0\u8F7D\u5B9E\u4F53\u6570\u636E");
+      throw new RuntimeError64("\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(
@@ -30342,8 +31649,8 @@ var ViewEngineBase = class {
 };
 
 // src/engine/md-view.engine.ts
-import { RuntimeModelError as RuntimeModelError67 } from "@ibiz-template/core";
-import { clone as clone26 } from "ramda";
+import { RuntimeModelError as RuntimeModelError71 } from "@ibiz-template/core";
+import { clone as clone30 } from "ramda";
 var MDViewEngine = class extends ViewEngineBase {
   /**
    * 多数据部件名称
@@ -30526,7 +31833,7 @@ var MDViewEngine = class extends ViewEngineBase {
       view: this.view
     }));
     if (result === -1) {
-      throw new RuntimeModelError67(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
+      throw new RuntimeModelError71(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
     } else {
       return {
         cancel: !result.ok
@@ -30549,9 +31856,9 @@ var MDViewEngine = class extends ViewEngineBase {
       (item) => item.id === "newdata"
     );
     if (!openAppViewLogic) {
-      throw new RuntimeModelError67(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
+      throw new RuntimeModelError71(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
     }
-    const params = clone26(this.view.params);
+    const params = clone30(this.view.params);
     if (copyMode) {
       params.srfcopymode = copyMode;
     }
@@ -30563,7 +31870,7 @@ var MDViewEngine = class extends ViewEngineBase {
       view: this.view
     }));
     if (result === -1) {
-      throw new RuntimeModelError67(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
+      throw new RuntimeModelError71(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
     } else {
       return {
         cancel: !result.ok
@@ -30731,6 +32038,13 @@ var GlobalUtil = class {
      * @date 2023-09-26 05:04:26
      */
     this.error = new ErrorHandlerCenter();
+    /**
+     * 视图堆栈
+     *
+     * @author chitanda
+     * @date 2024-01-18 14:01:23
+     */
+    this.viewStack = new ViewStack();
     this.error.register(new DefaultErrorHandler());
   }
   /**
@@ -30762,7 +32076,7 @@ var GlobalUtil = class {
 };
 
 // src/logic-scheduler/executor/logic-executor.ts
-import { RuntimeError as RuntimeError63 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError65 } from "@ibiz-template/core";
 var LogicExecutor = class {
   /**
    * @author lxm
@@ -30783,7 +32097,7 @@ var LogicExecutor = class {
    */
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   execute(_executeParams) {
-    throw new RuntimeError63("Method not implemented.");
+    throw new RuntimeError65("Method not implemented.");
   }
   /**
    * 销毁方法
@@ -30874,13 +32188,13 @@ var ScriptExecutor = class extends LogicExecutor {
 };
 
 // src/logic-scheduler/executor/app-de-ui-logic-executor.ts
-import { RuntimeModelError as RuntimeModelError68 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError72 } from "@ibiz-template/core";
 var AppDEUILogicExecutor = class extends LogicExecutor {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   execute(executeParams) {
     const { appDEUILogicId, appDataEntityId } = this.logic;
     if (!appDEUILogicId) {
-      throw new RuntimeModelError68(this.logic, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u754C\u9762\u903B\u8F91");
+      throw new RuntimeModelError72(this.logic, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u754C\u9762\u903B\u8F91");
     }
     execUILogic(appDEUILogicId, appDataEntityId, executeParams);
   }
@@ -31220,7 +32534,7 @@ var LogicSchedulerCenter = class {
 };
 
 // src/logic-scheduler/trigger/logic-trigger.ts
-import { RuntimeError as RuntimeError64 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError66 } from "@ibiz-template/core";
 var LogicTrigger = class {
   /**
    * @author lxm
@@ -31280,7 +32594,7 @@ var LogicTrigger = class {
     if (this.executor) {
       return this.executor.execute(executeParams);
     }
-    throw new RuntimeError64("".concat(this.logic.id, "\u6CA1\u6709\u7ED1\u5B9Aexecutor"));
+    throw new RuntimeError66("".concat(this.logic.id, "\u6CA1\u6709\u7ED1\u5B9Aexecutor"));
   }
   /**
    * 销毁方法
@@ -31297,12 +32611,12 @@ var CustomTrigger = class extends LogicTrigger {
 };
 
 // src/logic-scheduler/trigger/item-dyna-logic-trigger.ts
-import { RuntimeError as RuntimeError65 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError67 } from "@ibiz-template/core";
 var ItemDynaLogicTrigger = class extends LogicTrigger {
   bindExecutor(executor) {
     super.bindExecutor(executor);
     if (this.executor.type !== "SCRIPT") {
-      throw new RuntimeError65(
+      throw new RuntimeError67(
         "\u9884\u5B9A\u4E49\u903B\u8F91\u7C7B\u578B".concat(this.type, "\u7684\u89E6\u53D1\u5668\u7C7B\u578B\u53EA\u80FD\u662F\u811A\u672C")
       );
     }
@@ -31338,7 +32652,7 @@ var ItemDynaLogicTrigger = class extends LogicTrigger {
 };
 
 // src/logic-scheduler/trigger/timer-trigger.ts
-import { RuntimeError as RuntimeError66, RuntimeModelError as RuntimeModelError69 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError68, RuntimeModelError as RuntimeModelError73 } from "@ibiz-template/core";
 var TimerTrigger = class extends LogicTrigger {
   constructor() {
     super(...arguments);
@@ -31346,11 +32660,11 @@ var TimerTrigger = class extends LogicTrigger {
   }
   start() {
     if (!this.logic.timer) {
-      throw new RuntimeModelError69(this.logic, "\u5B9A\u65F6\u5668\u7F3A\u5C11\u5B9A\u65F6\u95F4\u9694");
+      throw new RuntimeModelError73(this.logic, "\u5B9A\u65F6\u5668\u7F3A\u5C11\u5B9A\u65F6\u95F4\u9694");
     }
     this.timer = setInterval(() => {
       if (!this.scheduler.defaultParamsCb) {
-        throw new RuntimeError66("\u5B9A\u65F6\u5668\u7F3A\u5C11\u9ED8\u8BA4\u53C2\u6570\u56DE\u8C03");
+        throw new RuntimeError68("\u5B9A\u65F6\u5668\u7F3A\u5C11\u9ED8\u8BA4\u53C2\u6570\u56DE\u8C03");
       }
       const params = this.scheduler.defaultParamsCb();
       this.executor.execute(params);
@@ -31367,8 +32681,8 @@ var TimerTrigger = class extends LogicTrigger {
 // src/logic-scheduler/executor/app-ui-logic-executor.ts
 import {
   ModelError as ModelError34,
-  RuntimeError as RuntimeError67,
-  RuntimeModelError as RuntimeModelError70
+  RuntimeError as RuntimeError69,
+  RuntimeModelError as RuntimeModelError74
 } from "@ibiz-template/core";
 import { notNilEmpty as notNilEmpty9 } from "qx-util";
 var AppUILogicExecutor = class extends LogicExecutor {
@@ -31405,7 +32719,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     const { context, params, ...rest } = parameters;
     const { data } = parameters;
     if (!(data == null ? void 0 : data[0])) {
-      throw new RuntimeError67("opendata\u6CA1\u6709\u53EF\u64CD\u4F5C\u6570\u636E\uFF01");
+      throw new RuntimeError69("opendata\u6CA1\u6709\u53EF\u64CD\u4F5C\u6570\u636E\uFF01");
     }
     const openViewRefs = appUILogic.openDataAppViews;
     let openViewRef;
@@ -31414,7 +32728,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     } else {
       openViewRef = appUILogic.openDataAppView;
       if (!openViewRef) {
-        throw new RuntimeModelError70(
+        throw new RuntimeModelError74(
           appUILogic,
           "opendata\u89C6\u56FE\u903B\u8F91\u6CA1\u6709\u914D\u7F6E\u9ED8\u8BA4\u6253\u5F00\u89C6\u56FE"
         );
@@ -31422,7 +32736,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     }
     const openView = openViewRef.refAppViewId;
     if (!openView) {
-      throw new RuntimeModelError70(
+      throw new RuntimeModelError74(
         appUILogic,
         "opendata\u89C6\u56FE\u903B\u8F91\u7684\u9ED8\u8BA4\u6253\u5F00\u89C6\u56FE\u6CA1\u6709\u5B9E\u9645\u5F15\u7528\u89C6\u56FE"
       );
@@ -31452,7 +32766,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     );
     const typeFileName = appDataEntity.formTypeAppDEFieldId || appDataEntity.dataTypeAppDEFieldId;
     if (!typeFileName) {
-      throw new RuntimeModelError70(
+      throw new RuntimeModelError74(
         appUILogic,
         "".concat(appDataEntity.codeName, "[\u591A\u8868\u5355\u5B9E\u4F53] or [\u7D22\u5F15\u5B9E\u4F53]\u7F3A\u5C11\u7C7B\u578B\u5C5E\u6027\u914D\u7F6E")
       );
@@ -31460,12 +32774,12 @@ var AppUILogicExecutor = class extends LogicExecutor {
     const { data } = parameters;
     const formTypeValue = data[0][typeFileName];
     if (!formTypeValue) {
-      throw new RuntimeModelError70(appUILogic, "\u6570\u636E\u6E90\u65E0\u8868\u5355\u7C7B\u578B\u5E94\u7528\u5B9E\u4F53\u5C5E\u6027\u503C");
+      throw new RuntimeModelError74(appUILogic, "\u6570\u636E\u6E90\u65E0\u8868\u5355\u7C7B\u578B\u5E94\u7528\u5B9E\u4F53\u5C5E\u6027\u503C");
     }
     const openViewRefs = appUILogic.openDataAppViews;
     const findView = openViewRefs == null ? void 0 : openViewRefs.find((item) => item.refMode === formTypeValue);
     if (!findView) {
-      throw new RuntimeError67(
+      throw new RuntimeError69(
         "\u6CA1\u6709\u627E\u5230\u4E0E\u8868\u5355\u7C7B\u578B".concat(formTypeValue, "\u76F8\u5173\u7684\u5B9E\u4F53\u7684\u7F16\u8F91\u89C6\u56FE")
       );
     }
@@ -31502,7 +32816,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
         return viewRef.refMode.toLowerCase() !== parentDeName;
       });
       if (!newViewRef) {
-        throw new RuntimeModelError70(
+        throw new RuntimeModelError74(
           appUILogic,
           "\u6CA1\u6709\u627E\u5230\u6279\u6DFB\u52A0\u9700\u8981\u6253\u5F00\u7684\u9009\u62E9\u89C6\u56FE"
         );
@@ -31512,7 +32826,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     } else {
       newViewRef = newDataAppView;
       if (!newViewRef || !newViewRef.refAppViewId) {
-        throw new RuntimeModelError70(
+        throw new RuntimeModelError74(
           appUILogic,
           "newdata\u89C6\u56FE\u903B\u8F91\u6CA1\u6709\u914D\u7F6E\u9ED8\u8BA4\u65B0\u5EFA\u6570\u636E\u89C6\u56FE"
         );
@@ -31576,7 +32890,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     const { wizardAppView, newDataAppViews } = appUILogic;
     const { context, params, ...rest } = parameters;
     if (!wizardAppView || !wizardAppView.refAppViewId) {
-      throw new RuntimeModelError70(appUILogic, "\u7F3A\u5C11\u9ED8\u8BA4\u7D22\u5F15\u5B9E\u4F53\u9009\u62E9\u89C6\u56FE");
+      throw new RuntimeModelError74(appUILogic, "\u7F3A\u5C11\u9ED8\u8BA4\u7D22\u5F15\u5B9E\u4F53\u9009\u62E9\u89C6\u56FE");
     }
     const result = await ibiz.commands.execute(
       OpenAppViewCommand.TAG,
@@ -31590,7 +32904,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     }
     const selectData = (_a = result.data) == null ? void 0 : _a[0];
     if (!selectData) {
-      throw new RuntimeError67("\u8BF7\u9009\u4E2D\u4E00\u6761\u6570\u636E");
+      throw new RuntimeError69("\u8BF7\u9009\u4E2D\u4E00\u6761\u6570\u636E");
     }
     const indexType = selectData.srfkey;
     const findView = newDataAppViews == null ? void 0 : newDataAppViews.find(
@@ -31600,7 +32914,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
       }
     );
     if (!findView) {
-      throw new RuntimeError67(
+      throw new RuntimeError69(
         "\u6CA1\u6709\u627E\u5230\u4E0E\u7D22\u5F15\u7C7B\u578B".concat(indexType, "\u76F8\u5173\u7684\u5B9E\u4F53\u7684\u7F16\u8F91\u89C6\u56FE")
       );
     }
@@ -31627,7 +32941,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
       const minorDERs = selfDe.minorAppDERSs;
       const pickParentDeName = newViewRef.refMode.toLowerCase();
       if (!minorDERs) {
-        throw new RuntimeModelError70(selfDe, "\u5B9E\u4F53\u6CA1\u6709\u4ECE\u5173\u7CFB\u96C6\u5408\uFF01");
+        throw new RuntimeModelError74(selfDe, "\u5B9E\u4F53\u6CA1\u6709\u4ECE\u5173\u7CFB\u96C6\u5408\uFF01");
       }
       let pickParentFieldName = "";
       minorDERs == null ? void 0 : minorDERs.forEach((item) => {
@@ -31637,7 +32951,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
         }
       });
       if (pickParentFieldName === void 0) {
-        throw new RuntimeError67(
+        throw new RuntimeError69(
           "\u6CA1\u6709\u627E\u5230".concat(pickParentDeName, "\u5728\u5F53\u524D\u5B9E\u4F53\u7684\u5916\u952E\u5C5E\u6027")
         );
       }
@@ -31724,12 +33038,12 @@ var ControlEventTrigger = class extends LogicTrigger {
 };
 
 // src/logic-scheduler/executor/app-ui-action-executor.ts
-import { RuntimeModelError as RuntimeModelError71 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError75 } from "@ibiz-template/core";
 var AppDEUIActionExecutor = class extends LogicExecutor {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   execute(executeParams) {
     if (!this.logic.appDEUIActionId) {
-      throw new RuntimeModelError71(
+      throw new RuntimeModelError75(
         this.logic,
         "\u903B\u8F91\u4E2D\u7F3A\u5C11\u89E6\u53D1\u5E94\u7528\u5B9E\u4F53\u754C\u9762\u884C\u4E3Aid"
       );
@@ -32087,6 +33401,8 @@ export {
   TreeGridExColumnController,
   TreeGridExController,
   TreeGridExFieldColumnController,
+  TreeGridExNodeColumnController,
+  TreeGridExNotifyState,
   TreeGridExRowState,
   TreeGridExService,
   TreeGridExUAColumnController,
@@ -32112,6 +33428,7 @@ export {
   ViewLayoutPanelController,
   ViewMode,
   ViewPortletController,
+  ViewStack,
   ViewType,
   WFStepTraceViewController,
   WFWithdrawUIActionProvider,