@ibiz-template/runtime 0.1.34 → 0.1.36

package/dist/index.esm.js

@@ -8389,6 +8389,29 @@ var ViewCallTag = /* @__PURE__ */ ((ViewCallTag2) => {
   return ViewCallTag2;
 })(ViewCallTag || {});
 
+// src/constant/value-op.ts
+var ValueOP = /* @__PURE__ */ ((ValueOP2) => {
+  ValueOP2["EQ"] = "EQ";
+  ValueOP2["NOT_EQ"] = "NOTEQ";
+  ValueOP2["GT"] = "GT";
+  ValueOP2["GT_AND_EQ"] = "GTANDEQ";
+  ValueOP2["LT"] = "LT";
+  ValueOP2["LT_AND_EQ"] = "LTANDEQ";
+  ValueOP2["IS_NULL"] = "ISNULL";
+  ValueOP2["IS_NOT_NULL"] = "ISNOTNULL";
+  ValueOP2["IN"] = "IN";
+  ValueOP2["NOT_IN"] = "NOTIN";
+  ValueOP2["LIKE"] = "LIKE";
+  ValueOP2["LIFT_LIKE"] = "LIFTLIKE";
+  ValueOP2["RIGHT_LIKE"] = "RIGHT_LIKE";
+  ValueOP2["CHILD_OF"] = "CHILDOF";
+  ValueOP2["USER_LIKE"] = "USERLIKE";
+  ValueOP2["BIT_AND"] = "BITAND";
+  ValueOP2["EXISTS"] = "EXISTS";
+  ValueOP2["NOT_EXISTS"] = "NOTEXISTS";
+  return ValueOP2;
+})(ValueOP || {});
+
 // src/constant/studio-event.ts
 var StudioViewEvents = class {
 };
@@ -10638,7 +10661,10 @@ var CounterService = class {
 CounterService.counterMap = /* @__PURE__ */ new Map();
 
 // src/service/service/entity/de.service.ts
-import { ModelError as ModelError13, RuntimeError as RuntimeError12 } from "@ibiz-template/core";
+import {
+  ModelError as ModelError13,
+  RuntimeError as RuntimeError12
+} from "@ibiz-template/core";
 
 // src/service/service/work-flow/work-flow.service.ts
 import { RuntimeError as RuntimeError10 } from "@ibiz-template/core";
@@ -11454,7 +11480,7 @@ var Method = class {
         case "POST":
           res = await this.app.net.post(
             this.mergeRequestPath(path2, methodName),
-            notNilEmpty6(data) ? data : params
+            notNilEmpty6(data) ? data : params || {}
           );
           break;
         case "GET":
@@ -11466,7 +11492,7 @@ var Method = class {
         case "PUT": {
           res = await this.app.net.put(
             this.mergeRequestPath(path2, methodName),
-            notNilEmpty6(data) ? data : params
+            notNilEmpty6(data) ? data : params || {}
           );
           break;
         }
@@ -11553,13 +11579,10 @@ var DELogicContext = class {
    * @param {Map<string, DELogicParam>} deLogicParams 实体逻辑参数集合
    * @param {IParams} context 上下文
    * @param {IData} data 数据对象
-   * @param {IParams} viewParams 视图参数
+   * @param {IParams} params 视图参数
    */
-  constructor(deLogicParams, context, data, viewParams) {
+  constructor(deLogicParams, context, data, params) {
     this.deLogicParams = deLogicParams;
-    this.context = context;
-    this.data = data;
-    this.viewParams = viewParams;
     /**
      * 实体逻辑参数
      *
@@ -11594,6 +11617,31 @@ var DELogicContext = class {
      * @type {string}
      */
     this.defaultParamName = "Default";
+    this.parameters = { context, data, params };
+  }
+  /**
+   * 上下文
+   */
+  get context() {
+    if (Object.prototype.hasOwnProperty.call(this.params, "context")) {
+      return this.params.context;
+    }
+    return this.parameters.context;
+  }
+  /**
+   * 数据
+   */
+  get data() {
+    return this.parameters.data;
+  }
+  /**
+   * 视图参数
+   */
+  get viewParam() {
+    if (Object.prototype.hasOwnProperty.call(this.params, "viewParam")) {
+      return this.params.viewParam;
+    }
+    return this.parameters.params;
   }
   /**
    * 重置实体逻辑参数
@@ -11896,7 +11944,7 @@ var DEActionNode = class extends DELogicNode {
       dstAppDEActionId,
       ctx.context,
       requestData,
-      ctx.viewParams
+      ctx.viewParam
     );
     if (res.ok) {
       ctx.params[retDELogicParamId] = res.data;
@@ -11970,13 +12018,13 @@ function handleSrcVal(ctx, srcValParams) {
       return ibiz.util.rawValue.format(srcValue);
     case "WEBCONTEXT":
     case "VIEWPARAM":
-      value = ctx.viewParams;
+      value = ctx.parameters.params;
       break;
     case "APPLICATION":
     case "SESSION":
     case "APPDATA":
     case "DATACONTEXT":
-      value = ctx.context;
+      value = ctx.parameters.context;
       break;
     case "ENVPARAM":
       value = clone5(ibiz.env);
@@ -12152,14 +12200,13 @@ var DataSetNode = class extends DELogicNode {
       dstDELogicParamId,
       retDELogicParamId
     } = this.model;
-    const requestData = ctx.params[dstDELogicParamId];
+    const queryParams = ctx.params[dstDELogicParamId];
     const app = ibiz.hub.getApp(ctx.context.srfappid);
     const res = await app.deService.exec(
       dstAppDataEntityId,
       dstAppDEDataSetId,
       ctx.context,
-      requestData,
-      ctx.viewParams
+      queryParams
     );
     if (res.ok) {
       ctx.params[retDELogicParamId] = res.data;
@@ -12324,7 +12371,7 @@ var DELogicParam = class {
     } else if (m.lastReturnParam) {
       ctx.initLastReturnParam(tag);
     } else if (m.appContextParam) {
-      ctx.params[tag] = ctx.context;
+      ctx.params[tag] = ctx.parameters.context;
     } else if (m.simpleListParam) {
       ctx.params[tag] = [];
     } else if (m.simpleParam) {
@@ -13196,10 +13243,11 @@ var DEService = class {
    * 实体级别 AI 聊天会话
    *
    * @author chitanda
-   * @date 2023-10-12 11:10:00
+   * @date 2023-10-16 16:10:16
+   * @param {(data: IPortalAsyncAction) => void} onmessage
    * @param {IParams} context
    * @param {IParams} [params={}]
-   * @param {FetchEventSourceInit} [options={}]
+   * @param {IData} [data={}]
    * @return {*}  {Promise<void>}
    */
   aiChatSse(onmessage, context, params = {}, data = {}) {
@@ -13215,7 +13263,10 @@ var DEService = class {
           },
           body: JSON.stringify(data),
           onmessage: (e) => {
-            onmessage(e);
+            if (e.data) {
+              const json = JSON.parse(e.data);
+              onmessage(json);
+            }
           },
           onclose: () => {
             resolve();
@@ -18619,30 +18670,20 @@ var CaptionBarController = class extends ControlController {
 import { recursiveIterate, RuntimeError as RuntimeError38 } from "@ibiz-template/core";
 
 // src/ui-action/provider/backend-ui-action-provider.ts
-import { RuntimeModelError as RuntimeModelError45 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError46 } from "@ibiz-template/core";
 import { isArray as isArray4 } from "qx-util";
 
 // src/ui-action/provider/ui-action-provider-base.ts
-import { RuntimeModelError as RuntimeModelError44 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError45 } from "@ibiz-template/core";
 
 // src/ui-logic/index.ts
 import { RuntimeError as RuntimeError36 } from "@ibiz-template/core";
 
 // src/ui-logic/ui-logic.ts
-import { ModelError as ModelError24, RuntimeModelError as RuntimeModelError43 } from "@ibiz-template/core";
+import { ModelError as ModelError24, RuntimeModelError as RuntimeModelError44 } from "@ibiz-template/core";
 
 // src/ui-logic/ui-logic-context.ts
 var UILogicContext = class {
-  /**
-   * Creates an instance of DELogicContext.
-   * @author lxm
-   * @date 2023-03-24 09:15:14
-   * @param {Map<string, DELogicParam>} deLogicParams 实体逻辑参数集合
-   * @param {IParams} context 上下文
-   * @param {IData} data 数据对象
-   * @param {IParams} viewParams 视图参数
-   * @param {IParams} [opt] 额外参数
-   */
   /**
    * Creates an instance of UILogicContext.
    * @author lxm
@@ -18693,6 +18734,9 @@ var UILogicContext = class {
    * 上下文
    */
   get context() {
+    if (Object.prototype.hasOwnProperty.call(this.params, "context")) {
+      return this.params.context;
+    }
     return this.parameters.context;
   }
   /**
@@ -18704,7 +18748,10 @@ var UILogicContext = class {
   /**
    * 视图参数
    */
-  get viewParams() {
+  get viewParam() {
+    if (Object.prototype.hasOwnProperty.call(this.params, "viewParam")) {
+      return this.params.viewParam;
+    }
     return this.parameters.params;
   }
   /**
@@ -18784,14 +18831,11 @@ import { clone as clone14 } from "ramda";
 function handleSrcVal2(ctx, srcValParams) {
   const { srcDEUILogicParamId, srcFieldName, srcValue } = srcValParams;
   const srcValueType = srcValParams.srcValueType || "SRCDLPARAM";
-  let srcField = srcFieldName;
+  const srcField = srcFieldName;
   let value;
   switch (srcValueType) {
     case "SRCDLPARAM":
       value = ctx.params[srcDEUILogicParamId];
-      if (ctx.isEntityParam(srcDEUILogicParamId)) {
-        srcField = srcField == null ? void 0 : srcField.toLowerCase();
-      }
       break;
     case "NULLVALUE":
       return null;
@@ -18801,13 +18845,13 @@ function handleSrcVal2(ctx, srcValParams) {
       return ibiz.util.rawValue.format(srcValue);
     case "WEBCONTEXT":
     case "VIEWPARAM":
-      value = ctx.viewParams;
+      value = ctx.parameters.params;
       break;
     case "APPLICATION":
     case "SESSION":
     case "APPDATA":
     case "DATACONTEXT":
-      value = ctx.context;
+      value = ctx.parameters.context;
       break;
     case "ENVPARAM":
       value = clone14(ibiz.env);
@@ -19085,7 +19129,7 @@ var DEActionNode2 = class extends UILogicNode {
       dstAppDEActionId,
       ctx.context,
       requestData,
-      ctx.viewParams
+      ctx.viewParam
     );
     if (res.ok) {
       ctx.params[retDEUILogicParamId] = res.data;
@@ -19113,6 +19157,8 @@ var DEUIActionNode = class extends UILogicNode {
     }
     await UIActionUtil.execAndResolved(dstAppDEUIActionId, {
       ...parameters,
+      context: ctx.context,
+      params: ctx.viewParam,
       data: actionData
     });
   }
@@ -19538,6 +19584,7 @@ var RenewParamNode2 = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/data-set-node/data-set-node.ts
+import { RuntimeModelError as RuntimeModelError41 } from "@ibiz-template/core";
 var DataSetNode2 = class extends UILogicNode {
   async exec(ctx) {
     const {
@@ -19546,14 +19593,16 @@ var DataSetNode2 = class extends UILogicNode {
       dstDEUILogicParamId,
       retDEUILogicParamId
     } = this.model;
-    const requestData = ctx.params[dstDEUILogicParamId];
+    if (!dstDEUILogicParamId) {
+      throw new RuntimeModelError41(this.model, "\u7F3A\u5C11\u914D\u7F6E\u8FC7\u6EE4\u53C2\u6570");
+    }
+    const queryParams = ctx.params[dstDEUILogicParamId];
     const app = ibiz.hub.getApp(ctx.context.srfappid);
     const res = await app.deService.exec(
       dstAppDataEntityId,
       dstAppDEDataSetId,
       ctx.context,
-      requestData,
-      ctx.viewParams
+      queryParams
     );
     if (res.ok) {
       ctx.params[retDEUILogicParamId] = res.data;
@@ -19571,19 +19620,19 @@ var ThrowExceptionNode2 = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/view-ctrl-fire-event-node/view-ctrl-fire-event-node.ts
-import { RuntimeError as RuntimeError34, RuntimeModelError as RuntimeModelError41 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError34, RuntimeModelError as RuntimeModelError42 } from "@ibiz-template/core";
 var ViewCtrlFireEventNode = class extends UILogicNode {
   async exec(ctx) {
     ctx.isEndNode = true;
     const { eventName, eventParamId, fireCtrlId } = this.model;
     if (!fireCtrlId) {
-      throw new RuntimeModelError41(this.model, "\u6CA1\u6709\u914D\u7F6E\u89E6\u53D1\u5BF9\u8C61");
+      throw new RuntimeModelError42(this.model, "\u6CA1\u6709\u914D\u7F6E\u89E6\u53D1\u5BF9\u8C61");
     }
     if (!eventName) {
-      throw new RuntimeModelError41(this.model, "\u6CA1\u6709\u914D\u7F6E\u4E8B\u4EF6\u540D\u79F0\u53C2\u6570");
+      throw new RuntimeModelError42(this.model, "\u6CA1\u6709\u914D\u7F6E\u4E8B\u4EF6\u540D\u79F0\u53C2\u6570");
     }
     if (!eventParamId) {
-      throw new RuntimeModelError41(this.model, "\u6CA1\u6709\u914D\u7F6E\u4E8B\u4EF6\u53C2\u6570");
+      throw new RuntimeModelError42(this.model, "\u6CA1\u6709\u914D\u7F6E\u4E8B\u4EF6\u53C2\u6570");
     }
     const invokeCtrl = ctx.params[fireCtrlId];
     if (!invokeCtrl) {
@@ -19598,7 +19647,7 @@ var ViewCtrlFireEventNode = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/execute-de-logic-node/execute-de-logic-node.ts
-import { RuntimeError as RuntimeError35, RuntimeModelError as RuntimeModelError42 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError35, RuntimeModelError as RuntimeModelError43 } from "@ibiz-template/core";
 var ExecuteDELogicNode = class extends UILogicNode {
   async exec(ctx) {
     const {
@@ -19608,13 +19657,13 @@ var ExecuteDELogicNode = class extends UILogicNode {
       retDEUILogicParamId
     } = this.model;
     if (!dstAppDataEntityId) {
-      throw new RuntimeModelError42(this.model, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53");
+      throw new RuntimeModelError43(this.model, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53");
     }
     if (!dstAppDELogicId) {
-      throw new RuntimeModelError42(this.model, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u903B\u8F91");
+      throw new RuntimeModelError43(this.model, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u903B\u8F91");
     }
     if (!dstDEUILogicParamId) {
-      throw new RuntimeModelError42(this.model, "\u6CA1\u6709\u914D\u7F6E\u4F20\u5165\u903B\u8F91\u53C2\u6570");
+      throw new RuntimeModelError43(this.model, "\u6CA1\u6709\u914D\u7F6E\u4F20\u5165\u903B\u8F91\u53C2\u6570");
     }
     const dstParam = ctx.params[dstDEUILogicParamId];
     if (!dstParam) {
@@ -19623,9 +19672,9 @@ var ExecuteDELogicNode = class extends UILogicNode {
     const result = await execDELogicById(
       dstAppDELogicId,
       dstAppDataEntityId,
-      dstParam.context,
-      dstParam.data,
-      dstParam.params
+      ctx.context,
+      dstParam,
+      ctx.params
     );
     if (retDEUILogicParamId) {
       ctx.params[retDEUILogicParamId] = result;
@@ -19656,7 +19705,8 @@ var UILogicParam = class {
   calc(ctx) {
     const tag = this.model.id;
     const m = this.model;
-    const { context, viewParams, data, parameters } = ctx;
+    const { parameters } = ctx;
+    const { context, params, data } = parameters;
     const app = ibiz.hub.getApp(context.srfappid);
     if (m.codeName === "layoutPanel") {
       ctx.params[tag] = parameters.view.layoutPanel.panelItems;
@@ -19700,7 +19750,7 @@ var UILogicParam = class {
     } else if (m.simpleParam) {
       ctx.params[tag] = {};
     } else if (m.viewNavDataParam) {
-      ctx.params[tag] = viewParams;
+      ctx.params[tag] = params;
     } else if (m.viewSessionParam) {
       throw new ModelError23(m, "\u672A\u652F\u6301\u7684\u903B\u8F91\u53C2\u6570\u7C7B\u578B: \u5F53\u524D\u89C6\u56FE\u4F1A\u8BDD");
     }
@@ -19754,7 +19804,7 @@ var UILogic = class {
     this.params = /* @__PURE__ */ new Map();
     var _a;
     if (!((_a = model.deuilogicNodes) == null ? void 0 : _a.length)) {
-      throw new RuntimeModelError43(model, "\u754C\u9762\u903B\u8F91\u6CA1\u6709\u914D\u7F6E\u903B\u8F91\u8282\u70B9");
+      throw new RuntimeModelError44(model, "\u754C\u9762\u903B\u8F91\u6CA1\u6709\u914D\u7F6E\u903B\u8F91\u8282\u70B9");
     }
     model.deuilogicNodes.forEach((node) => {
       const { logicNodeType } = node;
@@ -19869,7 +19919,7 @@ var UILogic = class {
       const start = this.nodes.get(startDEUILogicNodeId);
       await this.deepExec(start, ctx);
     } else {
-      throw new RuntimeModelError43(this.model, "\u672A\u8BBE\u7F6E\u8D77\u59CB\u8282\u70B9");
+      throw new RuntimeModelError44(this.model, "\u672A\u8BBE\u7F6E\u8D77\u59CB\u8282\u70B9");
     }
     if (ctx.isEndNode) {
       return ctx.result;
@@ -20005,7 +20055,7 @@ var UIActionProviderBase = class {
     const { appDEUILogicId, appDataEntityId, uilogicAttachMode } = action;
     if (uilogicAttachMode === "REPLACE") {
       if (!appDEUILogicId) {
-        throw new RuntimeModelError44(action, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u754C\u9762\u903B\u8F91");
+        throw new RuntimeModelError45(action, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u754C\u9762\u903B\u8F91");
       }
       await execUILogic(appDEUILogicId, appDataEntityId, args);
       return result;
@@ -20032,7 +20082,7 @@ var UIActionProviderBase = class {
     }
     if (action.uilogicAttachMode === "AFTER") {
       if (!appDEUILogicId) {
-        throw new RuntimeModelError44(action, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u754C\u9762\u903B\u8F91");
+        throw new RuntimeModelError45(action, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u754C\u9762\u903B\u8F91");
       }
       await execUILogic(appDEUILogicId, appDataEntityId, args);
     }
@@ -20215,7 +20265,7 @@ var BackendUIActionProvider = class extends UIActionProviderBase {
     const entityName = action.appDataEntityId;
     const methodName = action.appDEMethodId;
     if (!entityName || !methodName) {
-      throw new RuntimeModelError45(action, "\u672A\u914D\u7F6E\u5B9E\u4F53\u6216\u5B9E\u4F53\u884C\u4E3A");
+      throw new RuntimeModelError46(action, "\u672A\u914D\u7F6E\u5B9E\u4F53\u6216\u5B9E\u4F53\u884C\u4E3A");
     }
     const { resultContext, resultParams, resultData } = await this.handleParams(
       action,
@@ -20330,7 +20380,7 @@ var SysUIActionProvider = class extends UIActionProviderBase {
 };
 
 // src/ui-action/provider/front-ui-action-provider.ts
-import { StringUtil, RuntimeModelError as RuntimeModelError46, ModelError as ModelError25 } from "@ibiz-template/core";
+import { StringUtil, RuntimeModelError as RuntimeModelError47, ModelError as ModelError25 } from "@ibiz-template/core";
 var FrontUIActionProvider = class extends UIActionProviderBase {
   async execAction(action, args) {
     const { context, params, data, event, noWaitRoute } = args;
@@ -20345,7 +20395,7 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
       case "WIZARD": {
         const frontPSAppView = action.frontAppViewId;
         if (!frontPSAppView) {
-          throw new RuntimeModelError46(action, "\u672A\u914D\u7F6E\u6253\u5F00\u89C6\u56FE");
+          throw new RuntimeModelError47(action, "\u672A\u914D\u7F6E\u6253\u5F00\u89C6\u56FE");
         }
         const { resultContext, resultParams } = await this.handleParams(
           action,
@@ -20401,7 +20451,7 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
       );
       return result || {};
     }
-    throw new RuntimeModelError46(action, "\u81EA\u5B9A\u4E49\u7C7B\u578B\u7F3A\u5C11\u914D\u7F6E\u811A\u672C\u4EE3\u7801");
+    throw new RuntimeModelError47(action, "\u81EA\u5B9A\u4E49\u7C7B\u578B\u7F3A\u5C11\u914D\u7F6E\u811A\u672C\u4EE3\u7801");
   }
 };
 
@@ -21001,7 +21051,7 @@ var MenuPortletController = class extends PortletPartController {
 };
 
 // src/controller/control/data-view/data-view.controller.ts
-import { RuntimeModelError as RuntimeModelError47 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError48 } from "@ibiz-template/core";
 import { isNil as isNil18 } from "ramda";
 
 // src/controller/control/data-view/data-view.service.ts
@@ -21214,7 +21264,7 @@ var DataViewControlController = class extends MDControlController {
     const optItemModel = this.getOptItemModel();
     if (optItemModel) {
       if (!optItemModel.deuiactionGroup) {
-        throw new RuntimeModelError47(this.model, "\u64CD\u4F5C\u9879\u6CA1\u6709\u914D\u7F6E\u754C\u9762\u884C\u4E3A\u7EC4");
+        throw new RuntimeModelError48(this.model, "\u64CD\u4F5C\u9879\u6CA1\u6709\u914D\u7F6E\u754C\u9762\u884C\u4E3A\u7EC4");
       }
       if (!((_a = optItemModel.deuiactionGroup.uiactionGroupDetails) == null ? void 0 : _a.length)) {
         ibiz.log.debug("\u64CD\u4F5C\u9879\u754C\u9762\u884C\u4E3A\u7EC4\u6CA1\u6709\u914D\u7F6E\u754C\u9762\u884C\u4E3A");
@@ -21263,7 +21313,7 @@ var DataViewControlController = class extends MDControlController {
     const { enableGroup, groupMode, groupAppDEFieldId } = this.model;
     if (enableGroup && groupMode) {
       if (!groupAppDEFieldId) {
-        throw new RuntimeModelError47(this.model, "\u5206\u7EC4\u5C5E\u6027\u6CA1\u6709\u914D\u7F6E");
+        throw new RuntimeModelError48(this.model, "\u5206\u7EC4\u5C5E\u6027\u6CA1\u6709\u914D\u7F6E");
       }
       if (groupMode === "AUTO") {
         this.handleAutoGroup();
@@ -21330,7 +21380,7 @@ var DataViewControlController = class extends MDControlController {
   async handleCodeListGroup() {
     const { groupAppDEFieldId, groupCodeListId } = this.model;
     if (!groupCodeListId) {
-      throw new RuntimeModelError47(this.model, "\u5206\u7EC4\u4EE3\u7801\u8868\u6CA1\u6709\u914D\u7F6E");
+      throw new RuntimeModelError48(this.model, "\u5206\u7EC4\u4EE3\u7801\u8868\u6CA1\u6709\u914D\u7F6E");
     }
     const { items } = this.state;
     const groupMap = /* @__PURE__ */ new Map();
@@ -21417,10 +21467,10 @@ var DataViewControlController = class extends MDControlController {
 };
 
 // src/controller/control/exp-bar/calendar-exp-bar.controller.ts
-import { RuntimeModelError as RuntimeModelError49 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError50 } from "@ibiz-template/core";
 
 // src/controller/control/exp-bar/exp-bar.controller.ts
-import { RuntimeError as RuntimeError39, RuntimeModelError as RuntimeModelError48 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError39, RuntimeModelError as RuntimeModelError49 } from "@ibiz-template/core";
 var ExpBarControlController = class extends ControlController {
   constructor() {
     super(...arguments);
@@ -21475,7 +21525,7 @@ var ExpBarControlController = class extends ControlController {
   get xDataController() {
     const controller = this.view.getController(this.model.xdataControlName);
     if (!controller) {
-      throw new RuntimeModelError48(
+      throw new RuntimeModelError49(
         this.model,
         "\u65E0\u6CD5\u83B7\u53D6\u591A\u6570\u636E\u90E8\u4EF6[".concat(this.model.xdataControlName, "]\u63A7\u5236\u5668")
       );
@@ -21822,7 +21872,7 @@ var CalendarExpBarController = class extends ExpBarControlController {
   get xDataController() {
     const controller = this.view.getController(this.model.xdataControlName);
     if (!controller) {
-      throw new RuntimeModelError49(
+      throw new RuntimeModelError50(
         this.model,
         "\u65E0\u6CD5\u83B7\u53D6\u591A\u6570\u636E\u90E8\u4EF6[".concat(this.model.xdataControlName, "]\u63A7\u5236\u5668")
       );
@@ -21877,7 +21927,7 @@ var CalendarExpBarController = class extends ExpBarControlController {
 };
 
 // src/controller/control/exp-bar/tree-exp-bar.controller.ts
-import { RuntimeError as RuntimeError40, RuntimeModelError as RuntimeModelError50 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError40, RuntimeModelError as RuntimeModelError51 } from "@ibiz-template/core";
 var TreeExpBarController = class extends ExpBarControlController {
   constructor() {
     super(...arguments);
@@ -21900,7 +21950,7 @@ var TreeExpBarController = class extends ExpBarControlController {
   get xDataController() {
     const controller = this.view.getController(this.model.xdataControlName);
     if (!controller) {
-      throw new RuntimeModelError50(
+      throw new RuntimeModelError51(
         this.model,
         "\u65E0\u6CD5\u83B7\u53D6\u591A\u6570\u636E\u90E8\u4EF6[".concat(this.model.xdataControlName, "]\u63A7\u5236\u5668")
       );
@@ -22313,14 +22363,21 @@ var SearchFormController = class extends FormController {
     return this.data;
   }
   /**
-   * 获取搜索表单的视图过滤参数
+   * 获取搜索表单的过滤参数
    *
    * @author lxm
    * @date 2022-09-22 17:09:21
    * @returns {*}  {IParams}
    */
-  getParams() {
-    return { ...this.data.getOrigin() };
+  getFilterParams() {
+    const filterParams = {};
+    Object.keys(this.state.data).forEach((key) => {
+      const value = this.state.data[key];
+      if (value !== null && value !== void 0 && value !== "") {
+        filterParams[key] = value;
+      }
+    });
+    return filterParams;
   }
   /**
    * 执行搜索行为
@@ -23508,7 +23565,7 @@ import { clone as clone17 } from "ramda";
 // src/controller/control/form/edit-form/edit-form.service.ts
 import {
   recursiveIterate as recursiveIterate3,
-  RuntimeModelError as RuntimeModelError51
+  RuntimeModelError as RuntimeModelError52
 } from "@ibiz-template/core";
 var EditFormService = class extends ControlService {
   /**
@@ -23626,7 +23683,7 @@ var EditFormService = class extends ControlService {
     const wizardForm = this.model;
     const methodName = (_a = wizardForm.goBackControlAction) == null ? void 0 : _a.appDEMethodId;
     if (!methodName) {
-      throw new RuntimeModelError51(this.model, "\u7F3A\u5C11\u8FD4\u56DE\u64CD\u4F5C\u5B9E\u4F53\u884C\u4E3A");
+      throw new RuntimeModelError52(this.model, "\u7F3A\u5C11\u8FD4\u56DE\u64CD\u4F5C\u5B9E\u4F53\u884C\u4E3A");
     }
     let res = await this.exec(
       methodName,
@@ -25168,7 +25225,7 @@ import {
   mergeDefaultInLeft as mergeDefaultInLeft3,
   recursiveIterate as recursiveIterate4,
   RuntimeError as RuntimeError44,
-  RuntimeModelError as RuntimeModelError52
+  RuntimeModelError as RuntimeModelError53
 } from "@ibiz-template/core";
 import { clone as clone18 } from "ramda";
 
@@ -25364,11 +25421,11 @@ var GridController = class extends MDControlController {
       (item) => item.model.appDEFieldId === groupAppDEFieldId
     );
     if (!this.groupFieldColumn) {
-      throw new RuntimeModelError52(this.model, "\u6CA1\u6709\u914D\u7F6E\u5206\u7EC4\u5C5E\u6027\u7684\u5C5E\u6027\u5217");
+      throw new RuntimeModelError53(this.model, "\u6CA1\u6709\u914D\u7F6E\u5206\u7EC4\u5C5E\u6027\u7684\u5C5E\u6027\u5217");
     }
     const groupFieldName = this.groupFieldColumn.model.id;
     if (!this.groupFieldColumn.model.appCodeListId) {
-      throw new RuntimeModelError52(
+      throw new RuntimeModelError53(
         this.groupFieldColumn.model,
         "\u5206\u7EC4\u5C5E\u6027\u7684\u5C5E\u6027\u5217".concat(groupFieldName, "\u6CA1\u6709\u914D\u7F6E\u4EE3\u7801\u8868")
       );
@@ -25378,7 +25435,7 @@ var GridController = class extends MDControlController {
     );
     if (index !== -1 && index !== 0) {
       if (this.isMultistageHeader) {
-        throw new RuntimeModelError52(
+        throw new RuntimeModelError53(
           this.model,
           "\u8BF7\u5C06\u5206\u7EC4\u5C5E\u6027\u5217".concat(groupFieldName, "\u914D\u7F6E\u4E3A\u7B2C\u4E00\u5217")
         );
@@ -25388,10 +25445,10 @@ var GridController = class extends MDControlController {
     }
     if (groupMode === "CODELIST") {
       if (!groupCodeListId) {
-        throw new RuntimeModelError52(this.model, "\u4EE3\u7801\u8868\u5206\u7EC4\u6A21\u5F0F\u9700\u8981\u914D\u7F6E\u4EE3\u7801\u8868");
+        throw new RuntimeModelError53(this.model, "\u4EE3\u7801\u8868\u5206\u7EC4\u6A21\u5F0F\u9700\u8981\u914D\u7F6E\u4EE3\u7801\u8868");
       }
       if (this.groupFieldColumn.model.appCodeListId !== groupCodeListId) {
-        throw new RuntimeModelError52(
+        throw new RuntimeModelError53(
           this.model,
           "\u5206\u7EC4\u4EE3\u7801\u8868\u4E0E\u5C5E\u6027\u5217".concat(groupFieldName, "\u7684\u4EE3\u7801\u8868\u4E0D\u4E00\u81F4")
         );
@@ -25473,7 +25530,7 @@ var GridController = class extends MDControlController {
       return;
     }
     if (!aggAppDEDataSetId || !aggAppDataEntityId) {
-      throw new RuntimeModelError52(this.model, "\u7F3A\u5C11\u914D\u7F6E\u805A\u5408\u5B9E\u4F53\u6216\u805A\u5408\u6570\u636E\u96C6");
+      throw new RuntimeModelError53(this.model, "\u7F3A\u5C11\u914D\u7F6E\u805A\u5408\u5B9E\u4F53\u6216\u805A\u5408\u6570\u636E\u96C6");
     }
     const params = await this.getFetchParams();
     const app = ibiz.hub.getApp(this.context.srfappid);
@@ -26296,7 +26353,7 @@ var GridFieldColumnController = class extends GridColumnController {
 };
 
 // src/controller/control/grid/grid-column/grid-ua-column/grid-ua-column.controller.ts
-import { RuntimeModelError as RuntimeModelError53 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError54 } from "@ibiz-template/core";
 var GridUAColumnController = class extends GridColumnController {
   /**
    * 给rowController初始化操作列的状态
@@ -26309,7 +26366,7 @@ var GridUAColumnController = class extends GridColumnController {
     var _a;
     const { deuiactionGroup } = this.model;
     if (!deuiactionGroup) {
-      throw new RuntimeModelError53(this.model, "\u64CD\u4F5C\u5217\u6CA1\u6709\u914D\u7F6E\u754C\u9762\u884C\u4E3A\u7EC4");
+      throw new RuntimeModelError54(this.model, "\u64CD\u4F5C\u5217\u6CA1\u6709\u914D\u7F6E\u754C\u9762\u884C\u4E3A\u7EC4");
     }
     if (!((_a = deuiactionGroup.uiactionGroupDetails) == null ? void 0 : _a.length)) {
       ibiz.log.debug("\u64CD\u4F5C\u5217\u754C\u9762\u884C\u4E3A\u7EC4\u6CA1\u6709\u914D\u7F6E\u754C\u9762\u884C\u4E3A");
@@ -27531,45 +27588,116 @@ var PickupViewPanelController = class extends ControlController {
   }
 };
 
+// src/controller/control/search-bar/search-bar.controller.ts
+import { recursiveIterate as recursiveIterate6 } from "@ibiz-template/core";
+import { isNil as isNil20 } from "ramda";
+
+// src/controller/control/search-bar/search-bar-filter.controller.ts
+import { RuntimeModelError as RuntimeModelError55 } from "@ibiz-template/core";
+var SearchBarFilterController = class {
+  constructor(model, searchBar) {
+    this.model = model;
+    this.searchBar = searchBar;
+    var _a;
+    let field;
+    if (model.appDEFieldId) {
+      field = findFieldById(searchBar.appDataEntity, model.appDEFieldId);
+    }
+    this.fieldName = field ? field.codeName.toLowerCase() : model.id;
+    this.label = model.caption || (field == null ? void 0 : field.logicName) || model.id;
+    this.valueOP = (_a = model.defsearchMode) == null ? void 0 : _a.valueOP;
+  }
+  get context() {
+    return this.searchBar.context;
+  }
+  get params() {
+    return this.searchBar.params;
+  }
+  /**
+   * 初始化
+   * @author lxm
+   * @date 2023-10-12 05:47:19
+   * @return {*}  {Promise<void>}
+   */
+  async init() {
+    if (!this.model.editor) {
+      throw new RuntimeModelError55(this.model, "\u7F3A\u5C11\u7F16\u8F91\u5668\u6A21\u578B");
+    }
+    this.editorProvider = await getEditorProvider(this.model.editor);
+    if (this.editorProvider) {
+      this.editor = await this.editorProvider.createController(
+        this.model.editor,
+        this
+      );
+    }
+  }
+};
+
 // src/controller/control/search-bar/search-bar.controller.ts
 var SearchBarController = class extends ControlController {
   constructor() {
     super(...arguments);
     /**
-     * 占位符
+     * 快速搜索占位符
      * @return {*}
      * @author: zhujiamin
      * @Date: 2023-08-11 14:13:10
      */
     this.placeHolder = "";
+    /**
+     * 过滤项控制器集合
+     * @author lxm
+     * @date 2023-10-13 03:31:26
+     * @type {SearchBarFilterController[]}
+     */
+    this.filterControllers = [];
   }
   initState() {
     super.initState();
     this.state.query = "";
     this.state.selectedGroupItem = null;
     this.state.visible = !!(this.model.enableQuickSearch || this.model.enableGroup || this.model.enableFilter);
+    if (this.model.enableFilter) {
+      this.resetFilter();
+    }
   }
   async onCreated() {
-    var _a;
     await super.onCreated();
     const appDataEntity = await ibiz.hub.getAppDataEntity(
       this.model.appDataEntityId,
       this.context.srfappid
     );
     if (appDataEntity) {
-      const searchFields = (_a = appDataEntity.appDEFields) == null ? void 0 : _a.filter((field) => {
-        return field.enableQuickSearch;
-      });
+      this.appDataEntity = appDataEntity;
+      this.calcQuickSearchPlaceholder();
+    }
+    await this.initSearchBarFilters();
+  }
+  /**
+   * 计算快速搜索的占位
+   * @author lxm
+   * @date 2023-10-16 03:49:47
+   * @protected
+   * @return {*}  {void}
+   */
+  calcQuickSearchPlaceholder() {
+    if (!this.appDataEntity) {
+      return;
+    }
+    const searchFields = this.appDataEntity.appDEFields.filter((field) => {
+      return field.enableQuickSearch;
+    });
+    if (searchFields.length) {
       const placeHolders = [];
-      searchFields == null ? void 0 : searchFields.forEach((searchField) => {
-        if ((searchField == null ? void 0 : searchField.lnlanguageRes) && searchField.lnlanguageRes.lanResTag) {
+      searchFields.forEach((searchField) => {
+        if (searchField.lnlanguageRes && searchField.lnlanguageRes.lanResTag) {
           placeHolders.push(
             ibiz.i18n.t(
               searchField.lnlanguageRes.lanResTag,
               searchField.logicName
             )
           );
-        } else if (searchField == null ? void 0 : searchField.logicName) {
+        } else if (searchField.logicName) {
           placeHolders.push(searchField.logicName);
         }
       });
@@ -27594,9 +27722,114 @@ var SearchBarController = class extends ControlController {
    * @author: zhujiamin
    * @Date: 2023-06-01 18:08:18
    */
-  handleSearch() {
+  onSearch() {
     this.evt.emit("onSearch", void 0);
   }
+  /**
+   * 获取搜索栏的过滤参数（包括快速搜索，快速分组和过滤器的参数）
+   * @author lxm
+   * @date 2023-10-16 03:54:07
+   * @return {*}  {IParams}
+   */
+  getFilterParams() {
+    var _a;
+    const params = {};
+    if (this.state.query) {
+      params.query = this.state.query;
+    }
+    if ((_a = this.state.selectedGroupItem) == null ? void 0 : _a.data) {
+      const func = new Function(
+        "return (".concat(this.state.selectedGroupItem.data, ");")
+      );
+      const addParams = func();
+      Object.assign(params, addParams);
+    }
+    const filters = this.calcFilters();
+    if (filters) {
+      params.filters = filters;
+    }
+    return params;
+  }
+  /**
+   * 重置过滤器
+   * @author lxm
+   * @date 2023-10-16 03:52:44
+   */
+  resetFilter() {
+    this.state.filterNodes = [
+      {
+        leaf: false,
+        logicType: "AND",
+        children: [{ leaf: true, field: null, valueOP: null, value: null }]
+      }
+    ];
+  }
+  /**
+   * 初始化过滤项控制器
+   * @author lxm
+   * @date 2023-10-13 03:33:17
+   * @protected
+   * @return {*}  {Promise<void>}
+   */
+  async initSearchBarFilters() {
+    var _a;
+    if ((_a = this.model.searchBarFilters) == null ? void 0 : _a.length) {
+      this.model.searchBarFilters.forEach((item) => {
+        const filterController = new SearchBarFilterController(item, this);
+        this.filterControllers.push(filterController);
+      });
+      await Promise.all(
+        this.filterControllers.map((controller) => controller.init())
+      );
+    }
+  }
+  /**
+   * 计算过滤项参数
+   * @author lxm
+   * @date 2023-10-13 05:53:35
+   * @return {*}  {IData}
+   */
+  calcFilters() {
+    if (!this.model.enableFilter) {
+      return;
+    }
+    let hasFilter = false;
+    let hasError = false;
+    recursiveIterate6(this.state.filterNodes[0], (node) => {
+      if (node.leaf) {
+        if (node.field && node.valueOP && !isNil20(node.value)) {
+          hasFilter = true;
+        } else {
+          hasError = true;
+        }
+      }
+    });
+    if (hasFilter && !hasError) {
+      const filter = this.formatFilters(this.state.filterNodes[0]);
+      return filter;
+    }
+  }
+  /**
+   * 格式化过滤项
+   * @author lxm
+   * @date 2023-10-16 03:45:41
+   * @param {IFilterNode} node
+   * @return {*}  {IData}
+   */
+  formatFilters(node) {
+    if (!node.leaf) {
+      return {
+        ["$".concat(node.logicType.toLowerCase())]: node.children.map(
+          (item) => this.formatFilters(item)
+        )
+      };
+    }
+    return {
+      ["".concat(node.field)]: {
+        ["$".concat(node.valueOP.toLowerCase())]: node.value
+      }
+    };
+  }
 };
 
 // src/controller/control/tab-exp-panel/tab-exp-panel.controller.ts
@@ -27822,7 +28055,7 @@ var TabExpPanelController = class extends ControlController {
 };
 
 // src/controller/control/tree/tree.controller.ts
-import { recursiveIterate as recursiveIterate6 } from "@ibiz-template/core";
+import { recursiveIterate as recursiveIterate7 } from "@ibiz-template/core";
 
 // src/controller/control/tree/tree.service.ts
 import { ModelError as ModelError27 } from "@ibiz-template/core";
@@ -28192,7 +28425,7 @@ var TreeController = class extends MDControlController {
       this.state.rootNodes = nodes;
     }
     this.state.items = [];
-    recursiveIterate6(
+    recursiveIterate7(
       { children: this.state.rootNodes },
       (node) => {
         this.state.items.push(node);
@@ -28334,7 +28567,7 @@ var TreeController = class extends MDControlController {
    */
   calcExpandedKeys(nodes) {
     let expandedKeys = [...this.state.expandedKeys];
-    recursiveIterate6({ children: nodes }, (node) => {
+    recursiveIterate7({ children: nodes }, (node) => {
       var _a;
       if ((_a = node.children) == null ? void 0 : _a.length) {
         expandedKeys.push(node.id);
@@ -28675,6 +28908,10 @@ var WizardPanelController = class extends ControlController {
   }
 };
 
+// src/controller/control/md-ctrl/md-ctrl.controller.ts
+import { RuntimeModelError as RuntimeModelError56 } from "@ibiz-template/core";
+import { isNil as isNil21 } from "ramda";
+
 // src/controller/control/md-ctrl/md-ctrl.service.ts
 var MDCtrlService = class extends MDControlService {
   /**
@@ -28785,7 +29022,7 @@ var MDCtrlController = class extends MDControlController {
   async refresh() {
     await this.load({ isInitialLoad: true });
   }
-  afterLoad(args, items) {
+  async afterLoad(args, items) {
     if (args.isInitialLoad) {
       this.state.rows = [];
     }
@@ -28798,6 +29035,8 @@ var MDCtrlController = class extends MDControlController {
         })
       );
     }
+    await this.initGroupCodeListItems();
+    await this.handleDataGroup();
     return super.afterLoad(args, items);
   }
   /**
@@ -28806,7 +29045,7 @@ var MDCtrlController = class extends MDControlController {
    * @author zk
    * @date 2023-05-26 02:05:46
    * @param {IData[]} items
-   * @memberof ListController
+   * @memberof MDCtrlController
    */
   setData(items) {
     const rows = items.map((item) => {
@@ -28821,7 +29060,7 @@ var MDCtrlController = class extends MDControlController {
    * @author zk
    * @date 2023-05-26 02:05:35
    * @return {*}  {IData[]}
-   * @memberof ListController
+   * @memberof MDCtrlController
    */
   getAllData() {
     return this.state.rows.map((row) => row.data);
@@ -28884,11 +29123,114 @@ var MDCtrlController = class extends MDControlController {
     containerState.update(row.data.getOrigin());
     row.uaColStates[group.id] = containerState;
   }
+  /**
+   * 处理数据分组
+   *
+   * @memberof MDCtrlController
+   */
+  async handleDataGroup() {
+    const { enableGroup, groupMode, groupAppDEFieldId } = this.model;
+    if (enableGroup && groupMode) {
+      if (!groupAppDEFieldId) {
+        throw new RuntimeModelError56(this.model, "\u5206\u7EC4\u5C5E\u6027\u6CA1\u6709\u914D\u7F6E");
+      }
+      if (groupMode === "AUTO") {
+        this.handleAutoGroup();
+      } else if (groupMode === "CODELIST") {
+        await this.handleCodeListGroup();
+      }
+    }
+  }
+  /**
+   * 处理自动分组
+   *
+   * @memberof MDCtrlController
+   */
+  handleAutoGroup() {
+    const { groupAppDEFieldId } = this.model;
+    if (groupAppDEFieldId) {
+      const { items } = this.state;
+      const groupMap = /* @__PURE__ */ new Map();
+      items.forEach((item) => {
+        const groupVal = item[groupAppDEFieldId];
+        if (isNil21(groupVal)) {
+          return;
+        }
+        if (!groupMap.has(groupVal)) {
+          groupMap.set(groupVal, []);
+        }
+        groupMap.get(groupVal).push(new MobMDCtrlRowState(item, this));
+      });
+      const groups = [];
+      groupMap.forEach((value, key) => {
+        groups.push({
+          caption: key,
+          key,
+          children: [...value]
+        });
+      });
+      this.state.groups = groups;
+    }
+  }
+  /**
+   * 加载并初始化分组代码表项集合
+   * @author lxm
+   * @date 2023-08-29 05:11:39
+   * @protected
+   * @return {*}  {Promise<void>}
+   */
+  async initGroupCodeListItems() {
+    const { groupCodeListId } = this.model;
+    if (!groupCodeListId) {
+      return;
+    }
+    const app = ibiz.hub.getApp(this.context.srfappid);
+    this.groupCodeListItems = await app.codeList.get(
+      groupCodeListId,
+      this.context,
+      this.params
+    );
+  }
+  /**
+   * 处理代码表分组
+   *
+   * @memberof MDCtrlController
+   */
+  async handleCodeListGroup() {
+    const { groupAppDEFieldId, groupCodeListId } = this.model;
+    if (!groupCodeListId) {
+      throw new RuntimeModelError56(this.model, "\u5206\u7EC4\u4EE3\u7801\u8868\u6CA1\u6709\u914D\u7F6E");
+    }
+    const { items } = this.state;
+    const groupMap = /* @__PURE__ */ new Map();
+    this.groupCodeListItems.forEach((item) => {
+      groupMap.set(item.value, []);
+    });
+    items.forEach((item) => {
+      const groupVal = item[groupAppDEFieldId];
+      const groupArr = groupMap.get(groupVal);
+      if (groupArr) {
+        groupArr.push(new MobMDCtrlRowState(item, this));
+      }
+    });
+    const groups = [];
+    groupMap.forEach((arr, key) => {
+      const codeListItem = this.groupCodeListItems.find(
+        (item) => item.value === key
+      );
+      groups.push({
+        caption: codeListItem.text,
+        key: codeListItem.value,
+        children: arr
+      });
+    });
+    this.state.groups = groups;
+  }
 };
 
 // src/controller/control/kanban/kanban.controller.ts
-import { RuntimeError as RuntimeError48, RuntimeModelError as RuntimeModelError54 } from "@ibiz-template/core";
-import { isNil as isNil20 } from "ramda";
+import { RuntimeError as RuntimeError48, RuntimeModelError as RuntimeModelError57 } from "@ibiz-template/core";
+import { isNil as isNil22 } from "ramda";
 
 // src/controller/control/kanban/kanban.service.ts
 var KanbanService = class extends DataViewControlService {
@@ -28962,15 +29304,15 @@ var KanbanController = class extends DataViewControlController {
     const sortField = this.model.minorSortAppDEFieldId;
     const { minorSortDir } = this.model;
     if (!sortField) {
-      throw new RuntimeModelError54(this.model, "\u6392\u5E8F\u5C5E\u6027\u6CA1\u914D\u7F6E");
+      throw new RuntimeModelError57(this.model, "\u6392\u5E8F\u5C5E\u6027\u6CA1\u914D\u7F6E");
     }
     if (!minorSortDir) {
-      throw new RuntimeModelError54(this.model, "\u6392\u5E8F\u65B9\u5411\u6CA1\u914D\u7F6E");
+      throw new RuntimeModelError57(this.model, "\u6392\u5E8F\u65B9\u5411\u6CA1\u914D\u7F6E");
     }
     const isAsc = minorSortDir === "ASC";
     items.forEach((item) => {
       const sortValue = item[sortField];
-      if (isNil20(sortValue)) {
+      if (isNil22(sortValue)) {
         item[sortField] = 0;
       } else {
         const toNum = Number(sortValue);
@@ -29115,7 +29457,7 @@ var KanbanController = class extends DataViewControlController {
 };
 
 // src/controller/control/tree-grid-ex/tree-grid-ex.controller.ts
-import { recursiveIterate as recursiveIterate7 } from "@ibiz-template/core";
+import { recursiveIterate as recursiveIterate8 } from "@ibiz-template/core";
 
 // src/controller/control/tree-grid-ex/tree-grid-ex.service.ts
 import { isArray as isArray6 } from "qx-util";
@@ -29355,7 +29697,7 @@ var TreeGridExController = class extends MDControlController {
    * @memberof TreeGridExController
    */
   initColumnStates() {
-    recursiveIterate7(
+    recursiveIterate8(
       this.model,
       (column) => {
         if (column.columnType !== "GROUPGRIDCOLUMN") {
@@ -29443,7 +29785,7 @@ var TreeGridExController = class extends MDControlController {
       this.state.rootNodes = nodes;
     }
     this.state.items = [];
-    recursiveIterate7(
+    recursiveIterate8(
       { children: this.state.rootNodes },
       (node) => {
         this.state.items.push(node);
@@ -29462,7 +29804,7 @@ var TreeGridExController = class extends MDControlController {
    */
   calcExpandedKeys(nodes) {
     let expandedKeys = [];
-    recursiveIterate7({ children: nodes }, (node) => {
+    recursiveIterate8({ children: nodes }, (node) => {
       var _a;
       if ((_a = node.children) == null ? void 0 : _a.length) {
         expandedKeys.push(node.id);
@@ -30058,7 +30400,7 @@ var ViewEngineBase = class {
 };
 
 // src/engine/md-view.engine.ts
-import { RuntimeModelError as RuntimeModelError55 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError58 } from "@ibiz-template/core";
 import { clone as clone20 } from "ramda";
 var MDViewEngine = class extends ViewEngineBase {
   /**
@@ -30254,7 +30596,7 @@ var MDViewEngine = class extends ViewEngineBase {
       (item) => item.id === "newdata"
     );
     if (!openAppViewLogic) {
-      throw new RuntimeModelError55(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
+      throw new RuntimeModelError58(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
     }
     const params = clone20(this.view.params);
     if (copyMode) {
@@ -30270,7 +30612,7 @@ var MDViewEngine = class extends ViewEngineBase {
     if (result instanceof Object && result.ok) {
       this.refresh();
     } else if (result === -1) {
-      throw new RuntimeModelError55(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
+      throw new RuntimeModelError58(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
     }
   }
   /**
@@ -30317,35 +30659,12 @@ var MDViewEngine = class extends ViewEngineBase {
    * @return {*}  {IParams}
    */
   getSearchParams() {
-    var _a;
     const params = {};
     if (this.searchForm) {
-      const addParams = this.searchForm.getData()[0];
-      const filteredParams = Object.entries(addParams).reduce(
-        (result, [key, value]) => {
-          if (value !== null && value !== void 0 && value !== "") {
-            result[key] = value;
-          }
-          return result;
-        },
-        {}
-      );
-      Object.assign(params, filteredParams);
+      Object.assign(params, this.searchForm.getFilterParams());
     }
     if (this.searchBar) {
-      if (this.searchBar.state.query) {
-        const addParams = {
-          query: this.searchBar.state.query
-        };
-        Object.assign(params, addParams);
-      }
-      if ((_a = this.searchBar.state.selectedGroupItem) == null ? void 0 : _a.data) {
-        const func = new Function(
-          "return (".concat(this.searchBar.state.selectedGroupItem.data, ");")
-        );
-        const addParams = func();
-        Object.assign(params, addParams);
-      }
+      Object.assign(params, this.searchBar.getFilterParams());
     }
     return params;
   }
@@ -30408,7 +30727,7 @@ var MDViewEngine = class extends ViewEngineBase {
 
 // src/utils/error-handler/default-error-handler.ts
 import {
-  RuntimeModelError as RuntimeModelError56,
+  RuntimeModelError as RuntimeModelError59,
   ModelError as ModelError28,
   HttpError as HttpError4,
   NoticeError as NoticeError2,
@@ -30416,7 +30735,7 @@ import {
 } from "@ibiz-template/core";
 var DefaultErrorHandler = class {
   handle(error) {
-    if (error instanceof RuntimeModelError56 || error instanceof ModelError28) {
+    if (error instanceof RuntimeModelError59 || error instanceof ModelError28) {
       ibiz.message.error(error.message, 10, true);
     } else if (error instanceof HttpError4) {
       if (error.status === 401) {
@@ -30670,13 +30989,13 @@ var ScriptExecutor = class extends LogicExecutor {
 };
 
 // src/logic-scheduler/executor/app-de-ui-logic-executor.ts
-import { RuntimeModelError as RuntimeModelError57 } from "@ibiz-template/core";
+import { RuntimeModelError as RuntimeModelError60 } from "@ibiz-template/core";
 var AppDEUILogicExecutor = class extends LogicExecutor {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   execute(executeParams) {
     const { appDEUILogicId, appDataEntityId } = this.logic;
     if (!appDEUILogicId) {
-      throw new RuntimeModelError57(this.logic, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u754C\u9762\u903B\u8F91");
+      throw new RuntimeModelError60(this.logic, "\u6CA1\u6709\u914D\u7F6E\u5B9E\u4F53\u754C\u9762\u903B\u8F91");
     }
     execUILogic(appDEUILogicId, appDataEntityId, executeParams);
   }
@@ -31161,7 +31480,7 @@ var TimerTrigger = class extends LogicTrigger {
 import {
   ModelError as ModelError31,
   RuntimeError as RuntimeError56,
-  RuntimeModelError as RuntimeModelError58
+  RuntimeModelError as RuntimeModelError61
 } from "@ibiz-template/core";
 import { notNilEmpty as notNilEmpty10 } from "qx-util";
 var AppUILogicExecutor = class extends LogicExecutor {
@@ -31205,7 +31524,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     } else {
       openViewRef = appUILogic.openDataAppView;
       if (!openViewRef) {
-        throw new RuntimeModelError58(
+        throw new RuntimeModelError61(
           appUILogic,
           "opendata\u89C6\u56FE\u903B\u8F91\u6CA1\u6709\u914D\u7F6E\u9ED8\u8BA4\u6253\u5F00\u89C6\u56FE"
         );
@@ -31213,7 +31532,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     }
     const openView = openViewRef.refAppViewId;
     if (!openView) {
-      throw new RuntimeModelError58(
+      throw new RuntimeModelError61(
         appUILogic,
         "opendata\u89C6\u56FE\u903B\u8F91\u7684\u9ED8\u8BA4\u6253\u5F00\u89C6\u56FE\u6CA1\u6709\u5B9E\u9645\u5F15\u7528\u89C6\u56FE"
       );
@@ -31240,7 +31559,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     const appDataEntityId = parameters.view.model.appDataEntityId;
     const formTypeName = await getFormTypeFieldName(appDataEntityId);
     if (!formTypeName) {
-      throw new RuntimeModelError58(
+      throw new RuntimeModelError61(
         appUILogic,
         "".concat(appDataEntityId, "\u5B9E\u4F53\u7F3A\u5C11\u8868\u5355\u7C7B\u578B\u5E94\u7528\u5B9E\u4F53\u5C5E\u6027")
       );
@@ -31248,7 +31567,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     const { data } = parameters;
     const formTypeValue = data[0][formTypeName];
     if (!formTypeValue) {
-      throw new RuntimeModelError58(appUILogic, "\u6570\u636E\u6E90\u65E0\u8868\u5355\u7C7B\u578B\u5E94\u7528\u5B9E\u4F53\u5C5E\u6027\u503C");
+      throw new RuntimeModelError61(appUILogic, "\u6570\u636E\u6E90\u65E0\u8868\u5355\u7C7B\u578B\u5E94\u7528\u5B9E\u4F53\u5C5E\u6027\u503C");
     }
     const openViewRefs = appUILogic.openDataAppViews;
     const findView = openViewRefs == null ? void 0 : openViewRefs.find((item) => item.refMode === formTypeValue);
@@ -31290,7 +31609,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
         return viewRef.refMode.toLowerCase() !== parentDeName;
       });
       if (!newViewRef) {
-        throw new RuntimeModelError58(
+        throw new RuntimeModelError61(
           appUILogic,
           "\u6CA1\u6709\u627E\u5230\u6279\u6DFB\u52A0\u9700\u8981\u6253\u5F00\u7684\u9009\u62E9\u89C6\u56FE"
         );
@@ -31300,7 +31619,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     } else {
       newViewRef = newDataAppView;
       if (!newViewRef || !newViewRef.refAppViewId) {
-        throw new RuntimeModelError58(
+        throw new RuntimeModelError61(
           appUILogic,
           "newdata\u89C6\u56FE\u903B\u8F91\u6CA1\u6709\u914D\u7F6E\u9ED8\u8BA4\u65B0\u5EFA\u6570\u636E\u89C6\u56FE"
         );
@@ -31357,7 +31676,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     const { wizardAppView, newDataAppViews } = appUILogic;
     const { context, params, ...rest } = parameters;
     if (!wizardAppView || !wizardAppView.refAppViewId) {
-      throw new RuntimeModelError58(appUILogic, "\u7F3A\u5C11\u9ED8\u8BA4\u7D22\u5F15\u5B9E\u4F53\u9009\u62E9\u89C6\u56FE");
+      throw new RuntimeModelError61(appUILogic, "\u7F3A\u5C11\u9ED8\u8BA4\u7D22\u5F15\u5B9E\u4F53\u9009\u62E9\u89C6\u56FE");
     }
     const result = await ibiz.commands.execute(
       OpenAppViewCommand.TAG,
@@ -31403,7 +31722,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
       const minorDERs = selfDe.minorAppDERSs;
       const pickParentDeName = newViewRef.refMode.toLowerCase();
       if (!minorDERs) {
-        throw new RuntimeModelError58(selfDe, "\u5B9E\u4F53\u6CA1\u6709\u4ECE\u5173\u7CFB\u96C6\u5408\uFF01");
+        throw new RuntimeModelError61(selfDe, "\u5B9E\u4F53\u6CA1\u6709\u4ECE\u5173\u7CFB\u96C6\u5408\uFF01");
       }
       let pickParentFieldName;
       minorDERs == null ? void 0 : minorDERs.forEach((item) => {
@@ -31826,6 +32145,7 @@ export {
   V7AuthService,
   VIEW_PROVIDER_PREFIX,
   ValueExUtil,
+  ValueOP,
   ViewCallTag,
   ViewController,
   ViewEngineBase,