@ibiz-template/runtime 0.5.3-beta.8 → 0.5.3

package/dist/index.esm.js

@@ -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.
@@ -2886,6 +2975,14 @@ var UIDomain = class {
      * @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 {
@@ -2917,6 +3014,20 @@ var UIDomain = class {
     }
     return [];
   }
+  /**
+   * 查询指定主实体下的所有子实体关系
+   *
+   * @author chitanda
+   * @date 2024-01-17 16:01:21
+   * @param {string} appDataEntityId
+   * @return {*}  {IAppDERS[]}
+   */
+  getDERConfigByMajor(appDataEntityId) {
+    if (this.rs2Map.has(appDataEntityId)) {
+      return this.rs2Map.get(appDataEntityId);
+    }
+    return [];
+  }
   /**
    * 根据模型给的子实体中的父关系模型，计算每个实体的子关系模型
    *
@@ -3039,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);
@@ -3064,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 clone16 } 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";
@@ -3113,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;
@@ -3893,7 +4048,9 @@ function getProvider10(key) {
   );
 }
 function getAsyncActionProvider(actiontype) {
-  const provider = getProvider10(actiontype);
+  const provider = getProvider10(
+    actiontype || "DEFAULT"
+  );
   if (!provider) {
     throw new RuntimeError9("\u627E\u4E0D\u5F02\u6B65\u64CD\u4F5C\u7C7B\u578B".concat(actiontype, "\u5BF9\u5E94\u7684\u9002\u914D\u5668"));
   } else {
@@ -4475,7 +4632,9 @@ var DynamicCodeListCache = class {
       iconPathAppDEFieldId,
       iconPathXAppDEFieldId,
       disableAppDEFieldId,
-      dataAppDEFieldId
+      dataAppDEFieldId,
+      clsAppDEFieldId,
+      colorAppDEFieldId
     } = this.codeList;
     const value = valueAppDEFieldId ? data[valueAppDEFieldId] : data.srfkey;
     result.id = value;
@@ -4499,6 +4658,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(
@@ -4762,8 +4927,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);
@@ -4813,10 +4988,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) {
@@ -4838,9 +5028,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;
@@ -4861,6 +5060,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)) {
@@ -4868,9 +5072,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) {
@@ -4890,16 +5098,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!")
@@ -4940,10 +5173,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 [];
   }
@@ -5022,6 +5265,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
@@ -5437,7 +5696,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
@@ -6148,12 +6408,6 @@ var MethodDto = class {
    * @return {*}  {Promise<IDataEntity[]>}
    */
   async sets(context, data) {
-    const uiDomain = ibiz.uiDomainManager.get(context.srfsessionid);
-    if (uiDomain && uiDomain.state.rsInit !== true) {
-      await this.calcRs(context);
-      uiDomain.calcParentRs();
-      uiDomain.state.rsInit = true;
-    }
     return Promise.all(
       data.map(async (datum) => {
         const all = this.fields.filter((field) => field.type === "DTOS").map(async (field) => {
@@ -6195,7 +6449,6 @@ var MethodDto = class {
    *
    * @author chitanda
    * @date 2023-12-26 16:12:13
-   * @protected
    * @param {IContext} context
    * @param {number} [depth=0] 递归层级，避免进入死循环。最大递归层级为 10
    * @return {*}  {Promise<void>}
@@ -6312,6 +6565,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));
@@ -7172,9 +7428,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;
   }
@@ -7187,17 +7447,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;
@@ -7215,6 +7479,7 @@ 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;
@@ -7233,22 +7498,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);
@@ -7299,12 +7574,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 {
@@ -7396,10 +7673,19 @@ 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 uiDomain = ibiz.uiDomainManager.get(context.srfsessionid);
+      if (uiDomain && uiDomain.state.rsInit !== true) {
+        await this.dto.calcRs(context);
+        uiDomain.calcParentRs();
+        uiDomain.state.rsInit = true;
+      }
+      app.deService.clearTempCacheByRs(
+        {
+          srfappid: app.appId,
+          srfsessionid: context.srfsessionid
+        },
+        this.entity.id
+      );
       const items = await this.dto.sets(context, [data]);
       return items[0];
     }
@@ -7475,17 +7761,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);
@@ -7523,7 +7809,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";
@@ -7655,17 +7941,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();
@@ -7712,7 +7998,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"
           );
@@ -7722,7 +8008,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"
           );
@@ -7785,7 +8071,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];
@@ -7888,10 +8174,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);
@@ -8184,12 +8470,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"
       );
@@ -8200,37 +8486,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"
       );
@@ -8241,12 +8527,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];
@@ -8257,7 +8543,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 {
@@ -8268,7 +8554,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"
       );
@@ -8417,7 +8703,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
@@ -8425,7 +8711,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;
@@ -8524,7 +8810,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;
@@ -8643,66 +8929,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) {
@@ -8890,6 +9174,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);
@@ -8899,6 +9190,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();
+      }
+    }
+  }
   /**
    * 更新临时数据
    *
@@ -9012,21 +9397,19 @@ 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 items = await this.searchLocal(
-        cond,
-        new SearchFilter(context, searchParams)
-      );
+      const filter = new SearchFilter(context, searchParams);
+      const items = await this.searchLocal(cond, filter);
       res = new HttpResponse4(items, 200);
     } else {
       switch (this.method.dataSetType) {
@@ -9098,13 +9481,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;
   }
   /**
@@ -9118,7 +9501,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,
@@ -9198,6 +9581,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;
   }
@@ -9232,7 +9618,7 @@ var TreeCodeListNodeData = class extends TreeNodeData {
 
 // src/service/vo/tree-node-data/tree-data-set-node-data.ts
 import { updateKeyDefine } from "@ibiz-template/core";
-import { clone as clone15, isNil as isNil12 } from "ramda";
+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) {
@@ -9313,7 +9699,7 @@ var TreeDataSetNodeData = class _TreeDataSetNodeData extends TreeNodeData {
       }
     };
     this.clone = () => {
-      const cloneData = clone15(this._deData);
+      const cloneData = clone16(this._deData);
       const cloneNodeData = new _TreeDataSetNodeData(model, this._parent, {
         data: cloneData,
         leaf: this._leaf,
@@ -10088,6 +10474,42 @@ var _DEServiceUtil = class _DEServiceUtil {
       service.local.clear();
     });
   }
+  /**
+   * 清理指定实体的临时数据缓存，并根据关系清理掉子实体的临时数据缓存
+   *
+   * @author chitanda
+   * @date 2024-01-19 14:01:32
+   * @param {IContext} context
+   * @param {string} entityID
+   * @param {string[]} [clearEntities=[]] 已经清理过的实体忽略，避免关系循环引用导致死循环
+   * @return {*}  {void}
+   */
+  clearTempCacheByRs(context, entityID, clearEntities = []) {
+    if (clearEntities.includes(entityID) === true) {
+      return;
+    }
+    clearEntities.push(entityID);
+    const sandboxId = context.srfsessionid;
+    if (!this.cache.has(sandboxId)) {
+      return;
+    }
+    const map = this.cache.get(sandboxId);
+    const service = map.get(entityID);
+    if (service) {
+      service.local.clear();
+    }
+    const uiDomain = ibiz.uiDomainManager.get(context.srfsessionid);
+    if (uiDomain) {
+      const configs = uiDomain.getDERConfigByMajor(entityID);
+      configs.forEach((config) => {
+        this.clearTempCacheByRs(
+          context,
+          config.minorAppDataEntityId,
+          clearEntities
+        );
+      });
+    }
+  }
   /**
    * 执行服务方法
    * @author lxm
@@ -10131,7 +10553,7 @@ var _OpenAppViewCommand = class _OpenAppViewCommand {
    * @return {*}  {(Promise<IModalData | void>)}
    */
   async exec(appViewId, _context, params = {}, opts = {}) {
-    const context = clone16(_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"));
@@ -11653,7 +12075,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;
 }
@@ -11875,7 +12300,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) {
@@ -11940,7 +12365,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) {
@@ -12034,7 +12459,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,
@@ -12291,6 +12716,7 @@ var ViewController = class extends BaseController {
     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) {
@@ -12662,7 +13088,7 @@ var EditorController = class {
 };
 
 // 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 {
   /**
    * 加载代码表数据
@@ -12686,7 +13112,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")
     );
@@ -12695,7 +13121,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 clone17, 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 {
   /**
@@ -12737,7 +13163,7 @@ var ControlController = class extends BaseController {
         "".concat(model.controlType, "_DEFAULT")
       );
       if (panelModel) {
-        this.controlPanel = clone17(panelModel);
+        this.controlPanel = clone18(panelModel);
       }
     }
     this.updateContextParams({});
@@ -13489,7 +13915,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) {
@@ -13568,7 +13994,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;
@@ -13687,7 +14113,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) {
@@ -13703,7 +14129,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) {
@@ -13999,17 +14425,17 @@ 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 { 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 clone18, isNil as isNil21, mergeDeepRight } from "ramda";
+import { clone as clone19, isNil as isNil21, mergeDeepRight } from "ramda";
 dayjs4.extend(minMax);
 dayjs4.extend(isSameOrBefore);
 dayjs4.extend(quarterOfYear);
@@ -14052,10 +14478,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);
@@ -14284,7 +14710,7 @@ var BaseSeriesGenerator = class {
   dataPreprocess(data) {
     const tempData = [];
     data.forEach((singleData) => {
-      tempData.push(clone18(singleData));
+      tempData.push(clone19(singleData));
     });
     const { groupMode } = this.model;
     if (groupMode) {
@@ -14478,10 +14904,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;
@@ -14497,14 +14923,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;
@@ -14557,14 +14983,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;
@@ -15162,17 +15588,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 {
@@ -15318,24 +15744,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 clone19 } from "ramda";
+import { clone as clone20 } from "ramda";
 function handleSrcVal2(ctx, srcValParams) {
   const { srcDEUILogicParamId, srcFieldName, srcValue } = srcValParams;
   const srcValueType = srcValParams.srcValueType || "SRCDLPARAM";
@@ -15362,7 +15788,7 @@ function handleSrcVal2(ctx, srcValParams) {
       value = ctx.parameters.context;
       break;
     case "ENVPARAM":
-      value = clone19(ibiz.env);
+      value = clone20(ibiz.env);
       break;
     default:
       throw new ModelError18(srcValParams, "\u6682\u672A\u652F\u6301\u6E90\u503C\u7C7B\u578B".concat(srcValueType));
@@ -15427,7 +15853,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"
           );
@@ -15437,7 +15863,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"
           );
@@ -15503,7 +15929,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];
@@ -15629,10 +16055,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);
@@ -15650,13 +16076,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) {
@@ -15721,7 +16147,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 clone20 } from "ramda";
+import { clone as clone21 } from "ramda";
 var PrepareJSParamNode = class extends UILogicNode {
   async exec(ctx) {
     const nodeParams = this.model.deuilogicNodeParams;
@@ -15810,7 +16236,7 @@ var PrepareJSParamNode = class extends UILogicNode {
   copyParam(nodeParam, ctx) {
     const { dstDEUILogicParamId } = nodeParam;
     const srcVal = handleSrcVal2(ctx, nodeParam);
-    ctx.params[dstDEUILogicParamId] = clone20(srcVal);
+    ctx.params[dstDEUILogicParamId] = clone21(srcVal);
   }
   /**
    * 绑定参数
@@ -15887,20 +16313,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) {
@@ -15918,12 +16344,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"
       );
@@ -15934,7 +16360,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);
@@ -15948,10 +16374,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;
@@ -16011,12 +16437,12 @@ 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];
     ibiz.log.debug("\u903B\u8F91\u8282\u70B9".concat(name, "\u64CD\u4F5C\u53C2\u6570\u503C:"), param);
@@ -16024,36 +16450,36 @@ var DebugParamNode = class extends UILogicNode {
 };
 
 // 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 clone21 } 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] = clone21(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 {
@@ -16064,7 +16490,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"
       );
@@ -16082,12 +16508,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];
@@ -16098,19 +16524,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 {
@@ -16120,7 +16546,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);
@@ -16146,19 +16572,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) {
@@ -16173,7 +16599,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 {
@@ -16183,13 +16609,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) {
@@ -16350,7 +16776,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;
@@ -16470,7 +16896,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;
@@ -16605,7 +17031,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;
@@ -16620,7 +17046,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,
@@ -16845,7 +17271,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,
@@ -16970,7 +17396,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";
@@ -16988,7 +17414,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,
@@ -17053,7 +17479,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");
   }
   /**
    * 执行打印行为
@@ -17124,7 +17550,7 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
    */
   async executeDataImport(action, args) {
     var _a;
-    const { resultParams } = await this.handleParams(
+    const { resultContext, resultParams } = await this.handleParams(
       action,
       args.context,
       args.data,
@@ -17148,6 +17574,7 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
           dismiss: () => modal.dismiss(),
           appDataEntity,
           dataImport: appDEDataImport,
+          context: resultContext,
           params: resultParams
         },
         {
@@ -17901,7 +18328,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
@@ -18116,7 +18543,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");
@@ -18169,7 +18596,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();
@@ -18236,7 +18663,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();
@@ -18342,7 +18769,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,
@@ -18360,10 +18787,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);
@@ -18418,7 +18845,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")
       );
@@ -18777,7 +19204,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")
       );
@@ -18832,7 +19259,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);
@@ -18855,7 +19282,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")
       );
@@ -19101,7 +19528,7 @@ import { RuntimeError as RuntimeError50 } from "@ibiz-template/core";
 
 // src/controller/control/form/form/form.controller.ts
 import {
-  RuntimeModelError as RuntimeModelError55,
+  RuntimeModelError as RuntimeModelError56,
   debounceAndAsyncMerge,
   recursiveIterate as recursiveIterate3
 } from "@ibiz-template/core";
@@ -19229,7 +19656,7 @@ var FormController = class extends ControlController {
           return;
         }
         if (form.details[detail.id]) {
-          throw new RuntimeModelError55(
+          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")
           );
@@ -20066,6 +20493,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 */,
@@ -20871,7 +21301,7 @@ var FormMDCtrlController = class extends FormDetailController {
 import {
   mergeInLeft,
   ModelError as ModelError27,
-  RuntimeModelError as RuntimeModelError56
+  RuntimeModelError as RuntimeModelError57
 } from "@ibiz-template/core";
 var FormMDCtrlMDController = class extends FormMDCtrlController {
   constructor() {
@@ -20897,7 +21327,7 @@ var FormMDCtrlMDController = class extends FormMDCtrlController {
     await 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 RuntimeModelError57(this.model, "\u591A\u6570\u636E\u90E8\u4EF6\u672A\u914D\u7F6E\u5185\u5BB9\u90E8\u4EF6");
     }
     if (contentControl.controlType === "GRID") {
       mergeInLeft(contentControl, {
@@ -20994,7 +21424,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 RuntimeModelError57 } 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
@@ -21035,7 +21465,7 @@ var FormMDCtrlFormController = class extends FormMDCtrlController {
     super.onInit();
     const { contentControl } = this.model;
     if (!contentControl) {
-      throw new RuntimeModelError57(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);
@@ -21169,7 +21599,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 clone22 } from "ramda";
+import { clone as clone23 } from "ramda";
 var FormMDCtrlRepeaterController = class extends FormMDCtrlController {
   constructor() {
     super(...arguments);
@@ -21253,7 +21683,7 @@ var FormMDCtrlRepeaterController = class extends FormMDCtrlController {
     copyFields.forEach((key) => {
       tempForm[key] = this.form.model[key];
     });
-    this.repeatedForm = clone22(tempForm);
+    this.repeatedForm = clone23(tempForm);
   }
   /**
    * 设置重复器数据（修改主表单里重复器对应属性）
@@ -21361,10 +21791,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
@@ -21373,6 +21823,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
@@ -21383,12 +21847,12 @@ import {
 } from "@ibiz-template/core";
 import { debounce as debounce2 } from "lodash-es";
 import { createUUID as createUUID12 } from "qx-util";
-import { clone as clone23 } from "ramda";
+import { clone as clone24 } from "ramda";
 
 // src/controller/control/form/edit-form/edit-form.service.ts
 import {
   recursiveIterate as recursiveIterate6,
-  RuntimeModelError as RuntimeModelError58
+  RuntimeModelError as RuntimeModelError59
 } from "@ibiz-template/core";
 var EditFormService = class extends FormService {
   /**
@@ -21512,7 +21976,7 @@ var EditFormService = class extends FormService {
     const wizardForm = this.model;
     const methodName = (_a = wizardForm.goBackControlAction) == null ? void 0 : _a.appDEMethodId;
     if (!methodName) {
-      throw new RuntimeModelError58(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,
@@ -21748,8 +22212,8 @@ var EditFormController = class extends FormController {
    * @return {*}  {Promise<IData>}
    */
   async copy() {
-    const context = clone23(this.context);
-    const queryParams = clone23(this.params);
+    const context = clone24(this.context);
+    const queryParams = clone24(this.params);
     const appDataEntity = await ibiz.hub.getAppDataEntity(
       this.model.appDataEntityId,
       this.model.appId
@@ -21806,7 +22270,7 @@ var EditFormController = class extends FormController {
       return this.loadDraft();
     }
     const { context, params } = this.handlerAbilityParams(args);
-    const queryParams = clone23(params);
+    const queryParams = clone24(params);
     let res;
     try {
       await this.startLoading();
@@ -21887,7 +22351,7 @@ var EditFormController = class extends FormController {
       });
     }
     ibiz.mc.command.send(
-      this.data.$origin,
+      res.data,
       isCreate ? "OBJECTCREATED" : "OBJECTUPDATED"
     );
     return this.data;
@@ -22372,12 +22836,12 @@ import {
   mergeDefaultInLeft,
   recursiveIterate as recursiveIterate7,
   RuntimeError as RuntimeError53,
-  RuntimeModelError as RuntimeModelError60
+  RuntimeModelError as RuntimeModelError61
 } from "@ibiz-template/core";
-import { clone as clone24 } from "ramda";
+import { clone as clone25 } from "ramda";
 
 // src/controller/control/grid/grid/grid.service.ts
-import { RuntimeModelError as RuntimeModelError59 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError60 } from "@ibiz-template/core";
 var GridService = class extends MDControlService {
   /**
    * 初始化属性映射
@@ -22405,7 +22869,7 @@ var GridService = class extends MDControlService {
               dataType: dataItem.dataType
             });
           } else {
-            throw new RuntimeModelError59(
+            throw new RuntimeModelError60(
               column,
               "\u672A\u627E\u5230\u5BF9\u5E94\u7684\u8868\u683C\u6570\u636E\u9879[".concat(deField, "]")
             );
@@ -22684,7 +23148,7 @@ var GridController = class extends MDControlController {
     const result = await calcColumnModelBySchema(json, this);
     if (result && result.degridColumns.length > 0) {
       const { degridColumns, degridDataItems } = result;
-      this.model = clone24(this.model);
+      this.model = clone25(this.model);
       this.model.degridColumns = [
         ...(this.model.degridColumns || []).filter((item) => {
           return degridColumns.findIndex((x) => x.id === item.id) === -1;
@@ -22715,11 +23179,11 @@ var GridController = class extends MDControlController {
       (item) => item.model.appDEFieldId === groupAppDEFieldId
     );
     if (!this.groupFieldColumn) {
-      throw new RuntimeModelError60(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 RuntimeModelError60(
+      throw new RuntimeModelError61(
         this.groupFieldColumn.model,
         "\u5206\u7EC4\u5C5E\u6027\u7684\u5C5E\u6027\u5217".concat(groupFieldName, "\u6CA1\u6709\u914D\u7F6E\u4EE3\u7801\u8868")
       );
@@ -22729,7 +23193,7 @@ var GridController = class extends MDControlController {
     );
     if (index !== -1 && index !== 0) {
       if (this.isMultistageHeader) {
-        throw new RuntimeModelError60(
+        throw new RuntimeModelError61(
           this.model,
           "\u8BF7\u5C06\u5206\u7EC4\u5C5E\u6027\u5217".concat(groupFieldName, "\u914D\u7F6E\u4E3A\u7B2C\u4E00\u5217")
         );
@@ -22739,10 +23203,10 @@ var GridController = class extends MDControlController {
     }
     if (groupMode === "CODELIST") {
       if (!groupCodeListId) {
-        throw new RuntimeModelError60(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 RuntimeModelError60(
+        throw new RuntimeModelError61(
           this.model,
           "\u5206\u7EC4\u4EE3\u7801\u8868\u4E0E\u5C5E\u6027\u5217".concat(groupFieldName, "\u7684\u4EE3\u7801\u8868\u4E0D\u4E00\u81F4")
         );
@@ -22829,7 +23293,7 @@ var GridController = class extends MDControlController {
       return;
     }
     if (!aggAppDEDataSetId || !aggAppDataEntityId) {
-      throw new RuntimeModelError60(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);
@@ -23199,7 +23663,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 = clone24(row.data);
+        row.cacheData = clone25(row.data);
         const defaultVal = this.calcDefaultValue(row.data, false);
         Object.assign(row.data, defaultVal);
       }
@@ -23368,7 +23832,7 @@ var GridController = class extends MDControlController {
           }
         });
       }
-      const cloneData = clone24(
+      const cloneData = clone25(
         data2.map((item) => {
           return item.getOrigin();
         })
@@ -23606,7 +24070,7 @@ var GridController = class extends MDControlController {
 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 clone25, isNil as isNil23 } from "ramda";
+import { clone as clone26, isNil as isNil23 } from "ramda";
 var GridFieldColumnController = class extends GridColumnController {
   constructor() {
     super(...arguments);
@@ -23639,6 +24103,15 @@ var GridFieldColumnController = class extends GridColumnController {
   get hasAction() {
     return !!this.model.deuiactionId;
   }
+  /**
+   * 属性列对应值在数据里的属性字段名称
+   * @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, {
@@ -23680,7 +24153,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;
   }
   /**
@@ -23717,7 +24190,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;
     }
@@ -23735,7 +24208,7 @@ var GridFieldColumnController = class extends GridColumnController {
       srfkey: value,
       ...wfContext
     });
-    const tempParams = clone25(this.params);
+    const tempParams = clone26(this.params);
     const { context: newContext, params: newParams } = this.handlePublicParams(
       row.data,
       tempContext,
@@ -23906,7 +24379,7 @@ var GridFieldColumnController = class extends GridColumnController {
 };
 
 // src/controller/control/grid/grid-column/grid-ua-column/grid-ua-column.controller.ts
-import { RuntimeModelError as RuntimeModelError61 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError62 } from "@ibiz-template/core";
 var GridUAColumnController = class extends GridColumnController {
   /**
    * 给rowController初始化操作列的状态
@@ -23919,7 +24392,7 @@ var GridUAColumnController = class extends GridColumnController {
     var _a;
     const { deuiactionGroup } = this.model;
     if (!deuiactionGroup) {
-      throw new RuntimeModelError61(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");
@@ -24012,15 +24485,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;
-  }
   /**
    * 初始化方法，生成表格编辑项控制器
    *
@@ -25135,10 +25599,10 @@ import {
   mergeInLeft as mergeInLeft3,
   recursiveIterate as recursiveIterate9
 } from "@ibiz-template/core";
-import { clone as clone26, 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 RuntimeModelError62 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError63 } from "@ibiz-template/core";
 var ExcludeOPs = [
   "ISNULL" /* IS_NULL */,
   "ISNOTNULL" /* IS_NOT_NULL */
@@ -25179,7 +25643,7 @@ var SearchBarFilterController = class {
   async init() {
     if (!this.noEditor) {
       if (!this.model.editor) {
-        throw new RuntimeModelError62(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) {
@@ -25639,7 +26103,7 @@ var SearchBarController = class extends ControlController {
       }
     });
     if (addSearchBarFilters.length > 0) {
-      this.model = clone26(this.model);
+      this.model = clone27(this.model);
       this.model.searchBarFilters = addSearchBarFilters.concat(...mergeFilters);
       this.model.enableFilter = true;
     }
@@ -26223,7 +26687,7 @@ var TabExpPanelController = class extends ControlController {
 // src/controller/control/tree/tree.controller.ts
 import {
   RuntimeError as RuntimeError57,
-  RuntimeModelError as RuntimeModelError63,
+  RuntimeModelError as RuntimeModelError64,
   recursiveIterate as recursiveIterate10
 } from "@ibiz-template/core";
 
@@ -26576,6 +27040,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) {
@@ -26591,6 +27056,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
@@ -26602,6 +27073,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
@@ -27094,7 +27582,7 @@ var TreeController = class extends MDControlController {
     const { sortAppDEFieldId, sortDir, allowOrder } = orderNodeModel;
     if (allowOrder === true) {
       if (!sortAppDEFieldId) {
-        throw new RuntimeModelError63(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";
@@ -27175,7 +27663,7 @@ var TreeController = class extends MDControlController {
   async modifyNodeText(nodeData, text) {
     const model = this.getNodeModel(nodeData._nodeId);
     if (!model.allowEditText) {
-      throw new RuntimeModelError63(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");
@@ -27539,7 +28027,7 @@ var WizardPanelController = class extends ControlController {
 };
 
 // src/controller/control/md-ctrl/md-ctrl.controller.ts
-import { RuntimeModelError as RuntimeModelError64 } 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
@@ -27746,7 +28234,7 @@ var MDCtrlController = class extends MDControlController {
     const { enableGroup, groupMode, groupAppDEFieldId } = this.model;
     if (enableGroup && groupMode) {
       if (!groupAppDEFieldId) {
-        throw new RuntimeModelError64(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();
@@ -27813,7 +28301,7 @@ var MDCtrlController = class extends MDControlController {
   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 RuntimeModelError65(this.model, "\u5206\u7EC4\u4EE3\u7801\u8868\u6CA1\u6709\u914D\u7F6E");
     }
     const { items } = this.state;
     const groupMap = /* @__PURE__ */ new Map();
@@ -27843,7 +28331,7 @@ var MDCtrlController = class extends MDControlController {
 };
 
 // src/controller/control/kanban/kanban.controller.ts
-import { RuntimeError as RuntimeError59, RuntimeModelError as RuntimeModelError65 } 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
@@ -27921,10 +28409,10 @@ var KanbanController = class extends DataViewControlController {
     const sortField = this.model.minorSortAppDEFieldId;
     const { minorSortDir } = this.model;
     if (!sortField) {
-      throw new RuntimeModelError65(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 RuntimeModelError65(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) => {
@@ -28068,7 +28556,7 @@ var KanbanController = class extends DataViewControlController {
   async handleCodeListGroup() {
     const { groupAppDEFieldId, groupCodeListId } = this.model;
     if (!groupCodeListId) {
-      throw new RuntimeModelError65(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();
@@ -28364,10 +28852,11 @@ var KanbanController = class extends DataViewControlController {
 // src/controller/control/tree-grid-ex/tree-grid-ex.controller.ts
 import {
   RuntimeError as RuntimeError60,
+  RuntimeModelError as RuntimeModelError67,
   awaitTimeout as awaitTimeout3,
   recursiveIterate as recursiveIterate11
 } from "@ibiz-template/core";
-import { clone as clone27 } from "ramda";
+import { clone as clone28 } from "ramda";
 
 // src/controller/control/tree-grid-ex/tree-grid-ex.service.ts
 var TreeGridExService = class extends TreeService {
@@ -28637,12 +29126,14 @@ var TreeGridExController = class extends TreeController {
       return;
     }
     const nodeModel = this.getNodeModel(nodeData._nodeId);
-    const { appDataEntityId } = nodeModel;
+    const { appDataEntityId, updateAppDEActionId } = nodeModel;
     const isCreate = nodeData._deData.srfuf === 0 /* CREATE */;
     if (isCreate) {
       throw new RuntimeError60("\u6682\u4E0D\u652F\u6301\u65B0\u5EFA");
     }
-    const methodAction = "update";
+    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;
@@ -28651,7 +29142,7 @@ var TreeGridExController = class extends TreeController {
     try {
       res = await app.deService.exec(
         appDataEntityId,
-        methodAction,
+        updateAppDEActionId,
         tempContext,
         nodeData._deData
       );
@@ -28801,7 +29292,7 @@ var TreeGridExController = class extends TreeController {
         throw new RuntimeError60("\u540C\u65F6\u53EA\u80FD\u6709\u4E00\u884C\u5F00\u542F\u884C\u7F16\u8F91");
       }
       if (row.data._deData.srfuf === 1 /* UPDATE */) {
-        row.cacheData = clone27(row.data);
+        row.cacheData = clone28(row.data);
         const defaultVal = this.calcDefaultValue(row.data, false);
         Object.assign(row.data, defaultVal);
       }
@@ -28912,9 +29403,9 @@ var TreeGridExColumnController = class {
 import {
   DataTypes as DataTypes5,
   RuntimeError as RuntimeError61,
-  RuntimeModelError as RuntimeModelError66
+  RuntimeModelError as RuntimeModelError68
 } from "@ibiz-template/core";
-import { clone as clone28 } from "ramda";
+import { clone as clone29 } from "ramda";
 import dayjs6 from "dayjs";
 var TreeGridExNodeColumnController = class {
   /**
@@ -28943,7 +29434,7 @@ var TreeGridExNodeColumnController = class {
       }
     );
     if (!nodeColumn || !nodeDataItem) {
-      throw new RuntimeModelError66(
+      throw new RuntimeModelError68(
         nodeModel,
         "\u8282\u70B9\u6CA1\u6709\u914D\u7F6E\u5BF9\u5E94\u8868\u683C\u5217".concat(this.fieldColumn.name, "\u7684\u6570\u636E\u9879")
       );
@@ -28957,7 +29448,7 @@ var TreeGridExNodeColumnController = class {
         }
       );
       if (!nodeEditItem) {
-        throw new RuntimeModelError66(
+        throw new RuntimeModelError68(
           nodeModel,
           "\u6CA1\u6709\u627E\u5230\u5BF9\u5E94\u8868\u683C\u5217".concat(this.fieldColumn.name, "\u7684\u7F16\u8F91\u9879\u6A21\u578B")
         );
@@ -29123,7 +29614,7 @@ var TreeGridExNodeColumnController = class {
       srfkey: value,
       ...wfContext
     });
-    const tempParams = clone28(this.params);
+    const tempParams = clone29(this.params);
     const { userParam } = this.nodeColumn;
     if (userParam) {
       const { navigateContexts, navigateParams } = parseUserParams(userParam);
@@ -29357,7 +29848,7 @@ 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 RuntimeModelError67 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError69 } from "@ibiz-template/core";
 var TreeGridExUAColumnController = class extends TreeGridExColumnController {
   /**
    * 给rowController初始化操作列的状态
@@ -29371,7 +29862,7 @@ var TreeGridExUAColumnController = class extends TreeGridExColumnController {
     const { deuiactionGroup } = this.model;
     if (!deuiactionGroup) {
       return;
-      throw new RuntimeModelError67(this.model, "\u64CD\u4F5C\u5217\u6CA1\u6709\u914D\u7F6E\u754C\u9762\u884C\u4E3A\u7EC4");
+      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");
@@ -29425,7 +29916,7 @@ var TreeGridExUAColumnController = class extends TreeGridExColumnController {
 };
 
 // src/controller/control/tree-grid/tree-grid.controller.ts
-import { RuntimeModelError as RuntimeModelError68 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError70 } from "@ibiz-template/core";
 var TreeGridController = class extends GridController {
   constructor() {
     super(...arguments);
@@ -29470,10 +29961,10 @@ var TreeGridController = class extends GridController {
       return item.treeColumnMode === 2 || item.treeColumnMode === 3;
     });
     if (!treeGridParent) {
-      throw new RuntimeModelError68(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 RuntimeModelError68(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();
@@ -31198,8 +31689,8 @@ var ViewEngineBase = class {
 };
 
 // src/engine/md-view.engine.ts
-import { RuntimeModelError as RuntimeModelError69 } from "@ibiz-template/core";
-import { clone as clone29 } from "ramda";
+import { RuntimeModelError as RuntimeModelError71 } from "@ibiz-template/core";
+import { clone as clone30 } from "ramda";
 var MDViewEngine = class extends ViewEngineBase {
   /**
    * 多数据部件名称
@@ -31382,7 +31873,7 @@ var MDViewEngine = class extends ViewEngineBase {
       view: this.view
     }));
     if (result === -1) {
-      throw new RuntimeModelError69(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
@@ -31405,9 +31896,9 @@ var MDViewEngine = class extends ViewEngineBase {
       (item) => item.id === "newdata"
     );
     if (!openAppViewLogic) {
-      throw new RuntimeModelError69(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 = clone29(this.view.params);
+    const params = clone30(this.view.params);
     if (copyMode) {
       params.srfcopymode = copyMode;
     }
@@ -31419,7 +31910,7 @@ var MDViewEngine = class extends ViewEngineBase {
       view: this.view
     }));
     if (result === -1) {
-      throw new RuntimeModelError69(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
@@ -31587,6 +32078,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());
   }
   /**
@@ -31730,13 +32228,13 @@ var ScriptExecutor = class extends LogicExecutor {
 };
 
 // src/logic-scheduler/executor/app-de-ui-logic-executor.ts
-import { RuntimeModelError as RuntimeModelError70 } 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 RuntimeModelError70(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);
   }
@@ -32194,7 +32692,7 @@ var ItemDynaLogicTrigger = class extends LogicTrigger {
 };
 
 // src/logic-scheduler/trigger/timer-trigger.ts
-import { RuntimeError as RuntimeError68, RuntimeModelError as RuntimeModelError71 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError68, RuntimeModelError as RuntimeModelError73 } from "@ibiz-template/core";
 var TimerTrigger = class extends LogicTrigger {
   constructor() {
     super(...arguments);
@@ -32202,7 +32700,7 @@ var TimerTrigger = class extends LogicTrigger {
   }
   start() {
     if (!this.logic.timer) {
-      throw new RuntimeModelError71(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) {
@@ -32224,7 +32722,7 @@ var TimerTrigger = class extends LogicTrigger {
 import {
   ModelError as ModelError34,
   RuntimeError as RuntimeError69,
-  RuntimeModelError as RuntimeModelError72
+  RuntimeModelError as RuntimeModelError74
 } from "@ibiz-template/core";
 import { notNilEmpty as notNilEmpty9 } from "qx-util";
 var AppUILogicExecutor = class extends LogicExecutor {
@@ -32270,7 +32768,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     } else {
       openViewRef = appUILogic.openDataAppView;
       if (!openViewRef) {
-        throw new RuntimeModelError72(
+        throw new RuntimeModelError74(
           appUILogic,
           "opendata\u89C6\u56FE\u903B\u8F91\u6CA1\u6709\u914D\u7F6E\u9ED8\u8BA4\u6253\u5F00\u89C6\u56FE"
         );
@@ -32278,7 +32776,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     }
     const openView = openViewRef.refAppViewId;
     if (!openView) {
-      throw new RuntimeModelError72(
+      throw new RuntimeModelError74(
         appUILogic,
         "opendata\u89C6\u56FE\u903B\u8F91\u7684\u9ED8\u8BA4\u6253\u5F00\u89C6\u56FE\u6CA1\u6709\u5B9E\u9645\u5F15\u7528\u89C6\u56FE"
       );
@@ -32308,7 +32806,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     );
     const typeFileName = appDataEntity.formTypeAppDEFieldId || appDataEntity.dataTypeAppDEFieldId;
     if (!typeFileName) {
-      throw new RuntimeModelError72(
+      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")
       );
@@ -32316,7 +32814,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     const { data } = parameters;
     const formTypeValue = data[0][typeFileName];
     if (!formTypeValue) {
-      throw new RuntimeModelError72(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);
@@ -32358,7 +32856,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
         return viewRef.refMode.toLowerCase() !== parentDeName;
       });
       if (!newViewRef) {
-        throw new RuntimeModelError72(
+        throw new RuntimeModelError74(
           appUILogic,
           "\u6CA1\u6709\u627E\u5230\u6279\u6DFB\u52A0\u9700\u8981\u6253\u5F00\u7684\u9009\u62E9\u89C6\u56FE"
         );
@@ -32368,7 +32866,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     } else {
       newViewRef = newDataAppView;
       if (!newViewRef || !newViewRef.refAppViewId) {
-        throw new RuntimeModelError72(
+        throw new RuntimeModelError74(
           appUILogic,
           "newdata\u89C6\u56FE\u903B\u8F91\u6CA1\u6709\u914D\u7F6E\u9ED8\u8BA4\u65B0\u5EFA\u6570\u636E\u89C6\u56FE"
         );
@@ -32432,7 +32930,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     const { wizardAppView, newDataAppViews } = appUILogic;
     const { context, params, ...rest } = parameters;
     if (!wizardAppView || !wizardAppView.refAppViewId) {
-      throw new RuntimeModelError72(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,
@@ -32483,7 +32981,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
       const minorDERs = selfDe.minorAppDERSs;
       const pickParentDeName = newViewRef.refMode.toLowerCase();
       if (!minorDERs) {
-        throw new RuntimeModelError72(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) => {
@@ -32580,12 +33078,12 @@ var ControlEventTrigger = class extends LogicTrigger {
 };
 
 // src/logic-scheduler/executor/app-ui-action-executor.ts
-import { RuntimeModelError as RuntimeModelError73 } 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 RuntimeModelError73(
+      throw new RuntimeModelError75(
         this.logic,
         "\u903B\u8F91\u4E2D\u7F3A\u5C11\u89E6\u53D1\u5E94\u7528\u5B9E\u4F53\u754C\u9762\u884C\u4E3Aid"
       );
@@ -32970,6 +33468,7 @@ export {
   ViewLayoutPanelController,
   ViewMode,
   ViewPortletController,
+  ViewStack,
   ViewType,
   WFStepTraceViewController,
   WFWithdrawUIActionProvider,