@ibiz-template/runtime 0.4.17-dev.1 → 0.5.0-beta.1

package/dist/index.esm.js

@@ -1091,15 +1091,14 @@ async function toLocalOpenWFRedirectView(context, linkUrl, opts = {}) {
     context.srfprocessinstanceid = params.srfprocessinstanceid;
     delete params.srfprocessinstanceid;
   }
-  await ibiz.commands.execute(
-    OpenAppViewCommand.TAG,
-    deRdView.id,
+  return {
     context,
     params,
-    opts
-  );
+    opts,
+    viewId: deRdView.id
+  };
 }
-async function openDERedirectView(appView, context, params = {}, opts = {}) {
+async function getDERedirectToView(appView, context, params = {}, opts = {}) {
   var _a;
   const navContext = appView.appViewNavContexts || [];
   const navContextData = convertNavData(navContext, params, context);
@@ -1128,20 +1127,17 @@ async function openDERedirectView(appView, context, params = {}, opts = {}) {
           linkUrl = linkUrl.slice(linkUrl.indexOf("appredirectview?"));
         }
         if (linkUrl.startsWith("http://") || linkUrl.startsWith("https://")) {
-          return new Promise((resolve) => {
-            const newWindow = window.open(linkUrl, "_blank");
-            if (newWindow) {
-              newWindow.callback = () => {
-                resolve({ ok: true, data: [] });
-              };
-            }
-          });
+          return { type: "url", url: linkUrl };
         }
         if (linkUrl.startsWith("appredirectview?")) {
-          await toLocalOpenWFRedirectView(context, linkUrl, opts);
-          return { ok: true, data: [] };
+          const toView = await toLocalOpenWFRedirectView(
+            context,
+            linkUrl,
+            opts
+          );
+          return { type: "view", ...toView };
         }
-        return { ok: false, data: [] };
+        throw new RuntimeError("\u672A\u652F\u6301\u7684linkUrl\u683C\u5F0F:".concat(linkUrl));
       }
     }
   } finally {
@@ -1152,27 +1148,29 @@ async function openDERedirectView(appView, context, params = {}, opts = {}) {
   const rdTagItems = rdTag.split(":");
   const wfRdTag = rdTagItems.length === 2 ? rdTag : rdTagItems.slice(0, 2).join(":");
   const deRdTag = "".concat(entity.name.toUpperCase(), ":").concat(rdTag);
-  const allRefViews = appView.redirectAppViewRefs;
-  const refView = allRefViews == null ? void 0 : allRefViews.find((view) => {
+  const allRefViews = [];
+  if (appView.redirectAppViewRefs) {
+    allRefViews.push(...appView.redirectAppViewRefs);
+  }
+  if (appView.appViewRefs) {
+    allRefViews.push(...appView.appViewRefs);
+  }
+  const refView = allRefViews.find((view) => {
     const matchKey = view.name || view.id;
     return matchKey === deRdTag || matchKey === rdTag || matchKey === wfRdTag;
   });
   if (refView) {
     const viewId = refView.refAppViewId;
     if (viewId) {
-      const result = await ibiz.commands.execute(
-        OpenAppViewCommand.TAG,
+      return {
+        type: "view",
         viewId,
         context,
         params,
-        { ...opts, data: [curData] }
-      );
-      if (result) {
-        return result;
-      }
-    } else {
-      throw new RuntimeModelError2(refView, "\u672A\u914D\u7F6E\u5B9E\u9645\u5F15\u7528\u89C6\u56FE");
+        opts: { ...opts, data: [curData] }
+      };
     }
+    throw new RuntimeModelError2(refView, "\u672A\u914D\u7F6E\u5B9E\u9645\u5F15\u7528\u89C6\u56FE");
   } else {
     ibiz.log.error(
       "\u91CD\u5B9A\u5411\u89C6\u56FE\u5F15\u7528\u6709\uFF1A",
@@ -1187,7 +1185,34 @@ async function openDERedirectView(appView, context, params = {}, opts = {}) {
       "\u672A\u627E\u5230\u91CD\u5B9A\u5411\u6807\u8BC6[".concat(rdTag, "]\u6216[").concat(deRdTag, "]\u6216\u5DE5\u4F5C\u6D41[").concat(wfRdTag, "]\u5BF9\u5E94\u89C6\u56FE")
     );
   }
-  return { ok: true, data: [] };
+}
+async function openDERedirectView(appView, context, params = {}, opts = {}) {
+  let toView;
+  try {
+    toView = await getDERedirectToView(appView, context, params, opts);
+  } catch (error) {
+    ibiz.log.error(error);
+    return { ok: false, data: [] };
+  }
+  if (toView.type === "url") {
+    const openUrl = toView.url;
+    return new Promise((resolve) => {
+      const newWindow = window.open(openUrl, "_blank");
+      if (newWindow) {
+        newWindow.callback = () => {
+          resolve({ ok: true, data: [] });
+        };
+      }
+    });
+  }
+  const result = await ibiz.commands.execute(
+    OpenAppViewCommand.TAG,
+    toView.viewId,
+    toView.context,
+    toView.params,
+    toView.opts
+  );
+  return result || { ok: true, data: [] };
 }
 async function calcDERdTag(entity, rdView, params, data) {
   let rdTag = "";
@@ -1196,7 +1221,7 @@ async function calcDERdTag(entity, rdView, params, data) {
     const { codeName } = findFieldById(entity, typeFieldId);
     const value = data[codeName.toLowerCase()];
     if (notNilEmpty3(value)) {
-      return "".concat(value);
+      return "".concat(value.toUpperCase());
     }
     ibiz.log.warn(
       "\u91CD\u5B9A\u5411\u89C6\u56FE[".concat(rdView.name, "]\u81EA\u5B9A\u4E49\u7C7B\u522B\u5C5E\u6027[").concat(typeFieldId, "]\u503C\u4E3A\u7A7A"),
@@ -2709,12 +2734,50 @@ var UIDomain = class {
    * @param {string} [id]
    */
   constructor(id) {
+    /**
+     * DTO 父子关系映射
+     *
+     * @author chitanda
+     * @date 2023-12-26 15:12:13
+     * @protected
+     * @type {Map<string, IParentConfig[]>}
+     */
+    this.rsMap = /* @__PURE__ */ new Map();
     if (id) {
       this.id = id;
     } else {
       this.id = createUUID();
     }
   }
+  /**
+   * 设置当前界面域下，指定实体的相关父关系以及属性。在 DTO 包解析时设置此参数，销毁时清空
+   *
+   * @author chitanda
+   * @date 2023-12-26 15:12:31
+   * @param {string} entity
+   * @param {IParentConfig} config
+   */
+  setDERConfig(deCodeName, config) {
+    if (!this.rsMap.has(deCodeName)) {
+      this.rsMap.set(deCodeName, []);
+    }
+    const arr = this.rsMap.get(deCodeName);
+    arr.push(config);
+  }
+  /**
+   * 获取当前界面域下，具体实体的关系(在数据加载完成之后才有值)
+   *
+   * @author chitanda
+   * @date 2023-12-26 16:12:07
+   * @param {string} deCodeName
+   * @return {*}  {IParentConfig[]}
+   */
+  getDERConfig(deCodeName) {
+    if (this.rsMap.has(deCodeName)) {
+      return this.rsMap.get(deCodeName);
+    }
+    return [];
+  }
   /**
    * 界面域销毁
    *
@@ -2722,6 +2785,7 @@ var UIDomain = class {
    * @date 2023-12-22 15:12:49
    */
   destroy() {
+    this.rsMap.clear();
     const apps = ibiz.hub.getAllApps();
     apps.forEach((app) => {
       app.deService.reset({
@@ -5602,6 +5666,205 @@ var FileService = class {
   }
 };
 
+// src/service/app-data-entity/app-data-entity.ts
+import { clone as clone5, isNil as isNil7 } from "ramda";
+import { DataTypes } from "@ibiz-template/core";
+import { createUUID as createUUID3 } from "qx-util";
+
+// src/service/constant/srfuf.ts
+var Srfuf = /* @__PURE__ */ ((Srfuf2) => {
+  Srfuf2[Srfuf2["CREATE"] = 0] = "CREATE";
+  Srfuf2[Srfuf2["UPDATE"] = 1] = "UPDATE";
+  return Srfuf2;
+})(Srfuf || {});
+
+// src/service/app-data-entity/app-data-entity.ts
+var AppDataEntity = class _AppDataEntity {
+  get srfuf() {
+    return this.srfkey === this.tempsrfkey ? 1 /* UPDATE */ : 0 /* CREATE */;
+  }
+  /**
+   * Creates an instance of AppDataEntity.
+   *
+   * @author chitanda
+   * @date 2023-11-16 15:11:08
+   * @param {IAppDataEntity} entity
+   * @param {(IData | AppDataEntity)} [data={}]
+   */
+  constructor(entity, data = {}) {
+    Object.defineProperty(this, "_entity", {
+      enumerable: false,
+      configurable: true,
+      value: entity
+    });
+    Object.defineProperty(this, "_data", {
+      enumerable: false,
+      configurable: true,
+      value: data instanceof _AppDataEntity ? clone5(data._data) : clone5(data)
+    });
+    Object.defineProperty(this, "srfdeid", {
+      get() {
+        return entity.id;
+      }
+    });
+    Object.defineProperty(this, "srfdecodename", {
+      get() {
+        return entity.codeName;
+      }
+    });
+    const keyAppField = findModelChild(
+      entity.appDEFields || [],
+      entity.keyAppDEFieldId
+    );
+    if (keyAppField) {
+      const key = keyAppField.codeName.toLowerCase();
+      Object.defineProperty(this, "srfkeyfield", {
+        get() {
+          return key;
+        }
+      });
+      Object.defineProperty(this, "srfkey", {
+        set(val) {
+          this._data[key] = val;
+        },
+        get() {
+          return this._data[key];
+        }
+      });
+    } else {
+      ibiz.log.warn("\u5B9E\u4F53[".concat(entity.codeName, "]\u672A\u914D\u7F6E\u4E3B\u952E\u5B57\u6BB5"));
+    }
+    const majorAppField = findModelChild(
+      entity.appDEFields || [],
+      entity.majorAppDEFieldId
+    );
+    if (majorAppField) {
+      const major = majorAppField.codeName.toLowerCase();
+      Object.defineProperty(this, "srfmajorfield", {
+        get() {
+          return major;
+        }
+      });
+      Object.defineProperty(this, "srfmajortext", {
+        set(val) {
+          this._data[major] = val;
+        },
+        get() {
+          return this._data[major];
+        }
+      });
+    } else {
+      ibiz.log.warn("\u5B9E\u4F53[".concat(entity.codeName, "]\u672A\u914D\u7F6E\u4E3B\u6587\u672C\u5B57\u6BB5"));
+    }
+    Object.defineProperty(this, "tempsrfkey", {
+      enumerable: false,
+      configurable: true,
+      writable: true,
+      value: isNil7(this.srfkey) ? createUUID3() : this.srfkey
+    });
+    this.defineProperties();
+  }
+  /**
+   * 代理实际数据
+   *
+   * @author chitanda
+   * @date 2022-10-11 22:10:55
+   * @protected
+   */
+  defineProperties() {
+    var _a;
+    const { _data, convertVal } = this;
+    const properties = {};
+    const keys = Object.keys(_data);
+    keys.forEach((key) => {
+      properties[key] = {
+        enumerable: true,
+        set(val) {
+          _data[key] = val;
+        },
+        get() {
+          return _data[key];
+        }
+      };
+    });
+    (_a = this._entity.appDEFields) == null ? void 0 : _a.forEach((field) => {
+      const key = field.codeName.toLowerCase();
+      properties[key] = {
+        enumerable: true,
+        set(val) {
+          _data[key] = convertVal(val, field.stdDataType);
+        },
+        get() {
+          return _data[key];
+        }
+      };
+      _data[key] = convertVal(_data[key], field.stdDataType);
+    });
+    Object.defineProperties(this, properties);
+  }
+  /**
+   * 克隆数据
+   *
+   * @author chitanda
+   * @date 2022-10-11 00:10:15
+   * @return {*}  {AppDataEntity}
+   */
+  clone() {
+    const entity = new _AppDataEntity(this._entity, this._data);
+    entity.srfkey = this.srfkey;
+    return entity;
+  }
+  /**
+   * 合并参数
+   *
+   * @author chitanda
+   * @date 2022-10-19 11:10:25
+   * @param {(IData | AppDataEntity)} data
+   * @return {*}  {AppDataEntity}
+   */
+  assign(data) {
+    let _data = {};
+    if (data instanceof _AppDataEntity) {
+      _data = data._data;
+    } else {
+      _data = data;
+    }
+    Object.keys(_data).forEach((key) => {
+      if (_data[key] === void 0) {
+        delete _data[key];
+      }
+    });
+    Object.assign(this._data, _data);
+    return this;
+  }
+  /**
+   * 根据属性的数据类型转换值
+   * @author lxm
+   * @date 2023-09-25 03:37:28
+   * @protected
+   * @param {unknown} value
+   * @param {(number | undefined)} dataType
+   * @return {*}  {unknown}
+   */
+  convertVal(value, dataType) {
+    if (value == null) {
+      return value;
+    }
+    if (isNil7(dataType)) {
+      return value;
+    }
+    if (DataTypes.isNumber(dataType)) {
+      const numVal = !isNil7(value) && value !== "" ? Number(value) : value;
+      if (Number.isNaN(numVal)) {
+        ibiz.log.debug("".concat(value, "\u4E0D\u80FD\u8F6C\u6362\u6210\u6570\u5B57"));
+        return value;
+      }
+      return numVal;
+    }
+    return value;
+  }
+};
+
 // src/service/service/entity/de.service.ts
 var DEService = class {
   /**
@@ -5820,6 +6083,26 @@ var DEService = class {
     const resPath = calcResPath(context, this.model);
     return resPath + curPath;
   }
+  newEntity(data) {
+    if (data instanceof AppDataEntity) {
+      return data.clone();
+    }
+    return new AppDataEntity(this.model, data);
+  }
+  /**
+   * 创建数据对象实例
+   *
+   * @author chitanda
+   * @date 2023-12-23 19:12:57
+   * @param {(IData[] | IDataEntity[] | IData | IDataEntity)} data
+   * @return {*}  {(IDataEntity | IDataEntity[])}
+   */
+  createEntity(data) {
+    if (Array.isArray(data)) {
+      return data.map((item) => this.newEntity(item));
+    }
+    return this.newEntity(data);
+  }
   /**
    * 服务实例销毁
    *
@@ -5833,20 +6116,11 @@ var DEService = class {
 };
 
 // src/service/service/control/control.service.ts
-import { clone as clone6 } from "@ibiz-template/core";
-
-// src/service/vo/control.vo.ts
-import { createUUID as createUUID3 } from "qx-util";
-import { clone as clone5, isNil as isNil7 } from "ramda";
-
-// src/service/constant/srfuf.ts
-var Srfuf = /* @__PURE__ */ ((Srfuf2) => {
-  Srfuf2[Srfuf2["CREATE"] = 0] = "CREATE";
-  Srfuf2[Srfuf2["UPDATE"] = 1] = "UPDATE";
-  return Srfuf2;
-})(Srfuf || {});
+import { clone as clone7 } from "@ibiz-template/core";
 
 // src/service/vo/control.vo.ts
+import { createUUID as createUUID4 } from "qx-util";
+import { clone as clone6, isNil as isNil8 } from "ramda";
 var BuildInKeys = [
   "srfkey",
   "srfmajortext",
@@ -5935,7 +6209,7 @@ var ControlVO = class _ControlVO {
         enumerable: false,
         configurable: true,
         writable: true,
-        value: isNil7(this.srfkey) ? createUUID3() : this.srfkey
+        value: isNil8(this.srfkey) ? createUUID4() : this.srfkey
       });
     }
     Object.defineProperty(this, "srfuf", {
@@ -6034,7 +6308,7 @@ var ControlVO = class _ControlVO {
    * @return {*}  {ControlVO}
    */
   clone() {
-    const cloneOrigin = clone5(this.$origin);
+    const cloneOrigin = clone6(this.$origin);
     const newVal = new _ControlVO(cloneOrigin, this.$dataUIMap);
     Object.keys(this).forEach((key) => {
       newVal[key] = this[key];
@@ -6111,7 +6385,7 @@ var ControlService = class {
    * @returns {*}  {IHttpResponse}
    */
   handleResponse(res) {
-    return clone6(res);
+    return clone7(res);
   }
   /**
    * 实体数据转ui数据
@@ -6570,7 +6844,7 @@ var V7AuthService = class {
 };
 
 // src/service/service/async-action/async-action.service.ts
-import { isNil as isNil8 } from "ramda";
+import { isNil as isNil9 } from "ramda";
 var AsyncActionService = class {
   /**
    * 获取异步操作的集合
@@ -6581,7 +6855,7 @@ var AsyncActionService = class {
    */
   async fetch(params = {}) {
     const res = await ibiz.net.post("/portal/asyncaction/all", params);
-    if (isNil8(res.data)) {
+    if (isNil9(res.data)) {
       res.data = [];
     }
     return res;
@@ -6606,201 +6880,10 @@ import {
   RuntimeError as RuntimeError20,
   RuntimeModelError as RuntimeModelError19
 } from "@ibiz-template/core";
-import { isArray as isArray7, isNil as isNil10 } from "lodash-es";
+import { isArray as isArray6, isNil as isNil10 } from "lodash-es";
 
 // src/service/service/entity/method/method.ts
 import { RuntimeModelError as RuntimeModelError8 } from "@ibiz-template/core";
-import { isArray as isArray4 } from "lodash-es";
-
-// src/service/app-data-entity/app-data-entity.ts
-import { clone as clone7, isNil as isNil9 } from "ramda";
-import { DataTypes } from "@ibiz-template/core";
-import { createUUID as createUUID4 } from "qx-util";
-var AppDataEntity = class _AppDataEntity {
-  get srfuf() {
-    return this.srfkey === this.tempsrfkey ? 1 /* UPDATE */ : 0 /* CREATE */;
-  }
-  /**
-   * Creates an instance of AppDataEntity.
-   *
-   * @author chitanda
-   * @date 2023-11-16 15:11:08
-   * @param {IAppDataEntity} entity
-   * @param {(IData | AppDataEntity)} [data={}]
-   */
-  constructor(entity, data = {}) {
-    Object.defineProperty(this, "_entity", {
-      enumerable: false,
-      configurable: true,
-      value: entity
-    });
-    Object.defineProperty(this, "_data", {
-      enumerable: false,
-      configurable: true,
-      value: data instanceof _AppDataEntity ? clone7(data._data) : clone7(data)
-    });
-    Object.defineProperty(this, "srfdeid", {
-      get() {
-        return entity.id;
-      }
-    });
-    Object.defineProperty(this, "srfdecodename", {
-      get() {
-        return entity.codeName;
-      }
-    });
-    const keyAppField = findModelChild(
-      entity.appDEFields || [],
-      entity.keyAppDEFieldId
-    );
-    if (keyAppField) {
-      const key = keyAppField.codeName.toLowerCase();
-      Object.defineProperty(this, "srfkeyfield", {
-        get() {
-          return key;
-        }
-      });
-      Object.defineProperty(this, "srfkey", {
-        set(val) {
-          this._data[key] = val;
-        },
-        get() {
-          return this._data[key];
-        }
-      });
-    } else {
-      ibiz.log.warn("\u5B9E\u4F53[".concat(entity.codeName, "]\u672A\u914D\u7F6E\u4E3B\u952E\u5B57\u6BB5"));
-    }
-    const majorAppField = findModelChild(
-      entity.appDEFields || [],
-      entity.majorAppDEFieldId
-    );
-    if (majorAppField) {
-      const major = majorAppField.codeName.toLowerCase();
-      Object.defineProperty(this, "srfmajorfield", {
-        get() {
-          return major;
-        }
-      });
-      Object.defineProperty(this, "srfmajortext", {
-        set(val) {
-          this._data[major] = val;
-        },
-        get() {
-          return this._data[major];
-        }
-      });
-    } else {
-      ibiz.log.warn("\u5B9E\u4F53[".concat(entity.codeName, "]\u672A\u914D\u7F6E\u4E3B\u6587\u672C\u5B57\u6BB5"));
-    }
-    Object.defineProperty(this, "tempsrfkey", {
-      enumerable: false,
-      configurable: true,
-      writable: true,
-      value: isNil9(this.srfkey) ? createUUID4() : this.srfkey
-    });
-    this.defineProperties();
-  }
-  /**
-   * 代理实际数据
-   *
-   * @author chitanda
-   * @date 2022-10-11 22:10:55
-   * @protected
-   */
-  defineProperties() {
-    var _a;
-    const { _data, convertVal } = this;
-    const properties = {};
-    const keys = Object.keys(_data);
-    keys.forEach((key) => {
-      properties[key] = {
-        enumerable: true,
-        set(val) {
-          _data[key] = val;
-        },
-        get() {
-          return _data[key];
-        }
-      };
-    });
-    (_a = this._entity.appDEFields) == null ? void 0 : _a.forEach((field) => {
-      const key = field.codeName.toLowerCase();
-      properties[key] = {
-        enumerable: true,
-        set(val) {
-          _data[key] = convertVal(val, field.stdDataType);
-        },
-        get() {
-          return _data[key];
-        }
-      };
-      _data[key] = convertVal(_data[key], field.stdDataType);
-    });
-    Object.defineProperties(this, properties);
-  }
-  /**
-   * 克隆数据
-   *
-   * @author chitanda
-   * @date 2022-10-11 00:10:15
-   * @return {*}  {AppDataEntity}
-   */
-  clone() {
-    const entity = new _AppDataEntity(this._entity, this._data);
-    entity.srfkey = this.srfkey;
-    return entity;
-  }
-  /**
-   * 合并参数
-   *
-   * @author chitanda
-   * @date 2022-10-19 11:10:25
-   * @param {(IData | AppDataEntity)} data
-   * @return {*}  {AppDataEntity}
-   */
-  assign(data) {
-    let _data = {};
-    if (data instanceof _AppDataEntity) {
-      _data = data._data;
-    } else {
-      _data = data;
-    }
-    Object.keys(_data).forEach((key) => {
-      if (_data[key] === void 0) {
-        delete _data[key];
-      }
-    });
-    Object.assign(this._data, _data);
-    return this;
-  }
-  /**
-   * 根据属性的数据类型转换值
-   * @author lxm
-   * @date 2023-09-25 03:37:28
-   * @protected
-   * @param {unknown} value
-   * @param {(number | undefined)} dataType
-   * @return {*}  {unknown}
-   */
-  convertVal(value, dataType) {
-    if (value == null) {
-      return value;
-    }
-    if (isNil9(dataType)) {
-      return value;
-    }
-    if (DataTypes.isNumber(dataType)) {
-      const numVal = !isNil9(value) && value !== "" ? Number(value) : value;
-      if (Number.isNaN(numVal)) {
-        ibiz.log.debug("".concat(value, "\u4E0D\u80FD\u8F6C\u6362\u6210\u6570\u5B57"));
-        return value;
-      }
-      return numVal;
-    }
-    return value;
-  }
-};
 
 // src/service/dto/method.dto.ts
 import { ModelError as ModelError6 } from "@ibiz-template/core";
@@ -6811,6 +6894,15 @@ var MethodDto = class _MethodDto {
     this.isLocalMode = isLocalMode;
     this.dto = dto;
     this.dtoMap = /* @__PURE__ */ new Map();
+    /**
+     * 当前 DTO 是否已经计算过关系相关逻辑
+     *
+     * @link this.calcRs
+     * @author chitanda
+     * @date 2023-12-26 16:12:18
+     * @protected
+     */
+    this.isCalcRs = false;
     if (dto) {
       this.app = ibiz.hub.getApp(entity.appId);
       this.fields = dto.appDEMethodDTOFields || [];
@@ -6868,6 +6960,7 @@ var MethodDto = class _MethodDto {
    */
   async get(context, data) {
     const params = {};
+    const uiDomain = ibiz.uiDomainManager.get(context.srfsessionid);
     for (let i = 0; i < this.fields.length; i++) {
       const field = this.fields[i];
       const key = field.codeName.toLowerCase();
@@ -6889,11 +6982,19 @@ var MethodDto = class _MethodDto {
             if (!field.refAppDataEntityId) {
               break;
             }
+            let configs = uiDomain.getDERConfig(field.refAppDataEntityId);
+            const index = configs.findIndex(
+              (config) => config.majorDECodeName === this.entity.codeName
+            );
+            configs = configs.slice(index + 1);
             const dto = await this.getFieldDto(context, field);
             const filterParams = {};
             if (field.refPickupAppDEFieldId) {
               filterParams[field.refPickupAppDEFieldId] = data.srfkey;
             }
+            configs.forEach((config) => {
+              filterParams[config.pickupDEFName.toLowerCase()] = null;
+            });
             const items = await dto.select(context, filterParams);
             if (items) {
               const arr = [];
@@ -6921,12 +7022,13 @@ var MethodDto = class _MethodDto {
    * @date 2022-10-10 23:10:50
    * @param {IContext} context
    * @param {IData[]} data
-   * @return {*}  {Promise<AppDataEntity[]>}
+   * @return {*}  {Promise<IDataEntity[]>}
    */
   async sets(context, data) {
     if (this.isLocalMode) {
       this.service.local.clear();
     }
+    await this.calcRs(context);
     return Promise.all(
       data.map(async (datum) => {
         const all = this.fields.filter((field) => field.type === "DTOS").map(async (field) => {
@@ -6942,7 +7044,6 @@ var MethodDto = class _MethodDto {
             if (items) {
               const pKey = datum[this.entity.keyAppDEFieldId];
               items.forEach((item) => {
-                item.srfpkey = pKey;
                 item[field.refPickupAppDEFieldId] = pKey;
               });
               await dto.sets(context, items);
@@ -6954,7 +7055,7 @@ var MethodDto = class _MethodDto {
         for (let i = 0; i < all.length; i++) {
           await all[i];
         }
-        const entityData = new AppDataEntity(this.entity, datum);
+        const entityData = this.service.createEntity(datum);
         if (this.isLocalMode) {
           await this.service.local.add(context, entityData);
         }
@@ -6962,6 +7063,48 @@ var MethodDto = class _MethodDto {
       })
     );
   }
+  /**
+   * 递归计算当前 DTO 相关实体的父关系配置
+   *
+   * @author chitanda
+   * @date 2023-12-26 16:12:13
+   * @protected
+   * @param {IContext} context
+   * @param {number} [depth=0] 递归层级，避免进入死循环。最大递归层级为 10
+   * @return {*}  {Promise<void>}
+   */
+  async calcRs(context, depth = 0) {
+    if (this.isCalcRs || depth > 10) {
+      return;
+    }
+    this.isCalcRs = true;
+    depth += 1;
+    const uiDomain = ibiz.uiDomainManager.get(context.srfsessionid);
+    const dtoFields = this.fields.filter((field) => field.type === "DTOS");
+    for (let i = 0; i < dtoFields.length; i++) {
+      const field = dtoFields[i];
+      if (!field.refAppDataEntityId) {
+        continue;
+      }
+      const configs = uiDomain.getDERConfig(field.refAppDataEntityId);
+      const index = configs.findIndex(
+        (config) => config.pickupDEFName === field.refPickupAppDEFieldId
+      );
+      if (index === -1) {
+        const dto = await this.getFieldDto(context, field);
+        uiDomain.setDERConfig(field.refAppDataEntityId, {
+          majorDEName: this.entity.name,
+          majorDECodeName: this.entity.codeName,
+          majorDECodeName2: this.entity.codeName2,
+          minorDEName: dto.entity.name,
+          minorDECodeName: dto.entity.codeName,
+          minorDECodeName2: dto.entity.codeName2,
+          pickupDEFName: field.refPickupAppDEFieldId
+        });
+        await dto.calcRs(context, depth);
+      }
+    }
+  }
   /**
    * 获取子属性 DTO
    *
@@ -7190,29 +7333,20 @@ var Method = class {
    * @return {*}  {(IDataEntity | IDataEntity[])}
    */
   createEntity(data) {
-    const toEntity = (single) => {
-      if (single instanceof AppDataEntity) {
-        return single.clone();
-      }
-      return new AppDataEntity(this.entity, single);
-    };
-    if (isArray4(data)) {
-      return data.map((item) => toEntity(item));
-    }
-    return toEntity(data);
+    return this.service.createEntity(data);
   }
 };
 
 // src/de-logic/index.ts
 import { HttpError as HttpError3, HttpResponse as HttpResponse2, RuntimeError as RuntimeError19 } from "@ibiz-template/core";
-import { isArray as isArray6 } from "lodash-es";
+import { isArray as isArray5 } from "lodash-es";
 import { clone as clone12 } from "ramda";
 
 // src/de-logic/de-logic.ts
 import { ModelError as ModelError12, RuntimeModelError as RuntimeModelError18 } from "@ibiz-template/core";
 
 // src/de-logic/de-logic-context.ts
-import { isArray as isArray5 } from "lodash-es";
+import { isArray as isArray4 } from "lodash-es";
 var DELogicContext = class {
   /**
    * Creates an instance of DELogicContext.
@@ -7259,7 +7393,7 @@ var DELogicContext = class {
      * @type {string}
      */
     this.defaultParamName = "Default";
-    this.parameters = { context, data: isArray5(data) ? data : [data], params };
+    this.parameters = { context, data: isArray4(data) ? data : [data], params };
   }
   /**
    * 上下文
@@ -8292,7 +8426,7 @@ async function execFieldLogics(entity, type, context, data, params = {}) {
   if (!data) {
     return;
   }
-  if (isArray6(data)) {
+  if (isArray5(data)) {
     await Promise.all(
       data.map(
         (item) => execSingleFieldLogics(entity, type, context, item, params)
@@ -8314,7 +8448,7 @@ var DEActionMethod = class extends Method {
    * @return {*}  {(Promise<IData | IData[]>)}
    */
   async inputHandle(context, data) {
-    if (isArray7(data)) {
+    if (isArray6(data)) {
       return data;
     }
     return this.input.handle(context, data);
@@ -8373,7 +8507,7 @@ var DEActionMethod = class extends Method {
         if (this.method.needResourceKey) {
           let srfkey = context[this.entity.codeName.toLowerCase()];
           if (isNil10(srfkey)) {
-            srfkey = isArray7(data) ? null : data == null ? void 0 : data[this.entity.keyAppDEFieldId];
+            srfkey = isArray6(data) ? null : data == null ? void 0 : data[this.entity.keyAppDEFieldId];
           }
           path2 = "".concat(path2, "/").concat(srfkey);
         }
@@ -8512,7 +8646,7 @@ var DEActionMethod = class extends Method {
     try {
       const addData = this.createEntity(entity);
       let resultData;
-      if (isArray7(addData)) {
+      if (isArray6(addData)) {
         resultData = await Promise.all(
           addData.map((item) => this.service.local.add(context, item))
         );
@@ -8583,7 +8717,7 @@ var DEActionMethod = class extends Method {
     try {
       const updateData = this.createEntity(entity);
       let resultData;
-      if (isArray7(updateData)) {
+      if (isArray6(updateData)) {
         resultData = await Promise.all(
           updateData.map((item) => this.service.local.update(context, item))
         );
@@ -8649,12 +8783,12 @@ import {
   ModelError as ModelError13,
   RuntimeModelError as RuntimeModelError20
 } from "@ibiz-template/core";
-import { isArray as isArray8 } from "lodash-es";
+import { isArray as isArray7 } from "lodash-es";
 import { clone as clone13, isEmpty as isEmpty7, isNil as isNil11 } from "ramda";
 import { ascSort as ascSort2, descSort } from "qx-util";
 var FetchMethod = class extends Method {
   async exec(context, params, params2) {
-    const searchParams = params && !isArray8(params) ? params : params2 || {};
+    const searchParams = params && !isArray7(params) ? params : params2 || {};
     if (this.isLocalMode) {
       const items2 = await this.searchLocal(
         null,
@@ -9371,18 +9505,6 @@ 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 {
@@ -9444,7 +9566,6 @@ var GanttDataSetNodeData = class extends TreeDataSetNodeData {
       nodeModel,
       data
     );
-    this.nodeDataItem = calcNodeDataItem(nodeModel, data);
   }
 };
 
@@ -9581,7 +9702,7 @@ var MqttService = class {
 
 // src/service/de-service-util.ts
 import { RuntimeError as RuntimeError21 } from "@ibiz-template/core";
-var DEServiceUtil = class {
+var _DEServiceUtil = class _DEServiceUtil {
   /**
    * Creates an instance of DEServiceUtil.
    *
@@ -9600,13 +9721,6 @@ var DEServiceUtil = class {
      * @type {Map<string, Map<string, IAppDEService>>} Map<域标识, Map<实体标识, 实体服务>>
      */
     this.cache = /* @__PURE__ */ new Map();
-    /**
-     * 实体服务构造方法缓存
-     * @author lxm
-     * @date 2023-05-15 08:37:13
-     * @protected
-     */
-    this.constructorCache = /* @__PURE__ */ new Map();
   }
   /**
    * 注册服务工厂方法
@@ -9616,8 +9730,8 @@ var DEServiceUtil = class {
    * @param {string} id 实体标识
    * @param {DEServiceConstructor} constructor
    */
-  register(id, constructor) {
-    this.constructorCache.set(id, constructor);
+  static register(id, constructor) {
+    this.constructorCache.set(id.toUpperCase(), constructor);
   }
   /**
    * 根据实体标识获取实体服务
@@ -9642,7 +9756,7 @@ var DEServiceUtil = class {
       if (!entityModel) {
         throw new RuntimeError21("\u672A\u627E\u5230\u5E94\u7528\u5B9E\u4F53[".concat(id, "]"));
       }
-      const constructor = this.constructorCache.get(id);
+      const constructor = _DEServiceUtil.constructorCache.get(id.toUpperCase());
       let service;
       if (constructor) {
         service = await constructor(sandboxId, entityModel);
@@ -9706,6 +9820,15 @@ var DEServiceUtil = class {
     return service.exec(methodName, context, params, params2);
   }
 };
+/**
+ * 实体服务构造方法缓存
+ *
+ * @author lxm
+ * @date 2023-05-15 08:37:13
+ * @protected
+ */
+_DEServiceUtil.constructorCache = /* @__PURE__ */ new Map();
+var DEServiceUtil = _DEServiceUtil;
 
 // src/command/app/open-app-view/open-app-view.ts
 var _OpenAppViewCommand = class _OpenAppViewCommand {
@@ -12584,15 +12707,45 @@ var MDControlController = class extends ControlController {
     this.state.mdctrlActiveMode = 0;
     this.state.groups = [];
   }
-  async onCreated() {
-    var _a;
-    await super.onCreated();
-    this.dataEntity = await ibiz.hub.getAppDataEntity(
-      this.model.appDataEntityId,
-      this.model.appId
-    );
-    (_a = this.dataEntity.appDEFields) == null ? void 0 : _a.forEach((field) => {
-      this.fieldIdNameMap.set(field.id, field.name);
+  /**
+   * 批操作工具栏
+   *
+   * @author zk
+   * @date 2023-08-02 06:08:34
+   * @readonly
+   * @type {(IToolbarController | undefined)}
+   * @memberof ListController
+   */
+  get batchToolbarController() {
+    const controller = this.view.getController(
+      "".concat(this.model.name, "_batchtoolbar")
+    );
+    return controller;
+  }
+  /**
+   * 快速工具栏
+   *
+   * @author zk
+   * @date 2023-08-02 06:08:34
+   * @readonly
+   * @type {(IToolbarController | undefined)}
+   * @memberof ListController
+   */
+  get quickToolbarController() {
+    const controller = this.view.getController(
+      "".concat(this.model.name, "_quicktoolbar")
+    );
+    return controller;
+  }
+  async onCreated() {
+    var _a;
+    await super.onCreated();
+    this.dataEntity = await ibiz.hub.getAppDataEntity(
+      this.model.appDataEntityId,
+      this.model.appId
+    );
+    (_a = this.dataEntity.appDEFields) == null ? void 0 : _a.forEach((field) => {
+      this.fieldIdNameMap.set(field.id, field.name);
     });
     const fn = this.onDataChange.bind(this);
     this.onDataChange = debounce((msg) => {
@@ -12687,7 +12840,10 @@ var MDControlController = class extends ControlController {
     if (this.state.isSimple) {
       return [];
     }
-    await this.startLoading();
+    const silent = args.silent === true;
+    if (!silent) {
+      await this.startLoading();
+    }
     try {
       const isInitialLoad = args.isInitialLoad === true;
       const isLoadMore = args.isLoadMore === true;
@@ -12719,7 +12875,9 @@ var MDControlController = class extends ControlController {
       });
       throw error;
     } finally {
-      await this.endLoading();
+      if (!silent) {
+        await this.endLoading();
+      }
     }
     this.state.items.forEach((item, index) => {
       item.srfserialnum = index + 1;
@@ -12837,6 +12995,7 @@ var MDControlController = class extends ControlController {
     });
   }
   setSelection(selection) {
+    var _a, _b;
     const { selectedData } = this.state;
     if (!isElementSame(selectedData, selection)) {
       this.state.selectedData = selection;
@@ -12844,6 +13003,15 @@ var MDControlController = class extends ControlController {
         data: selection
       });
     }
+    const data = selection == null ? void 0 : selection[0];
+    (_a = this.batchToolbarController) == null ? void 0 : _a.calcButtonState(
+      data,
+      this.model.appDataEntityId
+    );
+    (_b = this.quickToolbarController) == null ? void 0 : _b.calcButtonState(
+      data,
+      this.model.appDataEntityId
+    );
   }
   /**
    * 行单击事件
@@ -14563,7 +14731,7 @@ import { recursiveIterate as recursiveIterate2, RuntimeError as RuntimeError46 }
 
 // src/ui-action/provider/backend-ui-action-provider.ts
 import { RuntimeModelError as RuntimeModelError47 } from "@ibiz-template/core";
-import { isArray as isArray9 } from "qx-util";
+import { isArray as isArray8 } from "qx-util";
 
 // src/ui-action/provider/ui-action-provider-base.ts
 import { RuntimeModelError as RuntimeModelError46 } from "@ibiz-template/core";
@@ -15998,7 +16166,6 @@ var UIActionProviderBase = class {
    * @return {*}  {Promise<IUIActionResult>}
    */
   async exec(action, args) {
-    const { context, params, data } = args;
     const result = {
       refresh: action.reloadData,
       refreshMode: action.refreshMode,
@@ -16020,12 +16187,17 @@ var UIActionProviderBase = class {
     if (result.cancel === true) {
       return this.returnError(result);
     }
-    const nextActionParams = {
-      ...args,
-      context: result.nextContext || context,
-      data: result.data || data,
-      params: result.nextParams || params
-    };
+    if (action.uilogicAttachMode === "AFTER") {
+      if (!appDEUILogicId) {
+        throw new RuntimeModelError46(action, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u754C\u9762\u903B\u8F91");
+      }
+      await execUILogic(
+        appDEUILogicId,
+        appDataEntityId,
+        this.mergeArgsByResult(args, result)
+      );
+    }
+    const nextActionParams = this.mergeArgsByResult(args, result);
     if (action.closeEditView) {
       this.doNextAction(action, nextActionParams, action.appId);
     } else {
@@ -16041,14 +16213,25 @@ var UIActionProviderBase = class {
         }
       }
     }
-    if (action.uilogicAttachMode === "AFTER") {
-      if (!appDEUILogicId) {
-        throw new RuntimeModelError46(action, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u754C\u9762\u903B\u8F91");
-      }
-      await execUILogic(appDEUILogicId, appDataEntityId, args);
-    }
     return result;
   }
+  /**
+   * 根据界面行为逻辑返回值，合并参数获得后续逻辑要用的参数
+   * @author lxm
+   * @date 2023-12-25 02:42:23
+   * @protected
+   * @param {IUILogicParams} args 当前环境的参数
+   * @param {IUIActionResult} result 上一次逻辑执行的结果
+   * @return {*}  {IUILogicParams}
+   */
+  mergeArgsByResult(args, result) {
+    return {
+      ...args,
+      context: result.nextContext || args.context,
+      data: result.data || args.data,
+      params: result.nextParams || args.params
+    };
+  }
   /**
    * 有错误和取消时对result做的处理
    * @author lxm
@@ -16290,7 +16473,7 @@ var BackendUIActionProvider = class extends UIActionProviderBase {
       }
     }
     Object.assign(actionResult, {
-      data: isArray9(res.data) ? res.data : [res.data],
+      data: isArray8(res.data) ? res.data : [res.data],
       nextContext: resultContext,
       nextParams: tempParams
     });
@@ -19369,15 +19552,11 @@ var FormDetailController = class {
   calcDynaClass(data) {
     if (this.model.dynaClass) {
       const dynaClass = calcDynaClass(this.model.dynaClass, data);
-      if (dynaClass.length) {
-        this.state.class.containerDyna = dynaClass;
-      }
+      this.state.class.containerDyna = dynaClass;
     }
     if (this.model.labelDynaClass) {
       const dynaClass = calcDynaClass(this.model.labelDynaClass, data);
-      if (dynaClass.length) {
-        this.state.class.labelDyna = dynaClass;
-      }
+      this.state.class.labelDyna = dynaClass;
     }
   }
   /**
@@ -23457,57 +23636,6 @@ var ListController = class extends MDControlController {
       }
     }
   }
-  /**
-   * 工具栏
-   *
-   * @author zk
-   * @date 2023-08-02 06:08:34
-   * @readonly
-   * @type {(IToolbarController | undefined)}
-   * @memberof ListController
-   */
-  get batchToolbarController() {
-    const controller = this.view.getController(
-      "".concat(this.model.name, "_batchtoolbar")
-    );
-    return controller;
-  }
-  /**
-   * 工具栏
-   *
-   * @author zk
-   * @date 2023-08-02 06:08:34
-   * @readonly
-   * @type {(IToolbarController | undefined)}
-   * @memberof ListController
-   */
-  get quickToolbarController() {
-    const controller = this.view.getController(
-      "".concat(this.model.name, "_quicktoolbar")
-    );
-    return controller;
-  }
-  /**
-   * 根据数据计算工具栏权限和状态
-   *
-   * @author zk
-   * @date 2023-08-02 06:08:11
-   * @param {IData[]} selection
-   * @memberof ListController
-   */
-  setSelection(selection) {
-    var _a, _b;
-    super.setSelection(selection);
-    const data = selection == null ? void 0 : selection[0];
-    (_a = this.batchToolbarController) == null ? void 0 : _a.calcButtonState(
-      data,
-      this.model.appDataEntityId
-    );
-    (_b = this.quickToolbarController) == null ? void 0 : _b.calcButtonState(
-      data,
-      this.model.appDataEntityId
-    );
-  }
   /**
    * 加载更多
    * @author lxm
@@ -24474,30 +24602,43 @@ var SearchBarService = class {
     });
     return res;
   }
+  /**
+   * 批量新建
+   * @param {IData} data
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-12-26 15:49:00
+   */
+  async createBatch(data) {
+    const createParams = this.convertFrontDataToBack(data);
+    const res = await this.app.net.post("".concat(this.themeUrl), createParams);
+    return res;
+  }
   /**
    * 更新数据
    *
    */
   async update(id, data) {
-    const updateParams = { app_view_tag: this.viewTag };
-    if (data.theme_model) {
-      Object.assign(updateParams, {
-        theme_model: JSON.stringify(data.theme_model)
-      });
-    }
-    if (data.caption) {
-      Object.assign(updateParams, {
-        name: data.caption
-      });
-    }
-    if (typeof data.show === "boolean") {
-      Object.assign(updateParams, {
-        show: data.show
-      });
-    }
+    const [updateParams] = this.convertFrontDataToBack([data]);
     const res = await this.app.net.put("".concat(this.themeUrl, "/").concat(id), updateParams);
     return res;
   }
+  /**
+   * 批量更新数据
+   * @param {IData} data
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-12-26 11:11:34
+   */
+  async updateBatch(data) {
+    const updateParams = this.convertFrontDataToBack(data);
+    const idUrl = updateParams.map((item) => item.id).join(";");
+    const res = await this.app.net.put(
+      "".concat(this.themeUrl, "/").concat(idUrl),
+      updateParams
+    );
+    return res;
+  }
   /**
    * 转换后台数据成前端需要的格式
    * @param {IData} data
@@ -24514,6 +24655,41 @@ var SearchBarService = class {
       if (item.theme_model) {
         tempItem.searchGroupData = JSON.parse(item.theme_model);
       }
+      if (typeof item.valid_flag === "number") {
+        tempItem.show = item.valid_flag === 1;
+      }
+      if (item.order_value) {
+        tempItem.order = item.order_value;
+      }
+      return tempItem;
+    });
+  }
+  /**
+   * 转换前端数据成后台需要的格式
+   * @param {IData} data
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-12-22 11:19:50
+   */
+  convertFrontDataToBack(data) {
+    return data.map((item) => {
+      const tempItem = {
+        appId: item.appId,
+        app_view_tag: this.viewTag,
+        id: item.id
+      };
+      if (item.caption) {
+        tempItem.name = item.caption;
+      }
+      if (item.searchGroupData && Object.keys(item.searchGroupData).length > 0) {
+        tempItem.theme_model = JSON.stringify(item.searchGroupData);
+      }
+      if (typeof item.show === "boolean") {
+        tempItem.valid_flag = item.show ? 1 : 0;
+      }
+      if (item.order) {
+        tempItem.order_value = item.order;
+      }
       return tempItem;
     });
   }
@@ -24550,7 +24726,7 @@ var SearchBarController = class extends ControlController {
      * @author: zhujiamin
      * @Date: 2023-12-21 10:17:43
      */
-    this.isBackendSearchGroup = true;
+    this.isBackendSearchGroup = this.model.searchBarStyle === "SEARCHBAR2";
   }
   /**
    * 表格控制器
@@ -24768,12 +24944,42 @@ var SearchBarController = class extends ControlController {
     this.state.searchBarGroups = [];
     if (this.isBackendSearchGroup) {
       if (this.model.searchBarGroups && this.model.searchBarGroups.length > 0) {
-        this.state.searchBarGroups = this.model.searchBarGroups.map((item) => ({
-          ...item,
-          show: true,
-          saved: false,
-          searchGroupData: {}
-        }));
+        this.state.searchBarGroups = this.model.searchBarGroups.map(
+          (item, index) => {
+            const tempGroup = {
+              ...item,
+              saved: false,
+              show: true,
+              searchGroupData: {},
+              order: (index + 1) * 100
+            };
+            if (item.data) {
+              try {
+                const tempData = JSON.parse(item.data);
+                if (tempData.theme_model) {
+                  if (tempData.theme_model.sort) {
+                    tempGroup.searchGroupData.sort = tempData.theme_model.sort;
+                  }
+                  if (tempData.theme_model.columnstates) {
+                    tempGroup.searchGroupData.columnstates = tempData.theme_model.columnstates;
+                  }
+                  if (tempData.theme_model.filternodes) {
+                    tempGroup.searchGroupData.filternodes = tempData.theme_model.filternodes;
+                  }
+                  if (tempData.theme_model.searchconds) {
+                    tempGroup.searchGroupData.searchconds = tempData.theme_model.searchconds;
+                  }
+                }
+                if (tempData.valid_flag) {
+                  tempGroup.show = tempData.valid_flag === "1";
+                }
+              } catch (error) {
+                ibiz.log.error(error);
+              }
+            }
+            return tempGroup;
+          }
+        );
       }
       const res = await this.service.fetch();
       if (res.ok) {
@@ -24785,16 +24991,26 @@ var SearchBarController = class extends ControlController {
             mergeInLeft3(existGroup, group);
             existGroup.saved = true;
           } else {
+            const tempMaxOrderIndex = this.state.searchBarGroups.reduce(
+              (maxIndex, item, currentIndex) => item.order > this.state.searchBarGroups[maxIndex].order ? currentIndex : maxIndex,
+              0
+            );
             this.state.searchBarGroups.push({
-              ...group,
               appId: this.context.srfappid,
-              show: true,
               saved: true,
-              searchGroupData: {}
+              show: true,
+              searchGroupData: {},
+              order: (tempMaxOrderIndex + 2) * 100,
+              // 以后台给的为准
+              ...group
             });
           }
         });
       }
+      this.state.searchBarGroups.sort((a, b) => a.order - b.order);
+      this.state.searchBarGroups.forEach((item, index) => {
+        item.order = (index + 1) * 100;
+      });
     }
   }
   /**
@@ -24815,8 +25031,9 @@ var SearchBarController = class extends ControlController {
       };
       if (this.state.selectedSearchGroupItem.saved) {
         await this.service.update(this.state.selectedSearchGroupItem.id, {
-          theme_model: saveParams,
-          show: this.state.selectedSearchGroupItem.show
+          searchGroupData: saveParams,
+          show: this.state.selectedSearchGroupItem.show,
+          order: this.state.selectedSearchGroupItem.order
         });
         ibiz.message.success("\u4FDD\u5B58\u6210\u529F");
       } else {
@@ -24848,6 +25065,7 @@ var SearchBarController = class extends ControlController {
       const res = await this.service.get(groupItem.id);
       if (res.ok) {
         mergeInLeft3(groupItem, res.data);
+        groupItem.show = true;
       }
     }
     if (groupItem.searchGroupData && groupItem.searchGroupData.filternodes) {
@@ -26486,7 +26704,7 @@ var MDCtrlController = class extends MDControlController {
    */
   async loadMore() {
     if (this.state.total > this.state.items.length && !this.state.isLoading) {
-      await this.load({ isLoadMore: true });
+      await this.load({ isLoadMore: true, silent: true });
     }
   }
   /**
@@ -27203,7 +27421,7 @@ var KanbanController = class extends DataViewControlController {
   /**
    * 打开批操作工具栏
    *
-   * @param {string} groupKey
+   * @param {string | number} groupKey
    * @memberof KanbanController
    */
   openBatch(groupKey) {
@@ -28328,9 +28546,6 @@ var ReportPanelController = class extends ControlController {
   }
 };
 
-// src/controller/control/gantt/gantt.controller.ts
-import { recursiveIterate as recursiveIterate12 } from "@ibiz-template/core";
-
 // src/controller/control/gantt/gantt.service.ts
 import { ModelError as ModelError30 } from "@ibiz-template/core";
 var GanttService = class extends TreeService {
@@ -28362,12 +28577,12 @@ var GanttService = class extends TreeService {
    * @param {TreeFetchOpts} opts
    * @return {*}  {(Promise<IGanttNodeData[] | undefined>)}
    */
-  async fetchGanttChildNodes(parentNodeData, opts) {
+  async fetchChildNodes(parentNodeData, opts) {
     const { hasQuery } = opts;
     let childrenNodes = [];
     if (!parentNodeData) {
       const rootNode = getRootNode(this.model);
-      childrenNodes = await this.fetchGanttNodeDatasByType(
+      childrenNodes = await this.fetchNodeDatasByType(
         rootNode,
         void 0,
         void 0,
@@ -28387,7 +28602,7 @@ var GanttService = class extends TreeService {
             this.model,
             childNodeRS.childDETreeNodeId
           );
-          return this.fetchGanttNodeDatasByType(
+          return this.fetchNodeDatasByType(
             childNode,
             childNodeRS,
             parentNodeData,
@@ -28414,7 +28629,7 @@ var GanttService = class extends TreeService {
    * @param {TreeFetchOpts} opts
    * @return {*}  {Promise<IGanttNodeData[]>}
    */
-  async fetchGanttNodeDatasByType(nodeModel, nodeRS, parentNodeData, opts) {
+  async fetchNodeDatasByType(nodeModel, nodeRS, parentNodeData, opts) {
     const leaf = getChildNodeRSs(this.model, {
       parentId: nodeModel.id,
       hasQuery: opts.hasQuery
@@ -28462,7 +28677,7 @@ var GanttService = class extends TreeService {
         result.map(async (childNode, index) => {
           if (expanded && // 全展开合只展开首节点expanded都为true
           (!expandFirstOnly || expandFirstOnly && index === 0) || isExpandedRoot) {
-            const subChildrenNodes = await this.fetchGanttChildNodes(
+            const subChildrenNodes = await this.fetchChildNodes(
               childNode,
               opts
             );
@@ -28584,54 +28799,7 @@ var GanttService = class extends TreeService {
 };
 
 // src/controller/control/gantt/gantt.controller.ts
-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 = {};
-    /**
-     * 上下文菜单控制器
-     *
-     * @author tony001
-     * @date 2023-12-11 16:12:57
-     * @type {{ [p: string]: ContextMenuController }}
-     */
-    this.contextMenus = {};
-    /**
-     * 是否启用快速搜索
-     *
-     * @author tony001
-     * @date 2023-12-11 16:12:13
-     * @type {boolean}
-     */
-    this.enableQuickSearch = false;
-  }
+var GanttController = class extends TreeGridExController {
   /**
    * 初始化状态
    *
@@ -28641,9 +28809,6 @@ var GanttController = class extends MDControlController {
    */
   initState() {
     super.initState();
-    this.state.size = 0;
-    this.state.query = "";
-    this.state.columnStates = [];
     this.state.rootNodes = [];
     this.state.ganttStyle = {};
   }
@@ -28656,131 +28821,16 @@ var GanttController = class extends MDControlController {
    */
   onDataChange(msg) {
   }
-  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;
-    }
-    if (this.dataEntity) {
-      const searchFields = (_b = this.dataEntity.appDEFields) == null ? void 0 : _b.filter((field) => {
-        return field.enableQuickSearch;
-      });
-      const placeHolders = [];
-      searchFields == null ? void 0 : searchFields.forEach((searchField) => {
-        if ((searchField == null ? void 0 : searchField.lnlanguageRes) && searchField.lnlanguageRes.lanResTag) {
-          placeHolders.push(
-            ibiz.i18n.t(
-              searchField.lnlanguageRes.lanResTag,
-              searchField.logicName
-            )
-          );
-        } else if (searchField == null ? void 0 : searchField.logicName) {
-          placeHolders.push(searchField.logicName);
-        }
-      });
-      if (placeHolders.length > 0) {
-        this.state.placeHolder = placeHolders.join("\u3001");
-      }
-    }
-    this.service = new GanttService(this.model);
-    await this.service.init(this.context);
-    this.model.detreeNodes.forEach((node) => {
-      var _a2, _b2;
-      if ((_b2 = (_a2 = node.decontextMenu) == null ? void 0 : _a2.detoolbarItems) == null ? void 0 : _b2.length) {
-        this.contextMenus[node.decontextMenu.id] = new ContextMenuController(
-          node.decontextMenu,
-          this.context,
-          this.params,
-          this.ctx
-        );
-      }
-    });
-    await Promise.all(
-      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() {
-    recursiveIterate12(
-      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";
-      }
-    });
+  async initService() {
+    this.service = new GanttService(this.model);
+    await this.service.init(this.context);
   }
   /**
    * 设置甘特图样式
@@ -28791,214 +28841,6 @@ var GanttController = class extends MDControlController {
   setGanttStyle(style) {
     this.state.ganttStyle = style;
   }
-  /**
-   * 加载
-   *
-   * @author tony001
-   * @date 2023-12-12 11:12:08
-   * @param {MDCtrlLoadParams} [args={}]
-   * @return {*}  {Promise<IGanttNodeData[]>}
-   */
-  async load(args = {}) {
-    const isInitialLoad = args.isInitialLoad === true;
-    if (isInitialLoad) {
-      await this.startLoading();
-    }
-    let nodes;
-    try {
-      nodes = await this.loadNodes();
-    } finally {
-      if (isInitialLoad) {
-        await this.endLoading();
-      }
-    }
-    await this.afterLoad(args, nodes);
-    this.state.isLoaded = true;
-    await this.evt.emit("onLoadSuccess", {
-      isInitialLoad
-    });
-    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);
-  }
-  /**
-   * 获取查询参数
-   *
-   * @author tony001
-   * @date 2023-12-12 11:12:22
-   * @param {IParams} [extraParams]
-   * @return {*}  {Promise<IParams>}
-   */
-  async getFetchParams(extraParams) {
-    const params = await super.getFetchParams(extraParams);
-    if (this.state.query) {
-      params.query = this.state.query;
-    }
-    return params;
-  }
-  /**
-   * 加载节点
-   *
-   * @author tony001
-   * @date 2023-12-12 11:12:33
-   * @param {IGanttNodeData} [parentNode]
-   * @return {*}  {Promise<IGanttNodeData[]>}
-   */
-  async loadNodes(parentNode) {
-    const params = await this.getFetchParams();
-    const hasQuery = !!params.query;
-    this.state.isLoading = true;
-    let nodes;
-    try {
-      nodes = await this.service.fetchGanttChildNodes(parentNode, {
-        context: this.context.clone(),
-        params,
-        hasQuery,
-        defaultExpandedKeys: []
-      }) || [];
-    } finally {
-      this.state.isLoading = false;
-    }
-    if (parentNode) {
-      parentNode.children = nodes;
-    } else {
-      this.state.rootNodes = nodes;
-    }
-    this.state.items = [];
-    recursiveIterate12(
-      { children: this.state.rootNodes },
-      (node) => {
-        this.state.items.push(node);
-      }
-    );
-    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 || {} }
-    };
-  }
   /**
    * 转化节点数据项
    * vo -> do
@@ -29056,37 +28898,6 @@ var GanttController = class extends MDControlController {
       }
     }
   }
-  /**
-   * 刷新指定树节点的子节点数据
-   *
-   * @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
@@ -31452,6 +31263,7 @@ export {
   ScriptFactory,
   ScriptFunction,
   SearchBarController,
+  SearchBarFilterController,
   SearchFilter,
   SearchFormController,
   SearchFormService,
@@ -31547,6 +31359,7 @@ export {
   getControlProvider,
   getControlsByView,
   getDEMethodProvider,
+  getDERedirectToView,
   getDeACMode,
   getDefaultValue,
   getEditorProvider,