@ibiz-template/runtime 0.1.24 → 0.1.25

package/dist/index.esm.js

@@ -6158,7 +6158,8 @@ var GlobalConfig = class {
   constructor() {
     // 全局视图配置
     this.view = {
-      enableDataInfoBar: true
+      enableDataInfoBar: true,
+      enableExpCache: true
     };
     // 全局表格配置
     this.grid = {
@@ -13222,7 +13223,6 @@ var DEService = class {
 };
 
 // src/service/vo/control.vo.ts
-import { DataTypes } from "@ibiz-template/core";
 import { clone as clone10, isNil as isNil8 } from "ramda";
 var ControlVO = class _ControlVO {
   /**
@@ -13318,8 +13318,7 @@ var ControlVO = class _ControlVO {
     });
     this.$dataUIMap.forEach((mapField, key) => {
       const value = mapField.dataKey;
-      const forceNumber = mapField.dataType !== void 0 && DataTypes.isNumber(mapField.dataType);
-      this.linkProperty(key, value, mapField.isOriginField, forceNumber);
+      this.linkProperty(key, value, mapField);
     });
     Object.keys($origin).forEach((value) => {
       if (!Object.prototype.hasOwnProperty.call(this, value)) {
@@ -13339,7 +13338,8 @@ var ControlVO = class _ControlVO {
    * @param {boolean} [forceNumber=false] 是否强制转换成数值，是的话set的时候转成数值
    * @returns {*}
    */
-  linkProperty(uiKey, dataKey, isOriginField = true, forceNumber = false) {
+  linkProperty(uiKey, dataKey, mapField) {
+    const isOriginField = mapField ? mapField.isOriginField : true;
     if (uiKey === "srfuf") {
       return;
     }
@@ -13351,14 +13351,12 @@ var ControlVO = class _ControlVO {
           return uiKey === "srfkey" ? this.$origin[dataKey] || this.$origin[uiKey] : this.$origin[dataKey];
         },
         set(val) {
-          let val2 = forceNumber && !isNil8(val) && val !== "" ? Number(val) : val;
-          if (Number.isNaN(val2)) {
-            val2 = val;
-            ibiz.log.error("".concat(val, "\u4E0D\u80FD\u8F6C\u6362\u6210\u6570\u5B57"));
-          }
-          this.$origin[dataKey] = val2;
+          this.$origin[dataKey] = mapField ? mapField.convertVal(val) : val;
         }
       });
+      if (mapField) {
+        this[uiKey] = mapField.convertVal(this.$origin[dataKey]);
+      }
     } else {
       Object.defineProperty(this, uiKey, {
         enumerable: true,
@@ -14037,6 +14035,7 @@ var TreeStaticNodeData = class extends TreeNodeData {
 };
 
 // src/service/vo/ui-map-field.ts
+import { DataTypes } from "@ibiz-template/core";
 import { isNil as isNil9 } from "ramda";
 var UIMapField = class {
   constructor(uiKey, dataKey, opts = {}) {
@@ -14065,6 +14064,26 @@ var UIMapField = class {
       this.dataType = opts.dataType;
     }
   }
+  /**
+   * 值转换
+   * @author lxm
+   * @date 2023-09-14 06:45:44
+   * @param {unknown} value 原值
+   */
+  convertVal(value) {
+    if (!this.dataType) {
+      return value;
+    }
+    if (DataTypes.isNumber(this.dataType)) {
+      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;
+      }
+      return numVal;
+    }
+    return value;
+  }
 };
 
 // src/service/vo/calendar-item-data/calendar-item-data.ts
@@ -15887,10 +15906,10 @@ var ControlController = class extends BaseController {
   constructor(model, context, params, ctx) {
     super(model, context, params, ctx);
     /**
-     * 子部件适配器
+     * 子适配器
      * @author lxm
      * @date 2023-07-19 04:14:50
-     * @type {{ [key: string]: IControlProvider }}
+     * @type {{ [key: string]: IProvider }}
      */
     this.providers = {};
     this.registerToCtx();
@@ -20543,13 +20562,20 @@ var ExpBarControlController = class extends ControlController {
     const selectItem = (_a = this.xDataController) == null ? void 0 : _a.state.items.find(
       (item) => item[this.navKeyName] === this.state.srfnav
     );
-    if (selectItem) {
+    const routeAndHasSub = this.routeDepth && window.location.hash.split("/").length > this.routeDepth * 2 + 2;
+    console.log("routeAndHasSub", routeAndHasSub);
+    if (routeAndHasSub) {
+      if (selectItem) {
+        this.xDataController.setSelection([selectItem]);
+      }
+      this._evt.emit("onNavViewChange", {
+        navViewMsg: { key: this.state.srfnav },
+        context: this.context
+      });
+    } else if (selectItem) {
+      this.xDataController.setActive(selectItem);
       this.xDataController.setSelection([selectItem]);
     }
-    this._evt.emit("onNavViewChange", {
-      navViewMsg: { key: this.state.srfnav },
-      context: this.context
-    });
   }
   /**
    * 导航页面首次打开且没有回显时，
@@ -20562,6 +20588,7 @@ var ExpBarControlController = class extends ControlController {
   defaultNavByFirstItem() {
     const data = this.xDataController.state.items[0];
     if (!data) {
+      this.state.srfnav = "";
       this._evt.emit("onNavViewChange", { navViewMsg: { key: "" } });
       return;
     }
@@ -20614,6 +20641,7 @@ var ExpBarControlController = class extends ControlController {
     const tempContext = Object.assign(context.clone(), resultContext, {
       currentSrfNav: data[this.navKeyName]
     });
+    this.state.srfnav = data[this.navKeyName];
     const tempParams = { ...resultParams };
     return { context: tempContext, params: tempParams };
   }
@@ -20680,6 +20708,18 @@ var ExpBarControlController = class extends ControlController {
       }
     });
   }
+  /**
+   * 路由变更处理回调
+   * @author lxm
+   * @date 2023-09-14 07:03:39
+   * @param {{ srfnav?: string; path: string }} info 当前系统的路由的从一级到最后一级的所有路径。
+   */
+  onRouterChange(info) {
+    if (this.state.srfnav !== info.srfnav) {
+      this.state.srfnav = info.srfnav;
+      this.defaultNavBySrfnav();
+    }
+  }
 };
 
 // src/controller/control/exp-bar/calendar-exp-bar.controller.ts
@@ -20743,6 +20783,7 @@ var CalendarExpBarController = class extends ExpBarControlController {
         this.params
       );
       context.currentSrfNav = item.navId;
+      this.state.srfnav = item.navId;
       return {
         key: item.navId,
         context,
@@ -20838,6 +20879,7 @@ var TreeExpBarController = class extends ExpBarControlController {
     }
     const result = this.prepareParams(nodeModel, deData, context, params);
     result.context.currentSrfNav = nodeId;
+    this.state.srfnav = nodeId;
     return {
       key: nodeId,
       viewId: nodeModel.navAppViewId,