@ibiz-template/runtime 0.1.24 → 0.1.26

package/dist/index.esm.js

@@ -6158,7 +6158,8 @@ var GlobalConfig = class {
   constructor() {
     // 全局视图配置
     this.view = {
-      enableDataInfoBar: true
+      enableDataInfoBar: true,
+      enableExpCache: true
     };
     // 全局表格配置
     this.grid = {
@@ -8578,6 +8579,36 @@ var TextUtil = class {
   }
 };
 
+// src/utils/raw-value-util/raw-value-util.ts
+var RawValueUtil = class {
+  /**
+   *  字符串是否完全由整数/浮点数组成
+   *
+   * @param {string} str
+   * @return {*}
+   */
+  isNumber(str) {
+    return /^-?\d+(\.\d+)?$/.test(str);
+  }
+  /**
+   * 转换直接值
+   *
+   * @param {string} val
+   * @return {*}
+   */
+  format(val) {
+    let tempVal = val;
+    if (val !== void 0) {
+      if (val === "true" || val === "false") {
+        tempVal = val === "true";
+      } else if (this.isNumber(val)) {
+        tempVal = parseFloat(val);
+      }
+    }
+    return tempVal;
+  }
+};
+
 // src/command/app/open-app-view/open-app-view.ts
 import { ModelError as ModelError3, RuntimeError as RuntimeError4 } from "@ibiz-template/core";
 var _OpenAppViewCommand = class _OpenAppViewCommand {
@@ -12017,7 +12048,7 @@ var EndNode = class extends DELogicNode {
         ctx.result = null;
         break;
       case "SRCVALUE":
-        ctx.result = rawValue;
+        ctx.result = ibiz.util.rawValue.format(rawValue);
         break;
       case "LOGICPARAM":
         ctx.result = ctx.params[returnParamId];
@@ -12055,7 +12086,7 @@ function handleSrcVal(ctx, srcValParams) {
     case "NONEVALUE":
       return void 0;
     case "SRCVALUE":
-      return srcValue;
+      return ibiz.util.rawValue.format(srcValue);
     case "WEBCONTEXT":
     case "VIEWPARAM":
       value = ctx.viewParams;
@@ -12683,18 +12714,18 @@ var DEActionMethod = class extends Method {
       if (!deLogic) {
         throw new RuntimeModelError18(this.method, "\u7F3A\u5C11\u5B9E\u4F53\u5904\u7406\u903B\u8F91");
       }
-      return execDELogicAction(deLogic, context, data, params);
+      return execDELogicAction(deLogic, context, data || {}, params || {});
     }
-    if (!this.isLocalMode) {
+    if (data && !this.isLocalMode) {
       data = await this.input.handle(context, data);
     }
-    if (!["READ", "GETDRAFT"].includes(this.method.actionMode)) {
-      await execFieldLogics(this.entity, "change", context, data, params);
+    if (data && !["READ", "GETDRAFT"].includes(this.method.actionMode)) {
+      await execFieldLogics(this.entity, "change", context, data, params || {});
     }
     let result;
     switch (this.method.codeName) {
       case "Create":
-        result = await this.create(context, data, params);
+        result = await this.create(context, data, params || {});
         break;
       case "Get":
         result = await this.get(context, params);
@@ -12726,14 +12757,20 @@ var DEActionMethod = class extends Method {
       default: {
         let path2 = this.calcPath(context);
         if (this.method.needResourceKey) {
-          path2 = "".concat(path2, "/").concat(context[this.entity.codeName.toLowerCase()] || data[this.entity.keyAppDEFieldId]);
+          path2 = "".concat(path2, "/").concat(context[this.entity.codeName.toLowerCase()] || (data == null ? void 0 : data[this.entity.keyAppDEFieldId]));
         }
         const res = await this.request(path2, context, data, params);
         res.data = await this.result.handle(context, res.data);
         result = res;
       }
     }
-    await execFieldLogics(this.entity, "compute", context, result.data, params);
+    await execFieldLogics(
+      this.entity,
+      "compute",
+      context,
+      result.data,
+      params || {}
+    );
     return result;
   }
   /**
@@ -13212,7 +13249,7 @@ var DEService = class {
    * @param {IParams} [params2={}] 查询参数
    * @return {*}  {Promise<IHttpResponse>}
    */
-  exec(id, context, params = {}, params2 = {}) {
+  exec(id, context, params, params2) {
     const method = this.getMethod(id);
     if (method) {
       return method.exec(context, params, params2);
@@ -13222,7 +13259,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 +13354,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 +13374,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 +13387,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,
@@ -13454,7 +13488,7 @@ var ControlService = class {
    * @param {IParams} [params={}] 视图参数或数据
    * @returns {*}  {Promise<IHttpResponse>}
    */
-  async exec(methodName, context, data = {}, params = {}) {
+  async exec(methodName, context, data, params) {
     const res = await this.app.deService.exec(
       this.model.appDataEntityId,
       methodName,
@@ -14037,6 +14071,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 +14100,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 +15942,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();
@@ -18369,7 +18424,7 @@ var EndNode2 = class extends UILogicNode {
         ctx.result = null;
         break;
       case "SRCVALUE":
-        ctx.result = rawValue;
+        ctx.result = ibiz.util.rawValue.format(rawValue);
         break;
       case "LOGICPARAM":
         ctx.result = ctx.params[returnParamId];
@@ -18405,7 +18460,7 @@ function handleSrcVal2(ctx, srcValParams) {
     case "NONEVALUE":
       return void 0;
     case "SRCVALUE":
-      return srcValue;
+      return ibiz.util.rawValue.format(srcValue);
     case "WEBCONTEXT":
     case "VIEWPARAM":
       value = ctx.viewParams;
@@ -20543,13 +20598,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 +20624,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 +20677,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 +20744,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 +20819,7 @@ var CalendarExpBarController = class extends ExpBarControlController {
         this.params
       );
       context.currentSrfNav = item.navId;
+      this.state.srfnav = item.navId;
       return {
         key: item.navId,
         context,
@@ -20838,6 +20915,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,
@@ -28732,6 +28810,13 @@ var GlobalUtil = class {
      * @date 2023-08-28 23:08:59
      */
     this.hbs = new HandlebarsUtil();
+    /**
+     * 直接值工具
+     *
+     * @author zhujiamin
+     * @date 2023-08-24 11:08:28
+     */
+    this.rawValue = new RawValueUtil();
   }
   /**
    * 显示应用级别的加载提示
@@ -29436,6 +29521,29 @@ var AppUILogicExecutor = class extends LogicExecutor {
       rest
     );
   }
+  async calcOpenViewRef(appUILogic, parameters) {
+    const appDataEntityId = parameters.view.model.appDataEntityId;
+    const formTypeName = await getFormTypeFieldName(appDataEntityId);
+    if (!formTypeName) {
+      throw new RuntimeModelError56(
+        appUILogic,
+        "".concat(appDataEntityId, "\u5B9E\u4F53\u7F3A\u5C11\u8868\u5355\u7C7B\u578B\u5E94\u7528\u5B9E\u4F53\u5C5E\u6027")
+      );
+    }
+    const { data } = parameters;
+    const formTypeValue = data[0][formTypeName];
+    if (!formTypeValue) {
+      throw new RuntimeModelError56(appUILogic, "\u6570\u636E\u6E90\u65E0\u8868\u5355\u7C7B\u578B\u5E94\u7528\u5B9E\u4F53\u5C5E\u6027\u503C");
+    }
+    const openViewRefs = appUILogic.openDataAppViews;
+    const findView = openViewRefs == null ? void 0 : openViewRefs.find((item) => item.refMode === formTypeValue);
+    if (!findView) {
+      throw new RuntimeError52(
+        "\u6CA1\u6709\u627E\u5230\u4E0E\u8868\u5355\u7C7B\u578B".concat(formTypeValue, "\u76F8\u5173\u7684\u5B9E\u4F53\u7684\u7F16\u8F91\u89C6\u56FE")
+      );
+    }
+    return findView;
+  }
   /**
    * 执行应用预置界面逻辑newdata
    *
@@ -29450,7 +29558,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
    */
   async executeNewDataAppUILogic(appUILogic, parameters) {
     const { context, params, ...rest } = parameters;
-    const { data } = parameters;
+    const { data, view } = parameters;
     const { enableWizardAdd, enableBatchAdd, batchAddOnly, newDataAppView } = appUILogic;
     let newViewRef;
     if (enableWizardAdd) {
@@ -29459,7 +29567,19 @@ var AppUILogicExecutor = class extends LogicExecutor {
         return { ok: false };
       }
     } else if (enableBatchAdd) {
-      throw new ModelError30(appUILogic, "enableBatchAdd\u6682\u672A\u652F\u6301");
+      const parentDeName = calcDeCodeNameById(
+        view.parentView.model.appDataEntityId
+      );
+      const batchViews = appUILogic.batchAddAppViews;
+      newViewRef = batchViews == null ? void 0 : batchViews.find((viewRef) => {
+        return viewRef.refMode.toLowerCase() !== parentDeName;
+      });
+      if (!newViewRef) {
+        throw new RuntimeModelError56(
+          appUILogic,
+          "\u6CA1\u6709\u627E\u5230\u6279\u6DFB\u52A0\u9700\u8981\u6253\u5F00\u7684\u9009\u62E9\u89C6\u56FE"
+        );
+      }
     } else if (batchAddOnly) {
       throw new ModelError30(appUILogic, "batchAddOnly\u6682\u672A\u652F\u6301");
     } else {
@@ -29487,13 +29607,17 @@ var AppUILogicExecutor = class extends LogicExecutor {
       _data.srfkey = void 0;
       tempParams = Object.assign(tempParams, _data.$origin);
     }
-    return ibiz.commands.execute(
+    const result = await ibiz.commands.execute(
       OpenAppViewCommand.TAG,
       newViewRef.refAppViewId,
       tempContext,
       tempParams,
       rest
     );
+    if (enableBatchAdd && result.data) {
+      await this.doBatchAdd(appUILogic, result.data, context, newViewRef);
+    }
+    return result;
   }
   /**
    * 获取向导新建视图引用
@@ -29536,28 +29660,71 @@ var AppUILogicExecutor = class extends LogicExecutor {
     }
     return findView;
   }
-  async calcOpenViewRef(appUILogic, parameters) {
-    const appDataEntityId = parameters.view.model.appDataEntityId;
-    const formTypeName = await getFormTypeFieldName(appDataEntityId);
-    if (!formTypeName) {
-      throw new RuntimeModelError56(
-        appUILogic,
-        "".concat(appDataEntityId, "\u5B9E\u4F53\u7F3A\u5C11\u8868\u5355\u7C7B\u578B\u5E94\u7528\u5B9E\u4F53\u5C5E\u6027")
-      );
-    }
-    const { data } = parameters;
-    const formTypeValue = data[0][formTypeName];
-    if (!formTypeValue) {
-      throw new RuntimeModelError56(appUILogic, "\u6570\u636E\u6E90\u65E0\u8868\u5355\u7C7B\u578B\u5E94\u7528\u5B9E\u4F53\u5C5E\u6027\u503C");
-    }
-    const openViewRefs = appUILogic.openDataAppViews;
-    const findView = openViewRefs == null ? void 0 : openViewRefs.find((item) => item.refMode === formTypeValue);
-    if (!findView) {
-      throw new RuntimeError52(
-        "\u6CA1\u6709\u627E\u5230\u4E0E\u8868\u5355\u7C7B\u578B".concat(formTypeValue, "\u76F8\u5173\u7684\u5B9E\u4F53\u7684\u7F16\u8F91\u89C6\u56FE")
+  /**
+   * 拿选中的数据做批添加新建
+   * @author lxm
+   * @date 2023-09-15 05:20:02
+   * @protected
+   * @param {IAppUIOpenDataLogic} appUILogic
+   * @param {IData[]} selections
+   * @param {IContext} context
+   * @param {IAppUILogicRefViewBase} newViewRef
+   * @return {*}  {Promise<void>}
+   */
+  async doBatchAdd(appUILogic, selections, context, newViewRef) {
+    var _a;
+    if (selections == null ? void 0 : selections.length) {
+      const selfDe = await ibiz.hub.getAppDataEntity(
+        appUILogic.appDataEntityId,
+        context.srfappid
       );
+      const minorDERs = selfDe.minorAppDERSs;
+      const pickParentDeName = newViewRef.refMode.toLowerCase();
+      if (!minorDERs) {
+        throw new RuntimeModelError56(selfDe, "\u5B9E\u4F53\u6CA1\u6709\u4ECE\u5173\u7CFB\u96C6\u5408\uFF01");
+      }
+      let pickParentFieldName;
+      minorDERs == null ? void 0 : minorDERs.forEach((item) => {
+        const majorDeName = calcDeCodeNameById(item.majorAppDataEntityId);
+        if (pickParentDeName === majorDeName) {
+          pickParentFieldName = item.parentAppDEFieldId;
+        }
+      });
+      const openViewKeyParam = (_a = newViewRef.navigateParams) == null ? void 0 : _a.find((navParam) => {
+        return navParam.key === "keymapping";
+      });
+      let addData = [];
+      if (openViewKeyParam) {
+        const keyValuePairs = openViewKeyParam.value.split(";");
+        const keyMapping = {};
+        for (const pair of keyValuePairs) {
+          const [sourceKey, targetKey] = pair.split(":");
+          if (sourceKey && targetKey) {
+            keyMapping[sourceKey] = targetKey;
+          }
+        }
+        addData = selections.map((item) => {
+          const tempData = {
+            [pickParentFieldName]: item.srfkey
+          };
+          for (const key in keyMapping) {
+            if (Object.prototype.hasOwnProperty.call(keyMapping, key)) {
+              const targetKey = keyMapping[key];
+              if (Object.prototype.hasOwnProperty.call(item, key)) {
+                tempData[targetKey] = item[key];
+              }
+            }
+          }
+          return tempData;
+        });
+      } else {
+        addData = selections.map((item) => ({
+          [pickParentFieldName]: item.srfkey
+        }));
+      }
+      const service = ibiz.hub.getApp(context.srfappid).deService;
+      await service.exec(selfDe.id, "Create", context, addData);
     }
-    return findView;
   }
 };
 
@@ -29885,6 +30052,7 @@ export {
   PortletPartController,
   PortletPartState,
   QXEventEx,
+  RawValueUtil,
   RegisterCenter,
   RemotePluginItem,
   ScriptFactory,