@ibiz-template/runtime 0.6.18 → 0.7.1

package/dist/index.esm.js

@@ -3350,8 +3350,8 @@ var baseStyle = {
   position: "fixed",
   zIndex: "10000"
 };
-function cloneElement(clone34, teleport = document.body, isRemoveChild = true) {
-  const element = getAnimationElement(clone34);
+function cloneElement(clone35, teleport = document.body, isRemoveChild = true) {
+  const element = getAnimationElement(clone35);
   if (element == null) {
     throw new Error("Cannot clone a null or undefined element.");
   }
@@ -3770,11 +3770,11 @@ function arrayContains(arr, val) {
   });
 }
 function cloneObject(o) {
-  var clone34 = {};
+  var clone35 = {};
   for (var p in o) {
-    clone34[p] = o[p];
+    clone35[p] = o[p];
   }
-  return clone34;
+  return clone35;
 }
 function replaceObjectProps(o1, o2) {
   var o = cloneObject(o1);
@@ -5065,7 +5065,7 @@ var FileUtil = class {
 
 // src/command/app/open-app-view/open-app-view.ts
 import { ModelError as ModelError15, RuntimeError as RuntimeError25 } from "@ibiz-template/core";
-import { clone as clone17 } from "ramda";
+import { clone as clone18 } from "ramda";
 
 // src/service/utils/de-dq-cond/ps-de-dq-cond-engine.ts
 import { isEmpty as isEmpty4 } from "ramda";
@@ -6330,7 +6330,7 @@ var AppCounter = class {
     this.context.destroy();
     this.destroyInterval();
     this.evt.reset();
-    ibiz.mc.command.change.on(this.countChange);
+    ibiz.mc.command.change.off(this.countChange);
   }
 };
 
@@ -6480,8 +6480,13 @@ var DEDQCondUtil = class {
 DEDQCondUtil.map = /* @__PURE__ */ new WeakMap();
 
 // src/service/utils/dynamic-code-list/dynamic-code-list.ts
-import { ModelError as ModelError5, RuntimeModelError as RuntimeModelError7 } from "@ibiz-template/core";
-import { isNil as isNil5 } from "ramda";
+import {
+  IBizContext as IBizContext2,
+  ModelError as ModelError5,
+  RuntimeModelError as RuntimeModelError7
+} from "@ibiz-template/core";
+import { clone as clone4, isNil as isNil5 } from "ramda";
+import { QXEvent as QXEvent3, notNilEmpty as notNilEmpty6 } from "qx-util";
 var DynamicCodeListCache = class {
   constructor(codeList) {
     /**
@@ -6501,7 +6506,55 @@ var DynamicCodeListCache = class {
      * @type {boolean}
      */
     this.isPredefined = false;
+    /**
+     * 应用上下文
+     *
+     * @author tony001
+     * @date 2024-04-10 15:04:25
+     * @protected
+     * @type {IContext}
+     */
+    this.context = IBizContext2.create();
+    /**
+     * 视图参数
+     *
+     * @author tony001
+     * @date 2024-04-10 15:04:39
+     * @protected
+     * @type {IParams}
+     */
+    this.params = {};
+    /**
+     * 事件对象
+     *
+     * @author tony001
+     * @date 2024-04-10 17:04:00
+     * @protected
+     */
+    this.evt = new QXEvent3();
     this.codeList = codeList;
+    this.codelistChange = this.codelistChange.bind(this);
+    const { appDataEntityId, appDEDataSetId } = this.codeList;
+    if (appDataEntityId && appDEDataSetId) {
+      ibiz.mc.command.change.on(this.codelistChange);
+    }
+  }
+  /**
+   * 设置上下文以及查询参数
+   *
+   * @author tony001
+   * @date 2024-04-10 15:04:04
+   * @protected
+   * @param {IContext} [context]
+   * @param {IParams} [params]
+   */
+  setParams(context, params) {
+    if (context) {
+      this.context = clone4(context);
+    }
+    if (params) {
+      this.params = clone4(params);
+    }
   }
   /**
    * 初始化
@@ -6623,6 +6676,7 @@ var DynamicCodeListCache = class {
    * @returns {*}  {Promise<CodeListItem[]>}
    */
   async load(context, params = {}) {
+    this.setParams(context, params);
     const app = ibiz.hub.getApp(context.srfappid);
     const {
       appDataEntityId,
@@ -6754,10 +6808,79 @@ var DynamicCodeListCache = class {
     delete cacheData.promise;
     return result;
   }
+  /**
+   * 接受代码表实体数据变更，刷新代码表
+   *
+   * @author tony001
+   * @date 2024-04-10 15:04:42
+   * @protected
+   * @param {IPortalMessage} msg
+   */
+  codelistChange(msg) {
+    const data = msg.data;
+    const { appDataEntityId } = this.codeList;
+    if (appDataEntityId) {
+      const codeName = calcDeCodeNameById(appDataEntityId);
+      if (data && data.srfdecodename && data.srfdecodename.toLowerCase() === codeName) {
+        this.refresh();
+      }
+    }
+  }
+  /**
+   * 刷新代码表数据
+   *
+   * @author tony001
+   * @date 2024-04-10 17:04:20
+   * @return {*}  {Promise<void>}
+   */
+  async refresh() {
+    const key = JSON.stringify(this.context) + JSON.stringify(this.params);
+    this.cache.delete(key);
+    const result = await this.get(this.context, this.params);
+    this.evt.emit("change", result);
+  }
+  /**
+   * 代码表数据变更事件监听
+   *
+   * @author tony001
+   * @date 2024-04-10 17:04:52
+   * @param {(data: CodeListItem[]) => void} fn
+   * @param {boolean} [immediate=true] 当有数据时，立即触发一次回调
+   */
+  onChange(fn, immediate = true) {
+    this.evt.on("change", fn);
+    const key = JSON.stringify(this.context) + JSON.stringify(this.params);
+    const cacheData = this.cache.get(key);
+    if (immediate && notNilEmpty6(cacheData)) {
+      fn(cacheData.items);
+    }
+  }
+  /**
+   * 取消代码表数据变更监听
+   *
+   * @author tony001
+   * @date 2024-04-10 17:04:57
+   * @param {(data: CodeListItem[]) => void} fn
+   */
+  offChange(fn) {
+    this.evt.off("change", fn);
+  }
+  /**
+   * 销毁(取消数据变更监听)
+   *
+   * @author tony001
+   * @date 2024-04-10 15:04:11
+   */
+  destroy() {
+    const { appDataEntityId, appDEDataSetId } = this.codeList;
+    if (appDataEntityId && appDEDataSetId) {
+      ibiz.mc.command.change.off(this.codelistChange);
+    }
+  }
 };
 
 // src/service/utils/de-cache/de-cache.ts
-import { where, equals, clone as clone4, isNil as isNil7, isEmpty as isEmpty6 } from "ramda";
+import { where, equals, clone as clone5, isNil as isNil7, isEmpty as isEmpty6 } from "ramda";
 import { createUUID as createUUID2 } from "qx-util";
 import { RuntimeError as RuntimeError16 } from "@ibiz-template/core";
 
@@ -6837,7 +6960,7 @@ var DECache = class {
    * @param {IDataEntity} entity
    */
   forceUpdate(_context, entity) {
-    this.cacheMap.set(entity.srfkey, clone4(entity));
+    this.cacheMap.set(entity.srfkey, clone5(entity));
     ibiz.log.warn("forceUpdate", entity.srfkey, entity);
   }
   /**
@@ -6876,7 +6999,7 @@ var DECache = class {
       }
       entity.srftempdate = (/* @__PURE__ */ new Date()).getTime();
       const commit = () => {
-        this.cacheMap.set(entity.srfkey, clone4(entity));
+        this.cacheMap.set(entity.srfkey, clone5(entity));
         ibiz.log.warn("add", entity.srfkey, entity);
       };
       const t = this.getTransaction(context);
@@ -6906,7 +7029,7 @@ var DECache = class {
       isExistSessionId("get", context);
       const data = this.cacheMap.get(srfKey);
       ibiz.log.warn("get", srfKey, data);
-      return clone4(data);
+      return clone5(data);
     } catch (err) {
       ibiz.log.error(err);
       return null;
@@ -6936,7 +7059,7 @@ var DECache = class {
       entity.srftempdate = (/* @__PURE__ */ new Date()).getTime();
       const data = this.cacheMap.get(oldKey);
       if (data) {
-        const _data = clone4(data);
+        const _data = clone5(data);
         _data.assign(entity);
         const commit = () => {
           data.assign(entity);
@@ -7019,7 +7142,7 @@ var DECache = class {
           entity.srfkey = createUUID2();
         }
         entity.srftempdate = (/* @__PURE__ */ new Date()).getTime();
-        const data = clone4(entity);
+        const data = clone5(entity);
         if (t) {
           t.change(data.srfkey, () => {
             commit(data);
@@ -7069,7 +7192,7 @@ var DECache = class {
         entity.srftempdate = (/* @__PURE__ */ new Date()).getTime();
         const data = this.cacheMap.get(entity.srfkey);
         if (data) {
-          const _data = clone4(data);
+          const _data = clone5(data);
           _data.assign(entity);
           entities[i] = _data;
           if (t) {
@@ -7594,6 +7717,44 @@ var CodeListService = class {
     }
     return [];
   }
+  /**
+   * 获取代码表实例对象(动态代码表返回具体实例，静态代码表返回undefined)
+   *
+   * @param tag 代码表标识
+   * @returns 动态代码表实例|undefined
+   */
+  async getCodeListInstance(tag) {
+    let codeListInstance;
+    const codeList = this.allCodeLists.get(tag);
+    if (!codeList) {
+      throw new RuntimeError17("\u627E\u4E0D\u5230".concat(tag, "\u4EE3\u7801\u8868"));
+    }
+    if (codeList.codeListType === "DYNAMIC") {
+      const codeName = codeList.codeName;
+      if (this.cache.has(codeName)) {
+        codeListInstance = this.cache.get(codeName);
+      } else {
+        codeListInstance = new DynamicCodeListCache(codeList);
+        this.cache.set(codeName, codeListInstance);
+        await codeListInstance.init();
+      }
+    }
+    return codeListInstance;
+  }
+  /**
+   * 销毁(清除动态代码表监听)
+   *
+   * @author tony001
+   * @return {void}
+   */
+  destroy() {
+    const cacheList = Array.from(this.cache.values());
+    cacheList.forEach((item) => {
+      if (item instanceof DynamicCodeListCache) {
+        item.destroy();
+      }
+    });
+  }
 };
 
 // src/service/service/config/config.service.ts
@@ -7659,7 +7820,10 @@ var CounterService = class {
    * @return {*}  {Promise<AppCounter>}
    */
   static async getCounter(model, context, params) {
-    const id = model.id;
+    let id = model.id;
+    if (params && params.customId) {
+      id = params.customId;
+    }
     if (this.counterMap.has(id)) {
       const counter2 = this.counterMap.get(id);
       if (counter2.isDestroyed === false) {
@@ -8073,7 +8237,7 @@ var FileService = class {
 };
 
 // src/service/app-data-entity/app-data-entity.ts
-import { clone as clone5, isNil as isNil9 } from "ramda";
+import { clone as clone6, isNil as isNil9 } from "ramda";
 import { DataTypes } from "@ibiz-template/core";
 import { createUUID as createUUID3 } from "qx-util";
 
@@ -8106,7 +8270,7 @@ var AppDataEntity = class _AppDataEntity {
     Object.defineProperty(this, "_data", {
       enumerable: false,
       configurable: true,
-      value: data instanceof _AppDataEntity ? clone5(data._data) : clone5(data)
+      value: data instanceof _AppDataEntity ? clone6(data._data) : clone6(data)
     });
     Object.defineProperty(this, "srfdeid", {
       get() {
@@ -8273,7 +8437,7 @@ var AppDataEntity = class _AppDataEntity {
 
 // src/service/dto/method.dto.ts
 import { ModelError as ModelError6, RuntimeModelError as RuntimeModelError9 } from "@ibiz-template/core";
-import { clone as clone6 } from "ramda";
+import { clone as clone7 } from "ramda";
 var MethodDto = class {
   /**
    * Creates an instance of MethodDto.
@@ -8372,7 +8536,7 @@ var MethodDto = class {
             });
             let res;
             if (deRs && deRs.nestedAppDEDataSetId) {
-              const _context = clone6(context);
+              const _context = clone7(context);
               _context[this.entity.codeName.toLowerCase()] = data.srfkey;
               const _params = {};
               if (deRs.parentAppDEFieldId) {
@@ -8786,11 +8950,11 @@ var DEService = class {
 };
 
 // src/service/service/control/control.service.ts
-import { clone as clone8 } from "@ibiz-template/core";
+import { clone as clone9 } from "@ibiz-template/core";
 
 // src/service/vo/control.vo.ts
 import { createUUID as createUUID4 } from "qx-util";
-import { clone as clone7, isNil as isNil10 } from "ramda";
+import { clone as clone8, isNil as isNil10 } from "ramda";
 var BuildInKeys = [
   "srfkey",
   "srfmajortext",
@@ -8978,7 +9142,7 @@ var ControlVO = class _ControlVO {
    * @return {*}  {ControlVO}
    */
   clone() {
-    const cloneOrigin = clone7(this.$origin);
+    const cloneOrigin = clone8(this.$origin);
     const newVal = new _ControlVO(cloneOrigin, this.$dataUIMap);
     Object.keys(this).forEach((key) => {
       newVal[key] = this[key];
@@ -9094,7 +9258,7 @@ var ControlService = class {
    * @returns {*}  {IHttpResponse}
    */
   handleResponse(res) {
-    return clone8(res);
+    return clone9(res);
   }
   /**
    * 实体数据转ui数据
@@ -9261,6 +9425,9 @@ var MDControlService = class extends ControlService {
       if (res.headers["x-total"]) {
         res.total = Number(res.headers["x-total"]);
       }
+      if (res.headers["x-total-pages"]) {
+        res.totalPages = Number(res.headers["x-total-pages"]);
+      }
     }
     if (res.ok) {
       if (isArray3(res.data)) {
@@ -9811,7 +9978,7 @@ import {
 } from "@ibiz-template/core";
 import { isArray as isArray6, isNil as isNil12 } from "lodash-es";
 import { ascSort } from "qx-util";
-import { clone as clone14 } from "ramda";
+import { clone as clone15 } from "ramda";
 
 // src/service/service/entity/method/method.ts
 import { RuntimeModelError as RuntimeModelError11 } from "@ibiz-template/core";
@@ -10051,7 +10218,7 @@ var Method = class {
 // src/de-logic/index.ts
 import { HttpError as HttpError4, HttpResponse as HttpResponse2, RuntimeError as RuntimeError22 } from "@ibiz-template/core";
 import { isArray as isArray5 } from "lodash-es";
-import { clone as clone13 } from "ramda";
+import { clone as clone14 } from "ramda";
 
 // src/de-logic/de-logic.ts
 import { ModelError as ModelError13, RuntimeModelError as RuntimeModelError21 } from "@ibiz-template/core";
@@ -10511,11 +10678,11 @@ var EndNode = class extends DELogicNode {
 
 // src/de-logic/de-logic-node/prepare-param-node/prepare-param-node.ts
 import { ModelError as ModelError11 } from "@ibiz-template/core";
-import { clone as clone10 } from "ramda";
+import { clone as clone11 } from "ramda";
 
 // src/de-logic/utils/handle-src-val.ts
 import { ModelError as ModelError10 } from "@ibiz-template/core";
-import { clone as clone9 } from "ramda";
+import { clone as clone10 } from "ramda";
 function handleSrcVal(ctx, srcValParams) {
   const { srcDELogicParamId, srcFieldName, srcValue, expression } = srcValParams;
   const srcValueType = srcValParams.srcValueType || "SRCDLPARAM";
@@ -10545,7 +10712,7 @@ function handleSrcVal(ctx, srcValParams) {
       value = ctx.parameters.context;
       break;
     case "ENVPARAM":
-      value = clone9(ibiz.env);
+      value = clone10(ibiz.env);
       break;
     case "EXPRESSION":
       if (!expression) {
@@ -10591,7 +10758,7 @@ var PrepareParamNode = class extends DELogicNode {
           let result;
           let originValue;
           if (nodeParam.dstDELogicParamId && ibiz.env.logLevel === "DEBUG") {
-            originValue = clone10(ctx.params[nodeParam.dstDELogicParamId]);
+            originValue = clone11(ctx.params[nodeParam.dstDELogicParamId]);
           }
           switch (nodeParam.paramAction) {
             case "SETPARAMVALUE":
@@ -10644,7 +10811,7 @@ var PrepareParamNode = class extends DELogicNode {
   copyParam(nodeParam, ctx) {
     const { dstDELogicParamId } = nodeParam;
     const srcVal = handleSrcVal(ctx, nodeParam);
-    ctx.params[dstDELogicParamId] = clone10(srcVal);
+    ctx.params[dstDELogicParamId] = clone11(srcVal);
   }
   /**
    * 绑定参数
@@ -10820,7 +10987,7 @@ var RenewParamNode = class extends DELogicNode {
 
 // src/de-logic/de-logic-node/copy-param-node/copy-param-node.ts
 import { RuntimeModelError as RuntimeModelError18 } from "@ibiz-template/core";
-import { clone as clone11 } from "ramda";
+import { clone as clone12 } from "ramda";
 var CopyParamNode = class extends DELogicNode {
   async exec(ctx) {
     const { dstDELogicParamId, srcDELogicParamId } = this.model;
@@ -10831,7 +10998,7 @@ var CopyParamNode = class extends DELogicNode {
       );
     }
     const srcVal = handleSrcVal(ctx, this.model);
-    ctx.params[dstDELogicParamId] = clone11(srcVal);
+    ctx.params[dstDELogicParamId] = clone12(srcVal);
     ibiz.log.debug(
       "\u5B9E\u4F53\u903B\u8F91\u8282\u70B9\uFF08\u62F7\u8D1D\u53C2\u6570\uFF09\uFF1A".concat(this.model.id, "-\u53C2\u6570\u540D\u79F0\uFF1A").concat(dstDELogicParamId, "-\u503C\uFF1A"),
       srcVal
@@ -10914,7 +11081,7 @@ var ThrowExceptionNode = class extends DELogicNode {
 
 // src/de-logic/de-logic-param/de-logic-param.ts
 import { ModelError as ModelError12 } from "@ibiz-template/core";
-import { clone as clone12 } from "ramda";
+import { clone as clone13 } from "ramda";
 var DELogicParam = class {
   /**
    * Creates an instance of DELogicParam.
@@ -10946,7 +11113,7 @@ var DELogicParam = class {
         ctx.params[tag] = ctx.data[0] || {};
       }
     } else if (m.appGlobalParam) {
-      ctx.params[tag] = clone12(ibiz.env);
+      ctx.params[tag] = clone13(ibiz.env);
     } else if (m.entityListParam) {
       ctx.params[tag] = [];
     } else if (m.entityPageParam) {
@@ -10962,7 +11129,7 @@ var DELogicParam = class {
     } else if (m.simpleParam) {
       ctx.params[tag] = {};
     } else if (m.cloneParam) {
-      ctx.params[tag] = clone12(ctx.data || {});
+      ctx.params[tag] = clone13(ctx.data || {});
     } else if (m.envParam) {
       throw new ModelError12(m, "\u672A\u652F\u6301\u7684\u903B\u8F91\u53C2\u6570\u7C7B\u578B: \u7CFB\u7EDF\u73AF\u5883\u53D8\u91CF");
     } else if (m.fileListParam) {
@@ -11210,9 +11377,9 @@ async function execDELogicById(deDELogicId, dataEntityId, context, data, params)
   return execDELogic(deLogic, context, data, params);
 }
 async function execDELogicAction(deDELogic, context, data, params) {
-  const _context = clone13(context);
-  const _data = data ? clone13(data) : data;
-  const _params = params ? clone13(params) : params;
+  const _context = clone14(context);
+  const _data = data ? clone14(data) : data;
+  const _params = params ? clone14(params) : params;
   try {
     const result = await execDELogic(deDELogic, _context, _data, _params);
     return new HttpResponse2(result);
@@ -11587,7 +11754,7 @@ var DEActionMethod = class extends Method {
             context,
             minorAppDataEntityId
           );
-          const _context = clone14(context);
+          const _context = clone15(context);
           _context[this.entity.codeName.toLowerCase()] = key;
           const res = await minorService.exec(nestedAppDEDataSetId, _context);
           const items = res.data || [];
@@ -11759,7 +11926,7 @@ import {
   RuntimeModelError as RuntimeModelError23
 } from "@ibiz-template/core";
 import { isArray as isArray7 } from "lodash-es";
-import { clone as clone15, isEmpty as isEmpty8, isNil as isNil13 } from "ramda";
+import { clone as clone16, isEmpty as isEmpty8, isNil as isNil13 } from "ramda";
 import { ascSort as ascSort2, descSort } from "qx-util";
 var FetchMethod = class extends Method {
   async exec(context, params, params2, header) {
@@ -11846,7 +12013,7 @@ var FetchMethod = class extends Method {
     const { page, size } = filter;
     const start = page * size;
     const end = (page + 1) * size - 1;
-    const items = list.slice(start, end).map((item) => clone15(item));
+    const items = list.slice(start, end).map((item) => clone16(item));
     return items;
   }
   /**
@@ -12201,7 +12368,7 @@ var TreeCodeListNodeData = class extends TreeNodeData {
 
 // src/service/vo/tree-node-data/tree-data-set-node-data.ts
 import { updateKeyDefine } from "@ibiz-template/core";
-import { clone as clone16, isNil as isNil15 } from "ramda";
+import { clone as clone17, isNil as isNil15 } from "ramda";
 var CloneExcludeKeys = [
   "_id",
   "srfnodeid",
@@ -12317,7 +12484,7 @@ var TreeDataSetNodeData = class _TreeDataSetNodeData extends TreeNodeData {
       }
     };
     this.clone = () => {
-      const cloneData = clone16(this._deData);
+      const cloneData = clone17(this._deData);
       const cloneNodeData = new _TreeDataSetNodeData(model, this._parent, {
         data: cloneData,
         leaf: this._leaf,
@@ -12659,7 +12826,7 @@ var MapData = class {
 };
 
 // src/service/vo/panel-data/panel-data.ts
-import { QXEvent as QXEvent3 } from "qx-util";
+import { QXEvent as QXEvent4 } from "qx-util";
 function updateKeyDefine3(target, keys) {
   keys.forEach((key) => {
     if (!Object.prototype.hasOwnProperty.call(target, key)) {
@@ -12674,7 +12841,7 @@ function updateKeyDefine3(target, keys) {
 }
 var PanelData = class {
   constructor(fields, origin) {
-    const _evt = new QXEvent3();
+    const _evt = new QXEvent4();
     const keyMap = {};
     const reverseKeyMap = {};
     fields.forEach((field) => {
@@ -12896,7 +13063,7 @@ var GanttCodeListNodeData = class extends TreeCodeListNodeData {
 };
 
 // src/service/mqtt/mqtt.service.ts
-import { QXEvent as QXEvent4, createUUID as createUUID7 } from "qx-util";
+import { QXEvent as QXEvent5, createUUID as createUUID7 } from "qx-util";
 var MqttService = class {
   /**
    * Creates an instance of MqttService.
@@ -12917,7 +13084,7 @@ var MqttService = class {
      * @author chitanda
      * @date 2023-10-23 15:10:06
      */
-    this.evt = new QXEvent4();
+    this.evt = new QXEvent5();
     /**
      * 连接选项
      *
@@ -13169,7 +13336,7 @@ var _OpenAppViewCommand = class _OpenAppViewCommand {
    * @return {*}  {(Promise<IModalData | void>)}
    */
   async exec(appViewId, _context, params = {}, opts = {}) {
-    const context = clone17(_context);
+    const context = clone18(_context);
     if (context.srfsimple) {
       delete context.srfsimple;
     }
@@ -13352,6 +13519,7 @@ var _AppFuncCommand = class _AppFuncCommand {
     const _context = context.clone();
     Object.assign(_context, convertNavData(navigateContexts, params, context));
     const _params = convertNavData(navigateParams, params, context);
+    Object.assign(_params, params);
     switch (appFuncType) {
       case "APPVIEW":
         return this.openAppView(appFunc, _context, _params, opts);
@@ -13463,7 +13631,7 @@ function installCommand() {
 }
 
 // src/app-hub.ts
-import { RuntimeError as RuntimeError68 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError67 } from "@ibiz-template/core";
 
 // src/application.ts
 import { Net, getToken } from "@ibiz-template/core";
@@ -13636,6 +13804,15 @@ var Application = class {
       await this.mqtt.connect();
     }
   }
+  /**
+   * 销毁应用
+   *
+   * @author tony001
+   * @date 2024-04-10 15:04:51
+   */
+  destroy() {
+    this.codeList.destroy();
+  }
 };
 
 // src/hub/convert/app-menu-convert/app-menu-convert.ts
@@ -13800,8 +13977,8 @@ var TreeGridExNotifyState = /* @__PURE__ */ ((TreeGridExNotifyState2) => {
 })(TreeGridExNotifyState || {});
 
 // src/controller/common/view/view.controller.ts
-import { notNilEmpty as notNilEmpty6 } from "qx-util";
-import { IBizContext as IBizContext2, RuntimeError as RuntimeError34 } from "@ibiz-template/core";
+import { notNilEmpty as notNilEmpty7 } from "qx-util";
+import { IBizContext as IBizContext3, RuntimeError as RuntimeError34 } from "@ibiz-template/core";
 import { isEmpty as isEmpty9, isNil as isNil22, isNotNil as isNotNil2 } from "ramda";
 
 // src/controller/utils/loading/loading.state.ts
@@ -13940,7 +14117,7 @@ var LoadingState = class {
 };
 
 // src/controller/ctx/ctx.ts
-import { QXEvent as QXEvent5 } from "qx-util";
+import { QXEvent as QXEvent6 } from "qx-util";
 
 // src/controller/ctx/ctx.state.ts
 var CTXState = class {
@@ -13970,7 +14147,7 @@ var CTX = class {
      * @date 2023-04-26 07:54:46
      * @protected
      */
-    this.evt = new QXEvent5(3e3);
+    this.evt = new QXEvent6(3e3);
     /**
      * 当前视图控制器集合（包含自身视图控制器，部件控制器，和下一层级的视图的控制器）
      * @author lxm
@@ -14306,8 +14483,8 @@ var ButtonContainerState = class {
 };
 
 // src/controller/utils/event/qx-event-ex.ts
-import { clearAll, QXEvent as QXEvent6 } from "qx-util";
-var QXEventEx = class extends QXEvent6 {
+import { clearAll, QXEvent as QXEvent7 } from "qx-util";
+var QXEventEx = class extends QXEvent7 {
   constructor() {
     super(...arguments);
     this.anyEventFns = [];
@@ -15230,7 +15407,7 @@ var ViewController = class extends BaseController {
    */
   constructor(model, context, params, ctx) {
     const _model = ibiz.util.layoutPanel.fill(model);
-    super(_model, IBizContext2.create({}, context), params || {}, new CTX(ctx));
+    super(_model, IBizContext3.create({}, context), params || {}, new CTX(ctx));
     this.session = {};
     this.modal = new Modal({});
     this.providers = {};
@@ -15454,13 +15631,13 @@ var ViewController = class extends BaseController {
     }
     const navContexts = this.model.appViewNavContexts;
     let context = {};
-    if (notNilEmpty6(navContexts)) {
+    if (notNilEmpty7(navContexts)) {
       context = convertNavData(navContexts, this.params, this.context);
     }
     Object.assign(this.context, context);
     const navParams = this.model.appViewNavParams;
     let params = {};
-    if (notNilEmpty6(navParams)) {
+    if (notNilEmpty7(navParams)) {
       params = convertNavData(navParams, this.params, this.context);
     }
     Object.assign(this.params, params);
@@ -15852,13 +16029,13 @@ var CodeListEditorController = class extends EditorController {
 // src/controller/common/control/control.controller.ts
 import {
   HttpError as HttpError6,
-  IBizContext as IBizContext3,
+  IBizContext as IBizContext4,
   IBizParams,
   NoticeError as NoticeError2,
   RuntimeError as RuntimeError35
 } from "@ibiz-template/core";
-import { clone as clone18, isNil as isNil23 } from "ramda";
-import { notNilEmpty as notNilEmpty7 } from "qx-util";
+import { clone as clone19, isNil as isNil23 } from "ramda";
+import { notNilEmpty as notNilEmpty8 } from "qx-util";
 var ControlController = class extends BaseController {
   /**
    * Creates an instance of ControlController.
@@ -15872,7 +16049,7 @@ var ControlController = class extends BaseController {
   constructor(model, context, params, ctx) {
     super(
       model,
-      IBizContext3.create({}, context),
+      IBizContext4.create({}, context),
       new IBizParams({}, params),
       ctx
     );
@@ -15921,7 +16098,7 @@ var ControlController = class extends BaseController {
         "".concat(model.controlType, "_DEFAULT")
       );
       if (panelModel) {
-        this.controlPanel = clone18(panelModel);
+        this.controlPanel = clone19(panelModel);
       }
     }
     this.updateContextParams({});
@@ -16015,12 +16192,12 @@ var ControlController = class extends BaseController {
     }
     const { controlNavContexts, controlNavParams } = this.model;
     let context = {};
-    if (notNilEmpty7(controlNavContexts)) {
+    if (notNilEmpty8(controlNavContexts)) {
       context = convertNavData(controlNavContexts, this.params, this.context);
     }
     Object.assign(this.context, context);
     let params = {};
-    if (notNilEmpty7(controlNavParams)) {
+    if (notNilEmpty8(controlNavParams)) {
       params = convertNavData(controlNavParams, this.params, this.context);
     }
     Object.assign(this.params, params);
@@ -16144,7 +16321,7 @@ var ControlController = class extends BaseController {
     }
     const { ctrlParams } = this.model.controlParam;
     let params = {};
-    if (notNilEmpty7(ctrlParams)) {
+    if (notNilEmpty8(ctrlParams)) {
       params = convertNavData(ctrlParams, this.params, this.context);
     }
     Object.assign(this.controlParams, params);
@@ -16492,6 +16669,9 @@ var MDControlController = class extends ControlController {
       if (typeof res.total === "number") {
         this.state.total = res.total;
       }
+      if (typeof res.totalPages === "number") {
+        this.state.totalPages = res.totalPages;
+      }
       if (isLoadMore) {
         this.state.items.push(...res.data);
       } else {
@@ -17033,7 +17213,7 @@ import { RuntimeModelError as RuntimeModelError28 } from "@ibiz-template/core";
 
 // src/controller/control/calendar/calendar.service.ts
 import { RuntimeError as RuntimeError39 } from "@ibiz-template/core";
-import { clone as clone19 } from "ramda";
+import { clone as clone20 } from "ramda";
 var CalendarService = class extends MDControlService {
   /**
    * 执行查询多条数据的方法
@@ -17054,7 +17234,7 @@ var CalendarService = class extends MDControlService {
       async (item) => {
         const fetchAction = item.appDEDataSetId || "fetchdefault";
         const tempContext = context.clone();
-        const tempParams = clone19(params);
+        const tempParams = clone20(params);
         if (item.maxSize) {
           tempParams.size = item.maxSize;
         }
@@ -17390,7 +17570,7 @@ import isSameOrBefore from "dayjs/plugin/isSameOrBefore";
 import quarterOfYear from "dayjs/plugin/quarterOfYear";
 import weekOfYear from "dayjs/plugin/weekOfYear";
 import isoWeek from "dayjs/plugin/isoWeek";
-import { clone as clone20, isNil as isNil25, mergeDeepRight } from "ramda";
+import { clone as clone21, isNil as isNil25, mergeDeepRight } from "ramda";
 dayjs4.extend(minMax2);
 dayjs4.extend(isSameOrBefore);
 dayjs4.extend(quarterOfYear);
@@ -17577,7 +17757,7 @@ var BaseSeriesGenerator = class {
       }
       groupData[group].get(catalog).value = plus(
         groupData[group].get(catalog).value,
-        item[this.valueField]
+        item[this.valueField] || 0
       );
       if (!groupData[group].get(catalog).chartData) {
         this.prepareChartData(groupData, item, catalog, group);
@@ -17666,7 +17846,7 @@ var BaseSeriesGenerator = class {
   dataPreprocess(data) {
     const tempData = [];
     data.forEach((singleData) => {
-      tempData.push(clone20(singleData));
+      tempData.push(clone21(singleData));
     });
     const { groupMode } = this.model;
     if (groupMode) {
@@ -18450,6 +18630,10 @@ var ChartController = class extends MDControlController {
   initState() {
     super.initState();
     this.state.size = 1e3;
+    this.state.showGrid = false;
+    this.state.gridHeaders = [];
+    this.state.gridData = [];
+    this.state.gridPosition = "bottom";
   }
   async onCreated() {
     await super.onCreated();
@@ -18457,6 +18641,7 @@ var ChartController = class extends MDControlController {
     await this.service.init(this.context);
     this.generator = new ChartOptionsGenerator2(this.model);
     await this.generator.init(this.context, this.params);
+    this.parseGridParam();
     this.resizeChart = this.resizeChart.bind(this);
     window.addEventListener("resize", this.resizeChart);
   }
@@ -18468,6 +18653,164 @@ var ChartController = class extends MDControlController {
     this.calcOptions();
     return result;
   }
+  /**
+   * 解析表格相关参数
+   *
+   * @memberof ChartController
+   */
+  parseGridParam() {
+    if (this.model.dechartDataGrid) {
+      if (this.model.dechartDataGrid.dataGridPos) {
+        this.state.gridPosition = this.model.dechartDataGrid.dataGridPos.toLocaleLowerCase();
+      } else {
+        this.state.gridPosition = "bottom";
+      }
+      if (this.model.dechartDataGrid.showDataGrid === true) {
+        this.state.showGrid = true;
+      }
+    }
+  }
+  /**
+   * 计算总数
+   *
+   * @param {string} valueField
+   * @return {*}
+   * @memberof ChartController
+   */
+  computeTotal(valueField) {
+    let total = 0;
+    this.state.items.forEach((item) => {
+      const value = Number(item[valueField]);
+      if (!Number.isNaN(value)) {
+        total += Number(value);
+      }
+    });
+    return total;
+  }
+  /**
+   * 处理单序列时的表格数据
+   * 图表单序列时，首先获取配置的分类属性和值属性的title,构建表头，内置支持百分比列
+   * 然后遍历图表默认分出来的分组数据去生成表格的数据
+   *
+   * @memberof ChartController
+   */
+  handleSingleSerieGridData() {
+    const serie = this.generator.seriesGenerators[0];
+    const { catalogField, valueField, groupData } = serie;
+    const fields = serie.chartGenerator.entity.appDEFields;
+    const cataTitle = fields.find((field) => {
+      return field.id === catalogField;
+    });
+    const valueTitle = fields.find((field) => {
+      return field.id === valueField;
+    });
+    const tempGridHeader = [
+      {
+        id: catalogField,
+        name: cataTitle == null ? void 0 : cataTitle.logicName
+      },
+      {
+        id: valueField,
+        name: valueTitle == null ? void 0 : valueTitle.logicName
+      },
+      {
+        id: "srfpercent",
+        name: "\u767E\u5206\u6BD4"
+      }
+    ];
+    this.state.gridHeaders = tempGridHeader;
+    const tempData = [];
+    const total = this.computeTotal(valueField);
+    if (groupData && groupData.$default_group) {
+      const group = groupData.$default_group;
+      for (const [key, value] of group) {
+        const tempValue = Number.isNaN(Number(value.value)) ? 0 : Number(value.value);
+        let percent = "";
+        if (total === 0 || Number.isNaN(Number(value.value))) {
+          percent = "0%";
+        } else {
+          percent = "".concat(Math.round(tempValue / total * 100), "%");
+        }
+        const tempItem = {
+          [catalogField]: key,
+          [valueField]: tempValue,
+          srfpercent: percent
+        };
+        tempData.push(tempItem);
+      }
+    }
+    this.state.gridData = tempData;
+  }
+  /**
+   * 处理多序列时的表格数据
+   * 图表多序列时，首先去遍历序列，然后获取每个序列的分类属性和值属性以及已经分好的分组数据，
+   * 查找当前的表格头数组中是否存在当前的分类或者值属性组成的项，如果没有就将当前分类或者值属性添加到表格头数组中，以序列作为表格列
+   * 同理，循环当前序列的分组数据，并根据当前分组属性的值生成表格数据，如果在表格数据中已经存在具有相同分组属性值，则把当前序列的当前分组属性对应的值属性
+   * 添加到表格数据中对应的项里
+   *
+   * @memberof ChartController
+   */
+  handleMultipleSerieGridData() {
+    const tempHeaders = [];
+    const tempData = [];
+    this.generator.seriesGenerators.forEach((serie) => {
+      const { catalogField, valueField, groupData } = serie;
+      const fields = serie.chartGenerator.entity.appDEFields;
+      const _index = tempHeaders.findIndex((item) => {
+        return item.id === catalogField;
+      });
+      if (_index < 0) {
+        const cataTitle = fields.find((field) => {
+          return field.id === catalogField.toLowerCase();
+        });
+        tempHeaders.push({
+          id: catalogField,
+          name: cataTitle == null ? void 0 : cataTitle.logicName
+        });
+      }
+      const valueTitle = fields.find((field) => {
+        return field.id === valueField.toLowerCase();
+      });
+      tempHeaders.push({
+        id: valueField,
+        name: valueTitle == null ? void 0 : valueTitle.logicName
+      });
+      if (groupData && groupData.$default_group) {
+        const group = groupData.$default_group;
+        for (const [key, value] of group) {
+          const tempValue = Number.isNaN(Number(value.value)) ? 0 : Number(value.value);
+          const index = tempData.findIndex((item) => {
+            return item[catalogField] === key;
+          });
+          if (index < 0) {
+            const tempItem = {
+              [catalogField]: key,
+              [valueField]: tempValue
+            };
+            tempData.push(tempItem);
+          } else {
+            Object.assign(tempData[index], { [valueField]: tempValue });
+          }
+        }
+      }
+    });
+    this.state.gridHeaders = tempHeaders;
+    this.state.gridData = tempData;
+  }
+  /**
+   * 计算表格数据
+   *
+   * @memberof ChartController
+   */
+  computeGridData() {
+    if (this.generator && this.generator.seriesGenerators) {
+      if (this.generator.seriesGenerators.length === 1) {
+        this.handleSingleSerieGridData();
+      } else {
+        this.handleMultipleSerieGridData();
+      }
+    }
+  }
   /**
    * 初始化echarts对象
    * @author lxm
@@ -18492,6 +18835,9 @@ var ChartController = class extends MDControlController {
    */
   calcOptions(data = this.state.items) {
     this.options = this.generator.calcOptionsByData(data);
+    if (this.state.showGrid) {
+      this.computeGridData();
+    }
     this.updateChart();
   }
   /**
@@ -18737,7 +19083,7 @@ import { ModelError as ModelError19, RuntimeModelError as RuntimeModelError33 }
 
 // src/ui-logic/utils/handle-src-val.ts
 import { ModelError as ModelError18 } from "@ibiz-template/core";
-import { clone as clone21 } from "ramda";
+import { clone as clone22 } from "ramda";
 function handleSrcVal2(ctx, srcValParams) {
   const { srcDEUILogicParamId, srcFieldName, srcValue } = srcValParams;
   const srcValueType = srcValParams.srcValueType || "SRCDLPARAM";
@@ -18764,7 +19110,7 @@ function handleSrcVal2(ctx, srcValParams) {
       value = ctx.parameters.context;
       break;
     case "ENVPARAM":
-      value = clone21(ibiz.env);
+      value = clone22(ibiz.env);
       break;
     default:
       throw new ModelError18(srcValParams, "\u6682\u672A\u652F\u6301\u6E90\u503C\u7C7B\u578B".concat(srcValueType));
@@ -19158,7 +19504,7 @@ var EndNode2 = class extends UILogicNode {
 
 // src/ui-logic/ui-logic-node/prepare-js-param-node/prepare-js-param-node.ts
 import { ModelError as ModelError22, RuntimeError as RuntimeError42 } from "@ibiz-template/core";
-import { clone as clone22 } from "ramda";
+import { clone as clone23 } from "ramda";
 var PrepareJSParamNode = class extends UILogicNode {
   async exec(ctx) {
     const nodeParams = this.model.deuilogicNodeParams;
@@ -19168,7 +19514,7 @@ var PrepareJSParamNode = class extends UILogicNode {
     for (const nodeParam of nodeParams) {
       let originValue;
       if (nodeParam.dstDEUILogicParamId && ibiz.env.logLevel === "DEBUG") {
-        originValue = clone22(ctx.params[nodeParam.dstDEUILogicParamId]);
+        originValue = clone23(ctx.params[nodeParam.dstDEUILogicParamId]);
       }
       switch (nodeParam.paramAction) {
         case "SETPARAMVALUE":
@@ -19257,7 +19603,7 @@ var PrepareJSParamNode = class extends UILogicNode {
   copyParam(nodeParam, ctx) {
     const { dstDEUILogicParamId } = nodeParam;
     const srcVal = handleSrcVal2(ctx, nodeParam);
-    ctx.params[dstDEUILogicParamId] = clone22(srcVal);
+    ctx.params[dstDEUILogicParamId] = clone23(srcVal);
   }
   /**
    * 绑定参数
@@ -19502,7 +19848,7 @@ var ResetParamNode2 = class extends UILogicNode {
 
 // src/ui-logic/ui-logic-node/copy-param-node/copy-param-node.ts
 import { RuntimeModelError as RuntimeModelError42 } from "@ibiz-template/core";
-import { clone as clone23 } from "ramda";
+import { clone as clone24 } from "ramda";
 var CopyParamNode2 = class extends UILogicNode {
   async exec(ctx) {
     const { dstDEUILogicParamId, srcDEUILogicParamId } = this.model;
@@ -19513,7 +19859,7 @@ var CopyParamNode2 = class extends UILogicNode {
       );
     }
     const srcVal = handleSrcVal2(ctx, this.model);
-    ctx.params[dstDEUILogicParamId] = clone23(srcVal);
+    ctx.params[dstDEUILogicParamId] = clone24(srcVal);
     ctx.setLastReturn(ctx.params[dstDEUILogicParamId]);
     ibiz.log.debug(
       "\u754C\u9762\u903B\u8F91\u8282\u70B9\uFF08\u62F7\u8D1D\u53C2\u6570\uFF09\uFF1A".concat(this.model.id, "-\u53C2\u6570\u540D\u79F0\uFF1A").concat(dstDEUILogicParamId, "-\u503C\uFF1A"),
@@ -23068,12 +23414,14 @@ var FormController = class extends ControlController {
     this.counters = {};
     const { appCounterRefs } = this.model;
     if (appCounterRefs && appCounterRefs.length > 0) {
+      const dataKey = this.context[calcDeCodeNameById(this.model.appDataEntityId)];
       try {
         await Promise.all(
           appCounterRefs.map(async (counterRef) => {
             const counter = await CounterService.getCounterByRef(
               counterRef,
-              this.context
+              this.context,
+              dataKey ? { customId: dataKey } : void 0
             );
             this.counters[counterRef.id] = counter;
           })
@@ -23093,7 +23441,7 @@ var FormController = class extends ControlController {
   setDetailError(name, message) {
     const detail = this.details[name];
     const state = detail == null ? void 0 : detail.state;
-    if (state && state.error) {
+    if (state) {
       state.error = message;
     }
   }
@@ -24008,7 +24356,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 createUUID10, notNilEmpty as notNilEmpty8 } from "qx-util";
+import { createUUID as createUUID10, notNilEmpty as notNilEmpty9 } from "qx-util";
 
 // src/controller/control/form/form-detail/form-druipart/form-druipart.state.ts
 var FormDruipartState = class extends FormDetailState {
@@ -24103,7 +24451,7 @@ var FormDRUIPartController = class extends FormDetailController {
   calcViewParams() {
     let newContext = this.form.context.clone();
     const navContexts = this.model.navigateContexts;
-    if (notNilEmpty8(navContexts)) {
+    if (notNilEmpty9(navContexts)) {
       newContext = Object.assign(
         newContext,
         convertNavData(
@@ -24608,7 +24956,27 @@ var FormItemController = class extends FormDetailController {
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl.controller.ts
 import { BitMask } from "@ibiz-template/core";
+
+// src/controller/control/form/form-detail/form-mdctrl/form-mdctrl.state.ts
+var FormMDCtrlState = class extends FormDetailState {
+  constructor() {
+    super(...arguments);
+    /**
+     * 界面行为组状态
+     *
+     * @type {(IButtonContainerState | null)}
+     * @memberof PortletPartState
+     */
+    this.actionGroupState = null;
+  }
+};
+
+// src/controller/control/form/form-detail/form-mdctrl/form-mdctrl.controller.ts
 var FormMDCtrlController = class extends FormDetailController {
+  createState() {
+    var _a;
+    return new FormMDCtrlState((_a = this.parent) == null ? void 0 : _a.state);
+  }
   /**
    * 名称
    * @author lxm
@@ -24682,6 +25050,68 @@ var FormMDCtrlController = class extends FormDetailController {
       await this.form.updateFormItem(this.model.deformItemUpdateId);
     }
   }
+  async formStateNotify(state) {
+    super.formStateNotify(state);
+    if (this.state.actionGroupState) {
+      const deData = this.data.getOrigin ? this.data.getOrigin() : this.data;
+      this.state.actionGroupState.update(this.form.context, deData);
+    }
+  }
+  /**
+   * 初始化
+   *
+   * @author zk
+   * @date 2023-07-25 10:07:11
+   * @return {*}  {Promise<void>}
+   * @memberof FormMDCtrlController
+   */
+  async onInit() {
+    super.onInit();
+    await this.initActionStates();
+  }
+  async initActionStates() {
+    var _a;
+    const { uiactionGroup } = this.model;
+    if (!((_a = uiactionGroup == null ? void 0 : uiactionGroup.uiactionGroupDetails) == null ? void 0 : _a.length)) {
+      return;
+    }
+    const containerState = new ButtonContainerState();
+    uiactionGroup.uiactionGroupDetails.forEach((detail) => {
+      const actionid = detail.uiactionId;
+      if (actionid) {
+        const buttonState = new UIActionButtonState(
+          detail.id,
+          this.form.context.srfappid,
+          actionid
+        );
+        containerState.addState(detail.id, buttonState);
+      }
+    });
+    await containerState.update(this.form.context);
+    this.state.actionGroupState = containerState;
+  }
+  /**
+   * 触发操作列点击事件
+   *
+   * @author lxm
+   * @date 2022-09-07 22:09:46
+   * @param {IPSUIActionGroupDetail} detail
+   * @param {MouseEvent} event
+   */
+  async onActionClick(detail, event) {
+    const actionId = detail.uiactionId;
+    await UIActionUtil.execAndResolved(
+      actionId,
+      {
+        context: this.context,
+        params: this.params,
+        data: [this.data],
+        view: this.form.view,
+        event
+      },
+      detail.appId
+    );
+  }
   /**
    * 刷新
    * @author lxm
@@ -24831,7 +25261,7 @@ import { RuntimeError as RuntimeError54, RuntimeModelError as RuntimeModelError5
 import { createUUID as createUUID11 } from "qx-util";
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form.state.ts
-var FormMDCtrlFormState = class extends FormDetailState {
+var FormMDCtrlFormState = class extends FormMDCtrlState {
 };
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form.controller.ts
@@ -25002,7 +25432,7 @@ var FormMDCtrlFormController = class extends FormMDCtrlController {
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater.controller.ts
 import { ModelError as ModelError28 } from "@ibiz-template/core";
-import { clone as clone24 } from "ramda";
+import { clone as clone25 } from "ramda";
 var FormMDCtrlRepeaterController = class extends FormMDCtrlController {
   constructor() {
     super(...arguments);
@@ -25086,7 +25516,7 @@ var FormMDCtrlRepeaterController = class extends FormMDCtrlController {
     copyFields.forEach((key) => {
       tempForm[key] = this.form.model[key];
     });
-    this.repeatedForm = clone24(tempForm);
+    this.repeatedForm = clone25(tempForm);
   }
   /**
    * 设置重复器数据（修改主表单里重复器对应属性）
@@ -25258,14 +25688,14 @@ var FormTabPanelController = class extends FormDetailController {
 // src/controller/control/form/edit-form/edit-form.controller.ts
 import {
   awaitTimeout,
-  IBizContext as IBizContext4,
+  IBizContext as IBizContext5,
   isElementSame as isElementSame2,
   mergeInLeft as mergeInLeft2,
   RuntimeError as RuntimeError55
 } from "@ibiz-template/core";
 import { debounce } from "lodash-es";
 import { createUUID as createUUID12 } from "qx-util";
-import { clone as clone25, isNil as isNil27 } from "ramda";
+import { clone as clone26, isNil as isNil27 } from "ramda";
 
 // src/controller/control/form/edit-form/edit-form.service.ts
 import {
@@ -25630,8 +26060,8 @@ var EditFormController = class extends FormController {
    * @return {*}  {Promise<IData>}
    */
   async copy() {
-    const context = clone25(this.context);
-    const queryParams = clone25(this.params);
+    const context = clone26(this.context);
+    const queryParams = clone26(this.params);
     const appDataEntity = await ibiz.hub.getAppDataEntity(
       this.model.appDataEntityId,
       this.model.appId
@@ -25688,7 +26118,7 @@ var EditFormController = class extends FormController {
       return this.loadDraft();
     }
     const { context, params } = this.handlerAbilityParams(args);
-    const queryParams = clone25(params);
+    const queryParams = clone26(params);
     let res;
     try {
       await this.startLoading();
@@ -25973,7 +26403,7 @@ var EditFormController = class extends FormController {
     switch (autoSaveMode) {
       case 3:
         saveParam.data = this.getDiffData();
-        saveParam.context = IBizContext4.create({ srfsimple: true });
+        saveParam.context = IBizContext5.create({ srfsimple: true });
         break;
       default:
     }
@@ -26301,7 +26731,7 @@ import {
   RuntimeError as RuntimeError56,
   RuntimeModelError as RuntimeModelError62
 } from "@ibiz-template/core";
-import { clone as clone26 } from "ramda";
+import { clone as clone27 } from "ramda";
 import dayjs5 from "dayjs";
 
 // src/controller/control/grid/grid/grid.service.ts
@@ -26651,7 +27081,7 @@ var GridController = class extends MDControlController {
     const result = await calcColumnModelBySchema(json, this);
     if (result && result.degridColumns.length > 0) {
       const { degridColumns, degridDataItems } = result;
-      this.model = clone26(this.model);
+      this.model = clone27(this.model);
       this.model.degridColumns = [
         ...(this.model.degridColumns || []).filter((item) => {
           return degridColumns.findIndex((x) => x.id === item.id) === -1;
@@ -26776,28 +27206,35 @@ var GridController = class extends MDControlController {
       this.gridStateNotify(row, "LOAD" /* LOAD */);
       return row;
     });
-    this.state.rows.forEach((row) => {
-      Object.values(row.uaColStates).forEach((uaState) => {
-        uaState.update(
-          this.context,
-          row.data.getOrigin(),
-          this.model.appDataEntityId
-        );
-      });
-    });
-    this.state.rows.forEach((row) => {
-      Object.values(row.uiActionGroupStates).forEach((uaState) => {
-        uaState.update(
-          this.context,
-          row.data.getOrigin(),
-          this.model.appDataEntityId
-        );
-      });
-    });
+    await this.updateRows(this.state.rows);
     this.calcGroupData(items);
     this.calcAggResult(items);
     return items;
   }
+  /**
+   * 更新行状态
+   * @param rows
+   */
+  async updateRows(rows) {
+    for (const row of rows) {
+      await Promise.all([
+        ...Object.values(row.uaColStates).map(
+          (uaState) => uaState.update(
+            this.context,
+            row.data.getOrigin(),
+            this.model.appDataEntityId
+          )
+        ),
+        ...Object.values(row.uiActionGroupStates).map(
+          (uaState) => uaState.update(
+            this.context,
+            row.data.getOrigin(),
+            this.model.appDataEntityId
+          )
+        )
+      ]);
+    }
+  }
   /**
    * 计算分组数据
    * @author lxm
@@ -27238,7 +27675,7 @@ var GridController = class extends MDControlController {
         throw new RuntimeError56("\u540C\u65F6\u53EA\u80FD\u6709\u4E00\u884C\u5F00\u542F\u884C\u7F16\u8F91");
       }
       if (row.data.srfuf === 1 /* UPDATE */) {
-        row.cacheData = clone26(row.data);
+        row.cacheData = clone27(row.data);
         const defaultVal = this.calcDefaultValue(row.data, false);
         Object.assign(row.data, defaultVal);
       }
@@ -27377,7 +27814,7 @@ var GridController = class extends MDControlController {
    */
   formatExcelData(data) {
     const { fields = [] } = this.dataExportParam;
-    const cloneData = clone26(
+    const cloneData = clone27(
       data.map((item) => {
         return fields.reduce((obj, key) => {
           obj[key] = item[key];
@@ -27641,7 +28078,7 @@ var GridController = class extends MDControlController {
 import { DataTypes as DataTypes4, ModelError as ModelError29, plus as plus2 } from "@ibiz-template/core";
 import dayjs6 from "dayjs";
 import { debounce as debounce2 } from "lodash-es";
-import { clone as clone27, isNil as isNil28 } from "ramda";
+import { clone as clone28, isNil as isNil28 } from "ramda";
 var GridFieldColumnController = class extends GridColumnController {
   constructor() {
     super(...arguments);
@@ -27779,7 +28216,7 @@ var GridFieldColumnController = class extends GridColumnController {
       srfkey: value,
       ...wfContext
     });
-    const tempParams = clone27(this.params);
+    const tempParams = clone28(this.params);
     const { context: newContext, params: newParams } = this.handlePublicParams(
       row.data,
       tempContext,
@@ -29196,11 +29633,33 @@ var PickupViewPanelController = class extends ControlController {
 
 // src/controller/control/search-bar/search-bar.controller.ts
 import { mergeInLeft as mergeInLeft3, recursiveIterate as recursiveIterate10 } from "@ibiz-template/core";
-import { clone as clone29, isNil as isNil30 } from "ramda";
+import { clone as clone30 } from "ramda";
 import { isString as isString2 } from "lodash-es";
 
 // src/controller/control/search-bar/search-bar-filter.controller.ts
 import { RuntimeModelError as RuntimeModelError64 } from "@ibiz-template/core";
+
+// src/controller/control/search-bar/util.ts
+var ItemsValueOPs = [
+  "EXISTS" /* EXISTS */,
+  "NOTEXISTS" /* NOT_EXISTS */
+];
+var SubFieldRegex = /^N_(.\w+)_(.\w+)$/;
+function isSimpleItems(model) {
+  var _a;
+  return ((_a = model.userParam) == null ? void 0 : _a.ITEMTYPE) === "SIMPLE";
+}
+function isHiddenFilter(model) {
+  var _a;
+  return ((_a = model.userParam) == null ? void 0 : _a.ITEMTYPE) === "HIDDEN";
+}
+function parseSubFieldInfo(str) {
+  const subStr = str.split("__")[1];
+  const matches = subStr.match(SubFieldRegex);
+  return { field: matches[1], op: matches[2] };
+}
+
+// src/controller/control/search-bar/search-bar-filter.controller.ts
 var ExcludeOPs = [
   "ISNULL" /* IS_NULL */,
   "ISNOTNULL" /* IS_NOT_NULL */,
@@ -29221,12 +29680,21 @@ var SearchBarFilterController = class {
      * @type {boolean}
      */
     this.noEditor = false;
+    /**
+     * 控制器类型
+     * @author lxm
+     * @date 2024-04-10 01:41:40
+     * @type {('ITEMS' | 'SIMPLE_ITEMS' | 'FIELD')}
+     */
+    this.type = "FIELD";
     var _a;
+    this.hidden = isHiddenFilter(model);
     let field;
     if (model.appDEFieldId) {
       field = findFieldById(this.appDataEntity, model.appDEFieldId);
     }
     this.fieldName = field ? field.codeName.toLowerCase() : model.id;
+    this.key = this.fieldName;
     this.label = model.caption || (field == null ? void 0 : field.logicName) || model.id;
     this.valueOP = (_a = model.defsearchMode) == null ? void 0 : _a.valueOP;
     this.noEditor = this.valueOP ? ExcludeOPs.includes(this.valueOP) : !this.model.editor;
@@ -29265,7 +29733,7 @@ var SearchBarFilterController = class {
    * 计算要递给编辑器的参数
    * @author lxm
    * @date 2024-02-04 06:35:28
-   * @param {IFilterLeafNode} node
+   * @param {IFilterNodeField} node
    * @return {*}  {{ value: unknown; data: IData }}
    */
   calcEditorProps(node) {
@@ -29284,7 +29752,7 @@ var SearchBarFilterController = class {
    * 编辑器值变更处理
    * @author lxm
    * @date 2024-02-04 06:42:04
-   * @param {IFilterLeafNode} node
+   * @param {IFilterNodeField} node
    * @param {unknown} value
    * @param {string} [name]
    */
@@ -29638,106 +30106,10 @@ async function calcFilterModelBySchema(json, appDataEntityId, modelAppId) {
   return addSearchBarFilters;
 }
 
-// src/controller/control/search-bar/use-searchcond.ts
-import { RuntimeError as RuntimeError59, recursiveIterate as recursiveIterate9 } from "@ibiz-template/core";
-import { isNil as isNil29 } from "ramda";
-var ExcludeOPs2 = ["ISNULL" /* IS_NULL */, "ISNOTNULL" /* IS_NOT_NULL */];
-function getOriginFilterNodes() {
-  return [
-    {
-      leaf: false,
-      logicType: "AND",
-      children: [{ leaf: true, field: null, valueOP: null, value: null }]
-    }
-  ];
-}
-function formatFilters(node) {
-  if (!node.leaf) {
-    if (node.logicType === "ITEMS") {
-      return {
-        condtype: "ITEMS",
-        fieldname: node.field,
-        condop: node.valueOP,
-        searchconds: node.children.map((item) => formatFilters(item))
-      };
-    }
-    return {
-      condtype: "GROUP",
-      condop: node.logicType,
-      bnotmode: false,
-      searchconds: node.children.map((item) => formatFilters(item))
-    };
-  }
-  const leafNode = node;
-  const temp = {
-    condtype: "DEFIELD",
-    fieldname: node.field,
-    condop: node.valueOP,
-    value: node.value
-  };
-  if (leafNode.valueItem) {
-    temp.valueItem = leafNode.valueItem;
-  }
-  return temp;
-}
-function parseFilters(data) {
-  if (data.condtype === "GROUP") {
-    return {
-      leaf: false,
-      logicType: data.condop === "AND" ? "AND" : "OR",
-      children: (data.searchconds || []).map(
-        (item) => parseFilters(item)
-      )
-    };
-  }
-  if (data.condtype === "ITEMS") {
-    return {
-      leaf: false,
-      logicType: "ITEMS",
-      field: data.fieldname || null,
-      valueOP: data.condop || null,
-      children: (data.searchconds || []).map(
-        (item) => parseFilters(item)
-      )
-    };
-  }
-  if (data.condtype === "DEFIELD") {
-    return {
-      leaf: true,
-      field: data.fieldname || null,
-      valueOP: data.condop || null,
-      value: data.value || null,
-      valueItem: data.valueItem || void 0
-    };
-  }
-  throw new RuntimeError59("\u65E0\u6548\u7684condtype:".concat(data.condtype));
-}
-function calcSearchConds(filterNodes) {
-  let hasFilter = false;
-  let hasError = false;
-  recursiveIterate9(filterNodes[0], (node) => {
-    if (node.leaf) {
-      if (node.field && node.valueOP && !isNil29(node.value) || node.field && node.valueOP && ExcludeOPs2.includes(node.valueOP)) {
-        hasFilter = true;
-      } else {
-        hasError = true;
-      }
-    }
-  });
-  if (hasFilter && !hasError) {
-    const filter = [formatFilters(filterNodes[0])];
-    return filter;
-  }
-}
-
 // src/controller/control/search-bar/search-bar-filter-items.controller.ts
-import { RuntimeError as RuntimeError60 } from "@ibiz-template/core";
-import { clone as clone28 } from "ramda";
-var ExcludeOPs3 = [
-  "ISNULL" /* IS_NULL */,
-  "ISNOTNULL" /* IS_NOT_NULL */
-];
-var SubFieldRegex = /^N_(.\w+)_(.\w+)$/;
+import { RuntimeError as RuntimeError59 } from "@ibiz-template/core";
+import { clone as clone29 } from "ramda";
+var SubFieldRegex2 = /^N_(.\w+)_(.\w+)$/;
 var SearchBarFilterItemsController = class extends SearchBarFilterController {
   constructor(filterModels, appDataEntity, context, params) {
     super(filterModels[0], appDataEntity, context, params);
@@ -29757,6 +30129,7 @@ var SearchBarFilterItemsController = class extends SearchBarFilterController {
      * @type {Map<string, SearchBarFilterController>}
      */
     this.subFilterCMap = /* @__PURE__ */ new Map();
+    this.type = "ITEMS";
   }
   /**
    * 计算标识
@@ -29793,7 +30166,7 @@ var SearchBarFilterItemsController = class extends SearchBarFilterController {
       return false;
     });
     if (!minorDEId) {
-      throw new RuntimeError60("\u627E\u4E0D\u5230\u5C5E\u6027".concat(targetField, "\u5BF9\u5E94\u7684\u5173\u8054\u5B9E\u4F53"));
+      throw new RuntimeError59("\u627E\u4E0D\u5230\u5C5E\u6027".concat(targetField, "\u5BF9\u5E94\u7684\u5173\u8054\u5B9E\u4F53"));
     }
     this.minorAppDE = await ibiz.hub.getAppDataEntity(
       minorDEId,
@@ -29813,28 +30186,31 @@ var SearchBarFilterItemsController = class extends SearchBarFilterController {
     this.filterModels.forEach((item) => {
       var _a2;
       const subStr = (_a2 = item.defsearchMode.codeName) == null ? void 0 : _a2.split("__")[1];
-      const matches = subStr.match(SubFieldRegex);
+      const matches = subStr.match(SubFieldRegex2);
       const subField = matches[1];
       const subOP = matches[2];
+      const cloneItem = clone29(item);
+      cloneItem.defsearchMode.valueOP = subOP;
+      cloneItem.id = subField;
+      const filterC = new SearchBarFilterController(
+        cloneItem,
+        this.appDataEntity,
+        this.context,
+        this.params
+      );
+      this.subFilterCMap.set(this.calcKey(subField, subOP), filterC);
+      if (filterC.hidden) {
+        return;
+      }
       if (!fieldMap.has(subField)) {
         fieldMap.set(subField, {
           name: subField,
           label: "",
-          valueOPs: []
+          valueOPs: [],
+          fieldName: subField
         });
       }
       fieldMap.get(subField).valueOPs.push(subOP);
-      const cloneItem = clone28(item);
-      cloneItem.defsearchMode.valueOP = subOP;
-      this.subFilterCMap.set(
-        this.calcKey(subField, subOP),
-        new SearchBarFilterController(
-          cloneItem,
-          this.appDataEntity,
-          this.context,
-          this.params
-        )
-      );
     });
     (_a = this.minorAppDE.appDEFields) == null ? void 0 : _a.forEach((item) => {
       const codeName = item.codeName.toUpperCase();
@@ -29850,6 +30226,9 @@ var SearchBarFilterItemsController = class extends SearchBarFilterController {
   async init() {
     await this.initMinorAppDE();
     await this.initAllFields();
+    this.hidden = Array.from(this.subFilterCMap.values()).every(
+      (item) => item.hidden
+    );
   }
   /**
    * 获取子搜索栏控制器
@@ -29864,13 +30243,246 @@ var SearchBarFilterItemsController = class extends SearchBarFilterController {
   }
 };
 
+// src/controller/control/search-bar/interface-util.ts
+import { recursiveIterate as recursiveIterate9 } from "@ibiz-template/core";
+import { isNil as isNil29 } from "ramda";
+function getOriginFilterNodes() {
+  return [
+    {
+      nodeType: "GROUP",
+      logicType: "AND",
+      children: [
+        { nodeType: "FIELD", field: null, valueOP: null, value: null }
+      ]
+    }
+  ];
+}
+function validateFilterNodes(filterNodes) {
+  const result = { pass: false };
+  let hasFilter = false;
+  let hasError = false;
+  recursiveIterate9(filterNodes[0], (node) => {
+    if (hasError) {
+      return;
+    }
+    if (node.nodeType === "FIELD") {
+      hasFilter = true;
+      hasError = !node.field || !node.valueOP || isNil29(node.value);
+    } else if (node.nodeType === "ITEMS") {
+      hasError = !node.field || !node.valueOP;
+    } else {
+      hasError = !node.logicType;
+    }
+  });
+  if (hasFilter && !hasError) {
+    result.pass = true;
+  }
+  return result;
+}
+function filterNode2SearchCond(filterNode, opts) {
+  let result;
+  if (filterNode.nodeType === "GROUP") {
+    const temp = {
+      condop: filterNode.logicType,
+      condtype: "GROUP"
+    };
+    if (filterNode.children.length > 0) {
+      temp.searchconds = filterNode.children.map(
+        (item) => filterNode2SearchCond(item, opts)
+      );
+    }
+    result = temp;
+    if (filterNode.notMode) {
+      temp.notmode = filterNode.notMode;
+    }
+  } else if (filterNode.nodeType === "FIELD") {
+    const temp = {
+      condtype: "DEFIELD",
+      fieldname: filterNode.field,
+      value: filterNode.value,
+      condop: filterNode.valueOP
+    };
+    if (filterNode.valueItem) {
+      temp.value = filterNode.valueItem;
+    }
+    result = temp;
+  } else {
+    const temp = {
+      condop: filterNode.valueOP,
+      fieldname: filterNode.field,
+      condtype: "ITEMS"
+    };
+    if (filterNode.children.length > 0) {
+      temp.searchconds = filterNode.children.map(
+        (item) => filterNode2SearchCond(item, opts)
+      );
+    }
+    result = temp;
+  }
+  if (opts == null ? void 0 : opts.after) {
+    opts.after(filterNode, result);
+  }
+  return result;
+}
+function calcSearchConds(filterNodes, opts) {
+  const { pass } = validateFilterNodes(filterNodes);
+  if (!pass) {
+    return;
+  }
+  const result = filterNodes.map((node) => filterNode2SearchCond(node, opts));
+  return result;
+}
+function SearchCondEx2filterNode(cond) {
+  var _a, _b;
+  let result;
+  if (cond.condtype === "GROUP") {
+    const temp = {
+      logicType: cond.condop,
+      nodeType: "GROUP",
+      children: []
+    };
+    if ((_a = cond.searchconds) == null ? void 0 : _a.length) {
+      temp.children = cond.searchconds.map(
+        (item) => SearchCondEx2filterNode(item)
+      );
+    }
+    result = temp;
+    if (cond.notmode) {
+      temp.notMode = cond.notmode;
+    }
+  } else if (cond.condtype === "DEFIELD") {
+    const temp = {
+      nodeType: "FIELD",
+      field: cond.fieldname,
+      value: cond.value,
+      valueOP: cond.condop
+    };
+    if (cond.valueItem) {
+      temp.valueItem = cond.valueItem;
+    }
+    result = temp;
+  } else {
+    const temp = {
+      nodeType: "ITEMS",
+      field: cond.fieldname,
+      valueOP: cond.condop,
+      children: []
+    };
+    if ((_b = cond.searchconds) == null ? void 0 : _b.length) {
+      temp.children = cond.searchconds.map(
+        (item) => SearchCondEx2filterNode(item)
+      );
+    }
+    if (cond.simple) {
+      temp.simple = cond.simple;
+    }
+    result = temp;
+  }
+  if (cond.hidden === true) {
+    result.hidden = true;
+  }
+  return result;
+}
+function filterNode2SearchCondEx(filterNode) {
+  let result;
+  if (filterNode.nodeType === "GROUP") {
+    const temp = {
+      condop: filterNode.logicType,
+      condtype: "GROUP"
+    };
+    if (filterNode.children.length > 0) {
+      temp.searchconds = filterNode.children.map(
+        (item) => filterNode2SearchCondEx(item)
+      );
+    }
+    result = temp;
+    if (filterNode.notMode) {
+      temp.notmode = filterNode.notMode;
+    }
+  } else if (filterNode.nodeType === "FIELD") {
+    const temp = {
+      condtype: "DEFIELD",
+      fieldname: filterNode.field,
+      value: filterNode.value,
+      condop: filterNode.valueOP
+    };
+    if (filterNode.valueItem) {
+      temp.valueItem = filterNode.valueItem;
+    }
+    result = temp;
+  } else {
+    const temp = {
+      condop: filterNode.valueOP,
+      fieldname: filterNode.field,
+      condtype: "ITEMS"
+    };
+    if (filterNode.children.length > 0) {
+      temp.searchconds = filterNode.children.map(
+        (item) => filterNode2SearchCondEx(item)
+      );
+    }
+    if (filterNode.simple) {
+      temp.simple = filterNode.simple;
+    }
+    result = temp;
+  }
+  if (filterNode.hidden === true) {
+    result.hidden = true;
+  }
+  return result;
+}
+function calcSearchCondExs(filterNodes) {
+  const { pass } = validateFilterNodes(filterNodes);
+  if (!pass) {
+    return;
+  }
+  const result = filterNodes.map(filterNode2SearchCondEx);
+  return result;
+}
+
+// src/controller/control/search-bar/search-bar-filter-simple-items.controller.ts
+var SearchBarFilterSimpleItemsController = class extends SearchBarFilterController {
+  constructor(filterModel, appDataEntity, context, params) {
+    super(filterModel, appDataEntity, context, params);
+    this.noEditor = false;
+    this.key = this.model.id;
+    this.type = "SIMPLE_ITEMS";
+    const info = parseSubFieldInfo(filterModel.defsearchMode.codeName);
+    this.subFieldName = info.field;
+    this.subValueOP = info.op;
+  }
+  /**
+   * 简单模式下添加节点逻辑
+   * @author lxm
+   * @date 2024-04-07 05:44:47
+   * @param {IFilterNodeField} node
+   * @return {*}  {void}
+   */
+  addSimpleFilterNode(node) {
+    Object.assign(node, {
+      simple: true,
+      field: this.fieldName,
+      nodeType: "ITEMS",
+      valueOP: this.valueOP,
+      children: [
+        {
+          nodeType: "FIELD",
+          field: this.subFieldName,
+          valueOP: this.subValueOP,
+          value: null
+        }
+      ]
+    });
+  }
+};
+
 // src/controller/control/search-bar/search-bar.controller.ts
 var ScriptValueRegex2 = /\$\{[^}]*\}/;
 var SearchBarController = class extends ControlController {
   constructor() {
     super(...arguments);
     /**
-     * 快速搜索占位符
+     * 快速搜索占位符（根据属性计算出来的快速搜索占位符）
      * @return {*}
      * @author: zhujiamin
      * @Date: 2023-08-11 14:13:10
@@ -29944,6 +30556,10 @@ var SearchBarController = class extends ControlController {
     this.state.selectedGroupItem = null;
     this.state.searchBarGroups = [];
     this.state.selectedSearchGroupItem = null;
+    this.state.advancedQuickSearch = false;
+    this.state.quickSearchItems = [];
+    this.state.quickSearchFieldNames = [];
+    this.state.quickSearchPlaceHolder = "";
     this.resetFilter();
     this.state.visible = !!(this.model.enableQuickSearch || this.model.enableGroup || this.enableFilter);
   }
@@ -29957,6 +30573,7 @@ var SearchBarController = class extends ControlController {
     if (appDataEntity) {
       this.appDataEntity = appDataEntity;
       this.calcQuickSearchPlaceholder();
+      this.initAdvancedQuickSearch();
     }
     if (this.isBackendSearchGroup && this.view.model.codeName) {
       this.service = new SearchBarService(
@@ -30004,7 +30621,7 @@ var SearchBarController = class extends ControlController {
       }
     });
     if (addSearchBarFilters.length > 0) {
-      this.model = clone29(this.model);
+      this.model = clone30(this.model);
       this.model.searchBarFilters = addSearchBarFilters.concat(...mergeFilters);
       this.model.enableFilter = true;
     }
@@ -30039,6 +30656,7 @@ var SearchBarController = class extends ControlController {
       });
       if (placeHolders.length > 0) {
         this.placeHolder = placeHolders.join("\u3001");
+        this.state.quickSearchPlaceHolder = this.placeHolder;
       }
     }
   }
@@ -30088,6 +30706,11 @@ var SearchBarController = class extends ControlController {
     const params = {};
     if (this.state.query) {
       params.query = this.state.query;
+      if (this.state.advancedQuickSearch && this.state.quickSearchFieldNames.length) {
+        params.queryconds = this.state.quickSearchFieldNames.map(
+          (name) => "n_".concat(name, "_like")
+        );
+      }
     }
     if (((_a = this.state.selectedGroupItem) == null ? void 0 : _a.data) && typeof this.state.selectedGroupItem.data === "string" && !this.isBackendSearchGroup) {
       const navParams = ScriptFactory.execSingleLine(
@@ -30124,7 +30747,18 @@ var SearchBarController = class extends ControlController {
       const itemsMap = /* @__PURE__ */ new Map();
       this.searchBarFilters.forEach((item) => {
         var _a2;
-        if (((_a2 = item.defsearchMode) == null ? void 0 : _a2.valueOP) && ["EXISTS", "NOTEXISTS"].includes(item.defsearchMode.valueOP)) {
+        if (((_a2 = item.defsearchMode) == null ? void 0 : _a2.valueOP) && ItemsValueOPs.includes(item.defsearchMode.valueOP)) {
+          if (isSimpleItems(item)) {
+            this.filterControllers.push(
+              new SearchBarFilterSimpleItemsController(
+                item,
+                this.appDataEntity,
+                this.context,
+                this.params
+              )
+            );
+            return;
+          }
           const key = "".concat(item.appDEFieldId, "_").concat(item.defsearchMode.valueOP);
           if (!itemsMap.has(key)) {
             itemsMap.set(key, []);
@@ -30162,45 +30796,24 @@ var SearchBarController = class extends ControlController {
    * @date 2023-10-13 05:53:35
    * @return {*}  {IData}
    */
-  calcFilters(valueFormat = true) {
+  calcFilters() {
     if (!this.enableFilter) {
       return;
     }
-    const searchconds = calcSearchConds(this.state.filterNodes);
-    if (valueFormat && searchconds) {
-      recursiveIterate10(
-        searchconds[0],
-        (node, parent) => {
-          if (node.condtype === "DEFIELD" && !isNil30(node.value)) {
-            let controller = this.findFilterController(
-              node.fieldname,
-              node.condop
-            );
-            if (!controller && parent.condtype === "ITEMS") {
-              const itemC = this.findFilterController(
-                parent.fieldname,
-                parent.condop
-              );
-              controller = itemC.getSubFilterController(
-                node.fieldname,
-                node.condop
-              );
-            }
-            if (controller) {
-              if (controller.valueItem && node.valueItem) {
-                node.value = node.valueItem;
-                delete node.valueItem;
-              } else if (ScriptValueRegex2.test(node.value)) {
-                node.value = ScriptFactory.execSingleLine("`".concat(node.value, "`"), {
-                  ...this.getEventArgs()
-                });
+    const searchconds = calcSearchConds(this.state.filterNodes, {
+      after: (node, cond) => {
+        if (node.nodeType === "FIELD" && isString2(node.value)) {
+          if (ScriptValueRegex2.test(node.value)) {
+            cond.value = ScriptFactory.execSingleLine(
+              "`".concat(node.value, "`"),
+              {
+                ...this.getEventArgs()
               }
-            }
+            );
           }
-        },
-        { childrenFields: ["searchconds"] }
-      );
-    }
+        }
+      }
+    });
     return searchconds;
   }
   /**
@@ -30316,7 +30929,7 @@ var SearchBarController = class extends ControlController {
    */
   async handleSave() {
     if (this.grid && this.state.selectedSearchGroupItem) {
-      const filters = this.calcFilters(false);
+      const filters = calcSearchCondExs(this.state.filterNodes);
       const saveParams = {
         searchconds: filters,
         sort: this.grid.state.sortQuery,
@@ -30364,14 +30977,14 @@ var SearchBarController = class extends ControlController {
     }
     if (groupItem.searchGroupData && groupItem.searchGroupData.searchconds && groupItem.searchGroupData.searchconds.length > 0) {
       const filterNodes = groupItem.searchGroupData.searchconds.map(
-        (item) => parseFilters(item)
+        (item) => SearchCondEx2filterNode(item)
       );
       this.state.filterNodes = filterNodes;
     } else {
       this.state.filterNodes = getOriginFilterNodes();
     }
     recursiveIterate10(this.state.filterNodes[0], (node) => {
-      if (node.leaf) {
+      if (node.nodeType === "FIELD") {
         if (node.field && node.valueOP && isString2(node.value) && ScriptValueRegex2.test(node.value)) {
           node.disabled = true;
         }
@@ -30382,6 +30995,50 @@ var SearchBarController = class extends ControlController {
       await this.grid.load({ isInitialLoad: true });
     }
   }
+  /**
+   * 初始化高级搜索
+   * @author lxm
+   * @date 2024-04-11 11:44:10
+   * @protected
+   */
+  initAdvancedQuickSearch() {
+    var _a;
+    if (this.model.quickSearchMode === 2 && ((_a = this.model.searchBarQuickSearchs) == null ? void 0 : _a.length)) {
+      this.state.advancedQuickSearch = true;
+      this.state.quickSearchItems = [];
+      this.state.quickSearchFieldNames = [];
+      this.model.searchBarQuickSearchs.forEach((item) => {
+        const filed = findFieldById(this.appDataEntity, item.appDEFieldId);
+        const fieldName = filed.codeName.toLowerCase();
+        this.state.quickSearchItems.push({
+          fieldName,
+          label: filed.logicName
+        });
+        this.state.quickSearchFieldNames.push(fieldName);
+      });
+      this.calcQuickSearchPlaceHolder();
+    }
+  }
+  /**
+   * 计算快速搜索占位符
+   * @author lxm
+   * @date 2024-04-11 05:36:52
+   */
+  calcQuickSearchPlaceHolder() {
+    if (this.state.advancedQuickSearch) {
+      if (this.state.quickSearchFieldNames.length) {
+        const labels = [];
+        this.state.quickSearchItems.forEach((item) => {
+          if (this.state.quickSearchFieldNames.includes(item.fieldName)) {
+            labels.push(item.label);
+          }
+        });
+        this.state.quickSearchPlaceHolder = labels.join("\u3001");
+      } else {
+        this.state.quickSearchPlaceHolder = this.placeHolder;
+      }
+    }
+  }
 };
 
 // src/controller/control/tab-exp-panel/tab-exp-panel.controller.ts
@@ -30543,6 +31200,7 @@ var TabExpPanelController = class extends ControlController {
       navViewMsg.isRoutePushed = true;
     }
     this.evt.emit("onNavViewChange", { navViewMsg });
+    this.evt.emit("onTabChange", { tab });
   }
   /**
    * 当前激活tab模型
@@ -30630,11 +31288,11 @@ var TabExpPanelController = class extends ControlController {
 
 // src/controller/control/tree/tree.controller.ts
 import {
-  RuntimeError as RuntimeError61,
+  RuntimeError as RuntimeError60,
   RuntimeModelError as RuntimeModelError65,
   recursiveIterate as recursiveIterate11
 } from "@ibiz-template/core";
-import { isNil as isNil31 } from "ramda";
+import { isNil as isNil30 } from "ramda";
 
 // src/controller/control/tree/tree.service.ts
 import { ModelError as ModelError30 } from "@ibiz-template/core";
@@ -31672,7 +32330,7 @@ var TreeController = class extends MDControlController {
       throw new RuntimeModelError65(model, "\u6811\u8282\u70B9\u6CA1\u6709\u914D\u7F6E\u7F16\u8F91\u6A21\u5F0F\uFF1A\u540D\u79F0");
     }
     if (nodeData._nodeType !== "DE") {
-      throw new RuntimeError61("\u4E0D\u662F\u5B9E\u4F53\u6811\u8282\u70B9\u6570\u636E");
+      throw new RuntimeError60("\u4E0D\u662F\u5B9E\u4F53\u6811\u8282\u70B9\u6570\u636E");
     }
     nodeData._text = text;
     await this.updateDeNodeData([nodeData]);
@@ -31688,7 +32346,7 @@ var TreeController = class extends MDControlController {
     let needRefresh = false;
     const treeNode = this.getNodeModel(item._nodeId);
     if (!treeNode) {
-      throw new RuntimeError61("\u672A\u627E\u5230\u6811\u8282\u70B9");
+      throw new RuntimeError60("\u672A\u627E\u5230\u6811\u8282\u70B9");
     }
     const nodeAppDataEntityId = treeNode.appDataEntityId;
     if (nodeAppDataEntityId) {
@@ -31712,7 +32370,7 @@ var TreeController = class extends MDControlController {
    * @return {*}  {void}
    */
   onDEDataChange(msg) {
-    if (!isNil31(msg.triggerKey) && msg.triggerKey === this.triggerKey) {
+    if (!isNil30(msg.triggerKey) && msg.triggerKey === this.triggerKey) {
       return;
     }
     if (msg.subtype === "OBJECTCREATED") {
@@ -31732,7 +32390,7 @@ var TreeController = class extends MDControlController {
 };
 
 // src/controller/control/wizard-panel/wizard-panel.controller.ts
-import { RuntimeError as RuntimeError62 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError61 } from "@ibiz-template/core";
 
 // src/controller/control/wizard-panel/wizard-panel.service.ts
 var WizardPanelService = class extends ControlService {
@@ -31898,7 +32556,7 @@ var WizardPanelController = class extends ControlController {
     const { activeFormTag } = this.state;
     const controller = this.formControllers.get(activeFormTag);
     if (!controller) {
-      throw new RuntimeError62("\u627E\u4E0D\u5230".concat(activeFormTag, "\u7684\u8868\u5355\u63A7\u5236\u5668"));
+      throw new RuntimeError61("\u627E\u4E0D\u5230".concat(activeFormTag, "\u7684\u8868\u5355\u63A7\u5236\u5668"));
     }
     return controller;
   }
@@ -31940,7 +32598,7 @@ var WizardPanelController = class extends ControlController {
   getWizardFormByTag(tag) {
     var _a;
     if (!((_a = this.model.dewizard) == null ? void 0 : _a.dewizardForms)) {
-      throw new RuntimeError62("\u6CA1\u6709\u914D\u7F6E\u5411\u5BFC\u8868\u5355\u96C6\u5408");
+      throw new RuntimeError61("\u6CA1\u6709\u914D\u7F6E\u5411\u5BFC\u8868\u5355\u96C6\u5408");
       return;
     }
     const wizardForm = this.model.dewizard.dewizardForms.find(
@@ -31949,7 +32607,7 @@ var WizardPanelController = class extends ControlController {
       }
     );
     if (!wizardForm) {
-      throw new RuntimeError62("\u627E\u4E0D\u5230\u6807\u8BC6\u4E3A".concat(tag, "\u7684\u5411\u5BFC\u8868\u5355"));
+      throw new RuntimeError61("\u627E\u4E0D\u5230\u6807\u8BC6\u4E3A".concat(tag, "\u7684\u5411\u5BFC\u8868\u5355"));
     }
     return wizardForm;
   }
@@ -32020,7 +32678,7 @@ var WizardPanelController = class extends ControlController {
       prevTag = this.tagHistory[this.tagHistory.length - 1];
     }
     if (!prevTag) {
-      throw new RuntimeError62("\u6CA1\u6709\u4E0A\u4E00\u4E2A\u8868\u5355");
+      throw new RuntimeError61("\u6CA1\u6709\u4E0A\u4E00\u4E2A\u8868\u5355");
     }
     this.state.activeFormTag = prevTag;
   }
@@ -32056,7 +32714,7 @@ var WizardPanelController = class extends ControlController {
         });
         const nextWizardStep = wizardSteps[index + 1];
         if (!nextWizardStep) {
-          throw new RuntimeError62("\u627E\u4E0D\u5230\u4E0B\u4E00\u4E2A\u5411\u5BFC\u6B65\u9AA4");
+          throw new RuntimeError61("\u627E\u4E0D\u5230\u4E0B\u4E00\u4E2A\u5411\u5BFC\u6B65\u9AA4");
         }
         const nextWizardForm = this.getWizardFormByTag(nextWizardStep.stepTag);
         if (nextWizardForm && nextWizardForm.formTag) {
@@ -32065,7 +32723,7 @@ var WizardPanelController = class extends ControlController {
       }
     }
     if (!nextTag) {
-      throw new RuntimeError62("\u627E\u4E0D\u5230\u4E0B\u4E00\u4E2A\u5411\u5BFC\u8868\u5355");
+      throw new RuntimeError61("\u627E\u4E0D\u5230\u4E0B\u4E00\u4E2A\u5411\u5BFC\u8868\u5355");
     }
     this.state.activeFormTag = nextTag;
     this.tagHistory.push(nextTag);
@@ -32085,7 +32743,7 @@ var WizardPanelController = class extends ControlController {
 
 // src/controller/control/md-ctrl/md-ctrl.controller.ts
 import { RuntimeModelError as RuntimeModelError66 } from "@ibiz-template/core";
-import { isNil as isNil32 } from "ramda";
+import { isNil as isNil31 } from "ramda";
 
 // src/controller/control/md-ctrl/md-ctrl.service.ts
 var MDCtrlService = class extends MDControlService {
@@ -32314,7 +32972,7 @@ var MDCtrlController = class extends MDControlController {
       const groupMap = /* @__PURE__ */ new Map();
       items.forEach((item) => {
         const groupVal = item[groupAppDEFieldId];
-        if (isNil32(groupVal)) {
+        if (isNil31(groupVal)) {
           return;
         }
         if (!groupMap.has(groupVal)) {
@@ -32390,8 +33048,8 @@ var MDCtrlController = class extends MDControlController {
 };
 
 // src/controller/control/kanban/kanban.controller.ts
-import { RuntimeError as RuntimeError63, RuntimeModelError as RuntimeModelError67 } from "@ibiz-template/core";
-import { isNil as isNil33 } from "ramda";
+import { RuntimeError as RuntimeError62, RuntimeModelError as RuntimeModelError67 } from "@ibiz-template/core";
+import { isNil as isNil32 } from "ramda";
 
 // src/controller/control/kanban/kanban.service.ts
 var KanbanService = class extends DataViewControlService {
@@ -32477,12 +33135,12 @@ var KanbanController = class extends DataViewControlController {
     const isAsc = minorSortDir === "ASC";
     items.forEach((item) => {
       const sortValue = item[sortField];
-      if (isNil33(sortValue)) {
+      if (isNil32(sortValue)) {
         item[sortField] = 0;
       } else {
         const toNum = Number(sortValue);
         if (Number.isNaN(toNum)) {
-          throw new RuntimeError63(
+          throw new RuntimeError62(
             "".concat(item.srfmajortext, "\u7684\u6392\u5E8F\u5C5E\u6027\u65E0\u6CD5\u8F6C\u6362\u6210\u6570\u503C")
           );
         }
@@ -32604,7 +33262,7 @@ var KanbanController = class extends DataViewControlController {
   }
   handleDataGroup() {
     if (!this.model.enableGroup || this.model.groupMode === "NONE") {
-      throw new RuntimeError63("\u770B\u677F\u90E8\u4EF6\u5FC5\u987B\u5F00\u542F\u5206\u7EC4");
+      throw new RuntimeError62("\u770B\u677F\u90E8\u4EF6\u5FC5\u987B\u5F00\u542F\u5206\u7EC4");
     }
     return super.handleDataGroup();
   }
@@ -32620,7 +33278,7 @@ var KanbanController = class extends DataViewControlController {
       const groupMap = /* @__PURE__ */ new Map();
       items.forEach((item) => {
         const groupVal = item[groupAppDEFieldId];
-        if (isNil33(groupVal)) {
+        if (isNil32(groupVal)) {
           return;
         }
         if (!groupMap.has(groupVal)) {
@@ -32947,12 +33605,12 @@ var KanbanController = class extends DataViewControlController {
 
 // src/controller/control/tree-grid-ex/tree-grid-ex.controller.ts
 import {
-  RuntimeError as RuntimeError64,
+  RuntimeError as RuntimeError63,
   RuntimeModelError as RuntimeModelError68,
   awaitTimeout as awaitTimeout3,
   recursiveIterate as recursiveIterate12
 } from "@ibiz-template/core";
-import { clone as clone30 } from "ramda";
+import { clone as clone31 } from "ramda";
 
 // src/controller/control/tree-grid-ex/tree-grid-ex.service.ts
 var TreeGridExService = class extends TreeService {
@@ -33207,11 +33865,11 @@ var TreeGridExController = class extends TreeController {
       return;
     }
     if (nodeData._nodeType !== "DE") {
-      throw new RuntimeError64("\u975E\u5B9E\u4F53\u8282\u70B9\u6570\u636E\u4E0D\u80FD\u4FDD\u5B58");
+      throw new RuntimeError63("\u975E\u5B9E\u4F53\u8282\u70B9\u6570\u636E\u4E0D\u80FD\u4FDD\u5B58");
     }
     const rowState = this.state.rows[nodeData._uuid];
     if (!rowState) {
-      throw new RuntimeError64("\u884C\u6570\u636E\u4E0D\u5B58\u5728");
+      throw new RuntimeError63("\u884C\u6570\u636E\u4E0D\u5B58\u5728");
     }
     if (!rowState.modified) {
       ibiz.log.debug("\u503C\u6CA1\u6709\u53D1\u751F\u6539\u53D8");
@@ -33225,7 +33883,7 @@ var TreeGridExController = class extends TreeController {
     const { appDataEntityId, updateAppDEActionId } = nodeModel;
     const isCreate = nodeData._deData.srfuf === 0 /* CREATE */;
     if (isCreate) {
-      throw new RuntimeError64("\u6682\u4E0D\u652F\u6301\u65B0\u5EFA");
+      throw new RuntimeError63("\u6682\u4E0D\u652F\u6301\u65B0\u5EFA");
     }
     if (!updateAppDEActionId) {
       throw new RuntimeModelError68(nodeModel, "\u6811\u8282\u70B9\u6CA1\u6709\u914D\u7F6E\u66F4\u65B0\u5B9E\u4F53\u884C\u4E3A");
@@ -33385,10 +34043,10 @@ var TreeGridExController = class extends TreeController {
         (item) => item.showRowEdit
       );
       if (editingRow) {
-        throw new RuntimeError64("\u540C\u65F6\u53EA\u80FD\u6709\u4E00\u884C\u5F00\u542F\u884C\u7F16\u8F91");
+        throw new RuntimeError63("\u540C\u65F6\u53EA\u80FD\u6709\u4E00\u884C\u5F00\u542F\u884C\u7F16\u8F91");
       }
       if (row.data._deData.srfuf === 1 /* UPDATE */) {
-        row.cacheData = clone30(row.data);
+        row.cacheData = clone31(row.data);
         const defaultVal = this.calcDefaultValue(row.data, false);
         Object.assign(row.data, defaultVal);
       }
@@ -33498,10 +34156,10 @@ var TreeGridExColumnController = class {
 // src/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-field-column/tree-grid-ex-node-column.controller.ts
 import {
   DataTypes as DataTypes5,
-  RuntimeError as RuntimeError65,
+  RuntimeError as RuntimeError64,
   RuntimeModelError as RuntimeModelError69
 } from "@ibiz-template/core";
-import { clone as clone31 } from "ramda";
+import { clone as clone32 } from "ramda";
 import dayjs7 from "dayjs";
 var TreeGridExNodeColumnController = class {
   /**
@@ -33699,7 +34357,7 @@ var TreeGridExNodeColumnController = class {
     const valueItem = this.nodeColumn.linkValueItem || "srfkey";
     const value = row.data[valueItem];
     if (value == null) {
-      throw new RuntimeError65("\u672A\u5728\u884C\u6570\u636E\u4E2D\u53D6\u5230 ".concat(valueItem, " \u7684\u503C"));
+      throw new RuntimeError64("\u672A\u5728\u884C\u6570\u636E\u4E2D\u53D6\u5230 ".concat(valueItem, " \u7684\u503C"));
     }
     const { linkAppViewId } = this.nodeColumn;
     if (!linkAppViewId) {
@@ -33710,7 +34368,7 @@ var TreeGridExNodeColumnController = class {
       srfkey: value,
       ...wfContext
     });
-    const tempParams = clone31(this.params);
+    const tempParams = clone32(this.params);
     const { userParam } = this.nodeColumn;
     if (userParam) {
       const { navigateContexts, navigateParams } = parseUserParams(userParam);
@@ -34112,7 +34770,7 @@ var TreeGridService = class extends GridService {
 };
 
 // src/controller/control/medit-view-panel/medit-view-panel.controller.ts
-import { RuntimeError as RuntimeError66 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError65 } from "@ibiz-template/core";
 import { createUUID as createUUID14 } from "qx-util";
 
 // src/controller/control/medit-view-panel/medit-view-panel.service.ts
@@ -34328,7 +34986,7 @@ var MEditViewPanelController = class extends MDControlController {
       (item) => item.id === id
     );
     if (panelUiItemIndex < 0) {
-      throw new RuntimeError66("\u7F16\u8F91\u89C6\u56FE\u9762\u677F\u90E8\u4EF6UI\u6570\u636E\u4E0D\u5B58\u5728");
+      throw new RuntimeError65("\u7F16\u8F91\u89C6\u56FE\u9762\u677F\u90E8\u4EF6UI\u6570\u636E\u4E0D\u5B58\u5728");
     }
     const tempUiItem = this.state.panelUiItems[panelUiItemIndex];
     if (tempUiItem.id.startsWith("mockId:")) {
@@ -34838,7 +35496,7 @@ var ReportPanelController = class extends ControlController {
 // src/controller/control/gantt/gantt.controller.ts
 import {
   awaitTimeout as awaitTimeout4,
-  RuntimeError as RuntimeError67,
+  RuntimeError as RuntimeError66,
   RuntimeModelError as RuntimeModelError71
 } from "@ibiz-template/core";
 
@@ -35282,11 +35940,11 @@ var GanttController = class extends TreeGridExController {
    */
   async modifyNodeTime(nodeData, { begin, end }) {
     if (nodeData._nodeType !== "DE") {
-      throw new RuntimeError67("\u4E0D\u662F\u5B9E\u4F53\u7518\u7279\u8282\u70B9\u6570\u636E");
+      throw new RuntimeError66("\u4E0D\u662F\u5B9E\u4F53\u7518\u7279\u8282\u70B9\u6570\u636E");
     }
     const rowState = this.getRowState(nodeData._id);
     if (!rowState) {
-      throw new RuntimeError67("\u884C\u6570\u636E\u4E0D\u5B58\u5728");
+      throw new RuntimeError66("\u884C\u6570\u636E\u4E0D\u5B58\u5728");
     }
     const { beginDataItemName, endDataItemName } = this.model;
     this.setRowValue(rowState, beginDataItemName, begin);
@@ -35306,11 +35964,11 @@ var GanttController = class extends TreeGridExController {
       return;
     }
     if (nodeData._nodeType !== "DE") {
-      throw new RuntimeError67("\u975E\u5B9E\u4F53\u8282\u70B9\u6570\u636E\u4E0D\u80FD\u4FDD\u5B58");
+      throw new RuntimeError66("\u975E\u5B9E\u4F53\u8282\u70B9\u6570\u636E\u4E0D\u80FD\u4FDD\u5B58");
     }
     const rowState = this.state.rows[nodeData._uuid];
     if (!rowState) {
-      throw new RuntimeError67("\u884C\u6570\u636E\u4E0D\u5B58\u5728");
+      throw new RuntimeError66("\u884C\u6570\u636E\u4E0D\u5B58\u5728");
     }
     if (!rowState.modified) {
       ibiz.log.debug("\u503C\u6CA1\u6709\u53D1\u751F\u6539\u53D8");
@@ -35358,7 +36016,7 @@ var GanttController = class extends TreeGridExController {
   async remove(args) {
     const { context, params, data } = this.handlerAbilityParams(args);
     if (!(data == null ? void 0 : data.length)) {
-      throw new RuntimeError67("\u672A\u9009\u4E2D\u6570\u636E");
+      throw new RuntimeError66("\u672A\u9009\u4E2D\u6570\u636E");
     }
     if ((args == null ? void 0 : args.silent) !== true) {
       const del = await ibiz.confirm.error({
@@ -35467,7 +36125,7 @@ var GanttController = class extends TreeGridExController {
         (item) => item.showRowEdit
       );
       if (editingRow) {
-        throw new RuntimeError67("\u8BF7\u5148\u5B8C\u6210\u5F53\u524D\u884C\u7F16\u8F91\u4E2D\u7684\u884C\u7684\u64CD\u4F5C");
+        throw new RuntimeError66("\u8BF7\u5148\u5B8C\u6210\u5F53\u524D\u884C\u7F16\u8F91\u4E2D\u7684\u884C\u7684\u64CD\u4F5C");
       }
     }
     let parentModel;
@@ -35557,16 +36215,16 @@ var HubController = class {
 };
 
 // src/controller/notification/notice.controller.ts
-import { QXEvent as QXEvent9 } from "qx-util";
+import { QXEvent as QXEvent10 } from "qx-util";
 
 // src/controller/notification/async-action.controller.ts
-import { QXEvent as QXEvent7 } from "qx-util";
-import { clone as clone32 } from "ramda";
-import { isNil as isNil34, isNumber as isNumber2 } from "lodash-es";
+import { QXEvent as QXEvent8 } from "qx-util";
+import { clone as clone33 } from "ramda";
+import { isNil as isNil33, isNumber as isNumber2 } from "lodash-es";
 import dayjs8 from "dayjs";
 var AsyncActionController = class {
   constructor() {
-    this.evt = new QXEvent7();
+    this.evt = new QXEvent8();
     this.total = 0;
     this.actions = [];
     /**
@@ -35637,14 +36295,14 @@ var AsyncActionController = class {
         data[key] = dayjs8(data[key]).format("YYYY-MM-DD HH:mm:ss");
       }
     });
-    if (!isNil34(data.actionresult)) {
+    if (!isNil33(data.actionresult)) {
       try {
         const json = JSON.parse(data.actionresult);
         data.actionresult = json;
       } catch (error) {
       }
     }
-    if (!isNil34(data.completionrate)) {
+    if (!isNil33(data.completionrate)) {
       const num = Number(data.completionrate);
       if (Number.isNaN(num)) {
         data.completionrate = void 0;
@@ -35669,7 +36327,7 @@ var AsyncActionController = class {
     } else {
       this.noticeResult(action);
     }
-    this.evt.emit("add", clone32(action));
+    this.evt.emit("add", clone33(action));
     this.evt.emit("dataChange");
   }
   /**
@@ -35691,7 +36349,7 @@ var AsyncActionController = class {
       }
       this.noticeResult(action);
     }
-    this.evt.emit("change", clone32(action));
+    this.evt.emit("change", clone33(action));
     this.evt.emit("dataChange");
   }
   noticeResult(action) {
@@ -35700,7 +36358,7 @@ var AsyncActionController = class {
 };
 
 // src/controller/notification/internal-message.controller.ts
-import { QXEvent as QXEvent8 } from "qx-util";
+import { QXEvent as QXEvent9 } from "qx-util";
 function isHTML(str) {
   if (str === "")
     return false;
@@ -35709,7 +36367,7 @@ function isHTML(str) {
 }
 var InternalMessageController = class {
   constructor() {
-    this.evt = new QXEvent8();
+    this.evt = new QXEvent9();
     this.total = 0;
     this.unreadCount = 0;
     /**
@@ -35869,7 +36527,7 @@ var InternalMessageController = class {
 // src/controller/notification/notice.controller.ts
 var NoticeController = class {
   constructor() {
-    this.evt = new QXEvent9();
+    this.evt = new QXEvent10();
     this.total = 0;
     this.asyncAction = new AsyncActionController();
     this.internalMessage = new InternalMessageController();
@@ -36087,7 +36745,7 @@ var AppHub = class {
       this.registerAppView(appView);
       return appView;
     }
-    throw new RuntimeError68("\u89C6\u56FE[".concat(id, "]\u4E0D\u5B58\u5728"));
+    throw new RuntimeError67("\u89C6\u56FE[".concat(id, "]\u4E0D\u5B58\u5728"));
   }
   /**
    * 根据视图模型路径，加参数重新计算视图模型
@@ -36108,7 +36766,7 @@ var AppHub = class {
       );
       return model;
     }
-    throw new RuntimeError68("\u89C6\u56FE[".concat(modelPath, "]\u4E0D\u5B58\u5728"));
+    throw new RuntimeError67("\u89C6\u56FE[".concat(modelPath, "]\u4E0D\u5B58\u5728"));
   }
   /**
    * 根据应用实体代码名称查找应用视图
@@ -36139,7 +36797,7 @@ var AppHub = class {
       this.registerAppDataEntity(entity, appId2);
       return entity;
     }
-    throw new RuntimeError68("\u672A\u627E\u5230\u5E94\u7528\u5B9E\u4F53[".concat(id, "]"));
+    throw new RuntimeError67("\u672A\u627E\u5230\u5E94\u7528\u5B9E\u4F53[".concat(id, "]"));
   }
   /**
    * 新建 hub 应用
@@ -36154,7 +36812,7 @@ var AppHub = class {
       return this.appMap.get(id);
     }
     if (!this.modelLoaderProvider) {
-      throw new RuntimeError68("\u8BF7\u5148\u6CE8\u518C\u6A21\u578B\u52A0\u8F7D\u9002\u914D\u5668");
+      throw new RuntimeError67("\u8BF7\u5148\u6CE8\u518C\u6A21\u578B\u52A0\u8F7D\u9002\u914D\u5668");
     }
     const appModel = await this.modelLoaderProvider.getApp(id);
     const app = new Application(appModel);
@@ -36233,6 +36891,17 @@ var AppHub = class {
     this.appMap.clear();
     this.configCache = void 0;
   }
+  /**
+   * 销毁基座
+   *
+   * @author tony001
+   * @date 2024-04-10 17:04:38
+   */
+  destroy() {
+    ibiz.hub.getAllApps().forEach((app) => {
+      app.destroy();
+    });
+  }
 };
 
 // src/engine/engine-factory.ts
@@ -36285,7 +36954,7 @@ var EngineFactory = class {
 };
 
 // src/engine/view-base.engine.ts
-import { RuntimeError as RuntimeError69, findRecursiveChild as findRecursiveChild3 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError68, findRecursiveChild as findRecursiveChild3 } from "@ibiz-template/core";
 var ViewEngineBase = class {
   /**
    * 构造函数在视图控制器的构造函数逻辑内部执行
@@ -36558,7 +37227,7 @@ var ViewEngineBase = class {
     const { appDataEntityId } = this.view.model;
     const { evt, context, params } = this.view;
     if (!appDataEntityId) {
-      throw new RuntimeError69("\u8BE5\u89C6\u56FE\u6CA1\u6709\u5B9E\u4F53\uFF0C\u65E0\u6CD5\u52A0\u8F7D\u5B9E\u4F53\u6570\u636E");
+      throw new RuntimeError68("\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(
@@ -36580,7 +37249,7 @@ var ViewEngineBase = class {
 
 // src/engine/md-view.engine.ts
 import { RuntimeModelError as RuntimeModelError72 } from "@ibiz-template/core";
-import { clone as clone33 } from "ramda";
+import { clone as clone34 } from "ramda";
 var MDViewEngine = class extends ViewEngineBase {
   /**
    * 多数据部件名称
@@ -36861,7 +37530,7 @@ var MDViewEngine = class extends ViewEngineBase {
     if (!openAppViewLogic) {
       throw new RuntimeModelError72(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
     }
-    const params = clone33(this.view.params);
+    const params = clone34(this.view.params);
     if (copyMode) {
       params.srfcopymode = copyMode;
     }
@@ -37037,7 +37706,7 @@ var MDViewEngine = class extends ViewEngineBase {
 };
 
 // src/global/global-util/global-util.ts
-import { RuntimeError as RuntimeError70 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError69 } from "@ibiz-template/core";
 var sourceTitle = document.title;
 var GlobalUtil = class {
   constructor() {
@@ -37170,7 +37839,7 @@ var GlobalUtil = class {
    * @return {*}  {IParams}
    */
   getGlobalParam() {
-    throw new RuntimeError70("\u83B7\u53D6\u5E94\u7528\u5168\u5C40\u53D8\u91CF\u6CA1\u6709\u5B9E\u73B0");
+    throw new RuntimeError69("\u83B7\u53D6\u5E94\u7528\u5168\u5C40\u53D8\u91CF\u6CA1\u6709\u5B9E\u73B0");
   }
   /**
    * 获取视图路由参数变量，数组类型，基于路由解析出来的，每一个对象里面都有context和params
@@ -37179,12 +37848,12 @@ var GlobalUtil = class {
    * @return {*}  {IParams}
    */
   getRouterParams() {
-    throw new RuntimeError70("\u83B7\u53D6\u89C6\u56FE\u8DEF\u7531\u53C2\u6570\u53D8\u91CF\u6CA1\u6709\u5B9E\u73B0");
+    throw new RuntimeError69("\u83B7\u53D6\u89C6\u56FE\u8DEF\u7531\u53C2\u6570\u53D8\u91CF\u6CA1\u6709\u5B9E\u73B0");
   }
 };
 
 // src/logic-scheduler/executor/logic-executor.ts
-import { RuntimeError as RuntimeError71 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError70 } from "@ibiz-template/core";
 var LogicExecutor = class {
   /**
    * @author lxm
@@ -37205,7 +37874,7 @@ var LogicExecutor = class {
    */
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   execute(_executeParams) {
-    throw new RuntimeError71("Method not implemented.");
+    throw new RuntimeError70("Method not implemented.");
   }
   /**
    * 销毁方法
@@ -37642,7 +38311,7 @@ var LogicSchedulerCenter = class {
 };
 
 // src/logic-scheduler/trigger/logic-trigger.ts
-import { RuntimeError as RuntimeError72 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError71 } from "@ibiz-template/core";
 var LogicTrigger = class {
   /**
    * @author lxm
@@ -37702,7 +38371,7 @@ var LogicTrigger = class {
     if (this.executor) {
       return this.executor.execute(executeParams);
     }
-    throw new RuntimeError72("".concat(this.logic.id, "\u6CA1\u6709\u7ED1\u5B9Aexecutor"));
+    throw new RuntimeError71("".concat(this.logic.id, "\u6CA1\u6709\u7ED1\u5B9Aexecutor"));
   }
   /**
    * 销毁方法
@@ -37719,12 +38388,12 @@ var CustomTrigger = class extends LogicTrigger {
 };
 
 // src/logic-scheduler/trigger/item-dyna-logic-trigger.ts
-import { RuntimeError as RuntimeError73 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError72 } from "@ibiz-template/core";
 var ItemDynaLogicTrigger = class extends LogicTrigger {
   bindExecutor(executor) {
     super.bindExecutor(executor);
     if (this.executor.type !== "SCRIPT") {
-      throw new RuntimeError73(
+      throw new RuntimeError72(
         "\u9884\u5B9A\u4E49\u903B\u8F91\u7C7B\u578B".concat(this.type, "\u7684\u89E6\u53D1\u5668\u7C7B\u578B\u53EA\u80FD\u662F\u811A\u672C")
       );
     }
@@ -37761,7 +38430,7 @@ var ItemDynaLogicTrigger = class extends LogicTrigger {
 };
 
 // src/logic-scheduler/trigger/timer-trigger.ts
-import { RuntimeError as RuntimeError74, RuntimeModelError as RuntimeModelError74 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError73, RuntimeModelError as RuntimeModelError74 } from "@ibiz-template/core";
 var TimerTrigger = class extends LogicTrigger {
   constructor() {
     super(...arguments);
@@ -37773,7 +38442,7 @@ var TimerTrigger = class extends LogicTrigger {
     }
     this.timer = setInterval(() => {
       if (!this.scheduler.defaultParamsCb) {
-        throw new RuntimeError74("\u5B9A\u65F6\u5668\u7F3A\u5C11\u9ED8\u8BA4\u53C2\u6570\u56DE\u8C03");
+        throw new RuntimeError73("\u5B9A\u65F6\u5668\u7F3A\u5C11\u9ED8\u8BA4\u53C2\u6570\u56DE\u8C03");
       }
       const params = this.scheduler.defaultParamsCb();
       this.executor.execute(params);
@@ -37790,10 +38459,10 @@ var TimerTrigger = class extends LogicTrigger {
 // src/logic-scheduler/executor/app-ui-logic-executor.ts
 import {
   ModelError as ModelError34,
-  RuntimeError as RuntimeError75,
+  RuntimeError as RuntimeError74,
   RuntimeModelError as RuntimeModelError75
 } from "@ibiz-template/core";
-import { notNilEmpty as notNilEmpty9 } from "qx-util";
+import { notNilEmpty as notNilEmpty10 } from "qx-util";
 var AppUILogicExecutor = class extends LogicExecutor {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   async execute(executeParams) {
@@ -37828,7 +38497,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     const { context, params, ...rest } = parameters;
     const { data } = parameters;
     if (!(data == null ? void 0 : data[0])) {
-      throw new RuntimeError75("opendata\u6CA1\u6709\u53EF\u64CD\u4F5C\u6570\u636E\uFF01");
+      throw new RuntimeError74("opendata\u6CA1\u6709\u53EF\u64CD\u4F5C\u6570\u636E\uFF01");
     }
     const openViewRefs = appUILogic.openDataAppViews;
     let openViewRef;
@@ -37857,7 +38526,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     );
     let tempParams = {};
     const navParams = openViewRef.navigateParams;
-    if (notNilEmpty9(navParams)) {
+    if (notNilEmpty10(navParams)) {
       tempParams = convertNavData(navParams, data[0], params, context);
     }
     return ibiz.commands.execute(
@@ -37888,7 +38557,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     const openViewRefs = appUILogic.openDataAppViews;
     const findView = openViewRefs == null ? void 0 : openViewRefs.find((item) => item.refMode === formTypeValue);
     if (!findView) {
-      throw new RuntimeError75(
+      throw new RuntimeError74(
         "\u6CA1\u6709\u627E\u5230\u4E0E\u8868\u5355\u7C7B\u578B".concat(formTypeValue, "\u76F8\u5173\u7684\u5B9E\u4F53\u7684\u7F16\u8F91\u89C6\u56FE")
       );
     }
@@ -37945,12 +38614,12 @@ var AppUILogicExecutor = class extends LogicExecutor {
     let tempParams = {};
     const _data = (data == null ? void 0 : data[0]) || {};
     const navContexts = newViewRef.navigateContexts;
-    if (notNilEmpty9(navContexts)) {
+    if (notNilEmpty10(navContexts)) {
       tempContext = convertNavData(navContexts, _data, params, context);
     }
     tempContext = Object.assign(context, tempContext);
     const navParams = newViewRef.navigateParams;
-    if (notNilEmpty9(navParams)) {
+    if (notNilEmpty10(navParams)) {
       tempParams = convertNavData(navParams, _data, params, context);
     }
     if (params.srfcopymode) {
@@ -38013,7 +38682,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     }
     const selectData = (_a = result.data) == null ? void 0 : _a[0];
     if (!selectData) {
-      throw new RuntimeError75("\u8BF7\u9009\u4E2D\u4E00\u6761\u6570\u636E");
+      throw new RuntimeError74("\u8BF7\u9009\u4E2D\u4E00\u6761\u6570\u636E");
     }
     const indexType = selectData.srfkey;
     const findView = newDataAppViews == null ? void 0 : newDataAppViews.find(
@@ -38023,7 +38692,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
       }
     );
     if (!findView) {
-      throw new RuntimeError75(
+      throw new RuntimeError74(
         "\u6CA1\u6709\u627E\u5230\u4E0E\u7D22\u5F15\u7C7B\u578B".concat(indexType, "\u76F8\u5173\u7684\u5B9E\u4F53\u7684\u7F16\u8F91\u89C6\u56FE")
       );
     }
@@ -38060,7 +38729,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
         }
       });
       if (pickParentFieldName === void 0) {
-        throw new RuntimeError75(
+        throw new RuntimeError74(
           "\u6CA1\u6709\u627E\u5230".concat(pickParentDeName, "\u5728\u5F53\u524D\u5B9E\u4F53\u7684\u5916\u952E\u5C5E\u6027")
         );
       }
@@ -38450,6 +39119,7 @@ export {
   HubController,
   INTERNAL_MESSAGE_PROVIDER_PREFIX,
   InternalMessageService,
+  ItemsValueOPs,
   KanbanController,
   KanbanService,
   LayoutPanelUtil,
@@ -38508,6 +39178,8 @@ export {
   SearchBarController,
   SearchBarFilterController,
   SearchBarFilterItemsController,
+  SearchBarFilterSimpleItemsController,
+  SearchCondEx2filterNode,
   SearchFilter,
   SearchFormController,
   SearchFormService,
@@ -38575,6 +39247,7 @@ export {
   calcMainStateOPPrivsStrs,
   calcNavParams,
   calcResPath,
+  calcSearchCondExs,
   calcSearchConds,
   compare,
   compareNumber,
@@ -38590,6 +39263,8 @@ export {
   exportData,
   fieldValueToBoolean,
   filterFieldLogics,
+  filterNode2SearchCond,
+  filterNode2SearchCondEx,
   filterValueRules,
   findAppDEMethod,
   findChildFormDetails,
@@ -38597,7 +39272,6 @@ export {
   findEditItem,
   findFieldById,
   findModelChild,
-  formatFilters,
   formatMultiData,
   generateEditorRules,
   generateRules,
@@ -38650,10 +39324,12 @@ export {
   installCommand,
   isDataContainer,
   isFormDataContainer,
+  isHiddenFilter,
+  isSimpleItems,
   isValueChange,
   matchMainState,
   openRedirectView,
-  parseFilters,
+  parseSubFieldInfo,
   parseUserParams,
   parseViewProtocol,
   presetAppCounterProvider,
@@ -38679,6 +39355,7 @@ export {
   strContain,
   testCond,
   toLocalOpenWFRedirectView,
+  validateFilterNodes,
   verifyDeRules,
   verifyFormGroupLogic,
   verifyPanelGroupLogic