@ibiz-template/runtime 0.6.1-dev.2 → 0.6.2-dev.0

package/dist/index.esm.js

@@ -233,8 +233,8 @@ var HelperBase = class {
    * @date 2021-12-29 14:12:47
    * @param {string} tag 助手标识
    */
-  constructor(Handlebars2, tag) {
-    Handlebars2.registerHelper(tag, this.onExecute);
+  constructor(Handlebars, tag) {
+    Handlebars.registerHelper(tag, this.onExecute);
   }
 };
 
@@ -408,12 +408,13 @@ var HelperNeq = class extends HelperBase {
 };
 
 // src/utils/handlebars/helpers/not/not.ts
+import { isEmpty, isNil } from "ramda";
 var HelperNot = class extends HelperBase {
   constructor(hbs) {
     super(hbs, "not");
   }
   onExecute(param, options) {
-    const bol = Handlebars.Utils.isEmpty(param);
+    const bol = isEmpty(param) || isNil(param);
     return HelperUtil.handleJudgmentExecute(this, bol, options);
   }
 };
@@ -595,7 +596,7 @@ var HandlebarsUtil = class {
 };
 
 // src/utils/nav-params/nav-params.ts
-import { isEmpty, isNil } from "lodash-es";
+import { isEmpty as isEmpty2, isNil as isNil2 } from "lodash-es";
 import { isNilOrEmpty, notNilEmpty } from "qx-util";
 function convertObjectToNavParams(navParams) {
   const result = [];
@@ -616,7 +617,7 @@ function convertObjectToNavParams(navParams) {
   return result;
 }
 function convertNavData(navParams, ...origins) {
-  if (!navParams || isEmpty(navParams)) {
+  if (!navParams || isEmpty2(navParams)) {
     return {};
   }
   const navParamsArr = Array.isArray(navParams) ? navParams : convertObjectToNavParams(navParams);
@@ -650,7 +651,7 @@ function convertNavDataByArray(naviDatas, ...origins) {
             key.slice(2, -1).toLowerCase()
           );
           if (find) {
-            valueStr = valueStr.replace(key, "".concat(isNil(value) ? "" : value));
+            valueStr = valueStr.replace(key, "".concat(isNil2(value) ? "" : value));
           }
         });
         result[naviData.key.toLowerCase()] = valueStr;
@@ -1294,6 +1295,9 @@ async function getDERedirectToView(appView, context, params = {}, opts = {}) {
     });
     if (refView) {
       viewId = refView.refAppViewId;
+      if (refView.openMode) {
+        opts.openMode = refView.openMode;
+      }
       if (viewId) {
         return {
           type: "view",
@@ -1405,7 +1409,7 @@ async function calcDERdTag(entity, rdView, params, data) {
 // src/utils/verify/verify.ts
 import { RuntimeError as RuntimeError3 } from "@ibiz-template/core";
 import { isNilOrEmpty as isNilOrEmpty3, notNilEmpty as notNilEmpty4 } from "qx-util";
-import { isNil as isNil2 } from "ramda";
+import { isNil as isNil3 } from "ramda";
 function testCond(value, op, value2) {
   if (Object.is(op, "IN")) {
     return contains(value, value2);
@@ -1431,7 +1435,7 @@ function testCond(value, op, value2) {
     case "ISNOTNULL":
       return notNilEmpty4(value);
     case "TESTNULL":
-      return isNil2(value);
+      return isNil3(value);
     case "IN":
       return contains(value, value2);
     case "NOTIN":
@@ -1504,7 +1508,7 @@ function strContain(value, value2, mode) {
 // src/utils/verify/de-rule-verify.ts
 import { RuntimeError as RuntimeError4 } from "@ibiz-template/core";
 import { isNilOrEmpty as isNilOrEmpty4 } from "qx-util";
-import { isEmpty as isEmpty2, isNil as isNil3 } from "ramda";
+import { isEmpty as isEmpty3, isNil as isNil4 } from "ramda";
 
 // src/utils/script/script-function.ts
 import { mergeRight } from "ramda";
@@ -1576,7 +1580,8 @@ var ScriptFunction = class {
       "parentView",
       "view",
       "parent",
-      "util"
+      "util",
+      "ctrl"
     ];
     keys.push(...presetArgsKeys);
     this.argKeys = Array.from(new Set(keys));
@@ -1858,7 +1863,7 @@ function checkFieldSimpleRule(value, op, value2, errorInfo, paramType, form, pri
     const _value2Field = form[value2] ? form[value2] : value2;
     value2 = _value2Field;
   }
-  if (isNil3(errorInfo) || isEmpty2(errorInfo)) {
+  if (isNil4(errorInfo) || isEmpty3(errorInfo)) {
     errorInfo = "\u5185\u5BB9\u5FC5\u987B\u7B26\u5408\u503C\u89C4\u5219";
   }
   const result = testCond(value, op, value2);
@@ -4988,7 +4993,7 @@ import { ModelError as ModelError15, RuntimeError as RuntimeError25 } from "@ibi
 import { clone as clone17 } from "ramda";
 
 // src/service/utils/de-dq-cond/ps-de-dq-cond-engine.ts
-import { isEmpty as isEmpty3 } from "ramda";
+import { isEmpty as isEmpty4 } from "ramda";
 
 // src/service/utils/de-dq-cond/ps-model-cond-engine-base.ts
 var PSModelCondEngineBase = class {
@@ -5295,7 +5300,7 @@ var _PSDEDQCondEngine = class _PSDEDQCondEngine extends PSModelCondEngineBase {
   testCond(cond, data, filter) {
     if (cond instanceof PSModelGroupCondBase) {
       const list = cond.getChildPSModelCondBases();
-      if (list == null || isEmpty3(list)) {
+      if (list == null || isEmpty4(list)) {
         return !cond.isNotMode();
       }
       const bAnd = "AND" /* CONDOP_AND */ === cond.getCondOp();
@@ -5318,15 +5323,15 @@ var _PSDEDQCondEngine = class _PSDEDQCondEngine extends PSModelCondEngineBase {
       return bRet;
     }
     if (cond instanceof PSModelSingleCondBase) {
-      if (isEmpty3(cond.getParam())) {
+      if (isEmpty4(cond.getParam())) {
         ibiz.log.warn("\u6CA1\u6709\u6307\u5B9A\u5C5E\u6027\u540D\u79F0", cond);
       }
       const objValue = data[cond.getParam().toLowerCase()];
       let objCondValue = null;
       const valType = cond.getValueType();
       const val = cond.getValue();
-      if (valType != null && !isEmpty3(valType)) {
-        if (isEmpty3(val)) {
+      if (valType != null && !isEmpty4(valType)) {
+        if (isEmpty4(val)) {
           ibiz.log.warn("\u6CA1\u6709\u6307\u5B9A\u4E0A\u4E0B\u6587\u53C2\u6570\u540D\u79F0");
         }
         if (_PSDEDQCondEngine.PARAMTYPE_WEBCONTEXT === valType) {
@@ -6361,7 +6366,7 @@ DEDQCondUtil.map = /* @__PURE__ */ new WeakMap();
 
 // src/service/utils/dynamic-code-list/dynamic-code-list.ts
 import { ModelError as ModelError5, RuntimeModelError as RuntimeModelError7 } from "@ibiz-template/core";
-import { isNil as isNil4 } from "ramda";
+import { isNil as isNil5 } from "ramda";
 var DynamicCodeListCache = class {
   constructor(codeList) {
     /**
@@ -6594,7 +6599,7 @@ var DynamicCodeListCache = class {
     }
     const promise = this.load(context, params);
     const { cacheTimeout } = this.codeList;
-    const waitTime = cacheTimeout === -1 || isNil4(cacheTimeout) ? ibiz.config.codeList.timeout : this.codeList.cacheTimeout;
+    const waitTime = cacheTimeout === -1 || isNil5(cacheTimeout) ? ibiz.config.codeList.timeout : this.codeList.cacheTimeout;
     const cacheData = {
       expirationTime: (/* @__PURE__ */ new Date()).getTime() + waitTime,
       promise
@@ -6608,17 +6613,17 @@ var DynamicCodeListCache = class {
 };
 
 // src/service/utils/de-cache/de-cache.ts
-import { where, equals, clone as clone4, isNil as isNil6, isEmpty as isEmpty5 } from "ramda";
+import { where, equals, clone as clone4, isNil as isNil7, isEmpty as isEmpty6 } from "ramda";
 import { createUUID as createUUID2 } from "qx-util";
 import { RuntimeError as RuntimeError16 } from "@ibiz-template/core";
 
 // src/service/utils/service-exist-util/service-exist-util.ts
 import { RuntimeError as RuntimeError15 } from "@ibiz-template/core";
-import { isEmpty as isEmpty4, isNil as isNil5 } from "ramda";
+import { isEmpty as isEmpty5, isNil as isNil6 } from "ramda";
 function isExistSrfKey(funcName, entity) {
   if (entity != null) {
     const { srfkey } = entity;
-    if (!isNil5(srfkey) && !isEmpty4(srfkey)) {
+    if (!isNil6(srfkey) && !isEmpty5(srfkey)) {
       return true;
     }
   }
@@ -6626,7 +6631,7 @@ function isExistSrfKey(funcName, entity) {
 }
 function isExistSessionId(funcName, context) {
   const { srfsessionid } = context;
-  if (!isNil5(srfsessionid) && !isEmpty4(srfsessionid)) {
+  if (!isNil6(srfsessionid) && !isEmpty5(srfsessionid)) {
     return true;
   }
   throw new RuntimeError15("\u6267\u884C\u300C".concat(funcName, "\u300D\u4E0D\u5B58\u5728\u300Csrfsessionid\u300D\u65E0\u6CD5\u5904\u7406"));
@@ -6722,7 +6727,7 @@ var DECache = class {
     }
     try {
       isExistSessionId("add", context);
-      if (isNil6(entity.srfkey) || isEmpty5(entity.srfkey)) {
+      if (isNil7(entity.srfkey) || isEmpty6(entity.srfkey)) {
         entity.srfkey = createUUID2();
       }
       entity.srftempdate = (/* @__PURE__ */ new Date()).getTime();
@@ -6866,7 +6871,7 @@ var DECache = class {
       const t = this.getTransaction(context);
       for (let i = 0; i < entities.length; i++) {
         const entity = entities[i];
-        if (isNil6(entity.srfkey) || isEmpty5(entity.srfkey)) {
+        if (isNil7(entity.srfkey) || isEmpty6(entity.srfkey)) {
           entity.srfkey = createUUID2();
         }
         entity.srftempdate = (/* @__PURE__ */ new Date()).getTime();
@@ -7057,7 +7062,7 @@ var DECache = class {
       }
     );
     const unionValues = unionKeys.map((key) => {
-      if (isNil6(data[key])) {
+      if (isNil7(data[key])) {
         return "__empty__";
       }
       return data[key];
@@ -7131,7 +7136,7 @@ function calcResPath(context, entity) {
 }
 
 // src/service/utils/search-filter/search-filter.ts
-import { isEmpty as isEmpty6, isNil as isNil7 } from "ramda";
+import { isEmpty as isEmpty7, isNil as isNil8 } from "ramda";
 var SearchFilter = class {
   /**
    * Creates an instance of SearchFilter.
@@ -7179,16 +7184,16 @@ var SearchFilter = class {
     this.sortMode = "ASC";
     this.context = context;
     if (data) {
-      if (!isNil7(data.page) && !isEmpty6(data.page)) {
+      if (!isNil8(data.page) && !isEmpty7(data.page)) {
         this.page = data.page;
       }
-      if (!isNil7(data.size) && !isEmpty6(data.size)) {
+      if (!isNil8(data.size) && !isEmpty7(data.size)) {
         this.size = data.size;
       }
-      if (!isNil7(data.query) && !isEmpty6(data.query)) {
+      if (!isNil8(data.query) && !isEmpty7(data.query)) {
         this.query = data.query;
       }
-      if (!isNil7(data.sort) && !isEmpty6(data.sort)) {
+      if (!isNil8(data.sort) && !isEmpty7(data.sort)) {
         const arr = data.sort.split(",");
         if (arr.length >= 1) {
           [this.sortField] = arr;
@@ -7910,7 +7915,7 @@ var FileService = class {
 };
 
 // src/service/app-data-entity/app-data-entity.ts
-import { clone as clone5, isNil as isNil8 } from "ramda";
+import { clone as clone5, isNil as isNil9 } from "ramda";
 import { DataTypes } from "@ibiz-template/core";
 import { createUUID as createUUID3 } from "qx-util";
 
@@ -8003,7 +8008,7 @@ var AppDataEntity = class _AppDataEntity {
       enumerable: false,
       configurable: true,
       writable: true,
-      value: isNil8(this.srfkey) ? createUUID3() : this.srfkey
+      value: isNil9(this.srfkey) ? createUUID3() : this.srfkey
     });
     this.defineProperties();
   }
@@ -8093,11 +8098,11 @@ var AppDataEntity = class _AppDataEntity {
     if (value == null) {
       return value;
     }
-    if (isNil8(dataType)) {
+    if (isNil9(dataType)) {
       return value;
     }
     if (DataTypes.isNumber(dataType)) {
-      const numVal = !isNil8(value) && value !== "" ? Number(value) : value;
+      const numVal = !isNil9(value) && value !== "" ? Number(value) : value;
       if (Number.isNaN(numVal)) {
         ibiz.log.debug("".concat(value, "\u4E0D\u80FD\u8F6C\u6362\u6210\u6570\u5B57"));
         return value;
@@ -8616,7 +8621,7 @@ import { clone as clone8 } from "@ibiz-template/core";
 
 // src/service/vo/control.vo.ts
 import { createUUID as createUUID4 } from "qx-util";
-import { clone as clone7, isNil as isNil9 } from "ramda";
+import { clone as clone7, isNil as isNil10 } from "ramda";
 var BuildInKeys = [
   "srfkey",
   "srfmajortext",
@@ -8705,7 +8710,7 @@ var ControlVO = class _ControlVO {
         enumerable: false,
         configurable: true,
         writable: true,
-        value: isNil9(this.srfkey) ? createUUID4() : this.srfkey
+        value: isNil10(this.srfkey) ? createUUID4() : this.srfkey
       });
     }
     Object.defineProperty(this, "srfuf", {
@@ -9429,7 +9434,7 @@ var V7AuthService = class {
 };
 
 // src/service/service/async-action/async-action.service.ts
-import { isNil as isNil10 } from "ramda";
+import { isNil as isNil11 } from "ramda";
 var AsyncActionService = class {
   /**
    * 获取异步操作的集合
@@ -9440,7 +9445,7 @@ var AsyncActionService = class {
    */
   async fetch(params = {}) {
     const res = await ibiz.net.post("/portal/asyncaction/all", params);
-    if (isNil10(res.data)) {
+    if (isNil11(res.data)) {
       res.data = [];
     }
     return res;
@@ -9465,7 +9470,7 @@ import {
   RuntimeError as RuntimeError23,
   RuntimeModelError as RuntimeModelError22
 } from "@ibiz-template/core";
-import { isArray as isArray6, isNil as isNil11 } from "lodash-es";
+import { isArray as isArray6, isNil as isNil12 } from "lodash-es";
 import { ascSort } from "qx-util";
 import { clone as clone14 } from "ramda";
 
@@ -9887,6 +9892,8 @@ var DELogicLinkSingleCond = class extends DELogicLinkCond {
    */
   test(ctx, context, data) {
     const dst = ctx.params[this.dstParam];
+    let result;
+    let compareValue;
     switch (this.type) {
       case "ENTITYFIELD": {
         if (!this.value) {
@@ -9896,7 +9903,9 @@ var DELogicLinkSingleCond = class extends DELogicLinkCond {
           );
         }
         const value = data[this.value] != null ? data[this.value] : context[this.value];
-        return testCond(dst[this.dstField], this.op, value);
+        compareValue = value;
+        result = testCond(dst[this.dstField], this.op, value);
+        break;
       }
       case "SRCENTITYFIELD": {
         if (!this.value) {
@@ -9906,13 +9915,26 @@ var DELogicLinkSingleCond = class extends DELogicLinkCond {
           );
         }
         const src = ctx.params[this.srcParam];
-        return testCond(dst[this.dstField], this.op, src[this.value]);
+        compareValue = src[this.value];
+        result = testCond(dst[this.dstField], this.op, src[this.value]);
+        break;
       }
       case "CURTIME":
         throw new ModelError8(this.model, "\u6682\u672A\u652F\u6301\u6761\u4EF6\u503C\u7C7B\u578B\u4E3A[\u5F53\u524D\u65F6\u95F4]");
       default:
-        return testCond(dst[this.dstField], this.op, this.value);
+        compareValue = this.value;
+        result = testCond(dst[this.dstField], this.op, this.value);
     }
+    ibiz.log.debug(
+      "\u5B9E\u4F53\u903B\u8F91\u8FDE\u63A5\u6761\u4EF6\u9879\uFF1A".concat(this.model.name, "-\u6761\u4EF6\u503C\u7C7B\u578B\uFF1A").concat(this.type, "-\u6E90\u5C5E\u6027\u540D\u79F0\uFF1A").concat(this.dstField, "-\u6E90\u5BF9\u8C61\u503C\uFF1A"),
+      dst[this.dstField],
+      "-\u5BF9\u6BD4\u6761\u4EF6\uFF1A".concat(this.op),
+      "-\u5BF9\u6BD4\u503C",
+      compareValue,
+      "-\u5BF9\u6BD4\u7ED3\u679C\uFF1A",
+      result
+    );
+    return result;
   }
 };
 
@@ -9977,7 +9999,12 @@ var DELogicLinkGroupCond = class _DELogicLinkGroupCond extends DELogicLinkCond {
         break;
       }
     }
-    return this.notMode ? !bol : bol;
+    const result = this.notMode ? !bol : bol;
+    ibiz.log.debug(
+      "\u5B9E\u4F53\u903B\u8F91\u8FDE\u63A5\u6761\u4EF6\u7EC4\u540D\u79F0\uFF1A".concat(this.model.name, "-\u6761\u4EF6\u7EC4\u6807\u8BC6\uFF1A").concat(this.model.id, "-\u8FD0\u884C\u7ED3\u679C\uFF1A"),
+      result
+    );
+    return result;
   }
 };
 
@@ -10083,12 +10110,17 @@ var DEActionNode = class extends DELogicNode {
     if (res.ok) {
       ctx.params[retDELogicParamId] = res.data;
     }
+    ibiz.log.debug(
+      "\u5B9E\u4F53\u903B\u8F91\u8282\u70B9\uFF08\u5B9E\u4F53\u884C\u4E3A\uFF09\uFF1A".concat(this.model.id, "-\u754C\u9762\u884C\u4E3A\u6240\u5C5E\u5B9E\u4F53\uFF1A").concat(dstAppDataEntityId, "-\u5B9E\u4F53\u884C\u4E3A\u6807\u8BC6\uFF1A").concat(dstAppDEActionId, "-\u53C2\u6570\u540D\u79F0\uFF1A").concat(retDELogicParamId, "-\u503C\uFF1A"),
+      ctx.params[retDELogicParamId]
+    );
   }
 };
 
 // src/de-logic/de-logic-node/start-node/start-node.ts
 var StartNode = class extends DELogicNode {
   async exec(_ctx) {
+    ibiz.log.debug("\u5B9E\u4F53\u903B\u8F91\u8282\u70B9\uFF08\u542F\u52A8\u8282\u70B9\uFF09\uFF1A".concat(this.model.id));
   }
 };
 
@@ -10122,6 +10154,10 @@ var EndNode = class extends DELogicNode {
           "\u6682\u672A\u652F\u6301\u7684\u7ED3\u675F\u8282\u70B9\u8FD4\u56DE\u503C\u7C7B\u578B: ".concat(returnType)
         );
     }
+    ibiz.log.debug(
+      "\u5B9E\u4F53\u903B\u8F91\u8282\u70B9\uFF08\u7ED3\u675F\u8282\u70B9\uFF09\uFF1A".concat(this.model.id, "-\u8FD4\u56DE\u503C\u7C7B\u578B\uFF1A").concat(returnType, "-\u8FD4\u56DE\u503C\uFF1A"),
+      ctx.result
+    );
   }
 };
 
@@ -10204,27 +10240,46 @@ var PrepareParamNode = class extends DELogicNode {
     if (nodeParams == null ? void 0 : nodeParams.length) {
       await Promise.all(
         nodeParams.map((nodeParam) => {
+          let result;
+          let originValue;
+          if (nodeParam.dstDELogicParamId) {
+            originValue = clone10(ctx.params[nodeParam.dstDELogicParamId]);
+          }
           switch (nodeParam.paramAction) {
             case "SETPARAMVALUE":
-              return this.setParamValue(nodeParam, ctx);
+              result = this.setParamValue(nodeParam, ctx);
+              break;
             case "RESETPARAM":
-              return this.resetParam(nodeParam, ctx);
+              result = this.resetParam(nodeParam, ctx);
+              break;
             case "COPYPARAM":
-              return this.copyParam(nodeParam, ctx);
+              result = this.copyParam(nodeParam, ctx);
+              break;
             case "BINDPARAM":
-              return this.bindParam(nodeParam, ctx);
+              result = this.bindParam(nodeParam, ctx);
+              break;
             case "RENEWPARAM":
-              return this.renewParam(nodeParam, ctx);
+              result = this.renewParam(nodeParam, ctx);
+              break;
             case "APPENDPARAM":
-              return this.appendParam(nodeParam, ctx);
+              result = this.appendParam(nodeParam, ctx);
+              break;
             case "SORTPARAM":
-              return this.sortParam(nodeParam, ctx);
+              result = this.sortParam(nodeParam, ctx);
+              break;
             default:
               throw new ModelError11(
                 nodeParam,
                 "\u6682\u672A\u652F\u6301\u903B\u8F91\u5904\u7406\u53C2\u6570\u64CD\u4F5C".concat(nodeParam.paramAction)
               );
           }
+          ibiz.log.debug(
+            "\u5B9E\u4F53\u903B\u8F91\u8282\u70B9\uFF08\u51C6\u5907\u53C2\u6570\uFF09\uFF1A".concat(this.model.id, "-\u53C2\u6570\u5904\u7406\u64CD\u4F5C\uFF1A").concat(nodeParam.paramAction, "-\u76EE\u6807\u903B\u8F91\u53C2\u6570\uFF1A").concat(nodeParam.dstDELogicParamId, "-\u6E90\u53C2\u6570\uFF08\u503C\uFF09\uFF1A"),
+            originValue,
+            "-\u76EE\u6807\u53C2\u6570\uFF08\u503C\uFF09\uFF1A",
+            ctx.params[nodeParam.dstDELogicParamId]
+          );
+          return result;
         })
       );
     }
@@ -10358,6 +10413,10 @@ var DataSetNode = class extends DELogicNode {
     if (res.ok) {
       ctx.params[retDELogicParamId] = res.data;
     }
+    ibiz.log.debug(
+      "\u5B9E\u4F53\u903B\u8F91\u8282\u70B9\uFF08\u6570\u636E\u96C6\u5408\uFF09\uFF1A".concat(this.model.id, "-\u6570\u636E\u96C6\u5B9E\u4F53\u6807\u8BC6\uFF1A").concat(dstAppDataEntityId, "-\u6570\u636E\u96C6\u6807\u8BC6\uFF1A").concat(dstAppDEDataSetId, "-\u53C2\u6570\u540D\u79F0\uFF1A").concat(retDELogicParamId, "-\u503C\uFF1A"),
+      ctx.params[retDELogicParamId]
+    );
   }
 };
 
@@ -10374,6 +10433,10 @@ var BindParamNode = class extends DELogicNode {
     }
     const srcVal = handleSrcVal(ctx, this.model);
     ctx.params[dstDELogicParamId] = srcVal;
+    ibiz.log.debug(
+      "\u5B9E\u4F53\u903B\u8F91\u8282\u70B9\uFF08\u7ED1\u5B9A\u53C2\u6570\uFF09\uFF1A".concat(this.model.id, "-\u53C2\u6570\u540D\u79F0\uFF1A").concat(dstDELogicParamId, "-\u503C\uFF1A"),
+      srcVal
+    );
   }
 };
 
@@ -10386,6 +10449,9 @@ var ResetParamNode = class extends DELogicNode {
       throw new RuntimeModelError16(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E");
     }
     ctx.resetParam(dstDELogicParamId);
+    ibiz.log.debug(
+      "\u5B9E\u4F53\u903B\u8F91\u8282\u70B9\uFF08\u91CD\u7F6E\u53C2\u6570\uFF09\uFF1A".concat(this.model.id, "-\u91CD\u7F6E\u53C2\u6570\uFF1A").concat(dstDELogicParamId)
+    );
   }
 };
 
@@ -10398,6 +10464,9 @@ var RenewParamNode = class extends DELogicNode {
       throw new RuntimeModelError17(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E");
     }
     ctx.renewParam(dstDELogicParamId);
+    ibiz.log.debug(
+      "\u5B9E\u4F53\u903B\u8F91\u8282\u70B9\uFF08\u91CD\u65B0\u5EFA\u7ACB\u53C2\u6570\uFF09\uFF1A".concat(this.model.id, "-\u91CD\u5EFA\u53C2\u6570\uFF1A").concat(dstDELogicParamId)
+    );
   }
 };
 
@@ -10415,6 +10484,10 @@ var CopyParamNode = class extends DELogicNode {
     }
     const srcVal = handleSrcVal(ctx, this.model);
     ctx.params[dstDELogicParamId] = clone11(srcVal);
+    ibiz.log.debug(
+      "\u5B9E\u4F53\u903B\u8F91\u8282\u70B9\uFF08\u62F7\u8D1D\u53C2\u6570\uFF09\uFF1A".concat(this.model.id, "-\u53C2\u6570\u540D\u79F0\uFF1A").concat(dstDELogicParamId, "-\u503C\uFF1A"),
+      srcVal
+    );
   }
 };
 
@@ -10431,6 +10504,10 @@ var SortParamNode = class extends DELogicNode {
     arr.sort((a, b) => {
       return dstSortDir === "ASC" ? a[key] - b[key] : b[key] - a[key];
     });
+    ibiz.log.debug(
+      "\u5B9E\u4F53\u903B\u8F91\u8282\u70B9\uFF08\u6392\u5E8F\u6570\u7EC4\u53C2\u6570\uFF09\uFF1A".concat(this.model.id, "-\u6392\u5E8F\u5C5E\u6027\uFF1A").concat(dstFieldName, "-\u6392\u5E8F\u6A21\u5F0F\uFF1A").concat(dstSortDir, "-\u53C2\u6570\u540D\u79F0\uFF1A").concat(dstDELogicParamId, "-\u6392\u5E8F\u540E\u6570\u7EC4\uFF1A"),
+      arr
+    );
   }
 };
 
@@ -10460,6 +10537,12 @@ var AppendParamNode = class extends DELogicNode {
       0,
       ...srcVal.slice(_srcIndex, _srcSize)
     );
+    ibiz.log.debug(
+      "\u5B9E\u4F53\u903B\u8F91\u8282\u70B9\uFF08\u9644\u52A0\u5230\u6570\u7EC4\uFF09\uFF1A".concat(this.model.id, "-\u9644\u52A0\u53C2\u6570\uFF1A"),
+      ctx.params,
+      "-\u9644\u52A0\u503C\uFF1A",
+      srcVal.slice(_srcIndex, _srcSize)
+    );
   }
 };
 
@@ -10468,6 +10551,9 @@ import { HttpError as HttpError3 } from "@ibiz-template/core";
 var ThrowExceptionNode = class extends DELogicNode {
   async exec(_ctx) {
     const { errorCode, errorInfo } = this.model;
+    ibiz.log.debug(
+      "\u5B9E\u4F53\u903B\u8F91\u8282\u70B9\uFF08\u629B\u51FA\u5F02\u5E38\uFF09\uFF1A".concat(this.model.id, "-\u9519\u8BEF\u4EE3\u7801\uFF1A").concat(errorCode, "-\u9519\u8BEF\u4FE1\u606F\uFF1A").concat(errorInfo)
+    );
     throw new HttpError3({
       response: {
         status: errorCode,
@@ -10544,6 +10630,7 @@ var DELogicParam = class {
     } else if (m.sessionParam) {
       throw new ModelError12(m, "\u672A\u652F\u6301\u7684\u903B\u8F91\u53C2\u6570\u7C7B\u578B: \u64CD\u4F5C\u4F1A\u8BDD\u53D8\u91CF");
     }
+    ibiz.log.debug("\u8BA1\u7B97\u5B9E\u4F53\u903B\u8F91\u53C2\u6570\uFF0C\u6807\u8BC6\uFF1A".concat(tag), "-\u503C\uFF1A", ctx.params[tag]);
   }
   /**
    * 重新建立变量
@@ -10561,6 +10648,11 @@ var DELogicParam = class {
     } else {
       throw new ModelError12(m, "\u672A\u652F\u6301\u7684\u903B\u8F91\u53C2\u6570\u7C7B\u578B\u91CD\u65B0\u5EFA\u7ACB\u53D8\u91CF");
     }
+    ibiz.log.debug(
+      "\u91CD\u65B0\u5EFA\u7ACB\u5B9E\u4F53\u903B\u8F91\u53C2\u6570\uFF0C\u6807\u8BC6\uFF1A".concat(tag),
+      "-\u503C\uFF1A",
+      ctx.params[tag]
+    );
   }
 };
 
@@ -10748,8 +10840,15 @@ async function execDELogic(deDELogic, context, data = {}, params = {}) {
   if (!deLogicMap.has(deDELogic)) {
     deLogicMap.set(deDELogic, new DELogic(deDELogic));
   }
+  ibiz.log.debug(
+    "\u5F00\u59CB\u6267\u884C\u5B9E\u4F53\u903B\u8F91\uFF0C\u903B\u8F91\u6807\u8BC6\uFF1A".concat(deDELogic.id, "-\u903B\u8F91\u540D\u79F0\uFF1A").concat(deDELogic.name)
+  );
   const deLogic = deLogicMap.get(deDELogic);
-  return deLogic.exec(context, data, params);
+  const result = await deLogic.exec(context, data, params);
+  ibiz.log.debug(
+    "\u7ED3\u675F\u6267\u884C\u5B9E\u4F53\u903B\u8F91\uFF0C\u903B\u8F91\u6807\u8BC6\uFF1A".concat(deDELogic.id, "-\u903B\u8F91\u540D\u79F0\uFF1A").concat(deDELogic.name)
+  );
+  return result;
 }
 async function execDELogicById(deDELogicId, dataEntityId, context, data, params) {
   const deLogic = await findDeLogic(
@@ -10870,7 +10969,7 @@ var DEActionMethod = class extends Method {
           let path2 = this.calcPath(context);
           if (this.method.needResourceKey) {
             let srfkey = context[this.entity.codeName.toLowerCase()];
-            if (isNil11(srfkey)) {
+            if (isNil12(srfkey)) {
               srfkey = isArray6(data) ? null : data == null ? void 0 : data[this.entity.keyAppDEFieldId];
             }
             path2 = "".concat(path2, "/").concat(srfkey);
@@ -11295,7 +11394,7 @@ import {
   RuntimeModelError as RuntimeModelError23
 } from "@ibiz-template/core";
 import { isArray as isArray7 } from "lodash-es";
-import { clone as clone15, isEmpty as isEmpty7, isNil as isNil12 } from "ramda";
+import { clone as clone15, isEmpty as isEmpty8, isNil as isNil13 } from "ramda";
 import { ascSort as ascSort2, descSort } from "qx-util";
 var FetchMethod = class extends Method {
   async exec(context, params, params2, header) {
@@ -11372,7 +11471,7 @@ var FetchMethod = class extends Method {
         }
       }
     }
-    if (!isNil12(filter.sortField) && !isEmpty7(filter.sortField)) {
+    if (!isNil13(filter.sortField) && !isEmpty8(filter.sortField)) {
       if (filter.sortMode === "DESC") {
         list = descSort(list, filter.sortField);
       } else {
@@ -11439,7 +11538,7 @@ function presetDEMethodProvider() {
 }
 
 // src/service/service/internal-message/internal-message.service.ts
-import { isNil as isNil13 } from "ramda";
+import { isNil as isNil14 } from "ramda";
 var InternalMessageService = class {
   constructor() {
     /**
@@ -11478,7 +11577,7 @@ var InternalMessageService = class {
         res.total = Number(res.headers["x-total"]);
       }
     }
-    if (isNil13(res.data)) {
+    if (isNil14(res.data)) {
       res.data = [];
     }
     return res;
@@ -11504,6 +11603,16 @@ var InternalMessageService = class {
   async markRead(messageId) {
     await ibiz.net.post("".concat(this.baseUrl, "/").concat(messageId, "/mark_read"), {});
   }
+  /**
+   * 批量设置已读
+   * @author lxm
+   * @date 2024-02-04 03:59:52
+   * @param {string} messageId
+   * @return {*}  {Promise<void>}
+   */
+  async batchMarkRead() {
+    await ibiz.net.post("".concat(this.baseUrl, "/mark_all_read"), {});
+  }
   /**
    * 获取未读数据的总条数
    * @author lxm
@@ -11684,7 +11793,7 @@ var TreeCodeListNodeData = class extends TreeNodeData {
 
 // src/service/vo/tree-node-data/tree-data-set-node-data.ts
 import { updateKeyDefine } from "@ibiz-template/core";
-import { clone as clone16, isNil as isNil14 } from "ramda";
+import { clone as clone16, isNil as isNil15 } from "ramda";
 var CloneExcludeKeys = [
   "_id",
   "srfnodeid",
@@ -11808,7 +11917,7 @@ var TreeDataSetNodeData = class _TreeDataSetNodeData extends TreeNodeData {
       });
       Object.keys(this).forEach((key) => {
         const deKey = getDeKey(key);
-        if (isNil14(deKey) && !CloneExcludeKeys.includes(key)) {
+        if (isNil15(deKey) && !CloneExcludeKeys.includes(key)) {
           cloneNodeData[key] = this[key];
         }
       });
@@ -11817,7 +11926,7 @@ var TreeDataSetNodeData = class _TreeDataSetNodeData extends TreeNodeData {
     return new Proxy(this, {
       set(target, p, value) {
         const deKey = getDeKey(p);
-        if (!isNil14(deKey)) {
+        if (!isNil15(deKey)) {
           target._deData[deKey] = value;
         } else {
           target[p] = value;
@@ -11826,8 +11935,8 @@ var TreeDataSetNodeData = class _TreeDataSetNodeData extends TreeNodeData {
       },
       get(target, p, _receiver) {
         const deKey = getDeKey(p);
-        if (!isNil14(deKey)) {
-          return isNil14(target._deData[deKey]) ? getKeyDefault(p) : target._deData[deKey];
+        if (!isNil15(deKey)) {
+          return isNil15(target._deData[deKey]) ? getKeyDefault(p) : target._deData[deKey];
         }
         return target[p];
       },
@@ -11931,7 +12040,7 @@ var TreeStaticNodeData = class extends TreeNodeData {
 
 // src/service/vo/ui-map-field.ts
 import { DataTypes as DataTypes2 } from "@ibiz-template/core";
-import { isNil as isNil15 } from "ramda";
+import { isNil as isNil16 } from "ramda";
 var UIMapField = class {
   constructor(uiKey, dataKey, opts = {}) {
     /**
@@ -11952,10 +12061,10 @@ var UIMapField = class {
     this.isRequestNeed = true;
     this.uiKey = uiKey;
     this.dataKey = dataKey;
-    if (!isNil15(opts.isOriginField)) {
+    if (!isNil16(opts.isOriginField)) {
       this.isOriginField = opts.isOriginField;
     }
-    if (!isNil15(opts.dataType)) {
+    if (!isNil16(opts.dataType)) {
       this.dataType = opts.dataType;
     }
   }
@@ -11970,7 +12079,7 @@ var UIMapField = class {
       return value;
     }
     if (DataTypes2.isNumber(this.dataType)) {
-      const numVal = !isNil15(value) && value !== "" ? Number(value) : value;
+      const numVal = !isNil16(value) && value !== "" ? Number(value) : value;
       if (Number.isNaN(numVal)) {
         ibiz.log.debug("".concat(value, "\u4E0D\u80FD\u8F6C\u6362\u6210\u6570\u5B57"));
         return value;
@@ -12965,10 +13074,10 @@ var Application = class {
      */
     this.deName2DeCodeName = /* @__PURE__ */ new Map();
     this.net = new Net({
-      baseURL: "".concat(ibiz.env.baseUrl, "/").concat(model.appId)
+      baseURL: "".concat(ibiz.env.baseUrl, "/").concat(this.appId)
     });
     this.configCache = new ConfigService(
-      model.appId,
+      this.appId,
       "PSSysApp",
       model.codeName
     );
@@ -12985,7 +13094,7 @@ var Application = class {
    * @type {string}
    */
   get appId() {
-    return this.model.appId;
+    return this.model.appId || ibiz.env.appId;
   }
   /**
    * 初始化应用
@@ -13043,7 +13152,7 @@ var Application = class {
     if (appDeId) {
       const appDataEntity = await ibiz.hub.getAppDataEntity(
         appDeId,
-        this.model.appId
+        this.appId
       );
       const find = appDataEntity.appDEUIActions.find((action) => {
         return action.id === actionId;
@@ -13070,7 +13179,7 @@ var Application = class {
     if (!result && appDataEntityId) {
       const appDataEntity = await ibiz.hub.getAppDataEntity(
         appDataEntityId,
-        this.model.appId
+        this.appId
       );
       result = (_b = appDataEntity.deopprivs) == null ? void 0 : _b.find((item) => item.name === id);
     }
@@ -13087,7 +13196,7 @@ var Application = class {
   async getDEUILogic(deUILogicId, appDataEntityId) {
     const appDataEntity = await ibiz.hub.getAppDataEntity(
       appDataEntityId,
-      this.model.appId
+      this.appId
     );
     return appDataEntity.appDEUILogics.find((logic) => {
       return logic.id === deUILogicId;
@@ -13107,7 +13216,7 @@ var Application = class {
       this.mqtt = new MqttService(
         ibiz.appData.mqtttopic,
         getToken(),
-        this.model.appId
+        this.appId
       );
       this.mqtt.evt.on("message", (message) => {
         ibiz.mc.command.next(message);
@@ -13281,7 +13390,7 @@ var TreeGridExNotifyState = /* @__PURE__ */ ((TreeGridExNotifyState2) => {
 // src/controller/common/view/view.controller.ts
 import { notNilEmpty as notNilEmpty6 } from "qx-util";
 import { IBizContext as IBizContext2, RuntimeError as RuntimeError34 } from "@ibiz-template/core";
-import { isEmpty as isEmpty8, isNil as isNil21, isNotNil as isNotNil2 } from "ramda";
+import { isEmpty as isEmpty9, isNil as isNil22, isNotNil as isNotNil2 } from "ramda";
 
 // src/controller/utils/loading/loading.state.ts
 import { NOOP } from "@ibiz-template/core";
@@ -13923,9 +14032,9 @@ function hasSubRoute(routeDepth) {
 }
 
 // src/controller/utils/util/util.ts
-import { isNil as isNil16 } from "ramda";
+import { isNil as isNil17 } from "ramda";
 function isValueChange(value, value2) {
-  if ((isNil16(value) || value === "") && (isNil16(value2) || value2 === "")) {
+  if ((isNil17(value) || value === "") && (isNil17(value2) || value2 === "")) {
     return false;
   }
   return value !== value2;
@@ -13941,7 +14050,7 @@ function getOriginData(data) {
 // src/controller/utils/value-rule/value-rule.ts
 import { RuntimeError as RuntimeError29 } from "@ibiz-template/core";
 import { isNilOrEmpty as isNilOrEmpty6, isNumber } from "qx-util";
-import { isNil as isNil17 } from "ramda";
+import { isNil as isNil18 } from "ramda";
 function generateRules(itemVRs, name, valueItemName) {
   const rules = [];
   itemVRs.forEach((item) => {
@@ -14006,7 +14115,7 @@ function generateEditorRules(editor) {
   if (maxLength) {
     rules.push({
       validator: (rule, value, callback) => {
-        if (!isNil17(value) && value.length > maxLength) {
+        if (!isNil18(value) && value.length > maxLength) {
           callback(
             new Error(
               "\u5185\u5BB9\u957F\u5EA6\u5FC5\u987B\u5C0F\u4E8E\u7B49\u4E8E".concat(maxLength, ",\u5F53\u524D\u957F\u5EA6\u4E3A").concat(value.length)
@@ -14021,7 +14130,7 @@ function generateEditorRules(editor) {
   if (minLength) {
     rules.push({
       validator: (rule, value, callback) => {
-        if (!isNil17(value) && value.length < minLength) {
+        if (!isNil18(value) && value.length < minLength) {
           callback(
             new Error(
               "\u5185\u5BB9\u957F\u5EA6\u5FC5\u987B\u5927\u4E8E\u7B49\u4E8E".concat(minLength, ",\u5F53\u524D\u957F\u5EA6\u4E3A").concat(value.length)
@@ -14033,10 +14142,10 @@ function generateEditorRules(editor) {
       }
     });
   }
-  if (!isNil17(maxValue)) {
+  if (!isNil18(maxValue)) {
     rules.push({
       validator: (rule, value, callback) => {
-        if (!isNil17(value) && isNumber(value) && value > maxValue) {
+        if (!isNil18(value) && isNumber(value) && value > maxValue) {
           callback(new Error("\u503C\u5FC5\u987B\u5C0F\u4E8E\u7B49\u4E8E".concat(maxValue)));
         } else {
           return true;
@@ -14044,10 +14153,10 @@ function generateEditorRules(editor) {
       }
     });
   }
-  if (!isNil17(minValue)) {
+  if (!isNil18(minValue)) {
     rules.push({
       validator: (rule, value, callback) => {
-        if (!isNil17(value) && isNumber(value) && value < minValue) {
+        if (!isNil18(value) && isNumber(value) && value < minValue) {
           callback(new Error("\u503C\u5FC5\u987B\u5927\u4E8E\u7B49\u4E8E".concat(minValue)));
         } else {
           return true;
@@ -14060,7 +14169,7 @@ function generateEditorRules(editor) {
 
 // src/controller/utils/value-ex/value-ex.ts
 import { RuntimeError as RuntimeError30 } from "@ibiz-template/core";
-import { isNil as isNil18, mergeLeft } from "ramda";
+import { isNil as isNil19, mergeLeft } from "ramda";
 var ValueExUtil = class {
   /**
    * 合并默认值
@@ -14085,7 +14194,7 @@ var ValueExUtil = class {
    * @return {*}  {string}
    */
   static toText(options, value) {
-    if (isNil18(value) || value === "") {
+    if (isNil19(value) || value === "") {
       return "";
     }
     const { valueType, objectNameField, textSeparator } = this.mergeDefault(options);
@@ -14110,12 +14219,12 @@ var ValueExUtil = class {
 import { RuntimeError as RuntimeError31, ModelError as ModelError17 } from "@ibiz-template/core";
 import dayjs from "dayjs";
 import { createUUID as createUUID8 } from "qx-util";
-import { isNil as isNil19, isNotNil } from "ramda";
+import { isNil as isNil20, isNotNil } from "ramda";
 function getDefaultValue(opts, origins) {
   var _a;
   const { name, valueType, defaultValue, valueFormat } = opts;
   const { data, context, params } = origins;
-  if (isNil19(valueType) && isNil19(defaultValue)) {
+  if (isNil20(valueType) && isNil20(defaultValue)) {
     return;
   }
   if (valueType === "RESET") {
@@ -14298,6 +14407,7 @@ var BaseController = class {
      */
     this.childNames = [];
     this.name = model.name || model.id;
+    this.preprocessModel(model);
     this.initState();
     this.convertMultipleLanguages();
   }
@@ -14311,6 +14421,16 @@ var BaseController = class {
   get _evt() {
     return this.evt;
   }
+  /**
+   * 根据需求对model进行预处理
+   *
+   * @author chitanda
+   * @date 2024-02-27 11:02:00
+   * @protected
+   * @param {T} _model
+   */
+  preprocessModel(_model) {
+  }
   /**
    * 初始化state的属性放，一般情况下只需要把对应的默认值直接赋值给state
    * 如果需要构造特殊class类型的state,可以重写该方法时，
@@ -14469,7 +14589,7 @@ var BaseController = class {
 
 // src/controller/utils/view-msg/view-msg-controller.ts
 import { RuntimeError as RuntimeError33, RuntimeModelError as RuntimeModelError24 } from "@ibiz-template/core";
-import { isNil as isNil20, mergeRight as mergeRight2 } from "ramda";
+import { isNil as isNil21, mergeRight as mergeRight2 } from "ramda";
 var ViewMsgController = class _ViewMsgController {
   constructor(msgGroupId) {
     this.msgGroupId = msgGroupId;
@@ -14654,19 +14774,19 @@ var ViewMsgController = class _ViewMsgController {
     const removeModeField = this.getDeFieldName(entity, removeFlagAppDEFieldId);
     const deViewMessages = dataSet.map((item) => {
       const message = {};
-      if (positionField && !isNil20(item[positionField])) {
+      if (positionField && !isNil21(item[positionField])) {
         message.position = item[positionField];
       }
-      if (titleField && !isNil20(item[titleField])) {
+      if (titleField && !isNil21(item[titleField])) {
         message.title = item[titleField];
       }
-      if (messageField && !isNil20(item[messageField])) {
+      if (messageField && !isNil21(item[messageField])) {
         message.message = item[messageField];
       }
-      if (typeField && !isNil20(item[typeField])) {
+      if (typeField && !isNil21(item[typeField])) {
         message.messageType = item[typeField];
       }
-      if (removeModeField && !isNil20(item[removeModeField])) {
+      if (removeModeField && !isNil21(item[removeModeField])) {
         message.removeMode = item[removeModeField];
       }
       return mergeRight2(basicMsg, message);
@@ -14825,6 +14945,7 @@ var ViewController = class extends BaseController {
     this.state.caption = this.model.caption;
     this.state.srfactiveviewdata = null;
     this.state.viewMessages = {};
+    this.state.isClosing = false;
   }
   async onCreated() {
     await super.onCreated();
@@ -14904,8 +15025,8 @@ var ViewController = class extends BaseController {
    * @protected
    */
   handleContextParams() {
-    this.context.srfappid = this.model.appId;
-    if (isNil21(this.context.srfsessionid) || isEmpty8(this.context.srfsessionid)) {
+    this.context.srfappid = this.model.appId || ibiz.env.appId;
+    if (isNil22(this.context.srfsessionid) || isEmpty9(this.context.srfsessionid)) {
       const domain = ibiz.uiDomainManager.create(this.id);
       this.context.srfsessionid = domain.id;
     }
@@ -15305,7 +15426,7 @@ var CodeListEditorController = class extends EditorController {
 
 // src/controller/common/control/control.controller.ts
 import { IBizContext as IBizContext3, IBizParams, NoticeError as NoticeError2 } from "@ibiz-template/core";
-import { clone as clone18, isNil as isNil22 } from "ramda";
+import { clone as clone18, isNil as isNil23 } from "ramda";
 import { notNilEmpty as notNilEmpty7 } from "qx-util";
 var ControlController = class extends BaseController {
   /**
@@ -15593,7 +15714,7 @@ var ControlController = class extends BaseController {
     let message;
     let duration;
     if (msgItem && msgItem.content) {
-      duration = isNil22(msgItem.timeout) ? void 0 : msgItem.timeout / 1e3;
+      duration = isNil23(msgItem.timeout) ? void 0 : msgItem.timeout / 1e3;
       const scriptParams = { ...this.getEventArgs() };
       if (opts == null ? void 0 : opts.data) {
         scriptParams.data = opts.data;
@@ -15645,6 +15766,13 @@ var MDControlController = class extends ControlController {
      * @protected
      */
     this.commandDataChange = false;
+    /**
+     * 是否设置过排序条件，比如searchBars默认点击分组时设置了
+     * @return {*}
+     * @author: zhujiamin
+     * @Date: 2024-02-22 16:10:23
+     */
+    this.isSetSort = false;
     /**
      * 实体属性映射，key是id，value是name
      * @author lxm
@@ -15716,7 +15844,9 @@ var MDControlController = class extends ControlController {
       fn(msg);
     }, 300);
     ibiz.mc.command.change.on(this.onDataChange);
-    this.setSort();
+    if (!this.isSetSort) {
+      this.setSort();
+    }
   }
   async onMounted() {
     await super.onMounted();
@@ -15930,9 +16060,9 @@ var MDControlController = class extends ControlController {
     await this.startLoading();
     let needRefresh = false;
     try {
-      const deName = calcDeCodeNameById(this.model.appDataEntityId);
       await handleAllSettled(
         data.map(async (item) => {
+          const deName = this.getRemoveDeName(item);
           if (item.srfuf !== 0 /* CREATE */) {
             const tempContext = context.clone();
             tempContext[deName] = item.srfkey;
@@ -15964,6 +16094,16 @@ var MDControlController = class extends ControlController {
     this.state.selectedData = [];
     await this._evt.emit("onRemoveSuccess", void 0);
   }
+  /**
+   * 获取删除实体codeName
+   * @param {IData} _item
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2024-02-22 16:47:44
+   */
+  getRemoveDeName(_item) {
+    return calcDeCodeNameById(this.model.appDataEntityId);
+  }
   /**
    * 后台删除结束后界面删除逻辑
    *
@@ -16181,7 +16321,7 @@ var AppMenuController = class extends ControlController {
       throw new RuntimeModelError26(menuItem, "\u6CA1\u6709\u914D\u7F6E\u5E94\u7528\u529F\u80FD");
     }
     const tempContext = this.context.clone();
-    tempContext.srfappid = menuItem.appId;
+    tempContext.srfappid = menuItem.appId || ibiz.env.appId;
     if (this.routeDepth && useDepth) {
       Object.assign(tempContext, {
         toRouteDepth: this.routeDepth + 1
@@ -16626,7 +16766,7 @@ import isSameOrBefore from "dayjs/plugin/isSameOrBefore";
 import quarterOfYear from "dayjs/plugin/quarterOfYear";
 import weekOfYear from "dayjs/plugin/weekOfYear";
 import isoWeek from "dayjs/plugin/isoWeek";
-import { clone as clone20, isNil as isNil23, mergeDeepRight } from "ramda";
+import { clone as clone20, isNil as isNil24, mergeDeepRight } from "ramda";
 dayjs4.extend(minMax2);
 dayjs4.extend(isSameOrBefore);
 dayjs4.extend(quarterOfYear);
@@ -16722,10 +16862,10 @@ var BaseSeriesGenerator = class {
    * @return {*}  {(string | undefined)}
    */
   translateVal(codeListKey, val, isExclude = false) {
-    if (isNil23(val)) {
+    if (isNil24(val)) {
       return void 0;
     }
-    if (isNil23(codeListKey)) {
+    if (isNil24(codeListKey)) {
       return val;
     }
     const codeListItems = this.chartGenerator.codeListMap.get(codeListKey);
@@ -16774,7 +16914,7 @@ var BaseSeriesGenerator = class {
           seriesCodeListId,
           item[this.groupField]
         );
-        if (isNil23(groupVal)) {
+        if (isNil24(groupVal)) {
           return;
         }
         group = groupVal;
@@ -18044,6 +18184,8 @@ var UILogicLinkSingleCond = class extends UILogicLinkCond {
       srcDEUILogicParamId: this.dstParam,
       srcFieldName: this.dstField
     });
+    let result;
+    let compareValue;
     switch (this.type) {
       case "ENTITYFIELD": {
         if (!this.value) {
@@ -18053,7 +18195,9 @@ var UILogicLinkSingleCond = class extends UILogicLinkCond {
           );
         }
         const value = data[this.value] != null ? data[this.value] : context[this.value];
-        return testCond(dstVal, this.op, value);
+        compareValue = value;
+        result = testCond(dstVal, this.op, value);
+        break;
       }
       case "SRCENTITYFIELD": {
         if (!this.value) {
@@ -18066,13 +18210,26 @@ var UILogicLinkSingleCond = class extends UILogicLinkCond {
           srcDEUILogicParamId: this.srcParam,
           srcFieldName: this.value
         });
-        return testCond(dstVal, this.op, srcVal);
+        compareValue = srcVal;
+        result = testCond(dstVal, this.op, srcVal);
+        break;
       }
       case "CURTIME":
         throw new ModelError19(this.model, "\u6682\u672A\u652F\u6301\u6761\u4EF6\u503C\u7C7B\u578B\u4E3A[\u5F53\u524D\u65F6\u95F4]");
       default:
-        return testCond(dstVal, this.op, this.value);
+        compareValue = this.value;
+        result = testCond(dstVal, this.op, this.value);
     }
+    ibiz.log.debug(
+      "\u754C\u9762\u903B\u8F91\u8FDE\u63A5\u6761\u4EF6\u9879\uFF1A".concat(this.model.name, "-\u6761\u4EF6\u503C\u7C7B\u578B\uFF1A").concat(this.type, "-\u6E90\u5C5E\u6027\u540D\u79F0\uFF1A").concat(this.dstField, "-\u6E90\u5BF9\u8C61\u503C\uFF1A"),
+      dstVal,
+      "-\u5BF9\u6BD4\u6761\u4EF6\uFF1A".concat(this.op),
+      "-\u5BF9\u6BD4\u503C\uFF1A",
+      compareValue,
+      "-\u5BF9\u6BD4\u7ED3\u679C\uFF1A",
+      result
+    );
+    return result;
   }
 };
 
@@ -18137,7 +18294,12 @@ var UILogicLinkGroupCond = class _UILogicLinkGroupCond extends UILogicLinkCond {
         break;
       }
     }
-    return this.notMode ? !bol : bol;
+    const result = this.notMode ? !bol : bol;
+    ibiz.log.debug(
+      "\u754C\u9762\u903B\u8F91\u8FDE\u63A5\u6761\u4EF6\u7EC4\u540D\u79F0\uFF1A".concat(this.model.name, "-\u6761\u4EF6\u7EC4\u6807\u8BC6\uFF1A").concat(this.model.id, "-\u8FD0\u884C\u7ED3\u679C\uFF1A"),
+      result
+    );
+    return result;
   }
 };
 
@@ -18266,6 +18428,10 @@ var DEActionNode2 = class extends UILogicNode {
     if (res.ok) {
       ctx.params[retDEUILogicParamId] = res.data;
     }
+    ibiz.log.debug(
+      "\u754C\u9762\u903B\u8F91\u8282\u70B9\uFF08\u5B9E\u4F53\u884C\u4E3A\uFF09\uFF1A".concat(this.model.id, "-\u754C\u9762\u884C\u4E3A\u6240\u5C5E\u5B9E\u4F53\uFF1A").concat(dstAppDataEntityId, "-\u5B9E\u4F53\u884C\u4E3A\u6807\u8BC6\uFF1A").concat(dstAppDEActionId, "-\u53C2\u6570\u540D\u79F0\uFF1A").concat(retDEUILogicParamId, "-\u503C\uFF1A"),
+      ctx.params[retDEUILogicParamId]
+    );
   }
 };
 
@@ -18273,7 +18439,7 @@ var DEActionNode2 = class extends UILogicNode {
 import { RuntimeModelError as RuntimeModelError35 } from "@ibiz-template/core";
 var DEUIActionNode = class extends UILogicNode {
   async exec(ctx) {
-    const { dstAppDEUIActionId, dstDEUILogicParamId } = this.model;
+    const { dstAppDEUIActionId, dstDEUILogicParamId, dstAppDataEntityId } = this.model;
     const { data, parameters } = ctx;
     if (!dstAppDEUIActionId) {
       throw new RuntimeModelError35(this.model, "\u672A\u914D\u7F6E\u754C\u9762\u884C\u4E3A");
@@ -18287,6 +18453,9 @@ var DEUIActionNode = class extends UILogicNode {
         actionData = [param];
       }
     }
+    ibiz.log.debug(
+      "\u754C\u9762\u903B\u8F91\u8282\u70B9\uFF08\u5B9E\u4F53\u754C\u9762\u884C\u4E3A\uFF09\uFF1A".concat(this.model.id, "-\u754C\u9762\u884C\u4E3A\u6807\u8BC6\uFF1A").concat(dstAppDEUIActionId, "-\u754C\u9762\u884C\u4E3A\u6240\u5C5E\u5B9E\u4F53\uFF1A").concat(dstAppDataEntityId, "-\u76EE\u6807\u903B\u8F91\u53C2\u6570\u5BF9\u8C61\uFF1A").concat(dstDEUILogicParamId)
+    );
     await UIActionUtil.execAndResolved(
       dstAppDEUIActionId,
       {
@@ -18303,6 +18472,7 @@ var DEUIActionNode = class extends UILogicNode {
 // src/ui-logic/ui-logic-node/start-node/start-node.ts
 var StartNode2 = class extends UILogicNode {
   async exec(_ctx) {
+    ibiz.log.debug("\u754C\u9762\u903B\u8F91\u8282\u70B9\uFF08\u542F\u52A8\u8282\u70B9\uFF09\uFF1A".concat(this.model.id));
   }
 };
 
@@ -18336,6 +18506,10 @@ var EndNode2 = class extends UILogicNode {
           "\u6682\u672A\u652F\u6301\u7684\u7ED3\u675F\u8282\u70B9\u8FD4\u56DE\u503C\u7C7B\u578B: ".concat(returnType)
         );
     }
+    ibiz.log.debug(
+      "\u754C\u9762\u903B\u8F91\u8282\u70B9\uFF08\u7ED3\u675F\u8282\u70B9\uFF09\uFF1A".concat(this.model.id, "-\u8FD4\u56DE\u503C\u7C7B\u578B\uFF1A").concat(returnType, "-\u8FD4\u56DE\u503C\uFF1A"),
+      ctx.result
+    );
   }
 };
 
@@ -18349,6 +18523,10 @@ var PrepareJSParamNode = class extends UILogicNode {
       return;
     }
     for (const nodeParam of nodeParams) {
+      let originValue;
+      if (nodeParam.dstDEUILogicParamId) {
+        originValue = clone22(ctx.params[nodeParam.dstDEUILogicParamId]);
+      }
       switch (nodeParam.paramAction) {
         case "SETPARAMVALUE":
           await this.setParamValue(nodeParam, ctx);
@@ -18377,6 +18555,12 @@ var PrepareJSParamNode = class extends UILogicNode {
             "\u6682\u672A\u652F\u6301\u903B\u8F91\u5904\u7406\u53C2\u6570\u64CD\u4F5C".concat(nodeParam.paramAction)
           );
       }
+      ibiz.log.debug(
+        "\u754C\u9762\u903B\u8F91\u8282\u70B9\uFF08\u51C6\u5907\u53C2\u6570\uFF09\uFF1A".concat(this.model.id, "-\u53C2\u6570\u5904\u7406\u64CD\u4F5C\uFF1A").concat(nodeParam.paramAction, "-\u76EE\u6807\u903B\u8F91\u53C2\u6570\uFF1A").concat(nodeParam.dstDEUILogicParamId, "-\u6E90\u53C2\u6570\uFF08\u503C\uFF09\uFF1A"),
+        originValue,
+        "-\u76EE\u6807\u53C2\u6570\uFF08\u503C\uFF09\uFF1A",
+        ctx.params[nodeParam.dstDEUILogicParamId]
+      );
     }
   }
   /**
@@ -18533,6 +18717,10 @@ var ViewCtrlInvokeNode = class extends UILogicNode {
     if (!invokeCtrl[invokeMethod] || !isFunction(invokeCtrl[invokeMethod])) {
       throw new RuntimeError42("\u6CA1\u6709\u627E\u5230\u8C03\u7528\u65B9\u6CD5".concat(invokeMethod));
     }
+    ibiz.log.debug(
+      "\u754C\u9762\u903B\u8F91\u8282\u70B9\uFF08\u89C6\u56FE\u90E8\u4EF6\u8C03\u7528\uFF09\uFF1A".concat(this.model.id, "-\u8C03\u7528\u89C6\u56FE\u90E8\u4EF6\u540D\u79F0\uFF1A").concat(invokeCtrlId, "-\u8C03\u7528\u65B9\u6CD5\u540D\u79F0\uFF1A").concat(invokeMethod, "-\u89E6\u53D1\u53C2\u6570\uFF1A"),
+      invokeParam
+    );
     await invokeCtrl[invokeMethod](invokeParam);
   }
 };
@@ -18550,6 +18738,10 @@ var BindParamNode2 = class extends UILogicNode {
     }
     const srcVal = handleSrcVal2(ctx, this.model);
     ctx.params[dstDEUILogicParamId] = srcVal;
+    ibiz.log.debug(
+      "\u754C\u9762\u903B\u8F91\u8282\u70B9\uFF08\u7ED1\u5B9A\u53C2\u6570\uFF09\uFF1A".concat(this.model.id, "-\u53C2\u6570\u540D\u79F0\uFF1A").concat(dstDEUILogicParamId, "-\u503C\uFF1A"),
+      srcVal
+    );
   }
 };
 
@@ -18615,6 +18807,9 @@ var MsgBoxNode = class extends UILogicNode {
       default:
         throw new ModelError23(this.model, "".concat(buttonsType, "\u6682\u672A\u652F\u6301"));
     }
+    ibiz.log.debug(
+      "\u754C\u9762\u903B\u8F91\u8282\u70B9\uFF08\u6D88\u606F\u5F39\u7A97\uFF09\uFF1A".concat(this.model.id, "-\u6D88\u606F\u7C7B\u578B\uFF1A").concat(type, "-\u6D88\u606F\uFF1A").concat(message)
+    );
     const result = await ibiz.modal.confirm(modalParams);
     ctx.setLastReturn(resultTags[result ? 0 : 1]);
   }
@@ -18623,6 +18818,9 @@ var MsgBoxNode = class extends UILogicNode {
 // src/ui-logic/ui-logic-node/pf-plugin-node/pf-plugin-node.ts
 var PFPluginNode = class extends UILogicNode {
   async exec(ctx) {
+    ibiz.log.debug(
+      "\u754C\u9762\u903B\u8F91\u8282\u70B9\uFF08\u524D\u7AEF\u63D2\u4EF6\uFF09\uFF1A".concat(this.model.id, "-\u63D2\u4EF6\u6807\u8BC6\uFF1A").concat(this.model.sysPFPluginId)
+    );
     const provider = await getUILogicNodeProvider(this.model);
     if (provider) {
       await provider.exec(this.model, ctx);
@@ -18652,6 +18850,9 @@ var ResetParamNode2 = class extends UILogicNode {
       throw new RuntimeModelError40(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E");
     }
     ctx.resetParam(dstDEUILogicParamId);
+    ibiz.log.debug(
+      "\u754C\u9762\u903B\u8F91\u8282\u70B9\uFF08\u91CD\u7F6E\u53C2\u6570\uFF09\uFF1A".concat(this.model.id, "-\u91CD\u7F6E\u53C2\u6570\uFF1A").concat(dstDEUILogicParamId)
+    );
   }
 };
 
@@ -18669,6 +18870,10 @@ var CopyParamNode2 = class extends UILogicNode {
     }
     const srcVal = handleSrcVal2(ctx, this.model);
     ctx.params[dstDEUILogicParamId] = clone23(srcVal);
+    ibiz.log.debug(
+      "\u754C\u9762\u903B\u8F91\u8282\u70B9\uFF08\u62F7\u8D1D\u53C2\u6570\uFF09\uFF1A".concat(this.model.id, "-\u53C2\u6570\u540D\u79F0\uFF1A").concat(dstDEUILogicParamId, "-\u503C\uFF1A"),
+      srcVal
+    );
   }
 };
 
@@ -18698,6 +18903,12 @@ var AppendParamNode2 = class extends UILogicNode {
       0,
       ...srcVal.slice(_srcIndex, _srcSize)
     );
+    ibiz.log.debug(
+      "\u754C\u9762\u903B\u8F91\u8282\u70B9\uFF08\u9644\u52A0\u5230\u6570\u7EC4\uFF09\uFF1A".concat(this.model.id, "-\u9644\u52A0\u53C2\u6570\uFF1A"),
+      ctx.params,
+      "-\u9644\u52A0\u503C\uFF1A",
+      srcVal.slice(_srcIndex, _srcSize)
+    );
   }
 };
 
@@ -18714,6 +18925,10 @@ var SortParamNode2 = class extends UILogicNode {
     arr.sort((a, b) => {
       return dstSortDir === "ASC" ? a[key] - b[key] : b[key] - a[key];
     });
+    ibiz.log.debug(
+      "\u754C\u9762\u903B\u8F91\u8282\u70B9\uFF08\u6392\u5E8F\u6570\u7EC4\u53C2\u6570\uFF09\uFF1A".concat(this.model.id, "-\u6392\u5E8F\u5C5E\u6027\uFF1A").concat(dstFieldName, "-\u6392\u5E8F\u6A21\u5F0F\uFF1A").concat(dstSortDir, "-\u53C2\u6570\u540D\u79F0\uFF1A").concat(dstDEUILogicParamId, "-\u6392\u5E8F\u540E\u6570\u7EC4\uFF1A"),
+      arr
+    );
   }
 };
 
@@ -18726,6 +18941,9 @@ var RenewParamNode2 = class extends UILogicNode {
       throw new RuntimeModelError44(this.model, "\u7F3A\u5C11\u76EE\u6807\u53C2\u6570\u5BF9\u8C61\u914D\u7F6E");
     }
     ctx.renewParam(dstDEUILogicParamId);
+    ibiz.log.debug(
+      "\u754C\u9762\u903B\u8F91\u8282\u70B9\uFF08\u91CD\u65B0\u5EFA\u7ACB\u53C2\u6570\uFF09\uFF1A".concat(this.model.id, "-\u91CD\u5EFA\u53C2\u6570\uFF1A").concat(dstDEUILogicParamId)
+    );
   }
 };
 
@@ -18753,6 +18971,10 @@ var DataSetNode2 = class extends UILogicNode {
     if (res.ok) {
       ctx.params[retDEUILogicParamId] = res.data;
     }
+    ibiz.log.debug(
+      "\u754C\u9762\u903B\u8F91\u8282\u70B9\uFF08\u6570\u636E\u96C6\u5408\uFF09\uFF1A".concat(this.model.id, "-\u6570\u636E\u96C6\u5B9E\u4F53\u6807\u8BC6\uFF1A").concat(dstAppDataEntityId, "-\u6570\u636E\u96C6\u6807\u8BC6\uFF1A").concat(dstAppDEDataSetId, "-\u53C2\u6570\u540D\u79F0\uFF1A").concat(retDEUILogicParamId, "-\u503C\uFF1A"),
+      ctx.params[retDEUILogicParamId]
+    );
   }
 };
 
@@ -18761,6 +18983,9 @@ import { RuntimeError as RuntimeError43 } from "@ibiz-template/core";
 var ThrowExceptionNode2 = class extends UILogicNode {
   async exec(_ctx) {
     const { errorInfo } = this.model;
+    ibiz.log.debug(
+      "\u754C\u9762\u903B\u8F91\u8282\u70B9\uFF08\u629B\u51FA\u5F02\u5E38\uFF09\uFF1A".concat(this.model.id, "-\u9519\u8BEF\u4FE1\u606F\uFF1A").concat(errorInfo)
+    );
     throw new RuntimeError43(errorInfo);
   }
 };
@@ -18788,6 +19013,10 @@ var ViewCtrlFireEventNode = class extends UILogicNode {
     if (!eventParam) {
       throw new RuntimeError44("\u6CA1\u6709\u627E\u5230\u4E8B\u4EF6\u53C2\u6570\u5BF9\u8C61".concat(eventParamId));
     }
+    ibiz.log.debug(
+      "\u754C\u9762\u903B\u8F91\u8282\u70B9\uFF08\u89C6\u56FE\u90E8\u4EF6\u4E8B\u4EF6\u89E6\u53D1\u903B\u8F91\uFF09\uFF1A".concat(this.model.id, "-\u8C03\u7528\u89C6\u56FE\u90E8\u4EF6\u540D\u79F0\uFF1A").concat(fireCtrlId, "-\u89E6\u53D1\u4E8B\u4EF6\u540D\u79F0\uFF1A").concat(eventName, "-\u89E6\u53D1\u53C2\u6570\uFF1A"),
+      eventParam
+    );
     await invokeCtrl.evt.emit(eventName, eventParam);
   }
 };
@@ -18825,12 +19054,20 @@ var ExecuteDELogicNode = class extends UILogicNode {
     if (retDEUILogicParamId) {
       ctx.params[retDEUILogicParamId] = result;
     }
+    ibiz.log.debug(
+      "\u754C\u9762\u903B\u8F91\u8282\u70B9\uFF08\u6267\u884C\u5B9E\u4F53\u903B\u8F91\uFF09\uFF1A".concat(this.model.id, "-\u5B9E\u4F53\u903B\u8F91\u6807\u8BC6\uFF1A").concat(dstAppDELogicId, "-\u5B9E\u4F53\u903B\u8F91\u6240\u5C5E\u5B9E\u4F53\uFF1A").concat(dstAppDataEntityId, "-\u53C2\u6570\u540D\u79F0\uFF1A").concat(retDEUILogicParamId, "-\u503C\uFF1A"),
+      result
+    );
   }
 };
 
 // src/ui-logic/ui-logic-node/raw-js-code-node/raw-js-code-node.ts
 var RawJSCodeNode = class extends UILogicNode {
   async exec(ctx) {
+    ibiz.log.debug(
+      "\u754C\u9762\u903B\u8F91\u8282\u70B9\uFF08\u76F4\u63A5\u4EE3\u7801\uFF09\uFF1A".concat(this.model.id, "-\u76F4\u63A5\u4EE3\u7801\uFF1A"),
+      this.model.code
+    );
     ScriptFactory.execScriptFn(
       {
         view: ctx.view,
@@ -18920,6 +19157,7 @@ var UILogicParam = class {
     } else if (m.viewSessionParam) {
       throw new ModelError24(m, "\u672A\u652F\u6301\u7684\u903B\u8F91\u53C2\u6570\u7C7B\u578B: \u5F53\u524D\u89C6\u56FE\u4F1A\u8BDD");
     }
+    ibiz.log.debug("\u8BA1\u7B97\u754C\u9762\u903B\u8F91\u53C2\u6570\uFF0C\u6807\u8BC6\uFF1A".concat(tag), "-\u503C\uFF1A", ctx.params[tag]);
   }
   /**
    * 重新建立变量
@@ -18937,6 +19175,11 @@ var UILogicParam = class {
     } else {
       throw new ModelError24(m, "\u672A\u652F\u6301\u7684\u903B\u8F91\u53C2\u6570\u7C7B\u578B\u91CD\u65B0\u5EFA\u7ACB\u53D8\u91CF");
     }
+    ibiz.log.debug(
+      "\u91CD\u65B0\u5EFA\u7ACB\u754C\u9762\u903B\u8F91\u53C2\u6570\uFF0C\u6807\u8BC6\uFF1A".concat(tag),
+      "-\u503C\uFF1A",
+      ctx.params[tag]
+    );
   }
 };
 
@@ -19143,8 +19386,15 @@ async function execUILogic(deUILogicId, appDataEntityId, parameters) {
   if (!uiLogicMap.has(deUILogic)) {
     uiLogicMap.set(deUILogic, new UILogic(deUILogic));
   }
+  ibiz.log.debug(
+    "\u5F00\u59CB\u6267\u884C\u754C\u9762\u903B\u8F91\uFF0C\u5B9E\u4F53\uFF1A".concat(appDataEntityId, "-\u903B\u8F91\u540D\u79F0\uFF1A").concat(deUILogic.name)
+  );
   const uiLogic = uiLogicMap.get(deUILogic);
-  return uiLogic.exec(parameters);
+  const result = await uiLogic.exec(parameters);
+  ibiz.log.debug(
+    "\u7ED3\u675F\u6267\u884C\u754C\u9762\u903B\u8F91\uFF0C\u5B9E\u4F53\uFF1A".concat(appDataEntityId, "-\u903B\u8F91\u540D\u79F0\uFF1A").concat(deUILogic.name)
+  );
+  return result;
 }
 
 // src/ui-action/uiaction-util.ts
@@ -19258,6 +19508,10 @@ var UIActionProviderBase = class {
       refreshMode: action.refreshMode,
       closeView: action.closeEditView
     };
+    const { view } = args;
+    if (action.closeEditView) {
+      view.state.isClosing = true;
+    }
     const { appDEUILogicId, appDataEntityId, uilogicAttachMode } = action;
     if (uilogicAttachMode === "REPLACE") {
       if (!appDEUILogicId) {
@@ -19267,12 +19521,12 @@ var UIActionProviderBase = class {
       return result;
     }
     if (!await this.isConfirm(action, args)) {
-      return this.returnError(result);
+      return this.returnError(result, view);
     }
     const _result = await this.execAction(action, args);
     Object.assign(result, _result);
     if (result.cancel === true) {
-      return this.returnError(result);
+      return this.returnError(result, view);
     }
     if (action.uilogicAttachMode === "AFTER") {
       if (!appDEUILogicId) {
@@ -19296,7 +19550,7 @@ var UIActionProviderBase = class {
       if (nextResult) {
         Object.assign(result, nextResult);
         if (nextResult.cancel === true) {
-          return this.returnError(result);
+          return this.returnError(result, view);
         }
       }
     }
@@ -19328,7 +19582,8 @@ var UIActionProviderBase = class {
    * @returns {*}  {IUIActionResult}
    * @memberof UIActionHandler
    */
-  returnError(result) {
+  returnError(result, view) {
+    view.state.isClosing = false;
     return Object.assign(result, {
       refresh: false,
       closeView: false
@@ -20586,7 +20841,7 @@ var RawItemPortletController = class extends PortletPartController {
 
 // src/controller/control/data-view/data-view.controller.ts
 import { RuntimeModelError as RuntimeModelError52 } from "@ibiz-template/core";
-import { isNil as isNil24 } from "ramda";
+import { isNil as isNil25 } from "ramda";
 
 // src/controller/control/data-view/data-view.service.ts
 var DataViewControlService = class extends MDControlService {
@@ -20874,7 +21129,7 @@ var DataViewControlController = class extends MDControlController {
       const groupMap = /* @__PURE__ */ new Map();
       items.forEach((item) => {
         const groupVal = item[groupAppDEFieldId];
-        if (isNil24(groupVal)) {
+        if (isNil25(groupVal)) {
           return;
         }
         if (!groupMap.has(groupVal)) {
@@ -21866,6 +22121,70 @@ var FormController = class extends ControlController {
     this.state.processing = false;
     this.state.modified = false;
   }
+  /**
+   * 进行模型预处理
+   *
+   * @author chitanda
+   * @date 2024-02-27 09:02:52
+   * @protected
+   */
+  preprocessModel(model) {
+    if (this.context && this.context.srfreadonly === true) {
+      const pages = model.deformPages;
+      if (pages) {
+        pages.forEach((page) => {
+          page.infoGroupMode = true;
+          if (page.deformDetails) {
+            page.deformDetails.forEach((detail) => {
+              this.deepPreprocessModel(detail);
+            });
+          }
+        });
+      }
+    }
+  }
+  /**
+   * 递归将表单模型修改为信息态
+   *
+   * @author chitanda
+   * @date 2024-02-27 11:02:43
+   * @protected
+   * @param {IDEFormGroupBase} model
+   */
+  deepPreprocessModel(model) {
+    if (model.detailType === "GROUPPANEL") {
+      model.infoGroupMode = true;
+    } else if (model.detailType === "FORMITEM") {
+      const { editor } = model;
+      if (editor) {
+        editor.readOnly = true;
+      }
+    }
+    switch (model.detailType) {
+      case "FORMITEM": {
+        const { editor } = model;
+        if (editor) {
+          editor.readOnly = true;
+        }
+        break;
+      }
+      case "MDCTRL": {
+        const detail = model;
+        detail.buildInActions = 0;
+        break;
+      }
+      case "GROUPPANEL":
+        model.infoGroupMode = true;
+        break;
+      default:
+        break;
+    }
+    if (model.deformDetails) {
+      model.deformDetails.forEach((detail) => {
+        this.deepPreprocessModel(detail);
+      });
+    }
+  }
   /**
    * 通知所有表单成员表单操作过程中的数据变更
    *
@@ -24597,7 +24916,9 @@ var EditFormController = class extends FormController {
     }
     this.state.modified = false;
     await this.evt.emit("onSaveSuccess", void 0);
-    this.formStateNotify("SAVE" /* SAVE */);
+    if (!this.view.state.isClosing) {
+      this.formStateNotify("SAVE" /* SAVE */);
+    }
     if (!silent) {
       this.actionNotification("".concat(isCreate ? "CREATE" : "UPDATE", "SUCCESS"), {
         default: "".concat(this.data.srfmajortext || "", "\u4FDD\u5B58\u6210\u529F")
@@ -26279,6 +26600,7 @@ var GridController = class extends MDControlController {
   setGroupParams(data) {
     if (data.sort) {
       this.state.sortQuery = data.sort;
+      this.isSetSort = true;
     } else {
       this.state.sortQuery = "";
     }
@@ -26336,7 +26658,7 @@ var GridController = class extends MDControlController {
 import { DataTypes as DataTypes4, ModelError as ModelError29, plus as plus2 } from "@ibiz-template/core";
 import dayjs5 from "dayjs";
 import { debounce as debounce3 } from "lodash-es";
-import { clone as clone27, isNil as isNil25 } from "ramda";
+import { clone as clone27, isNil as isNil26 } from "ramda";
 var GridFieldColumnController = class extends GridColumnController {
   constructor() {
     super(...arguments);
@@ -26548,11 +26870,11 @@ var GridFieldColumnController = class extends GridColumnController {
    */
   calcFieldAgg(items) {
     const { aggField, aggMode, aggValueFormat, unitName } = this.model;
-    if (isNil25(aggMode) || aggMode === "NONE") {
+    if (isNil26(aggMode) || aggMode === "NONE") {
       return;
     }
     const fieldName = aggField || this.model.id;
-    items = items.filter((item) => !isNil25(item[fieldName]));
+    items = items.filter((item) => !isNil26(item[fieldName]));
     let aggValue;
     if (this.grid.model.aggMode === "PAGE") {
       switch (aggMode) {
@@ -27868,7 +28190,7 @@ var PickupViewPanelController = class extends ControlController {
 
 // src/controller/control/search-bar/search-bar.controller.ts
 import { mergeInLeft as mergeInLeft3, recursiveIterate as recursiveIterate10 } from "@ibiz-template/core";
-import { clone as clone28, isNil as isNil27 } from "ramda";
+import { clone as clone28, isNil as isNil28 } from "ramda";
 import { isString as isString2 } from "lodash-es";
 
 // src/controller/control/search-bar/search-bar-filter.controller.ts
@@ -28310,7 +28632,7 @@ async function calcFilterModelBySchema(json, appDataEntityId, modelAppId) {
 
 // src/controller/control/search-bar/use-searchcond.ts
 import { RuntimeError as RuntimeError58, recursiveIterate as recursiveIterate9 } from "@ibiz-template/core";
-import { isNil as isNil26 } from "ramda";
+import { isNil as isNil27 } from "ramda";
 function getOriginFilterNodes() {
   return [
     {
@@ -28367,7 +28689,7 @@ function calcSearchConds(filterNodes) {
   let hasError = false;
   recursiveIterate9(filterNodes[0], (node) => {
     if (node.leaf) {
-      if (node.field && node.valueOP && !isNil26(node.value)) {
+      if (node.field && node.valueOP && !isNil27(node.value)) {
         hasFilter = true;
       } else {
         hasError = true;
@@ -28666,7 +28988,7 @@ var SearchBarController = class extends ControlController {
       recursiveIterate10(
         searchconds[0],
         (node) => {
-          if (node.condtype === "DEFIELD" && !isNil27(node.value)) {
+          if (node.condtype === "DEFIELD" && !isNil28(node.value)) {
             const controller = this.findFilterController(
               node.fieldname,
               node.condop
@@ -30107,6 +30429,20 @@ var TreeController = class extends MDControlController {
     nodeData._text = text;
     await this.updateDeNodeData([nodeData]);
   }
+  /**
+   * 获取删除实体codeName
+   * @param {IData} item
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2024-02-22 16:47:44
+   */
+  getRemoveDeName(item) {
+    const treeNode = this.getNodeModel(item._nodeId);
+    if (treeNode) {
+      return calcDeCodeNameById(treeNode.appDataEntityId);
+    }
+    return calcDeCodeNameById(this.model.appDataEntityId);
+  }
 };
 
 // src/controller/control/wizard-panel/wizard-panel.controller.ts
@@ -30463,7 +30799,7 @@ var WizardPanelController = class extends ControlController {
 
 // src/controller/control/md-ctrl/md-ctrl.controller.ts
 import { RuntimeModelError as RuntimeModelError65 } from "@ibiz-template/core";
-import { isNil as isNil28 } from "ramda";
+import { isNil as isNil29 } from "ramda";
 
 // src/controller/control/md-ctrl/md-ctrl.service.ts
 var MDCtrlService = class extends MDControlService {
@@ -30690,7 +31026,7 @@ var MDCtrlController = class extends MDControlController {
       const groupMap = /* @__PURE__ */ new Map();
       items.forEach((item) => {
         const groupVal = item[groupAppDEFieldId];
-        if (isNil28(groupVal)) {
+        if (isNil29(groupVal)) {
           return;
         }
         if (!groupMap.has(groupVal)) {
@@ -30767,7 +31103,7 @@ var MDCtrlController = class extends MDControlController {
 
 // src/controller/control/kanban/kanban.controller.ts
 import { RuntimeError as RuntimeError61, RuntimeModelError as RuntimeModelError66 } from "@ibiz-template/core";
-import { isNil as isNil29 } from "ramda";
+import { isNil as isNil30 } from "ramda";
 
 // src/controller/control/kanban/kanban.service.ts
 var KanbanService = class extends DataViewControlService {
@@ -30852,7 +31188,7 @@ var KanbanController = class extends DataViewControlController {
     const isAsc = minorSortDir === "ASC";
     items.forEach((item) => {
       const sortValue = item[sortField];
-      if (isNil29(sortValue)) {
+      if (isNil30(sortValue)) {
         item[sortField] = 0;
       } else {
         const toNum = Number(sortValue);
@@ -30959,7 +31295,7 @@ var KanbanController = class extends DataViewControlController {
       const groupMap = /* @__PURE__ */ new Map();
       items.forEach((item) => {
         const groupVal = item[groupAppDEFieldId];
-        if (isNil29(groupVal)) {
+        if (isNil30(groupVal)) {
           return;
         }
         if (!groupMap.has(groupVal)) {
@@ -33540,7 +33876,7 @@ var GanttController = class extends TreeGridExController {
   /**
    * 保存
    *
-   * @param {ITreeNodeData} nodeData
+   * @param {IGanttNodeData} nodeData
    * @return {*}  {Promise<void>}
    * @memberof GanttController
    */
@@ -33567,9 +33903,6 @@ var GanttController = class extends TreeGridExController {
     const nodeModel = this.getNodeModel(nodeData._nodeId);
     const { appDataEntityId } = nodeModel;
     const isCreate = nodeData._deData.srfuf === 0 /* CREATE */;
-    if (isCreate) {
-      return;
-    }
     const deName = calcDeCodeNameById(appDataEntityId);
     const tempContext = this.context.clone();
     tempContext[deName] = nodeData._deData.srfkey;
@@ -33806,7 +34139,7 @@ import { QXEvent as QXEvent9 } from "qx-util";
 // src/controller/notification/async-action.controller.ts
 import { QXEvent as QXEvent7 } from "qx-util";
 import { clone as clone31 } from "ramda";
-import { isNil as isNil30, isNumber as isNumber2 } from "lodash-es";
+import { isNil as isNil31, isNumber as isNumber2 } from "lodash-es";
 import dayjs7 from "dayjs";
 var AsyncActionController = class {
   constructor() {
@@ -33881,14 +34214,14 @@ var AsyncActionController = class {
         data[key] = dayjs7(data[key]).format("YYYY-MM-DD HH:mm:ss");
       }
     });
-    if (!isNil30(data.actionresult)) {
+    if (!isNil31(data.actionresult)) {
       try {
         const json = JSON.parse(data.actionresult);
         data.actionresult = json;
       } catch (error) {
       }
     }
-    if (!isNil30(data.completionrate)) {
+    if (!isNil31(data.completionrate)) {
       const num = Number(data.completionrate);
       if (Number.isNaN(num)) {
         data.completionrate = void 0;
@@ -34062,6 +34395,7 @@ var InternalMessageController = class {
           position: "bottom-right"
         });
       }
+      this.refreshUnreadCount();
     });
   }
   async markRead(message) {
@@ -34075,6 +34409,18 @@ var InternalMessageController = class {
     this.evt.emit("unreadCountChange", this.unreadCount);
     this.evt.emit("dataChange");
   }
+  /**
+   * 把所有未读消息标记为已读
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2024-02-21 15:38:25
+   */
+  async batchMarkRead() {
+    await this.service.batchMarkRead();
+    await this.fetch();
+    this.unreadCount = 0;
+    this.evt.emit("unreadCountChange", this.unreadCount);
+  }
   /**
    * 获取完整信息
    * @author lxm
@@ -34971,7 +35317,7 @@ var MDViewEngine = class extends ViewEngineBase {
       view: this.view
     }));
     if (result === -1) {
-      throw new RuntimeModelError70(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
+      throw new RuntimeModelError70(this.view.model, "\u7F3A\u5C11opendata\u7684\u89C6\u56FE\u903B\u8F91");
     } else {
       return {
         cancel: !result.ok
@@ -36350,6 +36696,14 @@ var PluginStaticResource = class {
    * @param {string} mateUrl import.mate.url
    */
   constructor(mateUrl) {
+    /**
+     * 是否为 http || https 开头
+     *
+     * @author chitanda
+     * @date 2022-11-07 14:11:28
+     * @protected
+     */
+    this.urlReg = /^http[s]?:\/\/[^\s]*/;
     /**
      * 已经输出过路径的 style 标签
      *
@@ -36371,6 +36725,9 @@ var PluginStaticResource = class {
    * @return {*}  {string}
    */
   dir(pathStr) {
+    if (this.urlReg.test(pathStr)) {
+      return pathStr;
+    }
     return this.url.origin + path.resolve(this.baseDir, pathStr);
   }
   /**
@@ -36383,7 +36740,7 @@ var PluginStaticResource = class {
    */
   async loadStyle(urls) {
     const all = urls.map((styleUrl) => {
-      const url = this.dir(styleUrl);
+      const url = this.urlReg.test(styleUrl) ? styleUrl : this.dir(styleUrl);
       if (this.styleElementMap.has(url)) {
         return false;
       }
@@ -36767,3 +37124,4 @@ export {
   verifyFormGroupLogic,
   verifyPanelGroupLogic
 };
+//! 只有动态走这个逻辑，全代码确保所有视图都设置了viewConfig