@ibiz-template/runtime 0.1.13 → 0.1.15

package/dist/index.esm.js

@@ -71,10 +71,10 @@ var require_utils = __commonJS({
       };
     }
     exports.isFunction = isFunction2;
-    var isArray4 = Array.isArray || function(value) {
+    var isArray5 = Array.isArray || function(value) {
       return value && typeof value === "object" ? toString.call(value) === "[object Array]" : false;
     };
-    exports.isArray = isArray4;
+    exports.isArray = isArray5;
     function indexOf(array, value) {
       for (var i = 0, len = array.length; i < len; i++) {
         if (array[i] === value) {
@@ -102,7 +102,7 @@ var require_utils = __commonJS({
     function isEmpty9(value) {
       if (!value && value !== 0) {
         return true;
-      } else if (isArray4(value) && value.length === 0) {
+      } else if (isArray5(value) && value.length === 0) {
         return true;
       } else {
         return false;
@@ -1098,7 +1098,7 @@ var require_no_conflict = __commonJS({
   "../../node_modules/.pnpm/handlebars@4.7.8/node_modules/handlebars/dist/cjs/handlebars/no-conflict.js"(exports, module) {
     "use strict";
     exports.__esModule = true;
-    exports["default"] = function(Handlebars) {
+    exports["default"] = function(Handlebars2) {
       (function() {
         if (typeof globalThis === "object")
           return;
@@ -1109,11 +1109,11 @@ var require_no_conflict = __commonJS({
         delete Object.prototype.__magic__;
       })();
       var $Handlebars = globalThis.Handlebars;
-      Handlebars.noConflict = function() {
-        if (globalThis.Handlebars === Handlebars) {
+      Handlebars2.noConflict = function() {
+        if (globalThis.Handlebars === Handlebars2) {
           globalThis.Handlebars = $Handlebars;
         }
-        return Handlebars;
+        return Handlebars2;
       };
     };
     module.exports = exports["default"];
@@ -6226,8 +6226,360 @@ var RegisterCenter = class {
 // src/command/app/app-func/app-func.ts
 import { ModelError as ModelError4, RuntimeError as RuntimeError5 } from "@ibiz-template/core";
 
+// src/utils/handlebars/utils/helper/helper.ts
+var HelperUtil = class {
+  /**
+   * 判断字符串是否为助手
+   *
+   * @author chitanda
+   * @date 2021-12-30 10:12:26
+   * @static
+   * @param {string} name
+   * @return {*}  {boolean}
+   */
+  static isHelperName(name) {
+    return this.helperNames.includes(name);
+  }
+  /**
+   * 判断类助手统一结果调用处理
+   *
+   * @author chitanda
+   * @date 2021-12-29 17:12:23
+   * @static
+   * @param {unknown} context 执行上下文
+   * @param {boolean} bol 判断结果
+   * @param {Handlebars.HelperOptions} options
+   * @return {*}  {(string | boolean)}
+   */
+  static handleJudgmentExecute(context, bol, options) {
+    if (options.fn) {
+      return bol ? options.fn(context) : options.inverse(context);
+    }
+    return bol ? options.hash.yes = true : options.hash.no = false;
+  }
+};
+/**
+ * 当前所有助手 tag 名称
+ *
+ * @author chitanda
+ * @date 2021-12-30 10:12:39
+ * @protected
+ * @type {string[]}
+ */
+HelperUtil.helperNames = [
+  "lookup",
+  "log",
+  "and",
+  "camelCase",
+  "concat",
+  "eq",
+  "gt",
+  "get",
+  "lowerCase",
+  "lt",
+  "lte",
+  "neq",
+  "not",
+  "or",
+  "pascalCase",
+  "pluralize",
+  "snakeCase",
+  "spinalCase",
+  "upperCase"
+];
+
+// src/utils/handlebars/helpers/helper-base.ts
+var HelperBase = class {
+  /**
+   * Creates an instance of HelperBase.
+   *
+   * @author chitanda
+   * @date 2021-12-29 14:12:47
+   * @param {string} tag 助手标识
+   */
+  constructor(Handlebars2, tag) {
+    Handlebars2.registerHelper(tag, this.onExecute);
+  }
+};
+
+// src/utils/handlebars/helpers/and/and.ts
+var HelperAnd = class extends HelperBase {
+  constructor(hbs) {
+    super(hbs, "and");
+  }
+  onExecute(...args) {
+    const options = args[args.length - 1];
+    args.pop();
+    const arr = args.filter((item) => !!item);
+    const bol = arr.length === args.length;
+    return HelperUtil.handleJudgmentExecute(this, bol, options);
+  }
+};
+
+// src/utils/handlebars/helpers/camel-case/camel-case.ts
+import { camelCase } from "lodash-es";
+var HelperCamelCase = class extends HelperBase {
+  constructor(hbs) {
+    super(hbs, "camelCase");
+  }
+  onExecute(param) {
+    if (!param) {
+      return "";
+    }
+    return camelCase(param);
+  }
+};
+
+// src/utils/handlebars/helpers/concat/concat.ts
+var HelperConcat = class extends HelperBase {
+  constructor(hbs) {
+    super(hbs, "concat");
+  }
+  onExecute(...args) {
+    args.pop();
+    return args.join("");
+  }
+};
+
+// src/utils/handlebars/helpers/eq/eq.ts
+import { eq } from "lodash-es";
+var HelperEq = class extends HelperBase {
+  constructor(hbs) {
+    super(hbs, "eq");
+  }
+  onExecute(param, param2, options) {
+    const bol = eq(param, param2);
+    return HelperUtil.handleJudgmentExecute(this, bol, options);
+  }
+};
+
+// src/utils/handlebars/helpers/gt/gt.ts
+import { gt } from "lodash-es";
+var HelperGt = class extends HelperBase {
+  constructor(hbs) {
+    super(hbs, "gt");
+  }
+  onExecute(param, param2, options) {
+    const bol = gt(param, param2);
+    return HelperUtil.handleJudgmentExecute(this, bol, options);
+  }
+};
+
+// src/utils/handlebars/helpers/gte/gte.ts
+import { gte } from "lodash-es";
+var HelperGte = class extends HelperBase {
+  constructor(hbs) {
+    super(hbs, "gte");
+  }
+  onExecute(param, param2, options) {
+    const bol = gte(param, param2);
+    return HelperUtil.handleJudgmentExecute(this, bol, options);
+  }
+};
+
+// src/utils/handlebars/helpers/eq-property-value/eq-property-value.ts
+import { eq as eq2, findIndex, isArray } from "lodash-es";
+var HelperEqPropertyValue = class extends HelperBase {
+  constructor(hbs) {
+    super(hbs, "eqPropertyValue");
+  }
+  onExecute(obj, key, val, options) {
+    let bol = false;
+    if (isArray(obj)) {
+      bol = !eq2(
+        findIndex(obj, (o) => eq2(o[key], val)),
+        -1
+      );
+    } else {
+      bol = // eslint-disable-next-line no-prototype-builtins
+      obj.hasOwnProperty(key) && (bol = eq2(obj[key], val));
+    }
+    return HelperUtil.handleJudgmentExecute(this, bol, options);
+  }
+};
+
+// src/utils/handlebars/helpers/json/json.ts
+var HelperJson = class extends HelperBase {
+  constructor(hbs) {
+    super(hbs, "jsonStringify");
+  }
+  onExecute(obj, space) {
+    return JSON.stringify(
+      obj,
+      null,
+      typeof space === "number" ? space : void 0
+    );
+  }
+};
+
+// src/utils/handlebars/helpers/lower-case/lower-case.ts
+var HelperLowerCase = class extends HelperBase {
+  constructor(hbs) {
+    super(hbs, "lowerCase");
+  }
+  onExecute(param) {
+    if (!param) {
+      return "";
+    }
+    return param.toLowerCase();
+  }
+};
+
+// src/utils/handlebars/helpers/lt/lt.ts
+import { lt } from "lodash-es";
+var HelperLt = class extends HelperBase {
+  constructor(hbs) {
+    super(hbs, "lt");
+  }
+  onExecute(param, param2, options) {
+    const bol = lt(param, param2);
+    return HelperUtil.handleJudgmentExecute(this, bol, options);
+  }
+};
+
+// src/utils/handlebars/helpers/lte/lte.ts
+import { lte } from "lodash-es";
+var HelperLte = class extends HelperBase {
+  constructor(hbs) {
+    super(hbs, "lte");
+  }
+  onExecute(param, param2, options) {
+    const bol = lte(param, param2);
+    return HelperUtil.handleJudgmentExecute(this, bol, options);
+  }
+};
+
+// src/utils/handlebars/helpers/neq/neq.ts
+import { eq as eq3 } from "lodash-es";
+var HelperNeq = class extends HelperBase {
+  constructor(hbs) {
+    super(hbs, "neq");
+  }
+  onExecute(param, param2, options) {
+    const bol = !eq3(param, param2);
+    return HelperUtil.handleJudgmentExecute(this, bol, options);
+  }
+};
+
+// src/utils/handlebars/helpers/not/not.ts
+var HelperNot = class extends HelperBase {
+  constructor(hbs) {
+    super(hbs, "not");
+  }
+  onExecute(param, options) {
+    const bol = Handlebars.Utils.isEmpty(param);
+    return HelperUtil.handleJudgmentExecute(this, bol, options);
+  }
+};
+
+// src/utils/handlebars/helpers/or/or.ts
+var HelperOr = class extends HelperBase {
+  constructor(hbs) {
+    super(hbs, "or");
+  }
+  onExecute(...args) {
+    var _a;
+    const options = args[args.length - 1];
+    args.pop();
+    const item = args.find((itemArg) => !!itemArg);
+    if (options.fn) {
+      const data = ((_a = options.data) == null ? void 0 : _a.root) || {};
+      return item ? options.fn(data) : options.inverse(data);
+    }
+    return item || "";
+  }
+};
+
+// src/utils/handlebars/helpers/pascal-case/pascal-case.ts
+import { upperFirst } from "lodash-es";
+var HelperPascalCase = class extends HelperBase {
+  constructor(hbs) {
+    super(hbs, "pascalCase");
+  }
+  onExecute(param) {
+    if (!param) {
+      return "";
+    }
+    return upperFirst(param);
+  }
+};
+
+// src/utils/handlebars/helpers/snake-case/snake-case.ts
+import { snakeCase } from "lodash-es";
+var HelperSnakeCase = class extends HelperBase {
+  constructor(hbs) {
+    super(hbs, "snakeCase");
+  }
+  onExecute(param) {
+    if (!param) {
+      return "";
+    }
+    return snakeCase(param);
+  }
+};
+
+// src/utils/handlebars/helpers/spinal-case/spinal-case.ts
+import { kebabCase } from "lodash-es";
+var HelperSpinalCase = class extends HelperBase {
+  constructor(hbs) {
+    super(hbs, "spinalCase");
+  }
+  onExecute(param) {
+    if (!param) {
+      return "";
+    }
+    return kebabCase(param);
+  }
+};
+
+// src/utils/handlebars/helpers/upper-case/upper-case.ts
+var HelperUpperCase = class extends HelperBase {
+  constructor(hbs) {
+    super(hbs, "upperCase");
+  }
+  onExecute(param) {
+    if (!param) {
+      return "";
+    }
+    return param.toUpperCase();
+  }
+};
+
+// src/utils/handlebars/helpers/index.ts
+function installHelpers(hsb) {
+  new HelperAnd(hsb);
+  new HelperCamelCase(hsb);
+  new HelperConcat(hsb);
+  new HelperEq(hsb);
+  new HelperGt(hsb);
+  new HelperGte(hsb);
+  new HelperJson(hsb);
+  new HelperLowerCase(hsb);
+  new HelperLt(hsb);
+  new HelperLte(hsb);
+  new HelperNeq(hsb);
+  new HelperNot(hsb);
+  new HelperOr(hsb);
+  new HelperPascalCase(hsb);
+  new HelperSnakeCase(hsb);
+  new HelperSpinalCase(hsb);
+  new HelperUpperCase(hsb);
+  new HelperEqPropertyValue(hsb);
+}
+
 // src/utils/handlebars/handlebars.ts
 var HandlebarsUtil = class {
+  constructor() {
+    /**
+     * 如果已经在请求中，则不再重复请求
+     *
+     * @author chitanda
+     * @date 2023-08-30 11:08:58
+     * @protected
+     * @type {(Promise<unknown> | null)}
+     */
+    this.p = null;
+  }
   /**
    * handlebars 是否已经初始化
    *
@@ -6244,10 +6596,20 @@ var HandlebarsUtil = class {
    *
    * @author chitanda
    * @date 2023-08-28 17:08:24
-   * @return {*}  {Promise<void>}
+   * @return {*}  {Promise<unknown>}
    */
   async init() {
-    this.hsb = await Promise.resolve().then(() => __toESM(require_handlebars(), 1));
+    if (this.isInit) {
+      return;
+    }
+    if (this.p) {
+      return this.p;
+    }
+    this.p = Promise.resolve().then(() => __toESM(require_handlebars(), 1));
+    this.hsb = await this.p;
+    this.p = null;
+    installHelpers(this.hsb);
+    return this.hsb;
   }
   /**
    * 异步绘制模板，返回渲染后的字符串
@@ -8076,6 +8438,7 @@ var Modal = class {
   constructor(opts) {
     this.mode = "EMBED" /* EMBED */;
     this.viewUsage = 4;
+    this.ignoreDismissCheck = false;
     this.hooks = {
       shouldDismiss: new AsyncSeriesHook(),
       beforeDismiss: new AsyncSeriesHook()
@@ -8112,7 +8475,9 @@ var Modal = class {
   }
   async dismiss(data = { ok: false, data: [] }) {
     const context = { allowClose: true };
-    await this.hooks.shouldDismiss.call(context);
+    if (this.ignoreDismissCheck !== true) {
+      await this.hooks.shouldDismiss.call(context);
+    }
     if (!context.allowClose) {
       ibiz.log.debug("shouldDismiss\u7ED3\u679C\u4E3Afalse,\u5173\u95ED\u4E2D\u65AD\u3002");
       return false;
@@ -10705,6 +11070,7 @@ import {
 
 // src/service/service/entity/method/method.ts
 import { RuntimeModelError as RuntimeModelError7 } from "@ibiz-template/core";
+import { notNilEmpty as notNilEmpty5 } from "qx-util";
 
 // src/service/app-data-entity/app-data-entity.ts
 import { clone as clone4 } from "ramda";
@@ -10913,7 +11279,9 @@ var MethodDto = class _MethodDto {
             for (let j = 0; j < items.length; j++) {
               arr.push(await dto.get(context, items[j]));
             }
-            params[key] = arr;
+            if (arr.length > 0) {
+              params[key] = arr;
+            }
           }
           break;
         }
@@ -11119,16 +11487,22 @@ var Method = class {
       let res = null;
       switch (requestMethod) {
         case "POST":
-          res = await this.app.net.post("".concat(path2, "/").concat(methodName), data);
+          res = await this.app.net.post(
+            "".concat(path2, "/").concat(methodName),
+            notNilEmpty5(data) ? data : params
+          );
           break;
         case "GET":
-          res = await this.app.net.get("".concat(path2, "/").concat(methodName), params);
+          res = await this.app.net.get("".concat(path2, "/").concat(methodName), data);
           break;
         case "PUT":
-          res = await this.app.net.put("".concat(path2, "/").concat(methodName), data);
+          res = await this.app.net.put(
+            "".concat(path2, "/").concat(methodName),
+            notNilEmpty5(data) ? data : params
+          );
           break;
         case "DELETE":
-          res = await this.app.net.delete("".concat(path2, "/").concat(methodName), params);
+          res = await this.app.net.delete("".concat(path2, "/").concat(methodName), data);
           break;
         default:
           if (requestMethod) {
@@ -12972,7 +13346,7 @@ var ControlService = class {
 
 // src/service/service/control/md-control.service.ts
 import { RuntimeError as RuntimeError15 } from "@ibiz-template/core";
-import { isArray } from "qx-util";
+import { isArray as isArray2 } from "qx-util";
 var MDControlService = class extends ControlService {
   /**
    * 执行查询多条数据的方法
@@ -13104,7 +13478,7 @@ var MDControlService = class extends ControlService {
       }
     }
     if (res.ok) {
-      if (isArray(res.data)) {
+      if (isArray2(res.data)) {
         res.data = res.data.map((item) => this.toUIData(item));
       } else {
         res.data = this.toUIData(res.data);
@@ -13711,7 +14085,7 @@ var DEServiceUtil = class {
 };
 
 // src/app-hub.ts
-import { RuntimeError as RuntimeError43 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError44 } from "@ibiz-template/core";
 
 // src/application.ts
 import { Net } from "@ibiz-template/core";
@@ -13959,9 +14333,9 @@ var PanelNotifyState = /* @__PURE__ */ ((PanelNotifyState2) => {
 })(PanelNotifyState || {});
 
 // src/controller/common/view/view.controller.ts
-import { createUUID as createUUID2, notNilEmpty as notNilEmpty5 } from "qx-util";
-import { IBizContext as IBizContext2, RuntimeError as RuntimeError21 } from "@ibiz-template/core";
-import { isEmpty as isEmpty8, isNil as isNil11 } from "ramda";
+import { createUUID as createUUID2, notNilEmpty as notNilEmpty6 } from "qx-util";
+import { IBizContext as IBizContext2, RuntimeError as RuntimeError22 } from "@ibiz-template/core";
+import { isEmpty as isEmpty8, isNil as isNil12 } from "ramda";
 
 // src/controller/utils/loading/loading.state.ts
 import { NOOP } from "@ibiz-template/core";
@@ -14470,6 +14844,13 @@ var ControllerEvent = class {
    */
   constructor(getBaseArgs) {
     this.getBaseArgs = getBaseArgs;
+    /**
+     * 是否已经销毁
+     * @author lxm
+     * @date 2023-08-30 02:54:14
+     * @type {boolean}
+     */
+    this.isDestroyed = false;
     /**
      * 事件对象
      *
@@ -14488,6 +14869,9 @@ var ControllerEvent = class {
    * @return {*}  {Promise<void>}
    */
   async emit(name, args) {
+    if (this.isDestroyed) {
+      return;
+    }
     await this.evt.asyncEmit(name, {
       ...this.getBaseArgs(),
       eventName: name,
@@ -14503,6 +14887,9 @@ var ControllerEvent = class {
    * @param  fn 事件回调
    */
   on(name, fn) {
+    if (this.isDestroyed) {
+      return;
+    }
     this.evt.on(name, fn);
   }
   /**
@@ -14512,6 +14899,9 @@ var ControllerEvent = class {
    * @param fn 事件回调
    */
   onAll(fn) {
+    if (this.isDestroyed) {
+      return;
+    }
     this.evt.onAll(fn);
   }
   /**
@@ -14523,6 +14913,7 @@ var ControllerEvent = class {
   destroy() {
     this.getBaseArgs = void 0;
     this.evt.reset();
+    this.isDestroyed = true;
   }
 };
 
@@ -14603,6 +14994,54 @@ function generateRules(itemVRs, name, valueItemName) {
   return rules;
 }
 
+// src/controller/utils/value-ex/value-ex.ts
+import { RuntimeError as RuntimeError21 } from "@ibiz-template/core";
+import { isNil as isNil11, mergeLeft } from "ramda";
+var ValueExUtil = class {
+  /**
+   * 合并默认值
+   * @author lxm
+   * @date 2023-08-30 02:06:58
+   * @static
+   * @param {ValueExOptions} options
+   * @return {*}  {ValueExOptions}
+   */
+  static mergeDefault(options) {
+    return mergeLeft(options, {
+      textSeparator: ",",
+      valueSeparator: ","
+    });
+  }
+  /**
+   * 转成显示用的文本
+   * @author lxm
+   * @date 2023-08-30 01:55:38
+   * @param {ValueExOptions} options
+   * @param {unknown} value
+   * @return {*}  {string}
+   */
+  static toText(options, value) {
+    if (isNil11(value) || value === "") {
+      return "";
+    }
+    const { valueType, objectNameField, textSeparator } = this.mergeDefault(options);
+    if (["OBJECTS", "OBJECT"].includes(valueType)) {
+      if (!objectNameField) {
+        throw new RuntimeError21("\u7F3A\u5C11objectNameField");
+      }
+      const textKey = objectNameField.toLowerCase();
+      if (valueType === "OBJECTS") {
+        return value.map((item) => item[textKey] || "---").join(textSeparator);
+      }
+      return value[textKey];
+    }
+    if (valueType === "SIMPLES") {
+      return value.join(textSeparator);
+    }
+    return "".concat(value);
+  }
+};
+
 // src/controller/common/base.controller.ts
 var SELF_KEY = "__self";
 var BaseController = class {
@@ -14672,6 +15111,7 @@ var BaseController = class {
   initState() {
     this.state.isCreated = false;
     this.state.isMounted = false;
+    this.state.isDestroyed = false;
   }
   /**
    * 获取事件的基础参数
@@ -14762,6 +15202,7 @@ var BaseController = class {
    */
   async destroyed() {
     await this.onDestroyed();
+    this.state.isDestroyed = true;
     ibiz.log.debug("".concat(this.constructor.name, ":").concat(this.name, " onDestroyed"));
     await this._evt.emit("onDestroyed", void 0);
     this.evt.destroy();
@@ -15013,18 +15454,18 @@ var ViewController = class extends BaseController {
    */
   handleContextParams() {
     this.context.srfappid = this.model.appId;
-    if (isNil11(this.context.srfsessionid) || isEmpty8(this.context.srfsessionid)) {
+    if (isNil12(this.context.srfsessionid) || isEmpty8(this.context.srfsessionid)) {
       this.context.srfsessionid = createUUID2();
     }
     const navContexts = this.model.appViewNavContexts;
     let context = {};
-    if (notNilEmpty5(navContexts)) {
+    if (notNilEmpty6(navContexts)) {
       context = convertNavData(navContexts, this.context, this.params);
     }
     Object.assign(this.context, context);
     const navParams = this.model.appViewNavParams;
     let params = {};
-    if (notNilEmpty5(navParams)) {
+    if (notNilEmpty6(navParams)) {
       params = convertNavData(navParams, this.context, this.params);
     }
     Object.assign(this.params, params);
@@ -15045,7 +15486,7 @@ var ViewController = class extends BaseController {
   async callUIAction(key, args) {
     const result = this.call(key, args);
     if (result === void 0) {
-      throw new RuntimeError21("\u6CA1\u6709\u5F15\u64CE\u652F\u6301\u9884\u7F6E\u754C\u9762\u884C\u4E3A".concat(key));
+      throw new RuntimeError22("\u6CA1\u6709\u5F15\u64CE\u652F\u6301\u9884\u7F6E\u754C\u9762\u884C\u4E3A".concat(key));
     }
     return result;
   }
@@ -15162,11 +15603,13 @@ var EditorController = class {
     if (navigateContexts && data) {
       selfContext = convertNavData(navigateContexts, context, params, data);
     }
+    const _context = Object.assign(context.clone(), selfContext);
     let selfParams = {};
     if (navigateParams && data) {
       selfParams = convertNavData(navigateParams, context, params, data);
     }
-    return { context: selfContext, params: selfParams };
+    const _params = { ...params, ...selfParams };
+    return { context: _context, params: _params };
   }
   /**
    * 字符串转对象、数组对象
@@ -15390,7 +15833,7 @@ var ControlController = class extends BaseController {
 };
 
 // src/controller/common/control/md-control.controller.ts
-import { isElementSame, RuntimeError as RuntimeError22 } from "@ibiz-template/core";
+import { isElementSame, RuntimeError as RuntimeError23 } from "@ibiz-template/core";
 var MDControlController = class extends ControlController {
   get _evt() {
     return this.evt;
@@ -15526,7 +15969,7 @@ var MDControlController = class extends ControlController {
   async remove(args) {
     const { context, params, data } = this.handlerAbilityParams(args);
     if (!(data == null ? void 0 : data.length)) {
-      throw new RuntimeError22("\u672A\u9009\u4E2D\u6570\u636E");
+      throw new RuntimeError23("\u672A\u9009\u4E2D\u6570\u636E");
     }
     if ((args == null ? void 0 : args.silent) !== true) {
       const del = await ibiz.confirm.error({
@@ -15663,7 +16106,7 @@ var MDControlController = class extends ControlController {
 // src/controller/control/app-menu/app-menu.controller.ts
 import {
   findRecursiveChild,
-  RuntimeError as RuntimeError23,
+  RuntimeError as RuntimeError24,
   RuntimeModelError as RuntimeModelError21
 } from "@ibiz-template/core";
 var AppMenuController = class extends ControlController {
@@ -15703,7 +16146,7 @@ var AppMenuController = class extends ControlController {
       childrenFields: ["appMenuItems"]
     });
     if (!menuItem) {
-      throw new RuntimeError23("\u627E\u4E0D\u5230\u540D\u4E3A".concat(id, "\u7684\u83DC\u5355\u9879"));
+      throw new RuntimeError24("\u627E\u4E0D\u5230\u540D\u4E3A".concat(id, "\u7684\u83DC\u5355\u9879"));
     }
     this.evt.emit("onClick", {
       eventArg: id,
@@ -15793,7 +16236,7 @@ var AppMenuController = class extends ControlController {
 // src/controller/control/app-menu-icon-view/app-menu-icon-view.controller.ts
 import {
   findRecursiveChild as findRecursiveChild2,
-  RuntimeError as RuntimeError24,
+  RuntimeError as RuntimeError25,
   RuntimeModelError as RuntimeModelError22
 } from "@ibiz-template/core";
 var AppMenuIconViewController = class extends AppMenuController {
@@ -15803,7 +16246,7 @@ var AppMenuIconViewController = class extends AppMenuController {
       childrenFields: ["appMenuItems"]
     });
     if (!menuItem) {
-      throw new RuntimeError24("\u627E\u4E0D\u5230\u540D\u4E3A".concat(id, "\u7684\u83DC\u5355\u9879"));
+      throw new RuntimeError25("\u627E\u4E0D\u5230\u540D\u4E3A".concat(id, "\u7684\u83DC\u5355\u9879"));
     }
     this.evt.emit("onClick", {
       eventArg: id,
@@ -15831,7 +16274,7 @@ var AppMenuIconViewController = class extends AppMenuController {
 import dayjs from "dayjs";
 
 // src/controller/control/calendar/calendar.service.ts
-import { RuntimeError as RuntimeError25 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError26 } from "@ibiz-template/core";
 var CalendarService = class extends MDControlService {
   /**
    * 执行查询多条数据的方法
@@ -15881,11 +16324,11 @@ var CalendarService = class extends MDControlService {
   setCalendarConfigData(items, index) {
     const { sysCalendarItems } = this.model;
     if (!sysCalendarItems) {
-      throw new RuntimeError25("\u672A\u627E\u5230\u65E5\u5386\u9879\u6A21\u578B");
+      throw new RuntimeError26("\u672A\u627E\u5230\u65E5\u5386\u9879\u6A21\u578B");
     }
     const calendarItem = sysCalendarItems[index];
     if (!calendarItem) {
-      throw new RuntimeError25("\u672A\u627E\u5230\u65E5\u5386\u9879\u6A21\u578B");
+      throw new RuntimeError26("\u672A\u627E\u5230\u65E5\u5386\u9879\u6A21\u578B");
     }
     return items.map((item) => {
       return new CalendarItemData(calendarItem, item);
@@ -16075,11 +16518,11 @@ var CalendarController = class extends MDControlController {
 };
 
 // src/controller/control/chart/chart.controller.ts
-import { RuntimeError as RuntimeError27 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError28 } from "@ibiz-template/core";
 
 // src/controller/control/chart/generator/chart-options-generator.ts
 import { mergeDeepRight as mergeDeepRight3 } from "ramda";
-import { RuntimeError as RuntimeError26 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError27 } from "@ibiz-template/core";
 
 // src/controller/control/chart/generator/line-series-generator.ts
 import { RuntimeModelError as RuntimeModelError24 } from "@ibiz-template/core";
@@ -16092,7 +16535,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 clone11, isNil as isNil12, mergeDeepRight } from "ramda";
+import { clone as clone11, isNil as isNil13, mergeDeepRight } from "ramda";
 dayjs2.extend(minMax);
 dayjs2.extend(isSameOrBefore);
 dayjs2.extend(quarterOfYear);
@@ -16181,10 +16624,10 @@ var BaseSeriesGenerator = class {
    * @return {*}  {(string | undefined)}
    */
   translateVal(codeListKey, val, isExclude = false) {
-    if (isNil12(val)) {
+    if (isNil13(val)) {
       return void 0;
     }
-    if (isNil12(codeListKey)) {
+    if (isNil13(codeListKey)) {
       return val;
     }
     const codeListItems = this.chartGenerator.codeListMap.get(codeListKey);
@@ -16214,7 +16657,7 @@ var BaseSeriesGenerator = class {
           seriesCodeListId,
           item[this.groupField]
         );
-        if (isNil12(groupVal)) {
+        if (isNil13(groupVal)) {
           return;
         }
         group = groupVal;
@@ -17015,7 +17458,7 @@ var ChartOptionsGenerator2 = class {
   getSrfkeyByParams(params) {
     const generator = this.seriesGenerators[params.seriesIndex];
     if (!generator) {
-      throw new RuntimeError26("\u627E\u4E0D\u5230".concat(params.seriesIndex, "\u5E8F\u5217\u7684generator\uFF01"));
+      throw new RuntimeError27("\u627E\u4E0D\u5230".concat(params.seriesIndex, "\u5E8F\u5217\u7684generator\uFF01"));
     }
     return generator.getSrfkeyByParams(params);
   }
@@ -17127,10 +17570,10 @@ var ChartController = class extends MDControlController {
    */
   updateChart() {
     if (!this.chart) {
-      throw new RuntimeError27("chart\u5BF9\u8C61\u6CA1\u6709\u6B63\u786E\u521D\u59CB\u5316");
+      throw new RuntimeError28("chart\u5BF9\u8C61\u6CA1\u6709\u6B63\u786E\u521D\u59CB\u5316");
     }
     if (!this.options) {
-      throw new RuntimeError27("options\u8FD8\u6CA1\u8BA1\u7B97");
+      throw new RuntimeError28("options\u8FD8\u6CA1\u8BA1\u7B97");
     }
     this.chart.setOption(this.options);
     this.resizeChart();
@@ -17169,7 +17612,7 @@ var CaptionBarController = class extends ControlController {
   async onCreated() {
     await super.onCreated();
     this.view.evt.on("onViewInfoChange", ({ caption: _caption, dataInfo }) => {
-      this.state.caption = "".concat(this.state.caption).concat(dataInfo ? "-".concat(dataInfo) : "");
+      this.state.caption = "".concat(this.view.model.caption).concat(dataInfo ? "-".concat(dataInfo) : "");
     });
   }
 };
@@ -17179,13 +17622,13 @@ import { recursiveIterate } from "@ibiz-template/core";
 
 // src/ui-action/provider/backend-ui-action-provider.ts
 import { RuntimeModelError as RuntimeModelError36 } from "@ibiz-template/core";
-import { isArray as isArray2 } from "qx-util";
+import { isArray as isArray3 } from "qx-util";
 
 // src/ui-action/provider/ui-action-provider-base.ts
 import { RuntimeModelError as RuntimeModelError35 } from "@ibiz-template/core";
 
 // src/ui-logic/index.ts
-import { RuntimeError as RuntimeError29 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError30 } from "@ibiz-template/core";
 
 // src/ui-logic/ui-logic.ts
 import { ModelError as ModelError22, RuntimeModelError as RuntimeModelError34 } from "@ibiz-template/core";
@@ -17697,7 +18140,7 @@ var PrepareJSParamNode = class extends UILogicNode {
 };
 
 // src/ui-logic/ui-logic-node/view-ctrl-invoke-node/view-ctrl-invoke-node.ts
-import { RuntimeError as RuntimeError28, RuntimeModelError as RuntimeModelError31 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError29, RuntimeModelError as RuntimeModelError31 } from "@ibiz-template/core";
 import { isFunction } from "lodash-es";
 var ViewCtrlInvokeNode = class extends UILogicNode {
   async exec(ctx) {
@@ -17714,14 +18157,14 @@ var ViewCtrlInvokeNode = class extends UILogicNode {
     }
     const invokeParam = ctx.params[invokeParamId];
     if (!invokeParam) {
-      throw new RuntimeError28("\u6CA1\u6709\u627E\u5230\u64CD\u4F5C\u53C2\u6570".concat(invokeParamId));
+      throw new RuntimeError29("\u6CA1\u6709\u627E\u5230\u64CD\u4F5C\u53C2\u6570".concat(invokeParamId));
     }
     const invokeCtrl = ctx.params[invokeCtrlId];
     if (!invokeCtrl) {
-      throw new RuntimeError28("\u6CA1\u6709\u627E\u5230\u754C\u9762\u5BF9\u8C61".concat(invokeCtrlId));
+      throw new RuntimeError29("\u6CA1\u6709\u627E\u5230\u754C\u9762\u5BF9\u8C61".concat(invokeCtrlId));
     }
     if (!invokeCtrl[invokeMethod] || !isFunction(invokeCtrl[invokeMethod])) {
-      throw new RuntimeError28("\u6CA1\u6709\u627E\u5230\u8C03\u7528\u65B9\u6CD5".concat(invokeMethod));
+      throw new RuntimeError29("\u6CA1\u6709\u627E\u5230\u8C03\u7528\u65B9\u6CD5".concat(invokeMethod));
     }
     await invokeCtrl[invokeMethod](invokeParam);
   }
@@ -18002,7 +18445,7 @@ async function execUILogic(deUILogicId, appDataEntityId, parameters) {
   const app = ibiz.hub.getApp(parameters.context.srfappid);
   const deUILogic = await app.getDEUILogic(deUILogicId, appDataEntityId);
   if (!deUILogic) {
-    throw new RuntimeError29(
+    throw new RuntimeError30(
       "\u627E\u4E0D\u5230\u5B9E\u4F53".concat(appDataEntityId, "\u7684\u754C\u9762\u903B\u8F91").concat(deUILogicId)
     );
   }
@@ -18015,7 +18458,7 @@ async function execUILogic(deUILogicId, appDataEntityId, parameters) {
 }
 
 // src/ui-action/uiaction-util.ts
-import { RuntimeError as RuntimeError30 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError31 } from "@ibiz-template/core";
 var UIActionUtil = class {
   /**
    * 执行界面行为
@@ -18030,7 +18473,7 @@ var UIActionUtil = class {
   static async exec(actionId, params) {
     const action = await getUIActionById(actionId);
     if (!action) {
-      throw new RuntimeError30("\u6CA1\u627E\u5230".concat(actionId, "\u7684\u754C\u9762\u884C\u4E3A\u6A21\u578B"));
+      throw new RuntimeError31("\u6CA1\u627E\u5230".concat(actionId, "\u7684\u754C\u9762\u884C\u4E3A\u6A21\u578B"));
     }
     const provider = await getUIActionProvider(action);
     return provider.exec(action, params);
@@ -18047,6 +18490,7 @@ var UIActionUtil = class {
     var _a, _b;
     const result = await this.exec(actionId, params);
     if (result.closeView) {
+      params.view.modal.ignoreDismissCheck = true;
       params.view.closeView({ ok: true });
     } else if (result.refresh) {
       switch (result.refreshMode) {
@@ -18254,6 +18698,7 @@ var BackendUIActionProvider = class extends UIActionProviderBase {
       data,
       params
     );
+    const tempParams = { ...resultParams };
     const frontPSAppView = action.frontAppViewId;
     if (frontPSAppView) {
       const res2 = await ibiz.commands.execute(
@@ -18280,7 +18725,7 @@ var BackendUIActionProvider = class extends UIActionProviderBase {
     const _data = resultData.map((item) => {
       var _a;
       return ((_a = item.getOrigin) == null ? void 0 : _a.call(item)) || item || {};
-    });
+    }).map((item) => Object.assign(item, tempParams));
     const isMultiData = ["MULTIKEY", "MULTIDATA"].includes(
       action.actionTarget
     );
@@ -18289,15 +18734,15 @@ var BackendUIActionProvider = class extends UIActionProviderBase {
       methodName,
       resultContext,
       isMultiData ? _data : _data[0],
-      resultParams
+      tempParams
     );
     if (res.ok && action.successMsg) {
       ibiz.message.success(action.successMsg);
     }
     Object.assign(actionResult, {
-      data: isArray2(res.data) ? res.data : [res.data],
+      data: isArray3(res.data) ? res.data : [res.data],
       nextContext: resultContext,
-      nextParams: resultParams
+      nextParams: tempParams
     });
     return actionResult;
   }
@@ -18616,7 +19061,7 @@ var ContextMenuController = class extends ToolbarController {
 };
 
 // src/controller/control/dashboard/dashboard.controller.ts
-import { RuntimeError as RuntimeError31 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError32 } from "@ibiz-template/core";
 var DashboardController = class extends ControlController {
   constructor() {
     super(...arguments);
@@ -18703,7 +19148,7 @@ var DashboardController = class extends ControlController {
     );
     if (values.find((item) => item.status === "rejected")) {
       ibiz.log.error("dataChangeNotify\u62A5\u9519", values);
-      throw new RuntimeError31("\u6570\u636E\u53D8\u66F4\u540E\u6709\u9519\u8BEF");
+      throw new RuntimeError32("\u6570\u636E\u53D8\u66F4\u540E\u6709\u9519\u8BEF");
     }
   }
 };
@@ -19156,7 +19601,7 @@ var DataViewControlController = class extends MDControlController {
 import { RuntimeModelError as RuntimeModelError40 } from "@ibiz-template/core";
 
 // src/controller/control/exp-bar/exp-bar.controller.ts
-import { RuntimeError as RuntimeError32, RuntimeModelError as RuntimeModelError39 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError33, RuntimeModelError as RuntimeModelError39 } from "@ibiz-template/core";
 var ExpBarControlController = class extends ControlController {
   constructor() {
     super(...arguments);
@@ -19436,7 +19881,7 @@ var ExpBarControlController = class extends ControlController {
     if (["GRID", "DATAVIEW", "LIST"].includes(((_a = this.XDataModel) == null ? void 0 : _a.controlType) || "")) {
       return this.XDataModel.navAppViewId;
     }
-    throw new RuntimeError32("\u591A\u8282\u70B9\u89C6\u56FE\u7531\u5B50\u7C7B\u5B9E\u73B0");
+    throw new RuntimeError33("\u591A\u8282\u70B9\u89C6\u56FE\u7531\u5B50\u7C7B\u5B9E\u73B0");
   }
   /**
    * 获取导航视图
@@ -19565,7 +20010,7 @@ var CalendarExpBarController = class extends ExpBarControlController {
 };
 
 // src/controller/control/exp-bar/tree-exp-bar.controller.ts
-import { RuntimeError as RuntimeError33, RuntimeModelError as RuntimeModelError41 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError34, RuntimeModelError as RuntimeModelError41 } from "@ibiz-template/core";
 var TreeExpBarController = class extends ExpBarControlController {
   constructor() {
     super(...arguments);
@@ -19640,7 +20085,7 @@ var TreeExpBarController = class extends ExpBarControlController {
     const deData = node.deData || node;
     const nodeModel = this.getNodeModel(node.nodeId);
     if (!nodeModel) {
-      throw new RuntimeError33("\u627E\u4E0D\u5230".concat(node.nodeId, "\u7684\u8282\u70B9\u6A21\u578B"));
+      throw new RuntimeError34("\u627E\u4E0D\u5230".concat(node.nodeId, "\u7684\u8282\u70B9\u6A21\u578B"));
     }
     const result = this.prepareParams(nodeModel, deData, context, params);
     result.context.currentSrfNav = nodeId;
@@ -19693,7 +20138,7 @@ var TreeExpBarController = class extends ExpBarControlController {
 import { mergeDefaultInLeft } from "@ibiz-template/core";
 
 // src/controller/control/form/form/form.controller.ts
-import { RuntimeError as RuntimeError34, debounceAndAsyncMerge } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError35, debounceAndAsyncMerge } from "@ibiz-template/core";
 var FormController = class extends ControlController {
   constructor() {
     super(...arguments);
@@ -19758,7 +20203,7 @@ var FormController = class extends ControlController {
     );
     if (values.find((item) => item.status === "rejected")) {
       ibiz.log.error("dataChangeNotify\u62A5\u9519", values);
-      throw new RuntimeError34("\u6570\u636E\u53D8\u66F4\u540E\u6709\u9519\u8BEF");
+      throw new RuntimeError35("\u6570\u636E\u53D8\u66F4\u540E\u6709\u9519\u8BEF");
     }
   }
   /**
@@ -20365,7 +20810,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 createUUID3, notNilEmpty as notNilEmpty6 } from "qx-util";
+import { createUUID as createUUID3, notNilEmpty as notNilEmpty7 } from "qx-util";
 
 // src/controller/control/form/form-detail/form-druipart/form-druipart.state.ts
 var FormDruipartState = class extends FormDetailState {
@@ -20444,7 +20889,9 @@ var FormDRUIPartController = class extends FormDetailController {
     await super.formStateNotify(state);
     this.isNewData = state === "DRAFT" /* DRAFT */;
     this.state.showMask = this.isNewData;
-    this.calcViewParams();
+    if (state === "LOAD" /* LOAD */ || state === "DRAFT" /* DRAFT */) {
+      this.calcViewParams();
+    }
   }
   /**
    * 计算视图上下文和视图参数,
@@ -20456,7 +20903,7 @@ var FormDRUIPartController = class extends FormDetailController {
   calcViewParams() {
     let newContext = this.form.context.clone();
     const navContexts = this.model.navigateContexts;
-    if (notNilEmpty6(navContexts)) {
+    if (notNilEmpty7(navContexts)) {
       newContext = Object.assign(
         newContext,
         convertNavData(
@@ -20626,7 +21073,7 @@ var FormGroupPanelController = class extends FormDetailController {
 // src/controller/control/form/form-detail/form-item/form-item.controller.ts
 import Schema from "async-validator";
 import { createUUID as createUUID4, isNilOrEmpty as isNilOrEmpty6 } from "qx-util";
-import { ModelError as ModelError24, RuntimeError as RuntimeError35 } from "@ibiz-template/core";
+import { ModelError as ModelError24, RuntimeError as RuntimeError36 } from "@ibiz-template/core";
 import dayjs3 from "dayjs";
 
 // src/controller/control/form/form-detail/form-item/form-item.state.ts
@@ -20931,7 +21378,7 @@ var FormItemController = class extends FormDetailController {
       case "SESSION":
       case "APPLICATION":
         if (!((_a = ibiz.appData) == null ? void 0 : _a.context)) {
-          throw new RuntimeError35("appdata.context\u4E0D\u5B58\u5728");
+          throw new RuntimeError36("appdata.context\u4E0D\u5B58\u5728");
         }
         data[this.name] = ibiz.appData.context[defaultValue];
         break;
@@ -21056,7 +21503,7 @@ var FormMDCtrlContentTypeController = class {
 };
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-control/form-mdctrl-control.controller.ts
-import { RuntimeError as RuntimeError36 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError37 } from "@ibiz-template/core";
 var FormMDCtrlControlController = class extends FormMDCtrlContentTypeController {
   /**
    * 初始化
@@ -21071,7 +21518,7 @@ var FormMDCtrlControlController = class extends FormMDCtrlContentTypeController
     const { model } = this.parent;
     const { contentControl } = model;
     if (!contentControl) {
-      throw new RuntimeError36("\u8868\u5355\u591A\u6570\u636E\u90E8\u4EF6\u672A\u914D\u7F6E\u5D4C\u5165\u90E8\u4EF6");
+      throw new RuntimeError37("\u8868\u5355\u591A\u6570\u636E\u90E8\u4EF6\u672A\u914D\u7F6E\u5D4C\u5165\u90E8\u4EF6");
     }
     this.controlModel = contentControl;
     const controlProvider = await getControlProvider(this.controlModel);
@@ -21175,13 +21622,13 @@ var FormMDCtrlDataViewController = class extends FormMDCtrlControlController {
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form/form-mdctrl-form.controller.ts
 import { mergeInLeft as mergeInLeft2 } from "@ibiz-template/core";
-import { isArray as isArray3 } from "lodash-es";
+import { isArray as isArray4 } from "lodash-es";
 
 // src/controller/control/form/edit-form/edit-form.controller.ts
 import {
   awaitTimeout,
   mergeInLeft,
-  RuntimeError as RuntimeError37,
+  RuntimeError as RuntimeError38,
   mergeDefaultInLeft as mergeDefaultInLeft2
 } from "@ibiz-template/core";
 import { debounce } from "lodash-es";
@@ -21551,7 +21998,7 @@ var EditFormController = class extends FormController {
     }
     const isValid = await this.validate();
     if (!isValid) {
-      throw new RuntimeError37("\u8BF7\u68C0\u67E5\u8868\u5355\u586B\u5199\uFF01");
+      throw new RuntimeError38("\u8BF7\u68C0\u67E5\u8868\u5355\u586B\u5199\uFF01");
     }
     await this.startLoading();
     await this.evt.emit("onBeforeSave", void 0);
@@ -21641,7 +22088,7 @@ var EditFormController = class extends FormController {
       (item) => item.id === formItemUpdateId
     );
     if (!formItemUpdate) {
-      throw new RuntimeError37("\u6CA1\u627E\u5230".concat(formItemUpdateId, "\u8868\u5355\u9879\u66F4\u65B0"));
+      throw new RuntimeError38("\u6CA1\u627E\u5230".concat(formItemUpdateId, "\u8868\u5355\u9879\u66F4\u65B0"));
     }
     const { appDEMethodId, defiupdateDetails } = formItemUpdate;
     const updateItems = defiupdateDetails.map((item) => item.id);
@@ -21671,7 +22118,7 @@ var EditFormController = class extends FormController {
   async wfStart(extraParams = {}) {
     const isValid = await this.validate();
     if (!isValid) {
-      throw new RuntimeError37("\u8BF7\u68C0\u67E5\u8868\u5355\u586B\u5199\uFF01");
+      throw new RuntimeError38("\u8BF7\u68C0\u67E5\u8868\u5355\u586B\u5199\uFF01");
     }
     await this.startLoading();
     try {
@@ -21699,7 +22146,7 @@ var EditFormController = class extends FormController {
   async wfSubmit(extraParams = {}) {
     const isValid = await this.validate();
     if (!isValid) {
-      throw new RuntimeError37("\u8BF7\u68C0\u67E5\u8868\u5355\u586B\u5199\uFF01");
+      throw new RuntimeError38("\u8BF7\u68C0\u67E5\u8868\u5355\u586B\u5199\uFF01");
     }
     await this.startLoading();
     try {
@@ -21813,7 +22260,7 @@ var FormMDCtrlFormController = class extends FormMDCtrlControlController {
   handleResponse(response) {
     const res = response;
     if (res.ok) {
-      if (isArray3(res.data)) {
+      if (isArray4(res.data)) {
         res.data = res.data.map(
           (item) => this.service.toUIData(item)
         );
@@ -21925,7 +22372,7 @@ var FormMDCtrlFormController = class extends FormMDCtrlControlController {
 };
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-grid/form-mdctrl-grid.controller.ts
-import { RuntimeError as RuntimeError38, mergeInLeft as mergeInLeft3 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError39, mergeInLeft as mergeInLeft3 } from "@ibiz-template/core";
 var FormMDCtrlGridController = class extends FormMDCtrlControlController {
   constructor() {
     super(...arguments);
@@ -22030,7 +22477,7 @@ var FormMDCtrlGridController = class extends FormMDCtrlControlController {
     const { model } = this.parent;
     const { contentControl } = model;
     if (!contentControl) {
-      throw new RuntimeError38("\u8868\u5355\u591A\u6570\u636E\u90E8\u4EF6\u672A\u914D\u7F6E\u5D4C\u5165\u90E8\u4EF6");
+      throw new RuntimeError39("\u8868\u5355\u591A\u6570\u636E\u90E8\u4EF6\u672A\u914D\u7F6E\u5D4C\u5165\u90E8\u4EF6");
     }
     mergeInLeft3(contentControl, { enableRowEdit: true, enableRowNew: true });
     this.controlModel = contentControl;
@@ -22740,7 +23187,7 @@ import {
   awaitTimeout as awaitTimeout2,
   debounceAndAsyncMerge as debounceAndAsyncMerge2,
   recursiveIterate as recursiveIterate4,
-  RuntimeError as RuntimeError39,
+  RuntimeError as RuntimeError40,
   RuntimeModelError as RuntimeModelError43
 } from "@ibiz-template/core";
 import { clone as clone13 } from "ramda";
@@ -23085,11 +23532,11 @@ var GridController = class extends MDControlController {
     this.state.rows.splice(index, 1);
     this.state.groups.forEach((item) => {
       if (item.children.length) {
-        const findIndex = item.children.findIndex(
+        const findIndex2 = item.children.findIndex(
           (item2) => item2.srfkey === data.srfkey
         );
-        if (findIndex !== -1) {
-          item.children.splice(findIndex, 1);
+        if (findIndex2 !== -1) {
+          item.children.splice(findIndex2, 1);
         }
       }
     });
@@ -23108,7 +23555,7 @@ var GridController = class extends MDControlController {
     }
     const editingRow = this.state.rows.find((item) => item.showRowEdit);
     if (editingRow) {
-      throw new RuntimeError39("\u8BF7\u5148\u5B8C\u6210\u5F53\u524D\u884C\u7F16\u8F91\u4E2D\u7684\u884C\u7684\u64CD\u4F5C");
+      throw new RuntimeError40("\u8BF7\u5148\u5B8C\u6210\u5F53\u524D\u884C\u7F16\u8F91\u4E2D\u7684\u884C\u7684\u64CD\u4F5C");
     }
     const res = await this.service.getDraft(this.context, this.params);
     this.state.items.unshift(res.data);
@@ -23133,7 +23580,7 @@ var GridController = class extends MDControlController {
       (item) => item.data.srfkey === data.srfkey
     );
     if (!rowState) {
-      throw new RuntimeError39("\u884C\u6570\u636E\u4E0D\u5B58\u5728");
+      throw new RuntimeError40("\u884C\u6570\u636E\u4E0D\u5B58\u5728");
     }
     if (!rowState.modified) {
       ibiz.log.debug("\u503C\u6CA1\u6709\u53D1\u751F\u6539\u53D8");
@@ -23145,7 +23592,7 @@ var GridController = class extends MDControlController {
     }
     const isValid = await this.validate(rowState);
     if (!isValid) {
-      throw new RuntimeError39("\u884C\u6570\u636E\u6821\u9A8C\u4E0D\u901A\u8FC7\uFF0C\u4FDD\u5B58\u53D6\u6D88");
+      throw new RuntimeError40("\u884C\u6570\u636E\u6821\u9A8C\u4E0D\u901A\u8FC7\uFF0C\u4FDD\u5B58\u53D6\u6D88");
     }
     await this.startLoading();
     let res;
@@ -23292,7 +23739,7 @@ var GridController = class extends MDControlController {
     );
     if (values.find((item) => item.status === "rejected")) {
       ibiz.log.error("dataChangeNotify\u62A5\u9519", values);
-      throw new RuntimeError39("\u6570\u636E\u53D8\u66F4\u540E\u6709\u9519\u8BEF");
+      throw new RuntimeError40("\u6570\u636E\u53D8\u66F4\u540E\u6709\u9519\u8BEF");
     }
   }
   /**
@@ -23322,7 +23769,7 @@ var GridController = class extends MDControlController {
   }
   async toggleRowEdit() {
     if (!this.model.enableRowNew) {
-      throw new RuntimeError39("\u5F53\u524D\u8868\u683C\u4E0D\u652F\u6301\u884C\u7F16\u8F91\uFF0C\u65E0\u6CD5\u5207\u6362\u5F00\u542F\u884C\u7F16\u8F91");
+      throw new RuntimeError40("\u5F53\u524D\u8868\u683C\u4E0D\u652F\u6301\u884C\u7F16\u8F91\uFF0C\u65E0\u6CD5\u5207\u6362\u5F00\u542F\u884C\u7F16\u8F91");
     }
     this.state.rowEditOpen = !this.state.rowEditOpen;
   }
@@ -23355,7 +23802,7 @@ var GridController = class extends MDControlController {
     if (toState === true) {
       const editingRow = this.state.rows.find((item) => item.showRowEdit);
       if (editingRow) {
-        throw new RuntimeError39("\u540C\u65F6\u53EA\u80FD\u6709\u4E00\u884C\u5F00\u542F\u884C\u7F16\u8F91");
+        throw new RuntimeError40("\u540C\u65F6\u53EA\u80FD\u6709\u4E00\u884C\u5F00\u542F\u884C\u7F16\u8F91");
       }
     }
     row.showRowEdit = toState;
@@ -23398,7 +23845,7 @@ var GridController = class extends MDControlController {
       (item) => item.id === updateId
     );
     if (!findUpdate) {
-      throw new RuntimeError39("\u6CA1\u627E\u5230".concat(updateId, "\u7F16\u8F91\u5217\u66F4\u65B0"));
+      throw new RuntimeError40("\u6CA1\u627E\u5230".concat(updateId, "\u7F16\u8F91\u5217\u66F4\u65B0"));
     }
     const { appDEMethodId, degeiupdateDetails } = findUpdate;
     const updateItems = degeiupdateDetails.map((item) => item.id);
@@ -23493,7 +23940,7 @@ var GridController = class extends MDControlController {
         data2 = this.getData();
       }
       if (data2.length === 0) {
-        throw new RuntimeError39("\u65E0\u5BFC\u51FA\u6570\u636E");
+        throw new RuntimeError40("\u65E0\u5BFC\u51FA\u6570\u636E");
       }
       return formatExcelData(data2);
     };
@@ -23512,11 +23959,11 @@ var GridController = class extends MDControlController {
     );
     const data = formatArrayData(filterVal, await getExportData());
     if (!ibiz.util.getExportExcel) {
-      throw new RuntimeError39("ibiz.util.getExportExcel\u4E0D\u5B58\u5728");
+      throw new RuntimeError40("ibiz.util.getExportExcel\u4E0D\u5B58\u5728");
     }
     const exportExcel = await ibiz.util.getExportExcel();
     if (!exportExcel) {
-      throw new RuntimeError39("\u5BFC\u51FA\u6A21\u5757\u52A0\u8F7D\u9519\u8BEF");
+      throw new RuntimeError40("\u5BFC\u51FA\u6A21\u5757\u52A0\u8F7D\u9519\u8BEF");
     }
     exportExcel.exportJsonToExcel({
       header,
@@ -23656,7 +24103,15 @@ var GridFieldColumnController = class extends GridColumnController {
    * @param {MouseEvent} event 鼠标事件
    * @returns {*}  {Promise<void>}
    */
-  async triggerAction(_row, _event) {
+  async triggerAction(row, event) {
+    const actionId = this.model.deuiactionId;
+    await UIActionUtil.execAndResolved(actionId, {
+      context: this.context,
+      params: this.params,
+      data: [row.data],
+      view: this.grid.view,
+      event
+    });
   }
   /**
    * 加载代码表数据
@@ -23743,6 +24198,9 @@ var GridFieldColumnController = class extends GridColumnController {
    * @return {*}  {string}
    */
   formatValue(value = "") {
+    if (this.model.valueType) {
+      return ValueExUtil.toText(this.model, value);
+    }
     const strVal = "".concat(value);
     if (!this.valueFormat) {
       return strVal;
@@ -23810,7 +24268,7 @@ var GridUAColumnController = class extends GridColumnController {
 };
 
 // src/controller/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.controller.ts
-import { RuntimeError as RuntimeError40 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError41 } from "@ibiz-template/core";
 import Schema2 from "async-validator";
 import { isNilOrEmpty as isNilOrEmpty7 } from "qx-util";
 var GridFieldEditColumnController = class extends GridFieldColumnController {
@@ -23944,7 +24402,7 @@ var GridFieldEditColumnController = class extends GridFieldColumnController {
     if (requiredChanged || names.includes(this.fieldName) || names.includes(this.valueItemName)) {
       const result = await this.validate(row);
       if (!result) {
-        throw new RuntimeError40(
+        throw new RuntimeError41(
           "".concat(this.editItem.codeName, "\u6821\u9A8C\u62A5\u9519,").concat(row.errors[this.fieldName])
         );
       }
@@ -24296,7 +24754,7 @@ var ListController = class extends MDControlController {
 };
 
 // src/controller/control/panel/panel/panel.controller.ts
-import { RuntimeError as RuntimeError41 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError42 } from "@ibiz-template/core";
 var PanelController = class extends ControlController {
   constructor() {
     super(...arguments);
@@ -24394,7 +24852,7 @@ var PanelController = class extends ControlController {
   async load() {
     const data = await this.prepareData();
     if (!data) {
-      throw new RuntimeError41("\u672A\u83B7\u53D6\u5230\u9762\u677F\u6570\u636E");
+      throw new RuntimeError42("\u672A\u83B7\u53D6\u5230\u9762\u677F\u6570\u636E");
     }
     const panelData = this.convertData(data);
     this.state.data = panelData;
@@ -24870,6 +25328,7 @@ var SearchBarController = class extends ControlController {
   initState() {
     super.initState();
     this.state.query = "";
+    this.state.selectedGroupItem = null;
     this.state.visible = !!(this.model.enableQuickSearch || this.model.enableGroup || this.model.enableFilter);
   }
   async onCreated() {
@@ -25610,7 +26069,7 @@ var TreeController = class extends MDControlController {
 };
 
 // src/controller/control/wizard-panel/wizard-panel.controller.ts
-import { RuntimeError as RuntimeError42 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError43 } from "@ibiz-template/core";
 
 // src/controller/control/wizard-panel/wizard-panel.service.ts
 var WizardPanelService = class extends ControlService {
@@ -25769,7 +26228,7 @@ var WizardPanelController = class extends ControlController {
     const { activeFormTag } = this.state;
     const controller = this.formControllers.get(activeFormTag);
     if (!controller) {
-      throw new RuntimeError42("\u627E\u4E0D\u5230".concat(activeFormTag, "\u7684\u8868\u5355\u63A7\u5236\u5668"));
+      throw new RuntimeError43("\u627E\u4E0D\u5230".concat(activeFormTag, "\u7684\u8868\u5355\u63A7\u5236\u5668"));
     }
     return controller;
   }
@@ -25844,7 +26303,7 @@ var WizardPanelController = class extends ControlController {
     this.tagHistory.pop();
     const prevTag = this.tagHistory[this.tagHistory.length - 1];
     if (!prevTag) {
-      throw new RuntimeError42("\u6CA1\u6709\u4E0A\u4E00\u4E2A\u8868\u5355");
+      throw new RuntimeError43("\u6CA1\u6709\u4E0A\u4E00\u4E2A\u8868\u5355");
     }
     this.state.activeFormTag = prevTag;
   }
@@ -25865,7 +26324,7 @@ var WizardPanelController = class extends ControlController {
         }
       );
       if (!wizardForm) {
-        throw new RuntimeError42("\u627E\u4E0D\u5230\u6807\u8BC6\u4E3A".concat(data.srfnextform, "\u7684\u5411\u5BFC\u8868\u5355"));
+        throw new RuntimeError43("\u627E\u4E0D\u5230\u6807\u8BC6\u4E3A".concat(data.srfnextform, "\u7684\u5411\u5BFC\u8868\u5355"));
       }
       nextTag = data.srfnextform;
     } else {
@@ -25877,7 +26336,7 @@ var WizardPanelController = class extends ControlController {
         });
         const nextWizardStep = wizardSteps[index + 1];
         if (!nextWizardStep) {
-          throw new RuntimeError42("\u627E\u4E0D\u5230\u4E0B\u4E00\u4E2A\u5411\u5BFC\u6B65\u9AA4");
+          throw new RuntimeError43("\u627E\u4E0D\u5230\u4E0B\u4E00\u4E2A\u5411\u5BFC\u6B65\u9AA4");
         }
         const nextWizardForm = this.model.dewizard.dewizardForms.find(
           (wizardForm) => {
@@ -25890,7 +26349,7 @@ var WizardPanelController = class extends ControlController {
       }
     }
     if (!nextTag) {
-      throw new RuntimeError42("\u627E\u4E0D\u5230\u4E0B\u4E00\u4E2A\u5411\u5BFC\u8868\u5355");
+      throw new RuntimeError43("\u627E\u4E0D\u5230\u4E0B\u4E00\u4E2A\u5411\u5BFC\u8868\u5355");
     }
     this.state.activeFormTag = nextTag;
     this.tagHistory.push(nextTag);
@@ -26319,7 +26778,7 @@ var AppHub = class {
       this.registerAppView(appView);
       return appView;
     }
-    throw new RuntimeError43("\u89C6\u56FE[".concat(id, "]\u4E0D\u5B58\u5728"));
+    throw new RuntimeError44("\u89C6\u56FE[".concat(id, "]\u4E0D\u5B58\u5728"));
   }
   /**
    * 根据应用实体代码名称查找应用视图
@@ -26350,7 +26809,7 @@ var AppHub = class {
       this.registerAppDataEntity(entity, appId);
       return entity;
     }
-    throw new RuntimeError43("\u672A\u627E\u5230\u5E94\u7528\u5B9E\u4F53[".concat(id, "]"));
+    throw new RuntimeError44("\u672A\u627E\u5230\u5E94\u7528\u5B9E\u4F53[".concat(id, "]"));
   }
   /**
    * 新建 hub 应用
@@ -26371,7 +26830,7 @@ var AppHub = class {
       appModel = await this.modelLoaderProvider.getApp(id);
       this.registerApp(appModel);
     } else {
-      throw new RuntimeError43("\u672A\u627E\u5230\u5E94\u7528[".concat(id, "]\u6A21\u578B"));
+      throw new RuntimeError44("\u672A\u627E\u5230\u5E94\u7528[".concat(id, "]\u6A21\u578B"));
     }
     const app = new Application(appModel);
     this.appMap.set(id, app);
@@ -26462,7 +26921,7 @@ var EngineFactory = class {
 };
 
 // src/engine/view-base.engine.ts
-import { RuntimeError as RuntimeError44 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError45 } from "@ibiz-template/core";
 var ViewEngineBase = class {
   /**
    * 构造函数在视图控制器的构造函数逻辑内部执行
@@ -26650,7 +27109,7 @@ var ViewEngineBase = class {
     const { appDataEntityId } = this.view.model;
     const { evt, context, params } = this.view;
     if (!appDataEntityId) {
-      throw new RuntimeError44("\u8BE5\u89C6\u56FE\u6CA1\u6709\u5B9E\u4F53\uFF0C\u65E0\u6CD5\u52A0\u8F7D\u5B9E\u4F53\u6570\u636E");
+      throw new RuntimeError45("\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(
@@ -26905,6 +27364,7 @@ var MDViewEngine = class extends ViewEngineBase {
    * @return {*}  {IParams}
    */
   getSearchParams() {
+    var _a;
     const params = {};
     if (this.searchForm) {
       const addParams = this.searchForm.getData()[0];
@@ -26919,11 +27379,20 @@ var MDViewEngine = class extends ViewEngineBase {
       );
       Object.assign(params, filteredParams);
     }
-    if (this.searchBar && this.searchBar.state.query) {
-      const addParams = {
-        query: this.searchBar.state.query
-      };
-      Object.assign(params, addParams);
+    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);
+      }
     }
     return params;
   }
@@ -27012,7 +27481,7 @@ var GlobalUtil = class {
 };
 
 // src/logic-scheduler/executor/logic-executor.ts
-import { RuntimeError as RuntimeError45 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError46 } from "@ibiz-template/core";
 var LogicExecutor = class {
   /**
    * @author lxm
@@ -27033,7 +27502,7 @@ var LogicExecutor = class {
    */
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   execute(_executeParams) {
-    throw new RuntimeError45("Method not implemented.");
+    throw new RuntimeError46("Method not implemented.");
   }
   /**
    * 销毁方法
@@ -27137,7 +27606,7 @@ var AppDEUILogicExecutor = class extends LogicExecutor {
 };
 
 // src/logic-scheduler/scheduler/logic-scheduler.ts
-import { mergeLeft } from "ramda";
+import { mergeLeft as mergeLeft2 } from "ramda";
 var LogicScheduler = class {
   constructor(logics) {
     this.triggers = /* @__PURE__ */ new Map();
@@ -27190,7 +27659,7 @@ var LogicScheduler = class {
     if (this.defaultParamsCb) {
       defaultParams = this.defaultParamsCb();
     }
-    return mergeLeft(executeParams, defaultParams);
+    return mergeLeft2(executeParams, defaultParams);
   }
   /**
    * 创建触发器实例
@@ -27465,7 +27934,7 @@ var LogicSchedulerCenter = class {
 };
 
 // src/logic-scheduler/trigger/logic-trigger.ts
-import { RuntimeError as RuntimeError46 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError47 } from "@ibiz-template/core";
 var LogicTrigger = class {
   /**
    * @author lxm
@@ -27525,7 +27994,7 @@ var LogicTrigger = class {
     if (this.executor) {
       return this.executor.execute(executeParams);
     }
-    throw new RuntimeError46("".concat(this.logic.id, "\u6CA1\u6709\u7ED1\u5B9Aexecutor"));
+    throw new RuntimeError47("".concat(this.logic.id, "\u6CA1\u6709\u7ED1\u5B9Aexecutor"));
   }
   /**
    * 销毁方法
@@ -27542,12 +28011,12 @@ var CustomTrigger = class extends LogicTrigger {
 };
 
 // src/logic-scheduler/trigger/item-dyna-logic-trigger.ts
-import { RuntimeError as RuntimeError47 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError48 } from "@ibiz-template/core";
 var ItemDynaLogicTrigger = class extends LogicTrigger {
   bindExecutor(executor) {
     super.bindExecutor(executor);
     if (this.executor.type !== "SCRIPT") {
-      throw new RuntimeError47(
+      throw new RuntimeError48(
         "\u9884\u5B9A\u4E49\u903B\u8F91\u7C7B\u578B".concat(this.type, "\u7684\u89E6\u53D1\u5668\u7C7B\u578B\u53EA\u80FD\u662F\u811A\u672C")
       );
     }
@@ -27579,12 +28048,12 @@ var ItemDynaLogicTrigger = class extends LogicTrigger {
     if (typeof result === "boolean") {
       return result;
     }
-    throw new RuntimeError47("".concat(this.logic.id, "\u903B\u8F91\u8FD4\u56DE\u503C\u4E0D\u662F\u5E03\u5C14\u503C"));
+    throw new RuntimeError48("".concat(this.logic.id, "\u903B\u8F91\u8FD4\u56DE\u503C\u4E0D\u662F\u5E03\u5C14\u503C"));
   }
 };
 
 // src/logic-scheduler/trigger/timer-trigger.ts
-import { RuntimeError as RuntimeError48 } from "@ibiz-template/core";
+import { RuntimeError as RuntimeError49 } from "@ibiz-template/core";
 var TimerTrigger = class extends LogicTrigger {
   constructor() {
     super(...arguments);
@@ -27593,7 +28062,7 @@ var TimerTrigger = class extends LogicTrigger {
   start() {
     this.timer = setInterval(() => {
       if (!this.scheduler.defaultParamsCb) {
-        throw new RuntimeError48("\u5B9A\u65F6\u5668\u7F3A\u5C11\u9ED8\u8BA4\u53C2\u6570\u56DE\u8C03");
+        throw new RuntimeError49("\u5B9A\u65F6\u5668\u7F3A\u5C11\u9ED8\u8BA4\u53C2\u6570\u56DE\u8C03");
       }
       const params = this.scheduler.defaultParamsCb();
       this.executor.execute(params);
@@ -27610,10 +28079,10 @@ var TimerTrigger = class extends LogicTrigger {
 // src/logic-scheduler/executor/app-ui-logic-executor.ts
 import {
   ModelError as ModelError29,
-  RuntimeError as RuntimeError49,
+  RuntimeError as RuntimeError50,
   RuntimeModelError as RuntimeModelError47
 } from "@ibiz-template/core";
-import { notNilEmpty as notNilEmpty7 } from "qx-util";
+import { notNilEmpty as notNilEmpty8 } from "qx-util";
 var AppUILogicExecutor = class extends LogicExecutor {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   execute(executeParams) {
@@ -27646,7 +28115,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     const { context, params, ...rest } = parameters;
     const { data } = parameters;
     if (!(data == null ? void 0 : data[0])) {
-      throw new RuntimeError49("opendata\u6CA1\u6709\u53EF\u64CD\u4F5C\u6570\u636E\uFF01");
+      throw new RuntimeError50("opendata\u6CA1\u6709\u53EF\u64CD\u4F5C\u6570\u636E\uFF01");
     }
     const openViewRef = appUILogic.openDataAppView;
     if (!openViewRef) {
@@ -27669,7 +28138,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
     );
     let tempParams = {};
     const navParams = openViewRef.navigateParams;
-    if (notNilEmpty7(navParams)) {
+    if (notNilEmpty8(navParams)) {
       tempParams = convertNavData(navParams, params, context, data[0]);
     }
     return ibiz.commands.execute(
@@ -27719,12 +28188,12 @@ var AppUILogicExecutor = class extends LogicExecutor {
     let tempParams = {};
     const _data = (data == null ? void 0 : data[0]) || {};
     const navContexts = newViewRef.navigateContexts;
-    if (notNilEmpty7(navContexts)) {
+    if (notNilEmpty8(navContexts)) {
       tempContext = convertNavData(navContexts, context, params, _data);
     }
     tempContext = Object.assign(context, tempContext);
     const navParams = newViewRef.navigateParams;
-    if (notNilEmpty7(navParams)) {
+    if (notNilEmpty8(navParams)) {
       tempParams = convertNavData(navParams, params, context, _data);
     }
     if (context.srfcopymode) {
@@ -27769,12 +28238,12 @@ var AppUILogicExecutor = class extends LogicExecutor {
     }
     const selectData = (_a = result.data) == null ? void 0 : _a[0];
     if (!selectData) {
-      throw new RuntimeError49("\u8BF7\u9009\u4E2D\u4E00\u6761\u6570\u636E");
+      throw new RuntimeError50("\u8BF7\u9009\u4E2D\u4E00\u6761\u6570\u636E");
     }
     const indexType = selectData.srfkey;
     const findView = newDataAppViews == null ? void 0 : newDataAppViews.find((item) => item.refMode === indexType);
     if (!findView) {
-      throw new RuntimeError49(
+      throw new RuntimeError50(
         "\u6CA1\u6709\u627E\u5230\u4E0E\u7D22\u5F15\u7C7B\u578B".concat(indexType, "\u76F8\u5173\u7684\u5B9E\u4F53\u7684\u7F16\u8F91\u89C6\u56FE")
       );
     }
@@ -28134,6 +28603,7 @@ export {
   UIMapField,
   V7AuthService,
   VIEW_PROVIDER_PREFIX,
+  ValueExUtil,
   ViewController,
   ViewEngineBase,
   ViewLayoutPanelController,