@ibiz-template/runtime 0.6.0-alpha.2 → 0.6.0-alpha.3

package/dist/index.esm.js

@@ -595,7 +595,7 @@ var HandlebarsUtil = class {
 };
 
 // src/utils/nav-params/nav-params.ts
-import { isEmpty } from "lodash-es";
+import { isEmpty, isNil } from "lodash-es";
 import { isNilOrEmpty, notNilEmpty } from "qx-util";
 function convertObjectToNavParams(navParams) {
   const result = [];
@@ -650,7 +650,7 @@ function convertNavDataByArray(naviDatas, ...origins) {
             key.slice(2, -1).toLowerCase()
           );
           if (find) {
-            valueStr = valueStr.replace(key, "".concat(value));
+            valueStr = valueStr.replace(key, "".concat(isNil(value) ? "" : value));
           }
         });
         result[naviData.key.toLowerCase()] = valueStr;
@@ -1391,7 +1391,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 } from "ramda";
+import { isNil as isNil2 } from "ramda";
 function testCond(value, op, value2) {
   if (Object.is(op, "IN")) {
     return contains(value, value2);
@@ -1417,7 +1417,7 @@ function testCond(value, op, value2) {
     case "ISNOTNULL":
       return notNilEmpty4(value);
     case "TESTNULL":
-      return isNil(value);
+      return isNil2(value);
     case "IN":
       return contains(value, value2);
     case "NOTIN":
@@ -1490,7 +1490,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 isNil2 } from "ramda";
+import { isEmpty as isEmpty2, isNil as isNil3 } from "ramda";
 
 // src/utils/script/script-function.ts
 import { mergeRight } from "ramda";
@@ -1844,7 +1844,7 @@ function checkFieldSimpleRule(value, op, value2, errorInfo, paramType, form, pri
     const _value2Field = form[value2] ? form[value2] : value2;
     value2 = _value2Field;
   }
-  if (isNil2(errorInfo) || isEmpty2(errorInfo)) {
+  if (isNil3(errorInfo) || isEmpty2(errorInfo)) {
     errorInfo = "\u5185\u5BB9\u5FC5\u987B\u7B26\u5408\u503C\u89C4\u5219";
   }
   const result = testCond(value, op, value2);
@@ -6347,7 +6347,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 isNil3 } from "ramda";
+import { isNil as isNil4 } from "ramda";
 var DynamicCodeListCache = class {
   constructor(codeList) {
     /**
@@ -6580,7 +6580,7 @@ var DynamicCodeListCache = class {
     }
     const promise = this.load(context, params);
     const { cacheTimeout } = this.codeList;
-    const waitTime = cacheTimeout === -1 || isNil3(cacheTimeout) ? ibiz.config.codeList.timeout : this.codeList.cacheTimeout;
+    const waitTime = cacheTimeout === -1 || isNil4(cacheTimeout) ? ibiz.config.codeList.timeout : this.codeList.cacheTimeout;
     const cacheData = {
       expirationTime: (/* @__PURE__ */ new Date()).getTime() + waitTime,
       promise
@@ -6594,17 +6594,17 @@ var DynamicCodeListCache = class {
 };
 
 // src/service/utils/de-cache/de-cache.ts
-import { where, equals, clone as clone4, isNil as isNil5, isEmpty as isEmpty5 } from "ramda";
+import { where, equals, clone as clone4, isNil as isNil6, isEmpty as isEmpty5 } 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 isNil4 } from "ramda";
+import { isEmpty as isEmpty4, isNil as isNil5 } from "ramda";
 function isExistSrfKey(funcName, entity) {
   if (entity != null) {
     const { srfkey } = entity;
-    if (!isNil4(srfkey) && !isEmpty4(srfkey)) {
+    if (!isNil5(srfkey) && !isEmpty4(srfkey)) {
       return true;
     }
   }
@@ -6612,7 +6612,7 @@ function isExistSrfKey(funcName, entity) {
 }
 function isExistSessionId(funcName, context) {
   const { srfsessionid } = context;
-  if (!isNil4(srfsessionid) && !isEmpty4(srfsessionid)) {
+  if (!isNil5(srfsessionid) && !isEmpty4(srfsessionid)) {
     return true;
   }
   throw new RuntimeError15("\u6267\u884C\u300C".concat(funcName, "\u300D\u4E0D\u5B58\u5728\u300Csrfsessionid\u300D\u65E0\u6CD5\u5904\u7406"));
@@ -6708,7 +6708,7 @@ var DECache = class {
     }
     try {
       isExistSessionId("add", context);
-      if (isNil5(entity.srfkey) || isEmpty5(entity.srfkey)) {
+      if (isNil6(entity.srfkey) || isEmpty5(entity.srfkey)) {
         entity.srfkey = createUUID2();
       }
       entity.srftempdate = (/* @__PURE__ */ new Date()).getTime();
@@ -6852,7 +6852,7 @@ var DECache = class {
       const t = this.getTransaction(context);
       for (let i = 0; i < entities.length; i++) {
         const entity = entities[i];
-        if (isNil5(entity.srfkey) || isEmpty5(entity.srfkey)) {
+        if (isNil6(entity.srfkey) || isEmpty5(entity.srfkey)) {
           entity.srfkey = createUUID2();
         }
         entity.srftempdate = (/* @__PURE__ */ new Date()).getTime();
@@ -7043,7 +7043,7 @@ var DECache = class {
       }
     );
     const unionValues = unionKeys.map((key) => {
-      if (isNil5(data[key])) {
+      if (isNil6(data[key])) {
         return "__empty__";
       }
       return data[key];
@@ -7117,7 +7117,7 @@ function calcResPath(context, entity) {
 }
 
 // src/service/utils/search-filter/search-filter.ts
-import { isEmpty as isEmpty6, isNil as isNil6 } from "ramda";
+import { isEmpty as isEmpty6, isNil as isNil7 } from "ramda";
 var SearchFilter = class {
   /**
    * Creates an instance of SearchFilter.
@@ -7165,16 +7165,16 @@ var SearchFilter = class {
     this.sortMode = "ASC";
     this.context = context;
     if (data) {
-      if (!isNil6(data.page) && !isEmpty6(data.page)) {
+      if (!isNil7(data.page) && !isEmpty6(data.page)) {
         this.page = data.page;
       }
-      if (!isNil6(data.size) && !isEmpty6(data.size)) {
+      if (!isNil7(data.size) && !isEmpty6(data.size)) {
         this.size = data.size;
       }
-      if (!isNil6(data.query) && !isEmpty6(data.query)) {
+      if (!isNil7(data.query) && !isEmpty6(data.query)) {
         this.query = data.query;
       }
-      if (!isNil6(data.sort) && !isEmpty6(data.sort)) {
+      if (!isNil7(data.sort) && !isEmpty6(data.sort)) {
         const arr = data.sort.split(",");
         if (arr.length >= 1) {
           [this.sortField] = arr;
@@ -7895,7 +7895,7 @@ var FileService = class {
 };
 
 // src/service/app-data-entity/app-data-entity.ts
-import { clone as clone5, isNil as isNil7 } from "ramda";
+import { clone as clone5, isNil as isNil8 } from "ramda";
 import { DataTypes } from "@ibiz-template/core";
 import { createUUID as createUUID3 } from "qx-util";
 
@@ -7988,7 +7988,7 @@ var AppDataEntity = class _AppDataEntity {
       enumerable: false,
       configurable: true,
       writable: true,
-      value: isNil7(this.srfkey) ? createUUID3() : this.srfkey
+      value: isNil8(this.srfkey) ? createUUID3() : this.srfkey
     });
     this.defineProperties();
   }
@@ -8078,11 +8078,11 @@ var AppDataEntity = class _AppDataEntity {
     if (value == null) {
       return value;
     }
-    if (isNil7(dataType)) {
+    if (isNil8(dataType)) {
       return value;
     }
     if (DataTypes.isNumber(dataType)) {
-      const numVal = !isNil7(value) && value !== "" ? Number(value) : value;
+      const numVal = !isNil8(value) && value !== "" ? Number(value) : value;
       if (Number.isNaN(numVal)) {
         ibiz.log.debug("".concat(value, "\u4E0D\u80FD\u8F6C\u6362\u6210\u6570\u5B57"));
         return value;
@@ -8601,7 +8601,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 isNil8 } from "ramda";
+import { clone as clone7, isNil as isNil9 } from "ramda";
 var BuildInKeys = [
   "srfkey",
   "srfmajortext",
@@ -8690,7 +8690,7 @@ var ControlVO = class _ControlVO {
         enumerable: false,
         configurable: true,
         writable: true,
-        value: isNil8(this.srfkey) ? createUUID4() : this.srfkey
+        value: isNil9(this.srfkey) ? createUUID4() : this.srfkey
       });
     }
     Object.defineProperty(this, "srfuf", {
@@ -9414,7 +9414,7 @@ var V7AuthService = class {
 };
 
 // src/service/service/async-action/async-action.service.ts
-import { isNil as isNil9 } from "ramda";
+import { isNil as isNil10 } from "ramda";
 var AsyncActionService = class {
   /**
    * 获取异步操作的集合
@@ -9425,7 +9425,7 @@ var AsyncActionService = class {
    */
   async fetch(params = {}) {
     const res = await ibiz.net.post("/portal/asyncaction/all", params);
-    if (isNil9(res.data)) {
+    if (isNil10(res.data)) {
       res.data = [];
     }
     return res;
@@ -9450,7 +9450,7 @@ import {
   RuntimeError as RuntimeError23,
   RuntimeModelError as RuntimeModelError22
 } from "@ibiz-template/core";
-import { isArray as isArray6, isNil as isNil10 } from "lodash-es";
+import { isArray as isArray6, isNil as isNil11 } from "lodash-es";
 import { ascSort } from "qx-util";
 import { clone as clone14 } from "ramda";
 
@@ -10855,7 +10855,7 @@ var DEActionMethod = class extends Method {
           let path2 = this.calcPath(context);
           if (this.method.needResourceKey) {
             let srfkey = context[this.entity.codeName.toLowerCase()];
-            if (isNil10(srfkey)) {
+            if (isNil11(srfkey)) {
               srfkey = isArray6(data) ? null : data == null ? void 0 : data[this.entity.keyAppDEFieldId];
             }
             path2 = "".concat(path2, "/").concat(srfkey);
@@ -11280,7 +11280,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 isNil11 } from "ramda";
+import { clone as clone15, isEmpty as isEmpty7, isNil as isNil12 } from "ramda";
 import { ascSort as ascSort2, descSort } from "qx-util";
 var FetchMethod = class extends Method {
   async exec(context, params, params2, header) {
@@ -11357,7 +11357,7 @@ var FetchMethod = class extends Method {
         }
       }
     }
-    if (!isNil11(filter.sortField) && !isEmpty7(filter.sortField)) {
+    if (!isNil12(filter.sortField) && !isEmpty7(filter.sortField)) {
       if (filter.sortMode === "DESC") {
         list = descSort(list, filter.sortField);
       } else {
@@ -11424,7 +11424,7 @@ function presetDEMethodProvider() {
 }
 
 // src/service/service/internal-message/internal-message.service.ts
-import { isNil as isNil12 } from "ramda";
+import { isNil as isNil13 } from "ramda";
 var InternalMessageService = class {
   constructor() {
     /**
@@ -11463,7 +11463,7 @@ var InternalMessageService = class {
         res.total = Number(res.headers["x-total"]);
       }
     }
-    if (isNil12(res.data)) {
+    if (isNil13(res.data)) {
       res.data = [];
     }
     return res;
@@ -11661,7 +11661,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 isNil13 } from "ramda";
+import { clone as clone16, isNil as isNil14 } from "ramda";
 var CloneExcludeKeys = ["_id", "_value", "_text", "_deData", "clone"];
 var TreeDataSetNodeData = class _TreeDataSetNodeData extends TreeNodeData {
   constructor(model, parentNodeData, opts) {
@@ -11778,7 +11778,7 @@ var TreeDataSetNodeData = class _TreeDataSetNodeData extends TreeNodeData {
       });
       Object.keys(this).forEach((key) => {
         const deKey = getDeKey(key);
-        if (isNil13(deKey) && !CloneExcludeKeys.includes(key)) {
+        if (isNil14(deKey) && !CloneExcludeKeys.includes(key)) {
           cloneNodeData[key] = this[key];
         }
       });
@@ -11787,7 +11787,7 @@ var TreeDataSetNodeData = class _TreeDataSetNodeData extends TreeNodeData {
     return new Proxy(this, {
       set(target, p, value) {
         const deKey = getDeKey(p);
-        if (!isNil13(deKey)) {
+        if (!isNil14(deKey)) {
           target._deData[deKey] = value;
         } else {
           target[p] = value;
@@ -11796,8 +11796,8 @@ var TreeDataSetNodeData = class _TreeDataSetNodeData extends TreeNodeData {
       },
       get(target, p, _receiver) {
         const deKey = getDeKey(p);
-        if (!isNil13(deKey)) {
-          return isNil13(target._deData[deKey]) ? getKeyDefault(p) : target._deData[deKey];
+        if (!isNil14(deKey)) {
+          return isNil14(target._deData[deKey]) ? getKeyDefault(p) : target._deData[deKey];
         }
         return target[p];
       },
@@ -11901,7 +11901,7 @@ var TreeStaticNodeData = class extends TreeNodeData {
 
 // src/service/vo/ui-map-field.ts
 import { DataTypes as DataTypes2 } from "@ibiz-template/core";
-import { isNil as isNil14 } from "ramda";
+import { isNil as isNil15 } from "ramda";
 var UIMapField = class {
   constructor(uiKey, dataKey, opts = {}) {
     /**
@@ -11922,10 +11922,10 @@ var UIMapField = class {
     this.isRequestNeed = true;
     this.uiKey = uiKey;
     this.dataKey = dataKey;
-    if (!isNil14(opts.isOriginField)) {
+    if (!isNil15(opts.isOriginField)) {
       this.isOriginField = opts.isOriginField;
     }
-    if (!isNil14(opts.dataType)) {
+    if (!isNil15(opts.dataType)) {
       this.dataType = opts.dataType;
     }
   }
@@ -11940,7 +11940,7 @@ var UIMapField = class {
       return value;
     }
     if (DataTypes2.isNumber(this.dataType)) {
-      const numVal = !isNil14(value) && value !== "" ? Number(value) : value;
+      const numVal = !isNil15(value) && value !== "" ? Number(value) : value;
       if (Number.isNaN(numVal)) {
         ibiz.log.debug("".concat(value, "\u4E0D\u80FD\u8F6C\u6362\u6210\u6570\u5B57"));
         return value;
@@ -13250,7 +13250,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 isNil20, isNotNil as isNotNil2 } from "ramda";
+import { isEmpty as isEmpty8, isNil as isNil21, isNotNil as isNotNil2 } from "ramda";
 
 // src/controller/utils/loading/loading.state.ts
 import { NOOP } from "@ibiz-template/core";
@@ -13640,6 +13640,9 @@ var UIActionButtonState = class {
     } else if (noPrivDisplayMode === 6) {
       this.visible = false;
     }
+    if ([2, 6].includes(noPrivDisplayMode) && this.dataAccessAction) {
+      this.visible = false;
+    }
     if (actionTarget && actionTarget !== "NONE" || uiactionMode === "SYS" && [
       "Save",
       "SaveAndExit",
@@ -13740,6 +13743,13 @@ var ButtonContainerState = class {
       })
     );
   }
+  async init() {
+    await Promise.all(
+      this.children.map((child) => {
+        return child.init();
+      })
+    );
+  }
 };
 
 // src/controller/utils/event/qx-event-ex.ts
@@ -13882,9 +13892,9 @@ function hasSubRoute(routeDepth) {
 }
 
 // src/controller/utils/util/util.ts
-import { isNil as isNil15 } from "ramda";
+import { isNil as isNil16 } from "ramda";
 function isValueChange(value, value2) {
-  if ((isNil15(value) || value === "") && (isNil15(value2) || value2 === "")) {
+  if ((isNil16(value) || value === "") && (isNil16(value2) || value2 === "")) {
     return false;
   }
   return value !== value2;
@@ -13900,7 +13910,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 isNil16 } from "ramda";
+import { isNil as isNil17 } from "ramda";
 function generateRules(itemVRs, name, valueItemName) {
   const rules = [];
   itemVRs.forEach((item) => {
@@ -13965,7 +13975,7 @@ function generateEditorRules(editor) {
   if (maxLength) {
     rules.push({
       validator: (rule, value, callback) => {
-        if (!isNil16(value) && value.length > maxLength) {
+        if (!isNil17(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)
@@ -13980,7 +13990,7 @@ function generateEditorRules(editor) {
   if (minLength) {
     rules.push({
       validator: (rule, value, callback) => {
-        if (!isNil16(value) && value.length < minLength) {
+        if (!isNil17(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)
@@ -13992,10 +14002,10 @@ function generateEditorRules(editor) {
       }
     });
   }
-  if (!isNil16(maxValue)) {
+  if (!isNil17(maxValue)) {
     rules.push({
       validator: (rule, value, callback) => {
-        if (!isNil16(value) && isNumber(value) && value > maxValue) {
+        if (!isNil17(value) && isNumber(value) && value > maxValue) {
           callback(new Error("\u503C\u5FC5\u987B\u5C0F\u4E8E\u7B49\u4E8E".concat(maxValue)));
         } else {
           return true;
@@ -14003,10 +14013,10 @@ function generateEditorRules(editor) {
       }
     });
   }
-  if (!isNil16(minValue)) {
+  if (!isNil17(minValue)) {
     rules.push({
       validator: (rule, value, callback) => {
-        if (!isNil16(value) && isNumber(value) && value < minValue) {
+        if (!isNil17(value) && isNumber(value) && value < minValue) {
           callback(new Error("\u503C\u5FC5\u987B\u5927\u4E8E\u7B49\u4E8E".concat(minValue)));
         } else {
           return true;
@@ -14019,7 +14029,7 @@ function generateEditorRules(editor) {
 
 // src/controller/utils/value-ex/value-ex.ts
 import { RuntimeError as RuntimeError30 } from "@ibiz-template/core";
-import { isNil as isNil17, mergeLeft } from "ramda";
+import { isNil as isNil18, mergeLeft } from "ramda";
 var ValueExUtil = class {
   /**
    * 合并默认值
@@ -14044,7 +14054,7 @@ var ValueExUtil = class {
    * @return {*}  {string}
    */
   static toText(options, value) {
-    if (isNil17(value) || value === "") {
+    if (isNil18(value) || value === "") {
       return "";
     }
     const { valueType, objectNameField, textSeparator } = this.mergeDefault(options);
@@ -14069,12 +14079,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 isNil18, isNotNil } from "ramda";
+import { isNil as isNil19, isNotNil } from "ramda";
 function getDefaultValue(opts, origins) {
   var _a;
   const { name, valueType, defaultValue, valueFormat } = opts;
   const { data, context, params } = origins;
-  if (isNil18(valueType) && isNil18(defaultValue)) {
+  if (isNil19(valueType) && isNil19(defaultValue)) {
     return;
   }
   if (valueType === "RESET") {
@@ -14428,7 +14438,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 isNil19, mergeRight as mergeRight2 } from "ramda";
+import { isNil as isNil20, mergeRight as mergeRight2 } from "ramda";
 var ViewMsgController = class _ViewMsgController {
   constructor(msgGroupId) {
     this.msgGroupId = msgGroupId;
@@ -14613,19 +14623,19 @@ var ViewMsgController = class _ViewMsgController {
     const removeModeField = this.getDeFieldName(entity, removeFlagAppDEFieldId);
     const deViewMessages = dataSet.map((item) => {
       const message = {};
-      if (positionField && !isNil19(item[positionField])) {
+      if (positionField && !isNil20(item[positionField])) {
         message.position = item[positionField];
       }
-      if (titleField && !isNil19(item[titleField])) {
+      if (titleField && !isNil20(item[titleField])) {
         message.title = item[titleField];
       }
-      if (messageField && !isNil19(item[messageField])) {
+      if (messageField && !isNil20(item[messageField])) {
         message.message = item[messageField];
       }
-      if (typeField && !isNil19(item[typeField])) {
+      if (typeField && !isNil20(item[typeField])) {
         message.messageType = item[typeField];
       }
-      if (removeModeField && !isNil19(item[removeModeField])) {
+      if (removeModeField && !isNil20(item[removeModeField])) {
         message.removeMode = item[removeModeField];
       }
       return mergeRight2(basicMsg, message);
@@ -14864,7 +14874,7 @@ var ViewController = class extends BaseController {
    */
   handleContextParams() {
     this.context.srfappid = this.model.appId;
-    if (isNil20(this.context.srfsessionid) || isEmpty8(this.context.srfsessionid)) {
+    if (isNil21(this.context.srfsessionid) || isEmpty8(this.context.srfsessionid)) {
       const domain = ibiz.uiDomainManager.create(this.id);
       this.context.srfsessionid = domain.id;
     }
@@ -15253,7 +15263,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 isNil21 } from "ramda";
+import { clone as clone18, isNil as isNil22 } from "ramda";
 import { notNilEmpty as notNilEmpty7 } from "qx-util";
 var ControlController = class extends BaseController {
   /**
@@ -15541,7 +15551,7 @@ var ControlController = class extends BaseController {
     let message;
     let duration;
     if (msgItem && msgItem.content) {
-      duration = isNil21(msgItem.timeout) ? void 0 : msgItem.timeout / 1e3;
+      duration = isNil22(msgItem.timeout) ? void 0 : msgItem.timeout / 1e3;
       const scriptParams = { ...this.getEventArgs() };
       if (opts == null ? void 0 : opts.data) {
         scriptParams.data = opts.data;
@@ -16573,7 +16583,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 isNil22, mergeDeepRight } from "ramda";
+import { clone as clone20, isNil as isNil23, mergeDeepRight } from "ramda";
 dayjs4.extend(minMax2);
 dayjs4.extend(isSameOrBefore);
 dayjs4.extend(quarterOfYear);
@@ -16669,10 +16679,10 @@ var BaseSeriesGenerator = class {
    * @return {*}  {(string | undefined)}
    */
   translateVal(codeListKey, val, isExclude = false) {
-    if (isNil22(val)) {
+    if (isNil23(val)) {
       return void 0;
     }
-    if (isNil22(codeListKey)) {
+    if (isNil23(codeListKey)) {
       return val;
     }
     const codeListItems = this.chartGenerator.codeListMap.get(codeListKey);
@@ -16721,7 +16731,7 @@ var BaseSeriesGenerator = class {
           seriesCodeListId,
           item[this.groupField]
         );
-        if (isNil22(groupVal)) {
+        if (isNil23(groupVal)) {
           return;
         }
         group = groupVal;
@@ -17718,6 +17728,9 @@ var CaptionBarController = class extends ControlController {
     await super.onCreated();
     this.view.evt.on("onViewInfoChange", ({ caption: _caption, dataInfo }) => {
       this.state.caption = "".concat(this.view.model.caption).concat(dataInfo ? "-".concat(dataInfo) : "");
+      if (this.view.modal.mode === "ROUTE") {
+        ibiz.util.setBrowserTitle(this.state.caption);
+      }
     });
   }
 };
@@ -19435,6 +19448,27 @@ var UIActionProviderBase = class {
       });
     }
   }
+  /**
+   * 处理打开视图配置自定义参数 modalOption
+   *
+   * @author zk
+   * @date 2024-02-01 01:02:28
+   * @param {IData} param
+   * @return {*}  {IData}
+   * @memberof FrontUIActionProvider
+   */
+  handleViewOptionParams(param) {
+    if (param.modaloption) {
+      try {
+        const modalOption = JSON.parse(param.modaloption);
+        delete param.modaloption;
+        return { modalOption };
+      } catch (error) {
+        ibiz.log.error("\u89C6\u56FE\u53C2\u6570modalOption \u89E3\u6790\u5931\u8D25\uFF1A".concat(error));
+      }
+    }
+    return {};
+  }
 };
 
 // src/ui-action/provider/backend-ui-action-provider.ts
@@ -19456,12 +19490,13 @@ var BackendUIActionProvider = class extends UIActionProviderBase {
     const tempParams = { ...resultParams };
     const frontPSAppView = action.frontAppViewId;
     if (frontPSAppView) {
+      const options = this.handleViewOptionParams(resultParams);
       const res2 = await ibiz.commands.execute(
         OpenAppViewCommand.TAG,
         frontPSAppView,
         resultContext,
         resultParams,
-        { event }
+        { event, ...options }
       );
       if (!(res2 == null ? void 0 : res2.ok)) {
         actionResult.cancel = true;
@@ -19634,27 +19669,6 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
     }
     return actionResult;
   }
-  /**
-   * 处理打开视图配置自定义参数 modalOption
-   *
-   * @author zk
-   * @date 2024-02-01 01:02:28
-   * @param {IData} param
-   * @return {*}  {IData}
-   * @memberof FrontUIActionProvider
-   */
-  handleViewOptionParams(param) {
-    if (param.modaloption) {
-      try {
-        const modalOption = JSON.parse(param.modaloption);
-        delete param.modaloption;
-        return { modalOption };
-      } catch (error) {
-        ibiz.log.error("\u89C6\u56FE\u53C2\u6570modalOption \u89E3\u6790\u5931\u8D25\uFF1A".concat(error));
-      }
-    }
-    return {};
-  }
   /**
    * 处理模式：用户自定义
    * @author lxm
@@ -19971,7 +19985,11 @@ var ToolbarController = class extends ControlController {
       },
       { childrenFields: ["detoolbarItems"] }
     );
-    await this.calcButtonState();
+    if (!this.state.manualCalcButtonState) {
+      await this.calcButtonState();
+    } else {
+      await this.state.buttonsState.init();
+    }
   }
   /**
    * 工具栏按钮点击事件
@@ -20525,7 +20543,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 isNil23 } from "ramda";
+import { isNil as isNil24 } from "ramda";
 
 // src/controller/control/data-view/data-view.service.ts
 var DataViewControlService = class extends MDControlService {
@@ -20813,7 +20831,7 @@ var DataViewControlController = class extends MDControlController {
       const groupMap = /* @__PURE__ */ new Map();
       items.forEach((item) => {
         const groupVal = item[groupAppDEFieldId];
-        if (isNil23(groupVal)) {
+        if (isNil24(groupVal)) {
           return;
         }
         if (!groupMap.has(groupVal)) {
@@ -25404,6 +25422,7 @@ var GridController = class extends MDControlController {
         );
       }
     }
+    this.calcColumnFixed();
   }
   async afterLoad(args, items) {
     await super.afterLoad(args, items);
@@ -25709,7 +25728,8 @@ var GridController = class extends MDControlController {
               key: column.codeName,
               caption: column.caption,
               hidden: !!column.hideDefault || !!column.hiddenDataItem,
-              uaColumn: column.columnType === "UAGRIDCOLUMN"
+              uaColumn: column.columnType === "UAGRIDCOLUMN",
+              adaptive: column.widthUnit === "STAR"
             });
           }
         },
@@ -25730,7 +25750,11 @@ var GridController = class extends MDControlController {
     );
     const allNum = showColumns.length;
     const { frozenFirstColumn, frozenLastColumn } = this.model;
+    this.hasAdaptiveColumn = false;
     showColumns.forEach((column, index) => {
+      if (column.adaptive) {
+        this.hasAdaptiveColumn = true;
+      }
       if (column.uaColumn) {
         column.fixed = index + 1 <= Math.floor(allNum / 2) ? "left" : "right";
       } else if (frozenFirstColumn && index < frozenFirstColumn) {
@@ -26199,6 +26223,7 @@ var GridController = class extends MDControlController {
    */
   setColumnVisible(columnState) {
     columnState.hidden = !columnState.hidden;
+    this.calcColumnFixed();
     this.saveColumnStates();
   }
   /**
@@ -26216,6 +26241,7 @@ var GridController = class extends MDControlController {
     }
     if (data.columnstates) {
       this.state.columnStates = data.columnstates;
+      this.calcColumnFixed();
     } else {
       this.initColumnStates();
     }
@@ -26233,6 +26259,7 @@ var GridController = class extends MDControlController {
     if (columnState) {
       this.state.columnStates.splice(oldIndex, 1);
       this.state.columnStates.splice(newIndex, 0, columnState);
+      this.calcColumnFixed();
       this.saveColumnStates();
     }
   }
@@ -26266,7 +26293,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 isNil24 } from "ramda";
+import { clone as clone27, isNil as isNil25 } from "ramda";
 var GridFieldColumnController = class extends GridColumnController {
   constructor() {
     super(...arguments);
@@ -26478,11 +26505,11 @@ var GridFieldColumnController = class extends GridColumnController {
    */
   calcFieldAgg(items) {
     const { aggField, aggMode, aggValueFormat, unitName } = this.model;
-    if (isNil24(aggMode) || aggMode === "NONE") {
+    if (isNil25(aggMode) || aggMode === "NONE") {
       return;
     }
     const fieldName = aggField || this.model.id;
-    items = items.filter((item) => !isNil24(item[fieldName]));
+    items = items.filter((item) => !isNil25(item[fieldName]));
     let aggValue;
     if (this.grid.model.aggMode === "PAGE") {
       switch (aggMode) {
@@ -27483,6 +27510,13 @@ var PanelItemController = class {
    * @returns {*}  {Promise<void>}
    */
   async init() {
+    var _a;
+    const hasVisibleLogic = !!((_a = this.model.panelItemGroupLogics) == null ? void 0 : _a.find(
+      (logic) => logic.logicCat === "PANELVISIBLE"
+    ));
+    if (hasVisibleLogic) {
+      this.state.visible = false;
+    }
     await this.onInit();
   }
   async onInit() {
@@ -27791,7 +27825,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 isNil26 } from "ramda";
+import { clone as clone28, isNil as isNil27 } from "ramda";
 import { isString as isString2 } from "lodash-es";
 
 // src/controller/control/search-bar/search-bar-filter.controller.ts
@@ -28233,7 +28267,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 isNil25 } from "ramda";
+import { isNil as isNil26 } from "ramda";
 function getOriginFilterNodes() {
   return [
     {
@@ -28290,7 +28324,7 @@ function calcSearchConds(filterNodes) {
   let hasError = false;
   recursiveIterate9(filterNodes[0], (node) => {
     if (node.leaf) {
-      if (node.field && node.valueOP && !isNil25(node.value)) {
+      if (node.field && node.valueOP && !isNil26(node.value)) {
         hasFilter = true;
       } else {
         hasError = true;
@@ -28589,7 +28623,7 @@ var SearchBarController = class extends ControlController {
       recursiveIterate10(
         searchconds[0],
         (node) => {
-          if (node.condtype === "DEFIELD" && !isNil26(node.value)) {
+          if (node.condtype === "DEFIELD" && !isNil27(node.value)) {
             const controller = this.findFilterController(
               node.fieldname,
               node.condop
@@ -30385,7 +30419,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 isNil27 } from "ramda";
+import { isNil as isNil28 } from "ramda";
 
 // src/controller/control/md-ctrl/md-ctrl.service.ts
 var MDCtrlService = class extends MDControlService {
@@ -30612,7 +30646,7 @@ var MDCtrlController = class extends MDControlController {
       const groupMap = /* @__PURE__ */ new Map();
       items.forEach((item) => {
         const groupVal = item[groupAppDEFieldId];
-        if (isNil27(groupVal)) {
+        if (isNil28(groupVal)) {
           return;
         }
         if (!groupMap.has(groupVal)) {
@@ -30689,7 +30723,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 isNil28 } from "ramda";
+import { isNil as isNil29 } from "ramda";
 
 // src/controller/control/kanban/kanban.service.ts
 var KanbanService = class extends DataViewControlService {
@@ -30774,7 +30808,7 @@ var KanbanController = class extends DataViewControlController {
     const isAsc = minorSortDir === "ASC";
     items.forEach((item) => {
       const sortValue = item[sortField];
-      if (isNil28(sortValue)) {
+      if (isNil29(sortValue)) {
         item[sortField] = 0;
       } else {
         const toNum = Number(sortValue);
@@ -30881,7 +30915,7 @@ var KanbanController = class extends DataViewControlController {
       const groupMap = /* @__PURE__ */ new Map();
       items.forEach((item) => {
         const groupVal = item[groupAppDEFieldId];
-        if (isNil28(groupVal)) {
+        if (isNil29(groupVal)) {
           return;
         }
         if (!groupMap.has(groupVal)) {
@@ -33495,7 +33529,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 isNil29, isNumber as isNumber2 } from "lodash-es";
+import { isNil as isNil30, isNumber as isNumber2 } from "lodash-es";
 import dayjs7 from "dayjs";
 var AsyncActionController = class {
   constructor() {
@@ -33570,14 +33604,14 @@ var AsyncActionController = class {
         data[key] = dayjs7(data[key]).format("YYYY-MM-DD HH:mm:ss");
       }
     });
-    if (!isNil29(data.actionresult)) {
+    if (!isNil30(data.actionresult)) {
       try {
         const json = JSON.parse(data.actionresult);
         data.actionresult = json;
       } catch (error) {
       }
     }
-    if (!isNil29(data.completionrate)) {
+    if (!isNil30(data.completionrate)) {
       const num = Number(data.completionrate);
       if (Number.isNaN(num)) {
         data.completionrate = void 0;
@@ -34207,6 +34241,7 @@ var ViewEngineBase = class {
    */
   constructor(view) {
     this.view = view;
+    this.init();
     this.initViewState();
   }
   /**
@@ -34264,6 +34299,15 @@ var ViewEngineBase = class {
   get viewLayoutPanel() {
     return this.view.layoutPanel;
   }
+  /**
+   * 引擎内部初始化
+   *
+   * @author chitanda
+   * @date 2024-02-05 22:02:12
+   * @protected
+   */
+  init() {
+  }
   async onCreated() {
     const { childNames } = this.view;
     childNames.push("captionbar", "toolbar");