@ibiz-template/runtime 0.4.11 → 0.4.13

package/dist/index.esm.js

@@ -4,7 +4,8 @@ var GlobalConfig = class {
     // 全局视图配置
     this.view = {
       enableDataInfoBar: true,
-      expCacheMode: "TABEXPPANEL:"
+      expCacheMode: "TABEXPPANEL:",
+      disableHomeTabs: false
     };
     // 全局表格配置
     this.grid = {
@@ -2028,10 +2029,20 @@ var LayoutPanelUtil = class {
     } else if (mainMenuAlign) {
       exTag = mainMenuAlign.toUpperCase();
     }
+    let key = "";
     if (exTag !== "") {
-      return "".concat(viewType, "_").concat(viewStyle, "_").concat(exTag);
+      key = "".concat(viewType, "_").concat(viewStyle, "_").concat(exTag);
+    } else {
+      key = "".concat(viewType, "_").concat(viewStyle);
+    }
+    if (ibiz.config.view.disableHomeTabs && [
+      "APPINDEXVIEW_DEFAULT",
+      "APPINDEXVIEW_DEFAULT_LEFT",
+      "APPINDEXVIEW_DEFAULT_TOP"
+    ].includes(key)) {
+      key += "_NO_NAV";
     }
-    return "".concat(viewType, "_").concat(viewStyle);
+    return key;
   }
 };
 
@@ -3310,6 +3321,7 @@ function getProvider5(key) {
 async function getGridColumnProvider(model) {
   let provider;
   const { columnType, enableRowEdit, sysPFPluginId, appId } = model;
+  const { renderSysPFPluginId } = model;
   if (sysPFPluginId) {
     const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
     if (pluginKey) {
@@ -3321,6 +3333,17 @@ async function getGridColumnProvider(model) {
       return provider;
     }
   }
+  if (renderSysPFPluginId) {
+    const pluginKey = await getPluginRegisterKey(renderSysPFPluginId, appId);
+    if (pluginKey) {
+      provider = getProvider5(pluginKey);
+    }
+    if (!provider) {
+      ibiz.log.error("\u627E\u4E0D\u5230\u6811\u8868\u683C\u5217\u63D2\u4EF6".concat(pluginKey, "\u5BF9\u5E94\u7684\u9002\u914D\u5668"));
+    } else {
+      return provider;
+    }
+  }
   const key = enableRowEdit ? "".concat(columnType, "_EDIT") : columnType;
   provider = getProvider5(key);
   if (!provider) {
@@ -4633,11 +4656,11 @@ var DECache = class {
     );
     const unionValues = unionKeys.map((key) => {
       if (isNil5(data[key])) {
-        throw new RuntimeError13("\u8054\u5408\u952E\u503C\u8BA1\u7B97\u5F02\u5E38\uFF0C".concat(key, "\u5C5E\u6027\u4E3A\u7A7A\u503C\uFF01"));
+        return "__empty__";
       }
       return data[key];
     });
-    data.srfkey = unionValues.join("");
+    data.srfkey = unionValues.join("||");
   }
 };
 
@@ -5064,6 +5087,8 @@ import {
   ModelError as ModelError5,
   RuntimeError as RuntimeError16
 } from "@ibiz-template/core";
+import { equals as equals2, isEmpty as isEmpty7, where as where2 } from "ramda";
+import { ascSort } from "qx-util";
 
 // src/service/service/work-flow/work-flow.service.ts
 import { RuntimeError as RuntimeError15 } from "@ibiz-template/core";
@@ -5532,6 +5557,55 @@ var DEService = class {
   fetchTempDefault(context, params, params2) {
     return this.exec("FetchTempDefault", context, params, params2);
   }
+  /**
+   * 查询本地数据，根据属性
+   *
+   * @param {IParams} context
+   * @param {IParams} params 根据多实体属性查找，例：{ name: '张三', age: 18, parent: null }
+   * @return {*}  {Promise<IDataEntity[]>}
+   */
+  async selectLocal(context, params = {}) {
+    let items = this.local.getList(context);
+    items = ascSort(items, "srfordervalue");
+    const data = {};
+    const nullData = {};
+    const undefinedData = {};
+    const emptyData = {};
+    if (params.srfkey) {
+      data.srfkey = equals2(params.srfkey);
+      delete params.srfkey;
+    }
+    for (const key in params) {
+      if (Object.prototype.hasOwnProperty.call(params, key)) {
+        const val = params[key];
+        if (val == null) {
+          nullData[key] = equals2(null);
+          undefinedData[key] = equals2(void 0);
+          emptyData[key] = equals2("");
+        } else {
+          data[key] = equals2(val);
+        }
+      }
+    }
+    if (!isEmpty7(data)) {
+      const pred = where2(data);
+      const nullPred = where2(nullData);
+      const undefinedPred = where2(undefinedData);
+      const emptyPred = where2(emptyData);
+      items = items.filter((obj) => {
+        if (isEmpty7(nullData)) {
+          if (pred(obj)) {
+            return true;
+          }
+        } else if (pred(obj) && (nullPred(obj) || undefinedPred(obj) || emptyPred(obj))) {
+          return true;
+        }
+        return false;
+      });
+    }
+    const list = items.map((obj) => obj.clone());
+    return list;
+  }
   /**
    * 执行服务方法 ac 模式
    *
@@ -6268,21 +6342,24 @@ var AuthorityService = class {
 import { CoreConst } from "@ibiz-template/core";
 import { clearCookie, getCookie, setCookie } from "qx-util";
 var V7AuthService = class {
-  async login(loginname, password, rememberme) {
+  async login(loginName, password, remember) {
     try {
       const res = await ibiz.net.post("/v7/login", {
-        loginname,
+        loginname: loginName,
         password,
-        rememberme
+        rememberme: remember
       });
       const { data } = res;
       if (data && data.token) {
-        setCookie(CoreConst.TOKEN, data.token, rememberme ? 7 : 0, true);
+        if (remember) {
+          setCookie(CoreConst.TOKEN_REMEMBER, "1", 7, true);
+        }
+        setCookie(CoreConst.TOKEN, data.token, remember ? 7 : 0, true);
         const expiredDate = (/* @__PURE__ */ new Date()).getTime() + (data.expirein || 7199) * 1e3;
         setCookie(
           CoreConst.TOKEN_EXPIRES,
           "".concat(expiredDate),
-          rememberme ? 7 : 0,
+          remember ? 7 : 0,
           true
         );
       }
@@ -6300,6 +6377,7 @@ var V7AuthService = class {
       await ibiz.net.get("/v7/logout");
       clearCookie(CoreConst.TOKEN);
       clearCookie(CoreConst.TOKEN_EXPIRES);
+      clearCookie(CoreConst.TOKEN_REMEMBER);
       return true;
     } catch (err) {
       ibiz.notification.error({
@@ -6312,6 +6390,7 @@ var V7AuthService = class {
   async extendLogin() {
     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;
@@ -6319,9 +6398,14 @@ var V7AuthService = class {
       setTimeout(async () => {
         const res = await ibiz.net.get("/uaa/refreshtoken2");
         if (res.ok) {
-          setCookie(CoreConst.TOKEN, res.data.token, 0, true);
+          setCookie(CoreConst.TOKEN, res.data.token, remember ? 7 : 0, true);
           const expiredDate = (/* @__PURE__ */ new Date()).getTime() + (res.data.expirein || 7199) * 1e3;
-          setCookie(CoreConst.TOKEN_EXPIRES, "".concat(expiredDate), 0, true);
+          setCookie(
+            CoreConst.TOKEN_EXPIRES,
+            "".concat(expiredDate),
+            remember ? 7 : 0,
+            true
+          );
         }
         this.extendLogin();
       }, wait);
@@ -6640,7 +6724,9 @@ var MethodDto = class _MethodDto {
             const service = await this.app.deService.getService(
               field.refAppDataEntityId
             );
-            const items = service.local.getList(context);
+            const items = await service.selectLocal(context, {
+              srfpkey: data[this.entity.keyAppDEFieldId]
+            });
             if (items) {
               const arr = [];
               for (let j = 0; j < items.length; j++) {
@@ -6687,6 +6773,10 @@ var MethodDto = class _MethodDto {
             const dto = await this.getFieldDto(field);
             const items = datum[key];
             if (items) {
+              const pKey = datum[this.entity.keyAppDEFieldId];
+              items.forEach((item) => {
+                item.srfpkey = pKey;
+              });
               await dto.sets(context, items);
             } else {
               await dto.sets(context, []);
@@ -8418,9 +8508,9 @@ import {
   ModelError as ModelError13,
   RuntimeModelError as RuntimeModelError20
 } from "@ibiz-template/core";
-import { ascSort, descSort } from "qx-util";
-import { clone as clone13, equals as equals2, isEmpty as isEmpty7, isNil as isNil11, where as where2 } from "ramda";
 import { isArray as isArray8 } from "lodash-es";
+import { clone as clone13, isEmpty as isEmpty8, isNil as isNil11 } from "ramda";
+import { ascSort as ascSort2, descSort } from "qx-util";
 var FetchMethod = class extends Method {
   get isLocalMode() {
     return isLocalMode(this.method);
@@ -8466,63 +8556,14 @@ var FetchMethod = class extends Method {
     }
     return res;
   }
-  /**
-   * 查询本地数据，根据属性
-   *
-   * @param {IParams} context
-   * @param {IParams} params 根据多实体属性查找，例：{ name: '张三', age: 18, parent: null }
-   * @return {*}  {Promise<IDataEntity[]>}
-   */
-  async selectLocal(context, params = {}) {
-    const service = await this.getService();
-    let items = service.local.getList(context);
-    items = ascSort(items, "srfordervalue");
-    const data = {};
-    const nullData = {};
-    const undefinedData = {};
-    const emptyData = {};
-    if (params.srfkey) {
-      data.srfkey = equals2(params.srfkey);
-      delete params.srfkey;
-    }
-    for (const key in params) {
-      if (Object.prototype.hasOwnProperty.call(params, key)) {
-        const val = params[key];
-        if (val == null) {
-          nullData[key] = equals2(null);
-          undefinedData[key] = equals2(void 0);
-          emptyData[key] = equals2("");
-        } else {
-          data[key] = equals2(val);
-        }
-      }
-    }
-    if (!isEmpty7(data)) {
-      const pred = where2(data);
-      const nullPred = where2(nullData);
-      const undefinedPred = where2(undefinedData);
-      const emptyPred = where2(emptyData);
-      items = items.filter((obj) => {
-        if (isEmpty7(nullData)) {
-          if (pred(obj)) {
-            return true;
-          }
-        } else if (pred(obj) && (nullPred(obj) || undefinedPred(obj) || emptyPred(obj))) {
-          return true;
-        }
-        return false;
-      });
-    }
-    const list = items.map((obj) => obj.clone());
-    return list;
-  }
   /**
    * 搜索本地数据
    *
-   * @protected
-   * @param {PSDEDQCondEngine | null} cond 查询实例
+   * @author chitanda
+   * @date 2023-12-18 11:12:27
+   * @param {(PSDEDQCondEngine | null)} cond 查询实例
    * @param {SearchFilter} filter 过滤对象
-   * @param {string[]} [queryParamKeys=this.entity.quickSearchKeys] 当前实体支持快速搜索的属性
+   * @param {string[]} [queryParamKeys=this.entity.quickSearchAppDEFieldIds!] 当前实体支持快速搜索的属性
    * @return {*}  {Promise<IDataEntity[]>}
    */
   async searchLocal(cond, filter, queryParamKeys = this.entity.quickSearchAppDEFieldIds) {
@@ -8534,7 +8575,7 @@ var FetchMethod = class extends Method {
         list = list.filter((obj) => cond.test(obj, filter));
       }
     } else {
-      list = await this.selectLocal(filter.context, filter.data);
+      list = await service.selectLocal(filter.context, filter.data);
       if (list.length > 0) {
         if (filter.query && filter.query !== "") {
           if (queryParamKeys) {
@@ -8553,11 +8594,11 @@ var FetchMethod = class extends Method {
         }
       }
     }
-    if (!isNil11(filter.sortField) && !isEmpty7(filter.sortField)) {
+    if (!isNil11(filter.sortField) && !isEmpty8(filter.sortField)) {
       if (filter.sortMode === "DESC") {
         list = descSort(list, filter.sortField);
       } else {
-        list = ascSort(list, filter.sortField);
+        list = ascSort2(list, filter.sortField);
       }
     }
     const { page, size } = filter;
@@ -8620,8 +8661,10 @@ function presetDEMethodProvider() {
 }
 
 // src/service/vo/tree-node-data/tree-node-data.ts
+import { createUUID as createUUID4 } from "qx-util";
 var TreeNodeData = class {
   constructor(model, parentNodeData, opts) {
+    this._uuid = createUUID4();
     this.leaf = false;
     this.leaf = opts.leaf === true;
     this.parent = parentNodeData;
@@ -8666,8 +8709,14 @@ var TreeCodeListNodeData = class extends TreeNodeData {
     const { data } = opts;
     this.text = data.text;
     this.value = data.value;
-    this.id = parentNodeData ? "".concat(parentNodeData.id, ":").concat(model.id, "@").concat(this.value) : model.id + this.value;
-    this.id = this.id.toLowerCase();
+    const selfId = "".concat(model.id, "@").concat(this.value).toLowerCase();
+    Object.defineProperty(this, "id", {
+      get() {
+        return this.parent ? "".concat(this.parent.id, ":").concat(selfId) : selfId;
+      },
+      enumerable: true,
+      configurable: true
+    });
     if (model.appDataEntityId) {
       const deName = calcDeCodeNameById(model.appDataEntityId);
       this.context = Object.assign(this.context || {}, {
@@ -8688,8 +8737,14 @@ var TreeDataSetNodeData = class extends TreeNodeData {
     this.deData = data;
     this.text = model.textAppDEFieldId ? data[model.textAppDEFieldId] : data.srfmajortext;
     this.value = model.idAppDEFieldId ? data[model.idAppDEFieldId] : data.srfkey;
-    this.id = parentNodeData ? "".concat(parentNodeData.id, ":").concat(model.id, "@").concat(data.srfkey) : model.id + data.srfkey;
-    this.id = this.id.toLowerCase();
+    const selfId = "".concat(model.id, "@").concat(data.srfkey).toLowerCase();
+    Object.defineProperty(this, "id", {
+      get() {
+        return this.parent ? "".concat(this.parent.id, ":").concat(selfId) : selfId;
+      },
+      enumerable: true,
+      configurable: true
+    });
     if (model.appDataEntityId) {
       const deName = calcDeCodeNameById(model.appDataEntityId);
       this.context = Object.assign(this.context || {}, {
@@ -8763,8 +8818,14 @@ var TreeStaticNodeData = class extends TreeNodeData {
     var _a, _b;
     super(model, parentNodeData, opts);
     const nodeValue = model.nodeValue === "root" ? void 0 : model.nodeValue;
-    this.id = parentNodeData ? "".concat(parentNodeData.id, ":").concat(model.id) : model.id;
-    this.id = this.id.toLowerCase();
+    const selfId = "".concat(model.id).toLowerCase();
+    Object.defineProperty(this, "id", {
+      get() {
+        return this.parent ? "".concat(this.parent.id, ":").concat(selfId) : selfId;
+      },
+      enumerable: true,
+      configurable: true
+    });
     this.text = model.text;
     this.value = nodeValue;
     if (parentNodeData && opts.parentValueLevel) {
@@ -9065,7 +9126,7 @@ var PanelData = class {
 };
 
 // src/service/vo/chart-data/chart-data.ts
-import { createUUID as createUUID4 } from "qx-util";
+import { createUUID as createUUID5 } from "qx-util";
 function updateKeyDefine3(target, keys) {
   keys.forEach((key) => {
     if (!Object.prototype.hasOwnProperty.call(target, key)) {
@@ -9083,7 +9144,7 @@ var ChartData = class {
     this._seriesModelId = seriesModel == null ? void 0 : seriesModel.id;
     this._catalog = catalog;
     this._groupName = groupName;
-    this._uuid = createUUID4();
+    this._uuid = createUUID5();
     return new Proxy(this, {
       set(target, p, value) {
         if (Object.prototype.hasOwnProperty.call(deData, p)) {
@@ -9126,6 +9187,18 @@ var calcDataItemValue = (fieldCodeName, nodeModel, data = {}) => {
   }
   return result;
 };
+var calcNodeDataItem = (nodeModel, data) => {
+  var _a;
+  const dataItem = {};
+  (_a = nodeModel.detreeNodeDataItems) == null ? void 0 : _a.forEach((item) => {
+    if (item.id && item.appDEFieldId) {
+      Object.assign(dataItem, {
+        [item.id.toLowerCase()]: data[item.appDEFieldId.toLowerCase()]
+      });
+    }
+  });
+  return dataItem;
+};
 
 // src/service/vo/gantt-node-data/gantt-static-node-data.ts
 var GanttStaticNodeData = class extends TreeStaticNodeData {
@@ -9187,6 +9260,7 @@ var GanttDataSetNodeData = class extends TreeDataSetNodeData {
       nodeModel,
       data
     );
+    this.nodeDataItem = calcNodeDataItem(nodeModel, data);
   }
 };
 
@@ -9229,7 +9303,7 @@ var GanttCodeListNodeData = class extends TreeCodeListNodeData {
 };
 
 // src/service/mqtt/mqtt.service.ts
-import { QXEvent as QXEvent3, createUUID as createUUID5, isNilOrEmpty as isNilOrEmpty6 } from "qx-util";
+import { QXEvent as QXEvent3, createUUID as createUUID6, isNilOrEmpty as isNilOrEmpty6 } from "qx-util";
 var MqttService = class {
   /**
    * Creates an instance of MqttService.
@@ -9263,7 +9337,7 @@ var MqttService = class {
       // 超时时间
       connectTimeout: 6e3,
       // 认证信息
-      clientId: createUUID5(),
+      clientId: createUUID6(),
       username: "",
       password: "",
       // 心跳时间
@@ -9702,7 +9776,7 @@ function installCommand() {
 }
 
 // src/app-hub.ts
-import { RuntimeError as RuntimeError58 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError59 } from "@ibiz-template/core";
 
 // src/application.ts
 import { Net, getToken } from "@ibiz-template/core";
@@ -9969,9 +10043,9 @@ var PanelNotifyState = /* @__PURE__ */ ((PanelNotifyState2) => {
 })(PanelNotifyState || {});
 
 // src/controller/common/view/view.controller.ts
-import { createUUID as createUUID7, notNilEmpty as notNilEmpty6 } from "qx-util";
+import { createUUID as createUUID8, notNilEmpty as notNilEmpty6 } from "qx-util";
 import { IBizContext as IBizContext2, RuntimeError as RuntimeError31 } from "@ibiz-template/core";
-import { isEmpty as isEmpty8, isNil as isNil18, isNotNil as isNotNil2 } from "ramda";
+import { isEmpty as isEmpty9, isNil as isNil18, isNotNil as isNotNil2 } from "ramda";
 
 // src/controller/utils/loading/loading.state.ts
 import { NOOP } from "@ibiz-template/core";
@@ -10786,7 +10860,7 @@ var ValueExUtil = class {
 // src/controller/utils/value-default/value-default.ts
 import { RuntimeError as RuntimeError28, ModelError as ModelError16 } from "@ibiz-template/core";
 import dayjs from "dayjs";
-import { createUUID as createUUID6 } from "qx-util";
+import { createUUID as createUUID7 } from "qx-util";
 import { isNil as isNil16, isNotNil } from "ramda";
 function getDefaultValue(opts, origins) {
   var _a;
@@ -10831,7 +10905,7 @@ function getDefaultValue(opts, origins) {
     case "CONTEXT":
       return params[defaultValue];
     case "UNIQUEID":
-      return createUUID6();
+      return createUUID7();
     default:
       throw new ModelError16({}, "\u9ED8\u8BA4\u503C\u7C7B\u578B[".concat(valueType, "]\u672A\u652F\u6301"));
   }
@@ -10963,6 +11037,7 @@ var BaseController = class {
     this.childNames = [];
     this.name = model.name || model.id;
     this.initState();
+    this.convertMultipleLanguages();
   }
   /**
    * 中间层的基类才会使用，用于在内部使用自身的事件，事件类型不是泛型用evt就能正确推导出来。
@@ -11120,6 +11195,14 @@ var BaseController = class {
   listenNewController(cb) {
     this.ctx.evt.on("onRegister", cb);
   }
+  /**
+   * 转换各类多语言
+   *
+   * @date 2023-05-18 02:57:00
+   * @protected
+   */
+  convertMultipleLanguages() {
+  }
 };
 
 // src/controller/utils/view-msg/view-msg-controller.ts
@@ -11366,7 +11449,6 @@ var ViewController = class extends BaseController {
      * @type {boolean}
      */
     this.isCloseView = false;
-    this._isActive = true;
     if (ctx) {
       ctx.registerController(this.model.name, this);
     }
@@ -11387,8 +11469,16 @@ var ViewController = class extends BaseController {
     var _a;
     return (_a = this.ctx.parent) == null ? void 0 : _a.view;
   }
+  /**
+   * 当前是否为激活状态(缓存下的激活状态，一般与框架的生命周期相同)
+   *
+   * @author chitanda
+   * @date 2023-12-13 11:12:48
+   * @readonly
+   * @type {boolean}
+   */
   get isActive() {
-    return this._isActive;
+    return this.state.activated;
   }
   /**
    * 视图重新激活
@@ -11397,7 +11487,7 @@ var ViewController = class extends BaseController {
    * @date 2023-07-12 17:07:55
    */
   onActivated() {
-    this._isActive = true;
+    this.state.activated = true;
     ibiz.log.debug("\u89C6\u56FE[".concat(this.model.name, "](").concat(this.model.id, ")\u6FC0\u6D3B"));
   }
   /**
@@ -11407,7 +11497,7 @@ var ViewController = class extends BaseController {
    * @date 2023-07-12 17:07:06
    */
   onDeactivated() {
-    this._isActive = false;
+    this.state.activated = false;
     ibiz.log.debug("\u89C6\u56FE[".concat(this.model.name, "](").concat(this.model.id, ")\u6682\u505C"));
   }
   /**
@@ -11468,6 +11558,7 @@ var ViewController = class extends BaseController {
   }
   initState() {
     super.initState();
+    this.state.activated = true;
     this.state.isLoading = false;
     this.state.caption = this.model.caption;
     this.state.srfactiveviewdata = null;
@@ -11547,8 +11638,8 @@ var ViewController = class extends BaseController {
    */
   handleContextParams() {
     this.context.srfappid = this.model.appId;
-    if (isNil18(this.context.srfsessionid) || isEmpty8(this.context.srfsessionid)) {
-      this.context.srfsessionid = createUUID7();
+    if (isNil18(this.context.srfsessionid) || isEmpty9(this.context.srfsessionid)) {
+      this.context.srfsessionid = createUUID8();
     }
     const navContexts = this.model.appViewNavContexts;
     let context = {};
@@ -11674,6 +11765,20 @@ var ViewController = class extends BaseController {
       this.alertViewMessage(rest);
     }
   }
+  /**
+   * 转换各类多语言
+   *
+   * @date 2023-05-18 02:57:00
+   * @protected
+   */
+  convertMultipleLanguages() {
+    if (this.model.capLanguageRes && this.model.capLanguageRes.lanResTag) {
+      this.model.caption = ibiz.i18n.t(
+        this.model.capLanguageRes.lanResTag,
+        this.model.caption
+      );
+    }
+  }
 };
 
 // src/controller/common/view/mob-view.controller.ts
@@ -11945,6 +12050,7 @@ var ControlController = class extends BaseController {
   }
   initState() {
     super.initState();
+    this.state.activated = true;
     this.state.isLoading = false;
   }
   async onCreated() {
@@ -12045,6 +12151,26 @@ var ControlController = class extends BaseController {
     this.state.isLoading = false;
     this.ctx.endLoading();
   }
+  /**
+   * 部件重新激活
+   *
+   * @author chitanda
+   * @date 2023-07-12 17:07:55
+   */
+  onActivated() {
+    this.state.activated = true;
+    ibiz.log.debug("\u89C6\u56FE[".concat(this.model.name, "](").concat(this.model.id, ")\u6FC0\u6D3B"));
+  }
+  /**
+   * 部件暂时停用
+   *
+   * @author chitanda
+   * @date 2023-07-12 17:07:06
+   */
+  onDeactivated() {
+    this.state.activated = false;
+    ibiz.log.debug("\u89C6\u56FE[".concat(this.model.name, "](").concat(this.model.id, ")\u6682\u505C"));
+  }
   /**
    * 处理数据能力方法通用参数，返回能力执行最终使用的参数
    * @author lxm
@@ -12178,6 +12304,14 @@ import { debounce } from "lodash-es";
 var MDControlController = class extends ControlController {
   constructor() {
     super(...arguments);
+    /**
+     * 在未激活时记录是否有 command 数据变更事件，有就记录。等待激活时刷新
+     *
+     * @author chitanda
+     * @date 2023-12-13 11:12:19
+     * @protected
+     */
+    this.commandDataChange = false;
     /**
      * 实体属性映射，key是id，value是name
      * @author lxm
@@ -12241,7 +12375,18 @@ var MDControlController = class extends ControlController {
    */
   onDataChange(msg) {
     if (msg.data && msg.data.srfdecodename === this.dataEntity.codeName) {
+      if (this.state.activated) {
+        this.refresh();
+      } else {
+        this.commandDataChange = true;
+      }
+    }
+  }
+  onActivated() {
+    super.onActivated();
+    if (this.commandDataChange) {
       this.refresh();
+      this.commandDataChange = false;
     }
   }
   /**
@@ -12665,6 +12810,31 @@ var AppMenuController = class extends ControlController {
     }
     return null;
   }
+  /**
+   * 转换各类多语言
+   *
+   * @date 2023-05-18 02:57:00
+   * @protected
+   */
+  convertMultipleLanguages() {
+    const convertItemCaption = (menuItems) => {
+      menuItems.forEach((item) => {
+        var _a;
+        if (item.capLanguageRes && item.capLanguageRes.lanResTag) {
+          item.caption = ibiz.i18n.t(
+            item.capLanguageRes.lanResTag,
+            item.caption
+          );
+        }
+        if ((_a = item.appMenuItems) == null ? void 0 : _a.length) {
+          convertItemCaption(item.appMenuItems);
+        }
+      });
+    };
+    if (this.model.appMenuItems && this.model.appMenuItems.length > 0) {
+      convertItemCaption(this.model.appMenuItems);
+    }
+  }
 };
 
 // src/controller/control/app-menu-icon-view/app-menu-icon-view.controller.ts
@@ -14132,14 +14302,7 @@ var ChartController = class extends MDControlController {
 var CaptionBarController = class extends ControlController {
   initState() {
     super.initState();
-    if (this.view.model.capLanguageRes) {
-      this.state.caption = ibiz.i18n.t(
-        this.view.model.capLanguageRes.lanResTag,
-        this.view.model.caption
-      );
-    } else {
-      this.state.caption = this.view.model.caption;
-    }
+    this.state.caption = this.view.model.caption;
   }
   async onCreated() {
     await super.onCreated();
@@ -16409,6 +16572,30 @@ var ToolbarController = class extends ControlController {
     );
     super.initControlScheduler(actualLogics);
   }
+  /**
+   * 转换各类多语言
+   *
+   * @date 2023-05-18 02:57:00
+   * @protected
+   */
+  convertMultipleLanguages() {
+    const convertItemCaption = (items) => {
+      items.forEach((item) => {
+        if (item.capLanguageRes && item.capLanguageRes.lanResTag) {
+          item.caption = ibiz.i18n.t(
+            item.capLanguageRes.lanResTag,
+            item.caption
+          );
+        }
+        if (item.itemType === "ITEMS" && item.detoolbarItems) {
+          convertItemCaption(item.detoolbarItems);
+        }
+      });
+    };
+    if (this.model.detoolbarItems && this.model.detoolbarItems.length > 0) {
+      convertItemCaption(this.model.detoolbarItems);
+    }
+  }
 };
 
 // src/controller/control/context-menu/context-menu.controllerr.ts
@@ -18053,7 +18240,7 @@ var ChartExpBarController = class extends ExpBarControlController {
 };
 
 // src/controller/control/form/search-form/search-form.controller.ts
-import { RuntimeError as RuntimeError49, mergeDefaultInLeft } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError49 } from "@ibiz-template/core";
 
 // src/controller/control/form/form/form.controller.ts
 import { debounceAndAsyncMerge, recursiveIterate as recursiveIterate2 } from "@ibiz-template/core";
@@ -18166,19 +18353,6 @@ var FormController = class extends ControlController {
       );
     });
   }
-  /**
-   * 获取加载草稿额外参数，新建默认值
-   * @author lxm
-   * @date 2023-04-27 10:32:06
-   * @return {*}
-   */
-  async getDraftParams() {
-    const result = {};
-    await Promise.all(
-      this.formItems.map((item) => item.setDefaultValue(true, result))
-    );
-    return result;
-  }
   /**
    * 初始化表单成员控制器
    *
@@ -18297,8 +18471,52 @@ var FormController = class extends ControlController {
 };
 
 // src/controller/control/form/search-form/search-form.service.ts
+import { recursiveIterate as recursiveIterate4 } from "@ibiz-template/core";
+
+// src/controller/control/form/form/form.service.ts
 import { recursiveIterate as recursiveIterate3 } from "@ibiz-template/core";
-var SearchFormService = class extends ControlService {
+var FormService = class extends ControlService {
+  /**
+   * 设置表单项的默认值
+   * @author lxm
+   * @date 2023-12-13 03:16:19
+   * @param {IData} data 表单数据
+   * @param {IParams} context 上下文
+   * @param {IParams} params 视图参数
+   * @param {('create' | 'update')} type 新建还是更新
+   */
+  setDefault(data, context, params, type) {
+    recursiveIterate3(
+      this.model,
+      (item) => {
+        if (item.detailType === "FORMITEM") {
+          const { createDVT, createDV, updateDVT, updateDV, valueFormat } = item;
+          const valueType = type === "create" ? createDVT : updateDVT;
+          const defaultValue = type === "create" ? createDV : updateDV;
+          const name = item.id.toLowerCase();
+          const defaultVal = getDefaultValue(
+            {
+              name,
+              valueType,
+              defaultValue,
+              valueFormat
+            },
+            { data, context, params }
+          );
+          if (defaultVal !== void 0) {
+            data[name] = defaultVal;
+          }
+        }
+      },
+      {
+        childrenFields: ["deformPages", "deformTabPages", "deformDetails"]
+      }
+    );
+  }
+};
+
+// src/controller/control/form/search-form/search-form.service.ts
+var SearchFormService = class extends FormService {
   /**
    * 执行获取草稿方法
    *
@@ -18308,10 +18526,13 @@ var SearchFormService = class extends ControlService {
    * @param {IParams} [params={}] 视图参数
    * @returns {*}  {Promise<IHttpResponse>}
    */
-  async getDraft(_context, params = {}) {
+  async getDraft(context, params = {}) {
     const tempData = this.getFilteredData({ ...params });
     let res = { ok: true, status: 200, data: tempData };
     res = this.handleResponse(res);
+    if (res.ok && res.data) {
+      this.setDefault(res.data, context, params, "create");
+    }
     return res;
   }
   /**
@@ -18321,7 +18542,7 @@ var SearchFormService = class extends ControlService {
    * @date 2022-08-31 18:08:37
    */
   initUIDataMap() {
-    recursiveIterate3(
+    recursiveIterate4(
       this.model,
       (item) => {
         if (item.detailType === "FORMITEM") {
@@ -18396,8 +18617,6 @@ var SearchFormController = class extends FormController {
    */
   async load() {
     const queryParams = { ...this.params };
-    const params = await this.getDraftParams();
-    Object.assign(queryParams, params);
     await this.evt.emit("onBeforeLoadDraft", { params: queryParams });
     let res;
     try {
@@ -18409,7 +18628,6 @@ var SearchFormController = class extends FormController {
       throw error;
     }
     this.state.data = res.data;
-    mergeDefaultInLeft(this.data, params);
     this.state.isLoaded = true;
     this.formStateNotify("DRAFT" /* DRAFT */);
     this.actionNotification("GETDRAFTSUCCESS");
@@ -18791,7 +19009,7 @@ var FormDetailController = class {
   }
   async onInit() {
     this.state.showMoreMode = this.model.showMoreMode;
-    const { layoutPos, sysCss, labelSysCss } = this.model;
+    const { layoutPos, sysCss, labelSysCss, capLanguageRes } = this.model;
     if (layoutPos) {
       const { width, height } = calcLayoutHeightWidth(layoutPos);
       this.state.layout.width = "".concat(width);
@@ -18803,6 +19021,12 @@ var FormDetailController = class {
     if (labelSysCss == null ? void 0 : labelSysCss.cssName) {
       this.state.class.label.push(labelSysCss.cssName);
     }
+    if (capLanguageRes && capLanguageRes.lanResTag) {
+      this.model.caption = ibiz.i18n.t(
+        capLanguageRes.lanResTag,
+        this.model.caption
+      );
+    }
   }
   /**
    * 创建表单状态对象
@@ -19068,7 +19292,7 @@ var FormButtonController = class extends FormDetailController {
 
 // src/controller/control/form/form-detail/form-druipart/form-druipart.controller.ts
 import { isOverlap as isOverlap2 } from "@ibiz-template/core";
-import { createUUID as createUUID8, notNilEmpty as notNilEmpty8 } from "qx-util";
+import { createUUID as createUUID9, notNilEmpty as notNilEmpty8 } from "qx-util";
 
 // src/controller/control/form/form-detail/form-druipart/form-druipart.state.ts
 var FormDruipartState = class extends FormDetailState {
@@ -19181,7 +19405,7 @@ var FormDRUIPartController = class extends FormDetailController {
       this.form.context
     );
     if (!this.state.viewComponentKey) {
-      this.state.viewComponentKey = createUUID8();
+      this.state.viewComponentKey = createUUID9();
       this.navContext = newContext;
       this.navParams = newParams;
     } else if (JSON.stringify(this.navContext) !== JSON.stringify(newContext) || JSON.stringify(this.navParams) !== JSON.stringify(newParams)) {
@@ -19575,9 +19799,6 @@ var FormItemController = class extends FormDetailController {
   async formStateNotify(state) {
     super.formStateNotify(state);
     this.calcEnableCond();
-    if (state === "LOAD" /* LOAD */) {
-      this.setDefaultValue(false);
-    }
   }
   calcDynamicLogic(names, mustCalc = false) {
     if (!this.model.hidden) {
@@ -19877,7 +20098,7 @@ var FormMDCtrlMDController = class extends FormMDCtrlController {
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form.controller.ts
 import { RuntimeError as RuntimeError50, RuntimeModelError as RuntimeModelError54 } from "@ibiz-template/core";
-import { createUUID as createUUID9 } from "qx-util";
+import { createUUID as createUUID10 } from "qx-util";
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form.state.ts
 var FormMDCtrlFormState = class extends FormDetailState {
@@ -20007,7 +20228,7 @@ var FormMDCtrlFormController = class extends FormMDCtrlController {
       this.state.items = [];
     }
     const item = {
-      id: createUUID9(),
+      id: createUUID10(),
       context,
       params
     };
@@ -20250,19 +20471,18 @@ var FormTabPanelController = class extends FormDetailController {
 import {
   awaitTimeout,
   mergeInLeft as mergeInLeft2,
-  RuntimeError as RuntimeError51,
-  mergeDefaultInLeft as mergeDefaultInLeft2
+  RuntimeError as RuntimeError51
 } from "@ibiz-template/core";
 import { debounce as debounce2 } from "lodash-es";
-import { createUUID as createUUID10 } from "qx-util";
+import { createUUID as createUUID11 } from "qx-util";
 import { clone as clone21 } from "ramda";
 
 // src/controller/control/form/edit-form/edit-form.service.ts
 import {
-  recursiveIterate as recursiveIterate4,
+  recursiveIterate as recursiveIterate5,
   RuntimeModelError as RuntimeModelError55
 } from "@ibiz-template/core";
-var EditFormService = class extends ControlService {
+var EditFormService = class extends FormService {
   /**
    * 执行获取单条数据方法
    *
@@ -20281,6 +20501,9 @@ var EditFormService = class extends ControlService {
       params
     );
     res = this.handleResponse(res);
+    if (res.ok && res.data) {
+      this.setDefault(res.data, context, params, "update");
+    }
     return res;
   }
   /**
@@ -20301,6 +20524,9 @@ var EditFormService = class extends ControlService {
       params
     );
     res = this.handleResponse(res);
+    if (res.ok && res.data) {
+      this.setDefault(res.data, context, params, "create");
+    }
     return res;
   }
   /**
@@ -20475,7 +20701,7 @@ var EditFormService = class extends ControlService {
       // 向导预置
       "srfnextform"
     ];
-    recursiveIterate4(
+    recursiveIterate5(
       this.model,
       (item) => {
         if (item.detailType === "FORMITEM" || item.detailType === "MDCTRL") {
@@ -20570,8 +20796,6 @@ var EditFormController = class extends FormController {
    */
   async loadDraft(args) {
     const { context, params: queryParams } = this.handlerAbilityParams(args);
-    const params = await this.getDraftParams();
-    Object.assign(queryParams, params);
     let res;
     try {
       await this.startLoading();
@@ -20587,7 +20811,6 @@ var EditFormController = class extends FormController {
       await this.endLoading();
     }
     this.state.data = res.data;
-    mergeDefaultInLeft2(this.data, params);
     this.formStateNotify("DRAFT" /* DRAFT */);
     await this.evt.emit("onLoadDraftSuccess", void 0);
     this.actionNotification("GETDRAFTSUCCESS");
@@ -20632,7 +20855,7 @@ var EditFormController = class extends FormController {
       await this.endLoading();
     }
     res.data.srfkey = void 0;
-    res.data.tempsrfkey = createUUID10();
+    res.data.tempsrfkey = createUUID11();
     this.state.modified = false;
     this.state.data = res.data;
     this.formStateNotify("LOAD" /* LOAD */);
@@ -20738,12 +20961,10 @@ var EditFormController = class extends FormController {
         default: "".concat(this.data.srfmajortext || "", "\u4FDD\u5B58\u6210\u529F")
       });
     }
-    if (this.view.modal.mode === "ROUTE") {
-      ibiz.mc.command.send(
-        this.data.$origin,
-        isCreate ? "OBJECTCREATED" : "OBJECTUPDATED"
-      );
-    }
+    ibiz.mc.command.send(
+      this.data.$origin,
+      isCreate ? "OBJECTCREATED" : "OBJECTUPDATED"
+    );
     return this.data;
   }
   /**
@@ -20784,9 +21005,7 @@ var EditFormController = class extends FormController {
     this.state.modified = false;
     await this.evt.emit("onRemoveSuccess", void 0);
     this.actionNotification("REMOVESUCCESS");
-    if (this.view.modal.mode === "ROUTE") {
-      ibiz.mc.command.send(this.data.$origin, "OBJECTREMOVED");
-    }
+    ibiz.mc.command.send(this.data.$origin, "OBJECTREMOVED");
     return ok;
   }
   /**
@@ -20889,10 +21108,8 @@ var EditFormController = class extends FormController {
     const { context, params } = this.handlerAbilityParams(args);
     try {
       await this.service.wfStart(context, params, this.data);
-      if (this.view.modal.mode === "ROUTE") {
-        ibiz.mc.command.send(this.data.$origin, "OBJECTUPDATED");
-        ibiz.mc.command.send({ srfdecodename: "SysTodo" }, "OBJECTUPDATED");
-      }
+      ibiz.mc.command.send(this.data.$origin, "OBJECTUPDATED");
+      ibiz.mc.command.send({ srfdecodename: "SysTodo" }, "OBJECTUPDATED");
     } catch (error) {
       this.actionNotification("WFSTARTERROR", {
         error
@@ -20920,10 +21137,8 @@ var EditFormController = class extends FormController {
     const { context, params } = this.handlerAbilityParams(args);
     try {
       await this.service.wfSubmit(context, params, this.data);
-      if (this.view.modal.mode === "ROUTE") {
-        ibiz.mc.command.send(this.data.$origin, "OBJECTUPDATED");
-        ibiz.mc.command.send({ srfdecodename: "SysTodo" }, "OBJECTUPDATED");
-      }
+      ibiz.mc.command.send(this.data.$origin, "OBJECTUPDATED");
+      ibiz.mc.command.send({ srfdecodename: "SysTodo" }, "OBJECTUPDATED");
     } catch (error) {
       this.actionNotification("WFSUBMITERROR", {
         error
@@ -21143,6 +21358,15 @@ var GridRowState = class {
      * @type {({ [p: string]: { disabled: boolean } })}
      */
     this.editColStates = {};
+    /**
+     * 界面行为组状态(p是界面行为的标识)
+     *
+     * @author zk
+     * @date 2023-12-15 10:12:42
+     * @type {{ [p: string]: IButtonContainerState }}
+     * @memberof IGridRowState
+     */
+    this.uiActionGroupStates = {};
     /**
      * 是否显示行编辑
      *
@@ -21176,6 +21400,9 @@ var GridRowState = class {
     Object.values(grid.uaColumns).forEach((column) => {
       column.initActionStates(this);
     });
+    Object.values(grid.fieldColumns).forEach((column) => {
+      column.initActionStates(this);
+    });
     Object.values(grid.editColumns).forEach((editColumn) => {
       this.editColStates[editColumn.fieldName] = {
         disabled: false,
@@ -21191,14 +21418,15 @@ var GridRowState = class {
 import {
   awaitTimeout as awaitTimeout2,
   debounceAndAsyncMerge as debounceAndAsyncMerge2,
-  mergeDefaultInLeft as mergeDefaultInLeft3,
-  recursiveIterate as recursiveIterate5,
+  mergeDefaultInLeft,
+  recursiveIterate as recursiveIterate6,
   RuntimeError as RuntimeError52,
-  RuntimeModelError as RuntimeModelError56
+  RuntimeModelError as RuntimeModelError57
 } from "@ibiz-template/core";
 import { clone as clone22 } from "ramda";
 
 // src/controller/control/grid/grid/grid.service.ts
+import { RuntimeModelError as RuntimeModelError56 } from "@ibiz-template/core";
 var GridService = class extends MDControlService {
   /**
    * 初始化属性映射
@@ -21209,21 +21437,34 @@ var GridService = class extends MDControlService {
   initUIDataMap() {
     var _a;
     super.initUIDataMap();
-    (_a = this.model.degridDataItems) == null ? void 0 : _a.forEach((column) => {
-      const uiKey = column.id.toLowerCase();
-      const deField = column.appDEFieldId;
-      let mapField;
-      if (deField) {
-        const deFieldKey = deField.toLowerCase();
-        mapField = new UIMapField(uiKey, deFieldKey, {
-          isOriginField: true,
-          dataType: column.dataType
-        });
-      } else {
-        mapField = new UIMapField(uiKey, uiKey);
-      }
-      this.dataUIMap.set(uiKey, mapField);
-    });
+    if (this.model.degridColumns) {
+      const dataItems = this.model.degridDataItems || [];
+      (_a = this.model.degridColumns) == null ? void 0 : _a.forEach((column) => {
+        const uiKey = column.id.toLowerCase();
+        const deField = column.appDEFieldId;
+        let mapField;
+        if (deField) {
+          const deFieldKey = deField.toLowerCase();
+          const dataItem = dataItems.find(
+            (item) => item.appDEFieldId === deField
+          );
+          if (dataItem) {
+            mapField = new UIMapField(uiKey, deFieldKey, {
+              isOriginField: true,
+              dataType: dataItem.dataType
+            });
+          } else {
+            throw new RuntimeModelError56(
+              column,
+              "\u672A\u627E\u5230\u5BF9\u5E94\u7684\u8868\u683C\u6570\u636E\u9879[".concat(deField, "]")
+            );
+          }
+        } else {
+          mapField = new UIMapField(uiKey, uiKey);
+        }
+        this.dataUIMap.set(uiKey, mapField);
+      });
+    }
   }
   /**
    * 编辑列更新
@@ -21400,11 +21641,11 @@ var GridController = class extends MDControlController {
       (item) => item.model.appDEFieldId === groupAppDEFieldId
     );
     if (!this.groupFieldColumn) {
-      throw new RuntimeModelError56(this.model, "\u6CA1\u6709\u914D\u7F6E\u5206\u7EC4\u5C5E\u6027\u7684\u5C5E\u6027\u5217");
+      throw new RuntimeModelError57(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 RuntimeModelError56(
+      throw new RuntimeModelError57(
         this.groupFieldColumn.model,
         "\u5206\u7EC4\u5C5E\u6027\u7684\u5C5E\u6027\u5217".concat(groupFieldName, "\u6CA1\u6709\u914D\u7F6E\u4EE3\u7801\u8868")
       );
@@ -21414,7 +21655,7 @@ var GridController = class extends MDControlController {
     );
     if (index !== -1 && index !== 0) {
       if (this.isMultistageHeader) {
-        throw new RuntimeModelError56(
+        throw new RuntimeModelError57(
           this.model,
           "\u8BF7\u5C06\u5206\u7EC4\u5C5E\u6027\u5217".concat(groupFieldName, "\u914D\u7F6E\u4E3A\u7B2C\u4E00\u5217")
         );
@@ -21424,10 +21665,10 @@ var GridController = class extends MDControlController {
     }
     if (groupMode === "CODELIST") {
       if (!groupCodeListId) {
-        throw new RuntimeModelError56(this.model, "\u4EE3\u7801\u8868\u5206\u7EC4\u6A21\u5F0F\u9700\u8981\u914D\u7F6E\u4EE3\u7801\u8868");
+        throw new RuntimeModelError57(this.model, "\u4EE3\u7801\u8868\u5206\u7EC4\u6A21\u5F0F\u9700\u8981\u914D\u7F6E\u4EE3\u7801\u8868");
       }
       if (this.groupFieldColumn.model.appCodeListId !== groupCodeListId) {
-        throw new RuntimeModelError56(
+        throw new RuntimeModelError57(
           this.model,
           "\u5206\u7EC4\u4EE3\u7801\u8868\u4E0E\u5C5E\u6027\u5217".concat(groupFieldName, "\u7684\u4EE3\u7801\u8868\u4E0D\u4E00\u81F4")
         );
@@ -21452,6 +21693,11 @@ var GridController = class extends MDControlController {
         uaState.update(row.data.getOrigin(), this.model.appDataEntityId);
       });
     });
+    this.state.rows.forEach((row) => {
+      Object.values(row.uiActionGroupStates).forEach((uaState) => {
+        uaState.update(row.data.getOrigin(), this.model.appDataEntityId);
+      });
+    });
     this.calcGroupData(items);
     this.calcAggResult(items);
     return items;
@@ -21509,7 +21755,7 @@ var GridController = class extends MDControlController {
       return;
     }
     if (!aggAppDEDataSetId || !aggAppDataEntityId) {
-      throw new RuntimeModelError56(this.model, "\u7F3A\u5C11\u914D\u7F6E\u805A\u5408\u5B9E\u4F53\u6216\u805A\u5408\u6570\u636E\u96C6");
+      throw new RuntimeModelError57(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);
@@ -21593,7 +21839,7 @@ var GridController = class extends MDControlController {
       throw error;
     }
     const draftData = res.data;
-    mergeDefaultInLeft3(draftData, defaultData);
+    mergeDefaultInLeft(draftData, defaultData);
     this.state.items.unshift(draftData);
     const newRow = new GridRowState(draftData, this);
     this.state.rows.unshift(newRow);
@@ -21704,7 +21950,7 @@ var GridController = class extends MDControlController {
    * @return {*}  {Promise<void>}
    */
   initColumnStates() {
-    recursiveIterate5(
+    recursiveIterate6(
       this.model,
       (column) => {
         if (column.columnType !== "GROUPGRIDCOLUMN") {
@@ -22164,6 +22410,30 @@ var GridController = class extends MDControlController {
       await this.setActive(data);
     }
   }
+  /**
+   * 转换各类多语言
+   *
+   * @date 2023-05-18 02:57:00
+   * @protected
+   */
+  convertMultipleLanguages() {
+    const convertColumnCaption = (columns) => {
+      columns.forEach((column) => {
+        if (column.capLanguageRes && column.capLanguageRes.lanResTag) {
+          column.caption = ibiz.i18n.t(
+            column.capLanguageRes.lanResTag,
+            column.caption
+          );
+        }
+        if (column.columnType === "GROUPGRIDCOLUMN" && column.degridColumns) {
+          convertColumnCaption(column.degridColumns);
+        }
+      });
+    };
+    if (this.model.degridColumns && this.model.degridColumns.length > 0) {
+      convertColumnCaption(this.model.degridColumns);
+    }
+  }
 };
 
 // src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts
@@ -22211,6 +22481,31 @@ var GridFieldColumnController = class extends GridColumnController {
     });
     this.loadCodeList();
   }
+  /**
+   * 初始化属性列界面行为组按钮状态
+   *
+   * @author lxm
+   * @date 2022-09-07 21:09:43
+   * @param {GridRowState} row
+   */
+  initActionStates(row) {
+    const { deuiactionGroup } = this.model;
+    if (deuiactionGroup && deuiactionGroup.uiactionGroupDetails) {
+      const containerState = new ButtonContainerState();
+      deuiactionGroup.uiactionGroupDetails.forEach((detail) => {
+        const actionid = detail.uiactionId;
+        if (actionid) {
+          const buttonState = new UIActionButtonState(
+            detail.id,
+            this.grid.context.srfappid,
+            actionid
+          );
+          containerState.addState(detail.id, buttonState);
+        }
+      });
+      row.uiActionGroupStates[this.model.codeName] = containerState;
+    }
+  }
   /**
    * 行是否可点击（影响列的界面样式）
    *
@@ -22417,10 +22712,35 @@ var GridFieldColumnController = class extends GridColumnController {
     }
     return ibiz.util.text.format(strVal, this.valueFormat);
   }
+  /**
+   * 触发界面行为组点击事件
+   *
+   * @author zk
+   * @date 2023-12-15 11:12:01
+   * @param {IUIActionGroupDetail} detail
+   * @param {GridRowState} row
+   * @param {MouseEvent} event
+   * @return {*}  {Promise<void>}
+   * @memberof GridFieldColumnController
+   */
+  async onActionClick(detail, row, event) {
+    const actionId = detail.uiactionId;
+    await UIActionUtil.execAndResolved(
+      actionId,
+      {
+        context: this.context,
+        params: this.params,
+        data: [row.data],
+        view: this.grid.view,
+        event
+      },
+      detail.appId
+    );
+  }
 };
 
 // src/controller/control/grid/grid-column/grid-ua-column/grid-ua-column.controller.ts
-import { RuntimeModelError as RuntimeModelError57 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError58 } from "@ibiz-template/core";
 var GridUAColumnController = class extends GridColumnController {
   /**
    * 给rowController初始化操作列的状态
@@ -22433,7 +22753,7 @@ var GridUAColumnController = class extends GridColumnController {
     var _a;
     const { deuiactionGroup } = this.model;
     if (!deuiactionGroup) {
-      throw new RuntimeModelError57(this.model, "\u64CD\u4F5C\u5217\u6CA1\u6709\u914D\u7F6E\u754C\u9762\u884C\u4E3A\u7EC4");
+      throw new RuntimeModelError58(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");
@@ -22985,7 +23305,7 @@ var ListController = class extends MDControlController {
 };
 
 // src/controller/control/panel/panel/panel.controller.ts
-import { recursiveIterate as recursiveIterate6, RuntimeError as RuntimeError54 } from "@ibiz-template/core";
+import { recursiveIterate as recursiveIterate7, RuntimeError as RuntimeError54 } from "@ibiz-template/core";
 var PanelController = class extends ControlController {
   constructor(model, context, params, ctx, container) {
     super(model, context, params, ctx);
@@ -23194,7 +23514,7 @@ var PanelController = class extends ControlController {
   }
   initControlScheduler(logics = []) {
     const actualLogics = [...logics];
-    recursiveIterate6(
+    recursiveIterate7(
       this.model,
       (item) => {
         if (item.controlLogics) {
@@ -23704,11 +24024,11 @@ var PickupViewPanelController = class extends ControlController {
 };
 
 // src/controller/control/search-bar/search-bar.controller.ts
-import { recursiveIterate as recursiveIterate7 } from "@ibiz-template/core";
+import { recursiveIterate as recursiveIterate8 } from "@ibiz-template/core";
 import { isNil as isNil23 } from "ramda";
 
 // src/controller/control/search-bar/search-bar-filter.controller.ts
-import { RuntimeModelError as RuntimeModelError58 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError59 } from "@ibiz-template/core";
 var SearchBarFilterController = class {
   constructor(model, searchBar) {
     this.model = model;
@@ -23736,7 +24056,7 @@ var SearchBarFilterController = class {
    */
   async init() {
     if (!this.model.editor) {
-      throw new RuntimeModelError58(this.model, "\u7F3A\u5C11\u7F16\u8F91\u5668\u6A21\u578B");
+      throw new RuntimeModelError59(this.model, "\u7F3A\u5C11\u7F16\u8F91\u5668\u6A21\u578B");
     }
     this.editorProvider = await getEditorProvider(this.model.editor);
     if (this.editorProvider) {
@@ -23861,7 +24181,7 @@ var SearchBarController = class extends ControlController {
     }
     const filters = this.calcFilters();
     if (filters) {
-      params.filters = filters;
+      params.searchconds = filters;
     }
     return params;
   }
@@ -23878,6 +24198,7 @@ var SearchBarController = class extends ControlController {
         children: [{ leaf: true, field: null, valueOP: null, value: null }]
       }
     ];
+    this.evt.emit("onSearch", void 0);
   }
   /**
    * 初始化过滤项控制器
@@ -23910,7 +24231,7 @@ var SearchBarController = class extends ControlController {
     }
     let hasFilter = false;
     let hasError = false;
-    recursiveIterate7(this.state.filterNodes[0], (node) => {
+    recursiveIterate8(this.state.filterNodes[0], (node) => {
       if (node.leaf) {
         if (node.field && node.valueOP && !isNil23(node.value)) {
           hasFilter = true;
@@ -23920,7 +24241,7 @@ var SearchBarController = class extends ControlController {
       }
     });
     if (hasFilter && !hasError) {
-      const filter = this.formatFilters(this.state.filterNodes[0]);
+      const filter = [this.formatFilters(this.state.filterNodes[0])];
       return filter;
     }
   }
@@ -23934,15 +24255,17 @@ var SearchBarController = class extends ControlController {
   formatFilters(node) {
     if (!node.leaf) {
       return {
-        ["$".concat(node.logicType.toLowerCase())]: node.children.map(
-          (item) => this.formatFilters(item)
-        )
+        condtype: "GROUP",
+        condop: node.logicType,
+        bnotmode: false,
+        searchconds: node.children.map((item) => this.formatFilters(item))
       };
     }
     return {
-      ["".concat(node.field)]: {
-        ["$".concat(node.valueOP.toLowerCase())]: node.value
-      }
+      condtype: "DEFIELD",
+      fieldname: node.field,
+      condop: node.valueOP,
+      value: node.value
     };
   }
 };
@@ -24184,7 +24507,11 @@ var TabExpPanelController = class extends ControlController {
 };
 
 // src/controller/control/tree/tree.controller.ts
-import { recursiveIterate as recursiveIterate8 } from "@ibiz-template/core";
+import {
+  RuntimeError as RuntimeError55,
+  RuntimeModelError as RuntimeModelError60,
+  recursiveIterate as recursiveIterate9
+} from "@ibiz-template/core";
 
 // src/controller/control/tree/tree.service.ts
 import { ModelError as ModelError29 } from "@ibiz-template/core";
@@ -24480,6 +24807,12 @@ var TreeController = class extends MDControlController {
      * @type {boolean}
      */
     this.enableQuickSearch = false;
+    /**
+     * 拖入节点关系处理
+     * @author lxm
+     * @date 2023-12-14 03:05:38
+     */
+    this.dropNodeRss = /* @__PURE__ */ new Map();
   }
   initState() {
     super.initState();
@@ -24517,6 +24850,7 @@ var TreeController = class extends MDControlController {
         this.state.placeHolder = placeHolders.join("\u3001");
       }
     }
+    this.initDropNodeRss();
     this.service = new TreeService(this.model);
     await this.service.init(this.context);
     this.model.detreeNodes.forEach((node) => {
@@ -24534,6 +24868,41 @@ var TreeController = class extends MDControlController {
       Object.values(this.contextMenus).map((menu) => menu.created())
     );
   }
+  /**
+   * 初始化节点拖入关系处理
+   * @author lxm
+   * @date 2023-12-14 03:13:42
+   * @protected
+   */
+  initDropNodeRss() {
+    var _a;
+    (_a = this.model.detreeNodes) == null ? void 0 : _a.forEach((node) => {
+      if (!node.allowDrop) {
+        return;
+      }
+      const infos = [];
+      const nodeRSs = getChildNodeRSs(this.model, {
+        parentId: node.id,
+        hasQuery: false
+      });
+      nodeRSs.forEach((nodeRS) => {
+        var _a2;
+        if ((_a2 = nodeRS.parentDER1N) == null ? void 0 : _a2.pickupDEFName) {
+          const childNode = this.getNodeModel(nodeRS.childDETreeNodeId);
+          if ((childNode == null ? void 0 : childNode.treeNodeType) === "DE" && childNode.appDataEntityId) {
+            infos.push({
+              minorEntityId: childNode.appDataEntityId,
+              pickupDEFName: nodeRS.parentDER1N.pickupDEFName.toLowerCase(),
+              childDETreeNodeId: nodeRS.childDETreeNodeId
+            });
+          }
+        }
+      });
+      if (infos.length > 0) {
+        this.dropNodeRss.set(node.id, infos);
+      }
+    });
+  }
   /**
    * 树部件加载，从根节点开始重新加载
    *
@@ -24595,7 +24964,7 @@ var TreeController = class extends MDControlController {
       this.state.rootNodes = nodes;
     }
     this.state.items = [];
-    recursiveIterate8(
+    recursiveIterate9(
       { children: this.state.rootNodes },
       (node) => {
         this.state.items.push(node);
@@ -24749,7 +25118,7 @@ var TreeController = class extends MDControlController {
    */
   calcExpandedKeys(nodes) {
     let expandedKeys = [...this.state.expandedKeys];
-    recursiveIterate8({ children: nodes }, (node) => {
+    recursiveIterate9({ children: nodes }, (node) => {
       var _a;
       if ((_a = node.children) == null ? void 0 : _a.length) {
         expandedKeys.push(node.id);
@@ -24809,10 +25178,206 @@ var TreeController = class extends MDControlController {
       })
     );
   }
+  /**
+   * 计算是否允许拖动
+   * @author lxm
+   * @date 2023-12-14 11:28:07
+   * @param {ITreeNodeData} draggingNode
+   * @return {*}  {boolean}
+   */
+  calcAllowDrag(draggingNode) {
+    const nodeModel = this.getNodeModel(draggingNode.nodeId);
+    return (nodeModel == null ? void 0 : nodeModel.allowDrag) === true;
+  }
+  /**
+   * 计算是否允许拖入
+   * @author lxm
+   * @date 2023-12-14 02:04:15
+   * @param {ITreeNodeData} draggingNode
+   * @param {ITreeNodeData} dropNode
+   * @param {('inner' | 'prev' | 'next')} type
+   * @return {*}  {boolean}
+   */
+  calcAllowDrop(draggingNode, dropNode, type) {
+    var _a, _b;
+    const draggingNodeModel = this.getNodeModel(draggingNode.nodeId);
+    if (type === "inner") {
+      return !!this.findDropNodeRS(
+        dropNode.nodeId,
+        draggingNodeModel.appDataEntityId
+      );
+    }
+    if (((_a = draggingNode.parent) == null ? void 0 : _a.id) !== ((_b = dropNode.parent) == null ? void 0 : _b.id)) {
+      return !!this.findDropNodeRS(
+        dropNode.parent.nodeId,
+        draggingNodeModel.appDataEntityId
+      );
+    }
+    const parentNodeModel = this.getNodeModel(dropNode.nodeId);
+    return (parentNodeModel == null ? void 0 : parentNodeModel.allowOrder) === true;
+  }
+  /**
+   * 找到指定父节点下的节点关系里面
+   * 配置的实体关系的子实体是指定实体的
+   * @author lxm
+   * @date 2023-12-14 01:43:41
+   * @protected
+   * @param {string} parentId 父节点模型id
+   * @param {string} appDataEntityId
+   * @return {*}  {(IDETreeNodeRS | undefined)}
+   */
+  findDropNodeRS(parentId, appDataEntityId) {
+    const nodeRSs = this.dropNodeRss.get(parentId);
+    return nodeRSs == null ? void 0 : nodeRSs.find((item) => item.minorEntityId === appDataEntityId);
+  }
+  /**
+   * 处理节点拖入事件
+   * @author lxm
+   * @date 2023-12-15 04:23:29
+   * @param {ITreeNodeData} draggingNode
+   * @param {ITreeNodeData} dropNode
+   * @param {('inner' | 'prev' | 'next')} dropType
+   * @return {*}  {Promise<void>}
+   */
+  async onNodeDrop(draggingNode, dropNode, dropType) {
+    var _a, _b, _c, _d;
+    if (dropType === "inner" && !dropNode.leaf && dropNode.children === void 0) {
+      await this.expandNodeByKey([dropNode.id]);
+    }
+    const modifiedNodeDatas = [];
+    const draggingNodeModel = this.getNodeModel(draggingNode.nodeId);
+    const dropInNode = dropType === "inner" ? dropNode : dropNode.parent;
+    const isChangedParent = ((_a = dropNode.parent) == null ? void 0 : _a.id) !== ((_b = draggingNode.parent) == null ? void 0 : _b.id);
+    let orderNodeModel = this.getNodeModel(dropNode.nodeId);
+    if (dropType === "inner" || ((_c = dropNode.parent) == null ? void 0 : _c.id) !== ((_d = draggingNode.parent) == null ? void 0 : _d.id)) {
+      const dropNodeRs = this.findDropNodeRS(
+        dropInNode.nodeId,
+        draggingNodeModel.appDataEntityId
+      );
+      if (dropNodeRs) {
+        draggingNode.deData[dropNodeRs.pickupDEFName] = dropInNode.value;
+        modifiedNodeDatas.push(draggingNode);
+        orderNodeModel = this.getNodeModel(dropNodeRs.childDETreeNodeId);
+      }
+    }
+    const originArr = draggingNode.parent.children;
+    originArr.splice(originArr.indexOf(draggingNode), 1);
+    if (dropType === "inner") {
+      if (!dropNode.children) {
+        dropNode.children = [];
+        dropNode.leaf = true;
+        this.state.expandedKeys.push(dropNode.id);
+      }
+      dropNode.children.push(draggingNode);
+    } else {
+      let insertIndex = dropInNode.children.indexOf(dropNode);
+      if (dropType === "next") {
+        insertIndex += 1;
+      }
+      dropInNode.children.splice(insertIndex, 0, draggingNode);
+    }
+    if (dropType === "inner" || isChangedParent) {
+      draggingNode.parent = dropInNode;
+      draggingNode.nodeId = orderNodeModel.id;
+      this.state.expandedKeys = this.calcExpandedKeys([dropInNode]);
+    }
+    const { sortAppDEFieldId, sortDir, allowOrder } = orderNodeModel;
+    if (allowOrder === true) {
+      if (!sortAppDEFieldId) {
+        throw new RuntimeModelError60(orderNodeModel, "\u7F3A\u5C11\u914D\u7F6E\u6392\u5E8F\u5C5E\u6027");
+      }
+      const sortField = sortAppDEFieldId.toLowerCase();
+      const isAsc = sortDir === "ASC";
+      const changedArr = [...dropInNode.children];
+      if (!isAsc) {
+        changedArr.reverse();
+      }
+      const getNextSort = (num) => {
+        return num + (100 - num % 100);
+      };
+      const getSort = (deData) => {
+        return deData[sortField] || 0;
+      };
+      let lastSort;
+      changedArr.forEach((item, index) => {
+        const deData = item.deData;
+        if (lastSort === void 0) {
+          if (item === draggingNode) {
+            if (index === 0) {
+              lastSort = 100;
+            } else {
+              lastSort = getNextSort(getSort(changedArr[index - 1].deData));
+            }
+            deData[sortField] = lastSort;
+            if (modifiedNodeDatas.indexOf(item) === -1) {
+              modifiedNodeDatas.push(item);
+            }
+          }
+        } else {
+          if (lastSort >= getSort(deData)) {
+            deData[sortField] = getNextSort(lastSort);
+            modifiedNodeDatas.push(item);
+          }
+          lastSort = getSort(deData);
+        }
+      });
+    }
+    await this.updateDeNodeData(modifiedNodeDatas);
+    this.evt.emit("onAfterNodeDrop", { isChangedParent });
+  }
+  /**
+   * 更新实体节点数据
+   * @author lxm
+   * @date 2023-12-15 04:19:36
+   * @protected
+   * @param {ITreeNodeData[]} nodeDatas 节点数据集合
+   * @return {*}  {Promise<void>}
+   */
+  async updateDeNodeData(nodeDatas) {
+    const app = ibiz.hub.getApp(this.context.srfappid);
+    await Promise.all(
+      nodeDatas.map(async (node) => {
+        const model = this.getNodeModel(node.nodeId);
+        const deData = node.deData;
+        const deName = calcDeCodeNameById(model.appDataEntityId);
+        const tempContext = this.context.clone();
+        tempContext[deName] = deData.srfkey;
+        const res = await app.deService.exec(
+          model.appDataEntityId,
+          "update",
+          tempContext,
+          deData
+        );
+        if (res.data) {
+          node.deData = res.data;
+        }
+      })
+    );
+  }
+  /**
+   * 修改节点文本
+   * @author lxm
+   * @date 2023-12-15 04:32:52
+   * @param {ITreeNodeData} nodeData
+   * @param {string} text
+   * @return {*}  {Promise<void>}
+   */
+  async modifyNodeText(nodeData, text) {
+    const model = this.getNodeModel(nodeData.nodeId);
+    if (!model.allowEditText) {
+      throw new RuntimeModelError60(model, "\u6811\u8282\u70B9\u6CA1\u6709\u914D\u7F6E\u7F16\u8F91\u6A21\u5F0F\uFF1A\u540D\u79F0");
+    }
+    if (!nodeData.deData) {
+      throw new RuntimeError55("\u4E0D\u662F\u5B9E\u4F53\u6811\u8282\u70B9\u6570\u636E");
+    }
+    nodeData.text = text;
+    nodeData.deData[model.textAppDEFieldId] = text;
+    await this.updateDeNodeData([nodeData]);
+  }
 };
 
 // src/controller/control/wizard-panel/wizard-panel.controller.ts
-import { RuntimeError as RuntimeError55 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError56 } from "@ibiz-template/core";
 
 // src/controller/control/wizard-panel/wizard-panel.service.ts
 var WizardPanelService = class extends ControlService {
@@ -24978,7 +25543,7 @@ var WizardPanelController = class extends ControlController {
     const { activeFormTag } = this.state;
     const controller = this.formControllers.get(activeFormTag);
     if (!controller) {
-      throw new RuntimeError55("\u627E\u4E0D\u5230".concat(activeFormTag, "\u7684\u8868\u5355\u63A7\u5236\u5668"));
+      throw new RuntimeError56("\u627E\u4E0D\u5230".concat(activeFormTag, "\u7684\u8868\u5355\u63A7\u5236\u5668"));
     }
     return controller;
   }
@@ -25020,7 +25585,7 @@ var WizardPanelController = class extends ControlController {
   getWizardFormByTag(tag) {
     var _a;
     if (!((_a = this.model.dewizard) == null ? void 0 : _a.dewizardForms)) {
-      throw new RuntimeError55("\u6CA1\u6709\u914D\u7F6E\u5411\u5BFC\u8868\u5355\u96C6\u5408");
+      throw new RuntimeError56("\u6CA1\u6709\u914D\u7F6E\u5411\u5BFC\u8868\u5355\u96C6\u5408");
       return;
     }
     const wizardForm = this.model.dewizard.dewizardForms.find(
@@ -25029,7 +25594,7 @@ var WizardPanelController = class extends ControlController {
       }
     );
     if (!wizardForm) {
-      throw new RuntimeError55("\u627E\u4E0D\u5230\u6807\u8BC6\u4E3A".concat(tag, "\u7684\u5411\u5BFC\u8868\u5355"));
+      throw new RuntimeError56("\u627E\u4E0D\u5230\u6807\u8BC6\u4E3A".concat(tag, "\u7684\u5411\u5BFC\u8868\u5355"));
     }
     return wizardForm;
   }
@@ -25100,7 +25665,7 @@ var WizardPanelController = class extends ControlController {
       prevTag = this.tagHistory[this.tagHistory.length - 1];
     }
     if (!prevTag) {
-      throw new RuntimeError55("\u6CA1\u6709\u4E0A\u4E00\u4E2A\u8868\u5355");
+      throw new RuntimeError56("\u6CA1\u6709\u4E0A\u4E00\u4E2A\u8868\u5355");
     }
     this.state.activeFormTag = prevTag;
   }
@@ -25136,7 +25701,7 @@ var WizardPanelController = class extends ControlController {
         });
         const nextWizardStep = wizardSteps[index + 1];
         if (!nextWizardStep) {
-          throw new RuntimeError55("\u627E\u4E0D\u5230\u4E0B\u4E00\u4E2A\u5411\u5BFC\u6B65\u9AA4");
+          throw new RuntimeError56("\u627E\u4E0D\u5230\u4E0B\u4E00\u4E2A\u5411\u5BFC\u6B65\u9AA4");
         }
         const nextWizardForm = this.getWizardFormByTag(nextWizardStep.stepTag);
         if (nextWizardForm && nextWizardForm.formTag) {
@@ -25145,7 +25710,7 @@ var WizardPanelController = class extends ControlController {
       }
     }
     if (!nextTag) {
-      throw new RuntimeError55("\u627E\u4E0D\u5230\u4E0B\u4E00\u4E2A\u5411\u5BFC\u8868\u5355");
+      throw new RuntimeError56("\u627E\u4E0D\u5230\u4E0B\u4E00\u4E2A\u5411\u5BFC\u8868\u5355");
     }
     this.state.activeFormTag = nextTag;
     this.tagHistory.push(nextTag);
@@ -25164,7 +25729,7 @@ var WizardPanelController = class extends ControlController {
 };
 
 // src/controller/control/md-ctrl/md-ctrl.controller.ts
-import { RuntimeModelError as RuntimeModelError59 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError61 } from "@ibiz-template/core";
 import { isNil as isNil24 } from "ramda";
 
 // src/controller/control/md-ctrl/md-ctrl.service.ts
@@ -25391,7 +25956,7 @@ var MDCtrlController = class extends MDControlController {
     const { enableGroup, groupMode, groupAppDEFieldId } = this.model;
     if (enableGroup && groupMode) {
       if (!groupAppDEFieldId) {
-        throw new RuntimeModelError59(this.model, "\u5206\u7EC4\u5C5E\u6027\u6CA1\u6709\u914D\u7F6E");
+        throw new RuntimeModelError61(this.model, "\u5206\u7EC4\u5C5E\u6027\u6CA1\u6709\u914D\u7F6E");
       }
       if (groupMode === "AUTO") {
         this.handleAutoGroup();
@@ -25458,7 +26023,7 @@ var MDCtrlController = class extends MDControlController {
   async handleCodeListGroup() {
     const { groupAppDEFieldId, groupCodeListId } = this.model;
     if (!groupCodeListId) {
-      throw new RuntimeModelError59(this.model, "\u5206\u7EC4\u4EE3\u7801\u8868\u6CA1\u6709\u914D\u7F6E");
+      throw new RuntimeModelError61(this.model, "\u5206\u7EC4\u4EE3\u7801\u8868\u6CA1\u6709\u914D\u7F6E");
     }
     const { items } = this.state;
     const groupMap = /* @__PURE__ */ new Map();
@@ -25488,7 +26053,7 @@ var MDCtrlController = class extends MDControlController {
 };
 
 // src/controller/control/kanban/kanban.controller.ts
-import { RuntimeError as RuntimeError56, RuntimeModelError as RuntimeModelError60 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError57, RuntimeModelError as RuntimeModelError62 } from "@ibiz-template/core";
 import { isNil as isNil25 } from "ramda";
 
 // src/controller/control/kanban/kanban.service.ts
@@ -25563,10 +26128,10 @@ var KanbanController = class extends DataViewControlController {
     const sortField = this.model.minorSortAppDEFieldId;
     const { minorSortDir } = this.model;
     if (!sortField) {
-      throw new RuntimeModelError60(this.model, "\u6392\u5E8F\u5C5E\u6027\u6CA1\u914D\u7F6E");
+      throw new RuntimeModelError62(this.model, "\u6392\u5E8F\u5C5E\u6027\u6CA1\u914D\u7F6E");
     }
     if (!minorSortDir) {
-      throw new RuntimeModelError60(this.model, "\u6392\u5E8F\u65B9\u5411\u6CA1\u914D\u7F6E");
+      throw new RuntimeModelError62(this.model, "\u6392\u5E8F\u65B9\u5411\u6CA1\u914D\u7F6E");
     }
     const isAsc = minorSortDir === "ASC";
     items.forEach((item) => {
@@ -25576,7 +26141,7 @@ var KanbanController = class extends DataViewControlController {
       } else {
         const toNum = Number(sortValue);
         if (Number.isNaN(toNum)) {
-          throw new RuntimeError56(
+          throw new RuntimeError57(
             "".concat(item.srfmajortext, "\u7684\u6392\u5E8F\u5C5E\u6027\u65E0\u6CD5\u8F6C\u6362\u6210\u6570\u503C")
           );
         }
@@ -25592,28 +26157,100 @@ var KanbanController = class extends DataViewControlController {
   }
   handleDataGroup() {
     if (!this.model.enableGroup || this.model.groupMode === "NONE") {
-      throw new RuntimeError56("\u770B\u677F\u90E8\u4EF6\u5FC5\u987B\u5F00\u542F\u5206\u7EC4");
+      throw new RuntimeError57("\u770B\u677F\u90E8\u4EF6\u5FC5\u987B\u5F00\u542F\u5206\u7EC4");
     }
     return super.handleDataGroup();
   }
   /**
-   * 拖拽变更事件处理回调
-   * @author lxm
-   * @date 2023-09-11 04:12:58
-   * @param {IDragChangeInfo} info
+   * 处理自动分组
+   *
+   * @memberof KanbanController
+   */
+  handleAutoGroup() {
+    const { groupAppDEFieldId } = this.model;
+    if (groupAppDEFieldId) {
+      const { items } = this.state;
+      const groupMap = /* @__PURE__ */ new Map();
+      items.forEach((item) => {
+        const groupVal = item[groupAppDEFieldId];
+        if (isNil25(groupVal)) {
+          return;
+        }
+        if (!groupMap.has(groupVal)) {
+          groupMap.set(groupVal, []);
+        }
+        groupMap.get(groupVal).push(item);
+      });
+      const groups = [];
+      groupMap.forEach((value, key) => {
+        const codeListItem = this.groupCodeListItems.find(
+          (item) => item.value === key
+        );
+        groups.push({
+          caption: codeListItem.text,
+          color: codeListItem.color,
+          key: codeListItem.value,
+          children: [...value]
+        });
+      });
+      this.state.groups = groups;
+    }
+  }
+  /**
+   * 处理代码表分组
+   *
    * @return {*}  {Promise<void>}
+   * @memberof KanbanController
    */
-  async onDragChange(info) {
-    if (!this.enableEditGroup) {
-      if (info.from !== info.to) {
-        ibiz.message.warning("\u5F53\u524D\u770B\u677F\u4E0D\u5141\u8BB8\u8C03\u6574\u5206\u7EC4\uFF01");
-        return;
-      }
+  async handleCodeListGroup() {
+    const { groupAppDEFieldId, groupCodeListId } = this.model;
+    if (!groupCodeListId) {
+      throw new RuntimeModelError62(this.model, "\u5206\u7EC4\u4EE3\u7801\u8868\u6CA1\u6709\u914D\u7F6E");
     }
-    const isAsc = this.model.minorSortDir === "ASC";
-    const { from, to, fromIndex, toIndex } = info;
-    const groupField = this.model.groupAppDEFieldId;
-    const sortField = this.model.minorSortAppDEFieldId;
+    const { items } = this.state;
+    const groupMap = /* @__PURE__ */ new Map();
+    this.groupCodeListItems.forEach((item) => {
+      groupMap.set(item.value, []);
+    });
+    items.forEach((item) => {
+      const groupVal = item[groupAppDEFieldId];
+      const groupArr = groupMap.get(groupVal);
+      if (groupArr) {
+        groupArr.push(item);
+      }
+    });
+    const groups = [];
+    groupMap.forEach((arr, key) => {
+      const codeListItem = this.groupCodeListItems.find(
+        (item) => item.value === key
+      );
+      groups.push({
+        caption: codeListItem.text,
+        color: codeListItem.color,
+        key: codeListItem.value,
+        children: arr
+      });
+    });
+    this.state.groups = groups;
+  }
+  /**
+   * 拖拽变更事件处理回调
+   * @author lxm
+   * @date 2023-09-11 04:12:58
+   * @param {IDragChangeInfo} info
+   * @return {*}  {Promise<void>}
+   */
+  async onDragChange(info) {
+    if (!this.enableEditGroup) {
+      if (info.from !== info.to) {
+        ibiz.message.warning("\u5F53\u524D\u770B\u677F\u4E0D\u5141\u8BB8\u8C03\u6574\u5206\u7EC4\uFF01");
+        return;
+      }
+    }
+    const isAsc = this.model.minorSortDir === "ASC";
+    const { from, to, fromIndex, toIndex } = info;
+    const groupField = this.model.groupAppDEFieldId;
+    const sortField = this.model.minorSortAppDEFieldId;
     const modifiedItems = [];
     const fromGroup = this.state.groups.find((x) => x.key === from);
     const toGroup = this.state.groups.find((x) => x.key === to);
@@ -25716,7 +26353,7 @@ var KanbanController = class extends DataViewControlController {
 };
 
 // src/controller/control/tree-grid-ex/tree-grid-ex.controller.ts
-import { recursiveIterate as recursiveIterate9 } from "@ibiz-template/core";
+import { recursiveIterate as recursiveIterate10 } from "@ibiz-template/core";
 
 // src/controller/control/tree-grid-ex/tree-grid-ex.service.ts
 import { isArray as isArray10 } from "qx-util";
@@ -25956,7 +26593,7 @@ var TreeGridExController = class extends MDControlController {
    * @memberof TreeGridExController
    */
   initColumnStates() {
-    recursiveIterate9(
+    recursiveIterate10(
       this.model,
       (column) => {
         if (column.columnType !== "GROUPGRIDCOLUMN") {
@@ -26044,7 +26681,7 @@ var TreeGridExController = class extends MDControlController {
       this.state.rootNodes = nodes;
     }
     this.state.items = [];
-    recursiveIterate9(
+    recursiveIterate10(
       { children: this.state.rootNodes },
       (node) => {
         this.state.items.push(node);
@@ -26063,7 +26700,7 @@ var TreeGridExController = class extends MDControlController {
    */
   calcExpandedKeys(nodes) {
     let expandedKeys = [];
-    recursiveIterate9({ children: nodes }, (node) => {
+    recursiveIterate10({ children: nodes }, (node) => {
       var _a;
       if ((_a = node.children) == null ? void 0 : _a.length) {
         expandedKeys.push(node.id);
@@ -26086,8 +26723,8 @@ var TreeGridService = class extends GridService {
 };
 
 // src/controller/control/medit-view-panel/medit-view-panel.controller.ts
-import { RuntimeError as RuntimeError57 } from "@ibiz-template/core";
-import { createUUID as createUUID11 } from "qx-util";
+import { RuntimeError as RuntimeError58 } from "@ibiz-template/core";
+import { createUUID as createUUID12 } from "qx-util";
 
 // src/controller/control/medit-view-panel/medit-view-panel.service.ts
 var MEditViewPanelService = class extends MDControlService {
@@ -26174,7 +26811,7 @@ var MEditViewPanelController = class extends MDControlController {
    */
   handlePanelItemParams(arg) {
     const [{ parameterName }] = this.parameters;
-    const id = arg[parameterName] ? arg[parameterName] : "mockId:".concat(createUUID11());
+    const id = arg[parameterName] ? arg[parameterName] : "mockId:".concat(createUUID12());
     const item = {
       id,
       context: this.context.clone(),
@@ -26302,7 +26939,7 @@ var MEditViewPanelController = class extends MDControlController {
       (item) => item.id === id
     );
     if (panelUiItemIndex < 0) {
-      throw new RuntimeError57("\u7F16\u8F91\u89C6\u56FE\u9762\u677F\u90E8\u4EF6UI\u6570\u636E\u4E0D\u5B58\u5728");
+      throw new RuntimeError58("\u7F16\u8F91\u89C6\u56FE\u9762\u677F\u90E8\u4EF6UI\u6570\u636E\u4E0D\u5B58\u5728");
     }
     const tempUiItem = this.state.panelUiItems[panelUiItemIndex];
     if (tempUiItem.id.startsWith("mockId:")) {
@@ -26615,7 +27252,7 @@ var UserReportPanelGenerator = class extends ReportPanelBaseGenerator {
             callBack: "{{ const nodes = data.controller.graph.getNodes(); if (nodes.length < 25) { data.controller.graph.zoomTo(1); data.controller.graph.fitCenter() } }}"
           }
         ],
-        nodeDataHook: "{{ data.forEach(node => { const type = node.data.source_lables || node.data.target_lables; Object.assign(node, { label: node.data.name, size: 66, style: { fill: node.color },donutAttrs: { prop1: 10000, prop2: 10 },donutColorMap: { prop1: node.color, prop2: node.color },icon: {show: true,img: type === 'NEO4J_ZT' ? resource.dir('/assets/images/user-avatar.png') : resource.dir('/assets/images/phone.png'),width: 40,height: 40}})})}}",
+        nodeDataHook: "{{ data.forEach(node => { const type = node.data.source_lables || node.data.target_lables; Object.assign(node, { label: node.data.name, size: 66, style: { fill: node.color },donutAttrs: { prop1: 10000, prop2: 10 },donutColorMap: { prop1: node.color, prop2: node.color },icon: {show: true,img: type === 'NEO4J_ZT' ? resource.dir('assets/images/user-avatar.png') : resource.dir('assets/images/phone.png'),width: 40,height: 40}})})}}",
         edgeDataHook: "{{ data.forEach(edge => {Object.assign(edge, { label: edge.name })}) }}"
       }
     };
@@ -26809,7 +27446,7 @@ var ReportPanelController = class extends ControlController {
 };
 
 // src/controller/control/gantt/gantt.controller.ts
-import { recursiveIterate as recursiveIterate10 } from "@ibiz-template/core";
+import { recursiveIterate as recursiveIterate11 } from "@ibiz-template/core";
 
 // src/controller/control/gantt/gantt.service.ts
 import { ModelError as ModelError30 } from "@ibiz-template/core";
@@ -27048,6 +27685,34 @@ var GanttService = class extends TreeService {
 var GanttController = class extends MDControlController {
   constructor() {
     super(...arguments);
+    /**
+     * 表格列适配器
+     *
+     * @type {{ [key: string]: IGridColumnProvider }}
+     * @memberof GanttController
+     */
+    this.providers = {};
+    /**
+     * 所有表格列控制器集合
+     *
+     * @type {{ [key: string]: GridColumnController }}
+     * @memberof GanttController
+     */
+    this.columns = {};
+    /**
+     * 所有表格属性列的控制器
+     *
+     * @type {{ [key: string]: GridFieldColumnController }}
+     * @memberof GanttController
+     */
+    this.fieldColumns = {};
+    /**
+     * 所有表格操作列的控制器
+     *
+     * @type {{ [key: string]: GridUAColumnController }}
+     * @memberof GanttController
+     */
+    this.uaColumns = {};
     /**
      * 上下文菜单控制器
      *
@@ -27076,10 +27741,14 @@ var GanttController = class extends MDControlController {
     super.initState();
     this.state.size = 0;
     this.state.query = "";
+    this.state.columnStates = [];
+    this.state.rootNodes = [];
   }
   async onCreated() {
     var _a, _b;
     await super.onCreated();
+    await this.initGridColumns();
+    this.initColumnStates();
     if ((_a = this.model.detreeNodes) == null ? void 0 : _a[0].enableQuickSearch) {
       this.enableQuickSearch = true;
     }
@@ -27121,6 +27790,86 @@ var GanttController = class extends MDControlController {
       Object.values(this.contextMenus).map((menu) => menu.created())
     );
   }
+  /**
+   * 初始化表格列
+   *
+   * @protected
+   * @return {*}  {Promise<void>}
+   * @memberof GanttController
+   */
+  async initGridColumns() {
+    if (this.model.detreeColumns) {
+      await Promise.all(
+        this.model.detreeColumns.map(
+          async (column) => this.initColumnsController(column)
+        )
+      );
+    }
+  }
+  /**
+   * 初始化表格属性列，操作列，编辑项控制器
+   *
+   * @protected
+   * @param {IDETreeColumn} column
+   * @return {*}  {Promise<void>}
+   * @memberof GanttController
+   */
+  async initColumnsController(column) {
+    const provider = await getGridColumnProvider(column);
+    if (!provider) {
+      return;
+    }
+    this.providers[column.codeName] = provider;
+    const controller = await provider.createController(column, this);
+    this.columns[column.codeName] = controller;
+    if (column.columnType === "DEFGRIDCOLUMN") {
+      this.fieldColumns[column.codeName] = controller;
+    } else if (column.columnType === "UAGRIDCOLUMN") {
+      this.uaColumns[column.codeName] = controller;
+    }
+  }
+  /**
+   * 初始化表格列状态
+   *
+   * @protected
+   * @memberof GanttController
+   */
+  initColumnStates() {
+    recursiveIterate11(
+      this.model,
+      (column) => {
+        if (column.columnType !== "GROUPGRIDCOLUMN") {
+          this.state.columnStates.push({
+            key: column.codeName,
+            caption: column.caption,
+            hidden: !!column.hideDefault,
+            uaColumn: column.columnType === "UAGRIDCOLUMN"
+          });
+        }
+      },
+      { childrenFields: ["detreeColumns"] }
+    );
+    this.calcColumnFixed();
+  }
+  /**
+   * 计算列的固定状态
+   *
+   * @protected
+   * @memberof GanttController
+   */
+  calcColumnFixed() {
+    const showColumns = this.state.columnStates.filter(
+      (column) => !column.hidden
+    );
+    const allNum = showColumns.length;
+    showColumns.forEach((column, index) => {
+      if (column.uaColumn) {
+        column.fixed = index + 1 <= Math.floor(allNum / 2) ? "left" : "right";
+      } else {
+        column.fixed = "right";
+      }
+    });
+  }
   /**
    * 加载
    *
@@ -27149,6 +27898,17 @@ var GanttController = class extends MDControlController {
     });
     return nodes;
   }
+  /**
+   * 获取节点模型
+   *
+   * @param {string} id
+   * @return {*}  {(IDETreeNode | undefined)}
+   * @memberof GanttController
+   */
+  getNodeModel(id) {
+    var _a;
+    return (_a = this.model.detreeNodes) == null ? void 0 : _a.find((item) => item.id === id);
+  }
   /**
    * 获取查询参数
    *
@@ -27193,7 +27953,7 @@ var GanttController = class extends MDControlController {
       this.state.rootNodes = nodes;
     }
     this.state.items = [];
-    recursiveIterate10(
+    recursiveIterate11(
       { children: this.state.rootNodes },
       (node) => {
         this.state.items.push(node);
@@ -27201,6 +27961,154 @@ var GanttController = class extends MDControlController {
     );
     return nodes;
   }
+  /**
+   * 甘特节点点击事件
+   *
+   * @param {IGanttNodeData} nodeData
+   * @return {*}  {Promise<void>}
+   * @memberof GanttController
+   */
+  async onGanttNodeClick(nodeData) {
+    if (this.state.singleSelect) {
+      const { selectedData } = this.state;
+      const filterArr = selectedData.filter((item) => item.id !== nodeData.id);
+      if (filterArr.length === selectedData.length) {
+        this.setSelection(
+          this.state.singleSelect ? [nodeData] : selectedData.concat([nodeData])
+        );
+      } else {
+        this.setSelection(filterArr);
+      }
+    }
+    if (this.state.mdctrlActiveMode === 1) {
+      await this.setActive(nodeData);
+    }
+  }
+  /**
+   * 甘特节点双击事件
+   *
+   * @param {IGanttNodeData} nodeData
+   * @return {*}  {Promise<void>}
+   * @memberof GanttController
+   */
+  async onDbGanttNodeClick(nodeData) {
+    if (this.state.mdctrlActiveMode === 2) {
+      await this.setActive(nodeData);
+    }
+  }
+  /**
+   * 设置激活
+   *
+   * @param {IGanttNodeData} item
+   * @return {*}  {Promise<void>}
+   * @memberof GanttController
+   */
+  setActive(item) {
+    const nodeParams = this.parseGanttNodeData(item);
+    return this.evt.emit("onActive", { ...nodeParams, nodeData: item });
+  }
+  /**
+   * 设置选中
+   *
+   * @param {IData[]} selection
+   * @memberof GanttController
+   */
+  setSelection(selection) {
+    const selectionIds = selection.map((item) => item.id);
+    const filterArr = this.state.items.filter(
+      (item) => selectionIds.includes(item.id)
+    );
+    super.setSelection(filterArr);
+  }
+  /**
+   * 执行界面行为
+   *
+   * @param {string} uiActionId
+   * @param {IGanttNodeData} nodeData
+   * @param {MouseEvent} event
+   * @param {string} appId
+   * @return {*}  {Promise<void>}
+   * @memberof GanttController
+   */
+  async doUIAction(uiActionId, nodeData, event, appId) {
+    const eventArgs = this.getEventArgs();
+    const nodeParams = this.parseGanttNodeData(nodeData);
+    const result = await UIActionUtil.exec(
+      uiActionId,
+      {
+        ...eventArgs,
+        ...nodeParams,
+        event
+      },
+      appId
+    );
+    if (result.closeView) {
+      this.view.closeView();
+    } else if (result.refresh) {
+      switch (result.refreshMode) {
+        case 1:
+          this.refreshNodeChildren(nodeData);
+          break;
+        case 2:
+          this.refreshNodeChildren(nodeData, true);
+          break;
+        case 3:
+          this.refresh();
+          break;
+        default:
+      }
+    }
+  }
+  /**
+   * 解析甘特节点获取通用数据，和完整的上下文和视图参数。
+   *
+   * @protected
+   * @param {IGanttNodeData} nodeData
+   * @return {*}  {{
+   *     data: IData[];
+   *     context: IContext;
+   *     params: IParams;
+   *   }}
+   * @memberof GanttController
+   */
+  parseGanttNodeData(nodeData) {
+    return {
+      data: [{ ...nodeData, ...nodeData.deData || {} }],
+      context: Object.assign(this.context.clone(), nodeData.context || {}),
+      params: { ...this.params, ...nodeData.params || {} }
+    };
+  }
+  /**
+   * 刷新指定树节点的子节点数据
+   *
+   * @param {(IGanttNodeData | IData)} nodeData 指定树节点数据，可以是节点数据，也可以是对应的实体数据
+   * @param {boolean} [refreshParent=false] 是否是刷新给定节点数据的父节点的子节点数据
+   * @return {*}  {Promise<void>}
+   * @memberof GanttController
+   */
+  async refreshNodeChildren(nodeData, refreshParent = false) {
+    const key = nodeData.srfkey ? "srfkey" : "id";
+    const currentNode = this.state.items.find(
+      (item) => item[key] === nodeData[key]
+    );
+    if (!currentNode) {
+      ibiz.log.error("\u627E\u4E0D\u5230\u5BF9\u5E94\u7684\u6811\u8282\u70B9\u6570\u636E", nodeData);
+      return;
+    }
+    if (refreshParent) {
+      const { parent } = currentNode;
+      if (!parent || !this.model.rootVisible && this.state.rootNodes.includes(parent)) {
+        this.refresh();
+        return;
+      }
+    }
+    const targetNode = refreshParent ? currentNode.parent : currentNode;
+    const nodes = await this.loadNodes(targetNode);
+    this.evt.emit("onAfterRefreshParent", {
+      parentNode: targetNode,
+      children: nodes
+    });
+  }
 };
 
 // src/controller/hub.controller.ts
@@ -27399,7 +28307,7 @@ var AppHub = class {
       this.registerAppView(appView);
       return appView;
     }
-    throw new RuntimeError58("\u89C6\u56FE[".concat(id, "]\u4E0D\u5B58\u5728"));
+    throw new RuntimeError59("\u89C6\u56FE[".concat(id, "]\u4E0D\u5B58\u5728"));
   }
   /**
    * 根据应用实体代码名称查找应用视图
@@ -27430,7 +28338,7 @@ var AppHub = class {
       this.registerAppDataEntity(entity, appId);
       return entity;
     }
-    throw new RuntimeError58("\u672A\u627E\u5230\u5E94\u7528\u5B9E\u4F53[".concat(id, "]"));
+    throw new RuntimeError59("\u672A\u627E\u5230\u5E94\u7528\u5B9E\u4F53[".concat(id, "]"));
   }
   /**
    * 新建 hub 应用
@@ -27445,7 +28353,7 @@ var AppHub = class {
       return this.appMap.get(id);
     }
     if (!this.modelLoaderProvider) {
-      throw new RuntimeError58("\u8BF7\u5148\u6CE8\u518C\u6A21\u578B\u52A0\u8F7D\u9002\u914D\u5668");
+      throw new RuntimeError59("\u8BF7\u5148\u6CE8\u518C\u6A21\u578B\u52A0\u8F7D\u9002\u914D\u5668");
     }
     const appModel = await this.modelLoaderProvider.getApp(id);
     const app = new Application(appModel);
@@ -27545,7 +28453,7 @@ var EngineFactory = class {
 };
 
 // src/engine/view-base.engine.ts
-import { RuntimeError as RuntimeError59 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError60 } from "@ibiz-template/core";
 var ViewEngineBase = class {
   /**
    * 构造函数在视图控制器的构造函数逻辑内部执行
@@ -27733,7 +28641,7 @@ var ViewEngineBase = class {
     const { appDataEntityId } = this.view.model;
     const { evt, context, params } = this.view;
     if (!appDataEntityId) {
-      throw new RuntimeError59("\u8BE5\u89C6\u56FE\u6CA1\u6709\u5B9E\u4F53\uFF0C\u65E0\u6CD5\u52A0\u8F7D\u5B9E\u4F53\u6570\u636E");
+      throw new RuntimeError60("\u8BE5\u89C6\u56FE\u6CA1\u6709\u5B9E\u4F53\uFF0C\u65E0\u6CD5\u52A0\u8F7D\u5B9E\u4F53\u6570\u636E");
     }
     const app = ibiz.hub.getApp(context.srfappid);
     const res = await app.deService.exec(
@@ -27754,7 +28662,7 @@ var ViewEngineBase = class {
 };
 
 // src/engine/md-view.engine.ts
-import { RuntimeModelError as RuntimeModelError61 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError63 } from "@ibiz-template/core";
 import { clone as clone24 } from "ramda";
 var MDViewEngine = class extends ViewEngineBase {
   /**
@@ -27938,7 +28846,7 @@ var MDViewEngine = class extends ViewEngineBase {
       view: this.view
     }));
     if (result === -1) {
-      throw new RuntimeModelError61(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
+      throw new RuntimeModelError63(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
     } else {
       return {
         cancel: !result.ok
@@ -27961,7 +28869,7 @@ var MDViewEngine = class extends ViewEngineBase {
       (item) => item.id === "newdata"
     );
     if (!openAppViewLogic) {
-      throw new RuntimeModelError61(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
+      throw new RuntimeModelError63(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
     }
     const params = clone24(this.view.params);
     if (copyMode) {
@@ -27975,7 +28883,7 @@ var MDViewEngine = class extends ViewEngineBase {
       view: this.view
     }));
     if (result === -1) {
-      throw new RuntimeModelError61(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
+      throw new RuntimeModelError63(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
     } else {
       return {
         cancel: !result.ok
@@ -28094,15 +29002,15 @@ var MDViewEngine = class extends ViewEngineBase {
 
 // src/utils/error-handler/default-error-handler.ts
 import {
-  RuntimeModelError as RuntimeModelError62,
+  RuntimeModelError as RuntimeModelError64,
   ModelError as ModelError31,
   HttpError as HttpError5,
   NoticeError as NoticeError2,
-  RuntimeError as RuntimeError60
+  RuntimeError as RuntimeError61
 } from "@ibiz-template/core";
 var DefaultErrorHandler = class {
   handle(error) {
-    if (error instanceof RuntimeModelError62 || error instanceof ModelError31) {
+    if (error instanceof RuntimeModelError64 || error instanceof ModelError31) {
       ibiz.message.error(error.message, 10, true);
     } else if (error instanceof HttpError5) {
       if (error.status === 401) {
@@ -28116,7 +29024,7 @@ var DefaultErrorHandler = class {
       }
     } else if (error instanceof NoticeError2) {
       ibiz.message.error(error.message, error.duration, error.duration === 0);
-    } else if (error instanceof RuntimeError60) {
+    } else if (error instanceof RuntimeError61) {
       ibiz.message.error(error.message, 10, true);
     }
     ibiz.log.error(error);
@@ -28258,7 +29166,7 @@ var GlobalUtil = class {
 };
 
 // src/logic-scheduler/executor/logic-executor.ts
-import { RuntimeError as RuntimeError61 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError62 } from "@ibiz-template/core";
 var LogicExecutor = class {
   /**
    * @author lxm
@@ -28279,7 +29187,7 @@ var LogicExecutor = class {
    */
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   execute(_executeParams) {
-    throw new RuntimeError61("Method not implemented.");
+    throw new RuntimeError62("Method not implemented.");
   }
   /**
    * 销毁方法
@@ -28370,13 +29278,13 @@ var ScriptExecutor = class extends LogicExecutor {
 };
 
 // src/logic-scheduler/executor/app-de-ui-logic-executor.ts
-import { RuntimeModelError as RuntimeModelError63 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError65 } 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 RuntimeModelError63(this.logic, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u754C\u9762\u903B\u8F91");
+      throw new RuntimeModelError65(this.logic, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u754C\u9762\u903B\u8F91");
     }
     execUILogic(appDEUILogicId, appDataEntityId, executeParams);
   }
@@ -28716,7 +29624,7 @@ var LogicSchedulerCenter = class {
 };
 
 // src/logic-scheduler/trigger/logic-trigger.ts
-import { RuntimeError as RuntimeError62 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError63 } from "@ibiz-template/core";
 var LogicTrigger = class {
   /**
    * @author lxm
@@ -28776,7 +29684,7 @@ var LogicTrigger = class {
     if (this.executor) {
       return this.executor.execute(executeParams);
     }
-    throw new RuntimeError62("".concat(this.logic.id, "\u6CA1\u6709\u7ED1\u5B9Aexecutor"));
+    throw new RuntimeError63("".concat(this.logic.id, "\u6CA1\u6709\u7ED1\u5B9Aexecutor"));
   }
   /**
    * 销毁方法
@@ -28793,12 +29701,12 @@ var CustomTrigger = class extends LogicTrigger {
 };
 
 // src/logic-scheduler/trigger/item-dyna-logic-trigger.ts
-import { RuntimeError as RuntimeError63 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError64 } from "@ibiz-template/core";
 var ItemDynaLogicTrigger = class extends LogicTrigger {
   bindExecutor(executor) {
     super.bindExecutor(executor);
     if (this.executor.type !== "SCRIPT") {
-      throw new RuntimeError63(
+      throw new RuntimeError64(
         "\u9884\u5B9A\u4E49\u903B\u8F91\u7C7B\u578B".concat(this.type, "\u7684\u89E6\u53D1\u5668\u7C7B\u578B\u53EA\u80FD\u662F\u811A\u672C")
       );
     }
@@ -28834,7 +29742,7 @@ var ItemDynaLogicTrigger = class extends LogicTrigger {
 };
 
 // src/logic-scheduler/trigger/timer-trigger.ts
-import { RuntimeError as RuntimeError64, RuntimeModelError as RuntimeModelError64 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError65, RuntimeModelError as RuntimeModelError66 } from "@ibiz-template/core";
 var TimerTrigger = class extends LogicTrigger {
   constructor() {
     super(...arguments);
@@ -28842,11 +29750,11 @@ var TimerTrigger = class extends LogicTrigger {
   }
   start() {
     if (!this.logic.timer) {
-      throw new RuntimeModelError64(this.logic, "\u5B9A\u65F6\u5668\u7F3A\u5C11\u5B9A\u65F6\u95F4\u9694");
+      throw new RuntimeModelError66(this.logic, "\u5B9A\u65F6\u5668\u7F3A\u5C11\u5B9A\u65F6\u95F4\u9694");
     }
     this.timer = setInterval(() => {
       if (!this.scheduler.defaultParamsCb) {
-        throw new RuntimeError64("\u5B9A\u65F6\u5668\u7F3A\u5C11\u9ED8\u8BA4\u53C2\u6570\u56DE\u8C03");
+        throw new RuntimeError65("\u5B9A\u65F6\u5668\u7F3A\u5C11\u9ED8\u8BA4\u53C2\u6570\u56DE\u8C03");
       }
       const params = this.scheduler.defaultParamsCb();
       this.executor.execute(params);
@@ -28863,8 +29771,8 @@ var TimerTrigger = class extends LogicTrigger {
 // src/logic-scheduler/executor/app-ui-logic-executor.ts
 import {
   ModelError as ModelError34,
-  RuntimeError as RuntimeError65,
-  RuntimeModelError as RuntimeModelError65
+  RuntimeError as RuntimeError66,
+  RuntimeModelError as RuntimeModelError67
 } from "@ibiz-template/core";
 import { notNilEmpty as notNilEmpty9 } from "qx-util";
 var AppUILogicExecutor = class extends LogicExecutor {
@@ -28872,12 +29780,12 @@ var AppUILogicExecutor = class extends LogicExecutor {
   async execute(executeParams) {
     let result;
     try {
-      if (this.logic.id === "opendata" && this.logic.builtinAppUILogic) {
+      if (this.logic.builtinAppUILogic && this.logic.builtinAppUILogic.viewLogicType === "APP_OPENDATA") {
         result = await this.executeOpenDataAppUILogic(
           this.logic.builtinAppUILogic,
           executeParams
         );
-      } else if (this.logic.id === "newdata" && this.logic.builtinAppUILogic) {
+      } else if (this.logic.builtinAppUILogic && this.logic.builtinAppUILogic.viewLogicType === "APP_NEWDATA") {
         result = await this.executeNewDataAppUILogic(
           this.logic.builtinAppUILogic,
           executeParams
@@ -28901,7 +29809,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     const { context, params, ...rest } = parameters;
     const { data } = parameters;
     if (!(data == null ? void 0 : data[0])) {
-      throw new RuntimeError65("opendata\u6CA1\u6709\u53EF\u64CD\u4F5C\u6570\u636E\uFF01");
+      throw new RuntimeError66("opendata\u6CA1\u6709\u53EF\u64CD\u4F5C\u6570\u636E\uFF01");
     }
     const openViewRefs = appUILogic.openDataAppViews;
     let openViewRef;
@@ -28910,7 +29818,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     } else {
       openViewRef = appUILogic.openDataAppView;
       if (!openViewRef) {
-        throw new RuntimeModelError65(
+        throw new RuntimeModelError67(
           appUILogic,
           "opendata\u89C6\u56FE\u903B\u8F91\u6CA1\u6709\u914D\u7F6E\u9ED8\u8BA4\u6253\u5F00\u89C6\u56FE"
         );
@@ -28918,7 +29826,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     }
     const openView = openViewRef.refAppViewId;
     if (!openView) {
-      throw new RuntimeModelError65(
+      throw new RuntimeModelError67(
         appUILogic,
         "opendata\u89C6\u56FE\u903B\u8F91\u7684\u9ED8\u8BA4\u6253\u5F00\u89C6\u56FE\u6CA1\u6709\u5B9E\u9645\u5F15\u7528\u89C6\u56FE"
       );
@@ -28948,7 +29856,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     );
     const typeFileName = appDataEntity.formTypeAppDEFieldId || appDataEntity.dataTypeAppDEFieldId;
     if (!typeFileName) {
-      throw new RuntimeModelError65(
+      throw new RuntimeModelError67(
         appUILogic,
         "".concat(appDataEntity.codeName, "[\u591A\u8868\u5355\u5B9E\u4F53] or [\u7D22\u5F15\u5B9E\u4F53]\u7F3A\u5C11\u7C7B\u578B\u5C5E\u6027\u914D\u7F6E")
       );
@@ -28956,12 +29864,12 @@ var AppUILogicExecutor = class extends LogicExecutor {
     const { data } = parameters;
     const formTypeValue = data[0][typeFileName];
     if (!formTypeValue) {
-      throw new RuntimeModelError65(appUILogic, "\u6570\u636E\u6E90\u65E0\u8868\u5355\u7C7B\u578B\u5E94\u7528\u5B9E\u4F53\u5C5E\u6027\u503C");
+      throw new RuntimeModelError67(appUILogic, "\u6570\u636E\u6E90\u65E0\u8868\u5355\u7C7B\u578B\u5E94\u7528\u5B9E\u4F53\u5C5E\u6027\u503C");
     }
     const openViewRefs = appUILogic.openDataAppViews;
     const findView = openViewRefs == null ? void 0 : openViewRefs.find((item) => item.refMode === formTypeValue);
     if (!findView) {
-      throw new RuntimeError65(
+      throw new RuntimeError66(
         "\u6CA1\u6709\u627E\u5230\u4E0E\u8868\u5355\u7C7B\u578B".concat(formTypeValue, "\u76F8\u5173\u7684\u5B9E\u4F53\u7684\u7F16\u8F91\u89C6\u56FE")
       );
     }
@@ -28998,7 +29906,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
         return viewRef.refMode.toLowerCase() !== parentDeName;
       });
       if (!newViewRef) {
-        throw new RuntimeModelError65(
+        throw new RuntimeModelError67(
           appUILogic,
           "\u6CA1\u6709\u627E\u5230\u6279\u6DFB\u52A0\u9700\u8981\u6253\u5F00\u7684\u9009\u62E9\u89C6\u56FE"
         );
@@ -29008,7 +29916,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     } else {
       newViewRef = newDataAppView;
       if (!newViewRef || !newViewRef.refAppViewId) {
-        throw new RuntimeModelError65(
+        throw new RuntimeModelError67(
           appUILogic,
           "newdata\u89C6\u56FE\u903B\u8F91\u6CA1\u6709\u914D\u7F6E\u9ED8\u8BA4\u65B0\u5EFA\u6570\u636E\u89C6\u56FE"
         );
@@ -29066,7 +29974,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     const { wizardAppView, newDataAppViews } = appUILogic;
     const { context, params, ...rest } = parameters;
     if (!wizardAppView || !wizardAppView.refAppViewId) {
-      throw new RuntimeModelError65(appUILogic, "\u7F3A\u5C11\u9ED8\u8BA4\u7D22\u5F15\u5B9E\u4F53\u9009\u62E9\u89C6\u56FE");
+      throw new RuntimeModelError67(appUILogic, "\u7F3A\u5C11\u9ED8\u8BA4\u7D22\u5F15\u5B9E\u4F53\u9009\u62E9\u89C6\u56FE");
     }
     const result = await ibiz.commands.execute(
       OpenAppViewCommand.TAG,
@@ -29080,7 +29988,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     }
     const selectData = (_a = result.data) == null ? void 0 : _a[0];
     if (!selectData) {
-      throw new RuntimeError65("\u8BF7\u9009\u4E2D\u4E00\u6761\u6570\u636E");
+      throw new RuntimeError66("\u8BF7\u9009\u4E2D\u4E00\u6761\u6570\u636E");
     }
     const indexType = selectData.srfkey;
     const findView = newDataAppViews == null ? void 0 : newDataAppViews.find(
@@ -29090,7 +29998,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
       }
     );
     if (!findView) {
-      throw new RuntimeError65(
+      throw new RuntimeError66(
         "\u6CA1\u6709\u627E\u5230\u4E0E\u7D22\u5F15\u7C7B\u578B".concat(indexType, "\u76F8\u5173\u7684\u5B9E\u4F53\u7684\u7F16\u8F91\u89C6\u56FE")
       );
     }
@@ -29117,7 +30025,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
       const minorDERs = selfDe.minorAppDERSs;
       const pickParentDeName = newViewRef.refMode.toLowerCase();
       if (!minorDERs) {
-        throw new RuntimeModelError65(selfDe, "\u5B9E\u4F53\u6CA1\u6709\u4ECE\u5173\u7CFB\u96C6\u5408\uFF01");
+        throw new RuntimeModelError67(selfDe, "\u5B9E\u4F53\u6CA1\u6709\u4ECE\u5173\u7CFB\u96C6\u5408\uFF01");
       }
       let pickParentFieldName;
       minorDERs == null ? void 0 : minorDERs.forEach((item) => {
@@ -29216,12 +30124,12 @@ var ControlEventTrigger = class extends LogicTrigger {
 };
 
 // src/logic-scheduler/executor/app-ui-action-executor.ts
-import { RuntimeModelError as RuntimeModelError66 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError68 } 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 RuntimeModelError66(
+      throw new RuntimeModelError68(
         this.logic,
         "\u903B\u8F91\u4E2D\u7F3A\u5C11\u89E6\u53D1\u5E94\u7528\u5B9E\u4F53\u754C\u9762\u884C\u4E3Aid"
       );