@ibiz-template/runtime 0.2.12 → 0.2.13

package/dist/index.esm.js

@@ -2892,7 +2892,7 @@ var require_base64 = __commonJS({
       var littleZ = 122;
       var zero = 48;
       var nine = 57;
-      var plus = 43;
+      var plus3 = 43;
       var slash = 47;
       var littleOffset = 26;
       var numberOffset = 52;
@@ -2905,7 +2905,7 @@ var require_base64 = __commonJS({
       if (zero <= charCode && charCode <= nine) {
         return charCode - zero + numberOffset;
       }
-      if (charCode == plus) {
+      if (charCode == plus3) {
         return 62;
       }
       if (charCode == slash) {
@@ -22697,6 +22697,19 @@ var WorkFlowService = class {
     }
     return data;
   }
+  /**
+   * 获取工作流实例标记
+   *
+   * @author zk
+   * @date 2023-11-06 06:11:07
+   * @private
+   * @param {IParams} context
+   * @return {*}  {string}
+   * @memberof WorkFlowService
+   */
+  getWFInstanceTag(context) {
+    return context.srfprocessinstanceid || "alls";
+  }
   /**
    * 根据当前步骤和任务获取工作流步骤数据（如：流程表单等）
    *
@@ -22739,7 +22752,9 @@ var WorkFlowService = class {
   async getWFHistory(context) {
     const deKeyValue = context[this.model.codeName.toLowerCase()];
     return this.app.net.get(
-      "".concat(this.getBaseUrl(), "/").concat(deKeyValue, "/process-instances/alls/history")
+      "".concat(this.getBaseUrl(), "/").concat(deKeyValue, "/process-instances/").concat(this.getWFInstanceTag(
+        context
+      ), "/history")
     );
   }
   /**
@@ -22753,7 +22768,9 @@ var WorkFlowService = class {
   async getWFProcessDiagram(context) {
     const deKeyValue = context[this.model.codeName.toLowerCase()];
     return this.app.net.request(
-      "".concat(this.getBaseUrl(), "/").concat(deKeyValue, "/process-instances/alls/processdiagram"),
+      "".concat(this.getBaseUrl(), "/").concat(deKeyValue, "/process-instances/").concat(this.getWFInstanceTag(
+        context
+      ), "/processdiagram"),
       {
         method: "post",
         data: {},
@@ -25403,6 +25420,16 @@ var ControlVO = class _ControlVO {
       configurable: true,
       value: $dataUIMap || /* @__PURE__ */ new Map()
     });
+    Object.defineProperty(this, "srfactionparam", {
+      get() {
+        return this.$origin.srfactionparam;
+      },
+      set(val) {
+        this.$origin.srfactionparam = val;
+      },
+      enumerable: true,
+      configurable: true
+    });
     ["srfkey", "srfmajortext"].forEach((key) => {
       if (Object.prototype.hasOwnProperty.call(this.$origin, key)) {
         Object.defineProperty(this, key, {
@@ -26074,7 +26101,6 @@ var TreeCodeListNodeData = class extends TreeNodeData {
   constructor(model, parentNodeData, opts) {
     super(model, parentNodeData, opts);
     const { data } = opts;
-    this.deData = data;
     this.text = data.text;
     this.value = data.value;
     this.id = parentNodeData ? "".concat(parentNodeData.id, ":").concat(model.id, "@").concat(this.value) : model.id + this.value;
@@ -27820,6 +27846,11 @@ var ControllerEvent = class {
   }
 };
 
+// src/controller/utils/route/route.ts
+function hasSubRoute(routeDepth) {
+  return window.location.hash.split("/").length > routeDepth * 2 + 2;
+}
+
 // src/controller/utils/util/util.ts
 import { isNil as isNil12 } from "ramda";
 function isValueChange(value, value2) {
@@ -28455,20 +28486,29 @@ var ViewMsgController = class _ViewMsgController {
    */
   calcStaticMsg(detail) {
     const { position: position1 } = detail;
+    const viewMsg = this.viewMsgMap.get(detail.appViewMsgId);
     const {
       title,
       message,
       removeMode,
       position: position2,
       messageType
-    } = this.viewMsgMap.get(detail.appViewMsgId);
+    } = viewMsg;
+    const { userTag, userTag2, userTag3, userTag4 } = viewMsg;
     const position = position1 || position2;
     return {
       title,
       message,
       position,
       messageType,
-      removeMode
+      removeMode,
+      // 额外参数
+      extraParams: {
+        userTag,
+        userTag2,
+        userTag3,
+        userTag4
+      }
     };
   }
   /**
@@ -28867,6 +28907,11 @@ var ViewController = class extends BaseController {
       title: message.title,
       desc: message.message
     };
+    if (message.extraParams.userTag) {
+      Object.assign(modalParams, {
+        confirmButtonText: message.extraParams.userTag
+      });
+    }
     if (message.messageType === "WARN") {
       await ibiz.modal.warning(modalParams);
     } else if (message.messageType === "ERROR") {
@@ -30054,8 +30099,8 @@ var CalendarController = class extends MDControlController {
    */
   getCurSelectDate(param) {
     const { selectedDate } = this.state;
-    const { start, end } = param;
-    if (!start || !end) {
+    const { srfstartdate, srfenddate } = param;
+    if (!srfstartdate || !srfenddate) {
       const firstDayOfMonth = new Date(
         selectedDate.getFullYear(),
         selectedDate.getMonth(),
@@ -30067,11 +30112,11 @@ var CalendarController = class extends MDControlController {
         1
       );
       return {
-        start: dayjs2(firstDayOfMonth).format("YYYY-MM-DD HH:mm:ss"),
-        end: dayjs2(lastDayOfMonth).format("YYYY-MM-DD HH:mm:ss")
+        srfstartdate: dayjs2(firstDayOfMonth).format("YYYY-MM-DD HH:mm:ss"),
+        srfenddate: dayjs2(lastDayOfMonth).format("YYYY-MM-DD HH:mm:ss")
       };
     }
-    return { start, end };
+    return { srfstartdate, srfenddate };
   }
   /**
    * 获取请求参数
@@ -30154,7 +30199,7 @@ import { RuntimeError as RuntimeError32 } from "@ibiz-template/core";
 import { RuntimeModelError as RuntimeModelError25 } from "@ibiz-template/core";
 
 // src/controller/control/chart/generator/base-series-generator.ts
-import { RuntimeModelError as RuntimeModelError24, toNumberOrNil } from "@ibiz-template/core";
+import { plus, RuntimeModelError as RuntimeModelError24, toNumberOrNil } from "@ibiz-template/core";
 import dayjs3 from "dayjs";
 import minMax from "dayjs/plugin/minMax";
 import isSameOrBefore from "dayjs/plugin/isSameOrBefore";
@@ -30308,7 +30353,10 @@ var BaseSeriesGenerator = class {
       if (!groupData[group].get(catalog)) {
         groupData[group].set(catalog, { value: 0 });
       }
-      groupData[group].get(catalog).value += item[this.valueField];
+      groupData[group].get(catalog).value = plus(
+        groupData[group].get(catalog).value,
+        item[this.valueField]
+      );
       groupData[group].get(catalog).deData = item;
     });
     return groupData;
@@ -32905,8 +32953,14 @@ var BackendUIActionProvider = class extends UIActionProviderBase {
         if (resultData.length === 0) {
           resultData.push({});
         }
+        const actionData = res2.data.map(
+          (item) => {
+            var _a;
+            return ((_a = item.getOrigin) == null ? void 0 : _a.call(item)) || item || {};
+          }
+        );
         resultData.forEach((item) => {
-          item.srfactionparam = res2.data;
+          item.srfactionparam = actionData;
         });
       }
     }
@@ -34323,7 +34377,7 @@ var ExpBarControlController = class extends ControlController {
         this.xDataLoadSuccess(event);
       });
       this.xDataController.evt.on("onRemoveSuccess", () => {
-        this.defaultNavByFirstItem();
+        this.navByFirstItem();
       });
     }
     if (this.toolbarController) {
@@ -34348,9 +34402,9 @@ var ExpBarControlController = class extends ControlController {
   xDataLoadSuccess(event) {
     if (event.isInitialLoad) {
       if (this.state.srfnav && this.routeDepth) {
-        this.defaultNavBySrfnav();
+        this.navBySrfnav();
       } else {
-        this.defaultNavByFirstItem();
+        this.navByFirstItem();
       }
     }
   }
@@ -34360,12 +34414,12 @@ var ExpBarControlController = class extends ControlController {
    * @date 2023-08-10 04:04:08
    * @protected
    */
-  defaultNavBySrfnav() {
+  navBySrfnav() {
     var _a;
     const selectItem = (_a = this.xDataController) == null ? void 0 : _a.state.items.find(
       (item) => item[this.navKeyName] === this.state.srfnav
     );
-    const routeAndHasSub = this.routeDepth && window.location.hash.split("/").length > this.routeDepth * 2 + 2;
+    const routeAndHasSub = this.routeDepth && hasSubRoute(this.routeDepth);
     if (routeAndHasSub) {
       if (selectItem) {
         this.xDataController.setSelection([selectItem]);
@@ -34378,9 +34432,20 @@ var ExpBarControlController = class extends ControlController {
         },
         context: this.context
       });
-    } else if (selectItem) {
+      return;
+    }
+    if (selectItem) {
       this.xDataController.setActive(selectItem);
       this.xDataController.setSelection([selectItem]);
+    } else {
+      this._evt.emit("onNavViewChange", {
+        navViewMsg: {
+          key: this.state.srfnav,
+          is404: true,
+          isCache: this.isCache
+        },
+        context: this.context
+      });
     }
   }
   /**
@@ -34391,14 +34456,13 @@ var ExpBarControlController = class extends ControlController {
    * @date 2023-08-10 03:58:15
    * @protected
    */
-  defaultNavByFirstItem() {
+  navByFirstItem() {
     const data = this.xDataController.state.items[0];
     if (!data) {
       this.state.srfnav = "";
       this._evt.emit("onNavViewChange", {
         navViewMsg: {
           key: "",
-          isRoutePushed: true,
           isCache: this.isCache
         }
       });
@@ -34527,10 +34591,10 @@ var ExpBarControlController = class extends ControlController {
    * @date 2023-09-14 07:03:39
    * @param {{ srfnav?: string; path: string }} info 当前系统的路由的从一级到最后一级的所有路径。
    */
-  onRouterChange(info) {
+  async onRouterChange(info) {
     if (this.state.srfnav !== info.srfnav) {
       this.state.srfnav = info.srfnav;
-      this.defaultNavBySrfnav();
+      this.navBySrfnav();
     }
   }
 };
@@ -34565,12 +34629,12 @@ var CalendarExpBarController = class extends ExpBarControlController {
     }
     return controller;
   }
-  defaultNavBySrfnav() {
+  navBySrfnav() {
     var _a;
     const selectItem = (_a = this.xDataController) == null ? void 0 : _a.state.items.find(
       (item) => item.navId === this.state.srfnav
     );
-    super.defaultNavBySrfnav();
+    super.navBySrfnav();
     if (!selectItem) {
       return;
     }
@@ -34700,7 +34764,7 @@ var TreeExpBarController = class extends ExpBarControlController {
       ...result
     };
   }
-  defaultNavByFirstItem() {
+  navByFirstItem() {
     const data = this.xDataController.state.items.find((node) => {
       if (!this.xDataController.model.rootVisible && this.xDataController.state.rootNodes.includes(node)) {
         return false;
@@ -34725,18 +34789,35 @@ var TreeExpBarController = class extends ExpBarControlController {
       }
     });
     if (this.state.srfnav) {
-      const expandedKeys = [];
-      this.state.srfnav.split(":").forEach((item, index) => {
-        if (index === 0) {
-          expandedKeys.push(item);
-        } else {
-          expandedKeys.push("".concat(expandedKeys[index - 1], ":").concat(item));
-        }
-      });
-      expandedKeys.pop();
-      this.defaultExpandedKeys = expandedKeys;
+      this.defaultExpandedKeys = this.calcExpandKeys(this.state.srfnav);
     }
   }
+  /**
+   * 根据srfnav计算需要展开的节点标识
+   * @author lxm
+   * @date 2023-11-07 02:42:45
+   * @param {string} srfnav
+   * @return {*}  {string[]}
+   */
+  calcExpandKeys(srfnav) {
+    const expandedKeys = [];
+    srfnav.split(":").forEach((item, index) => {
+      if (index === 0) {
+        expandedKeys.push(item);
+      } else {
+        expandedKeys.push("".concat(expandedKeys[index - 1], ":").concat(item));
+      }
+    });
+    expandedKeys.pop();
+    return expandedKeys;
+  }
+  async onRouterChange(info) {
+    if (this.state.srfnav !== info.srfnav) {
+      const expandKeys = this.calcExpandKeys(info.srfnav);
+      await this.xDataController.expandNodeByKey(expandKeys);
+    }
+    await super.onRouterChange(info);
+  }
 };
 
 // src/controller/control/exp-bar/chart-exp-bar.controller.ts
@@ -39023,7 +39104,7 @@ var GridController = class extends MDControlController {
 };
 
 // src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts
-import { DataTypes as DataTypes3, ModelError as ModelError26 } from "@ibiz-template/core";
+import { DataTypes as DataTypes3, ModelError as ModelError26, plus as plus2 } from "@ibiz-template/core";
 import dayjs4 from "dayjs";
 import { debounce as debounce3 } from "lodash-es";
 import { clone as clone22, isNil as isNil21 } from "ramda";
@@ -39209,10 +39290,10 @@ var GridFieldColumnController = class extends GridColumnController {
     if (this.grid.model.aggMode === "PAGE") {
       switch (aggMode) {
         case "SUM":
-          aggValue = items.map((item) => item[fieldName]).reduce((a, b) => a + b, 0);
+          aggValue = items.map((item) => item[fieldName]).reduce((a, b) => plus2(a, b), 0);
           break;
         case "AVG":
-          aggValue = items.map((item) => item[fieldName]).reduce((a, b) => a + b, 0) / items.length;
+          aggValue = items.map((item) => item[fieldName]).reduce((a, b) => plus2(a, b), 0) / items.length;
           break;
         case "MAX":
           aggValue = Math.max(...items.map((item) => item[fieldName]));
@@ -40819,6 +40900,18 @@ var TabExpPanelController = class extends ControlController {
     }
     return ibiz.config.view.expCacheMode.includes(this.model.controlType);
   }
+  /**
+   * 当前路由视图的层级
+   *
+   * @author zk
+   * @date 2023-07-11 10:07:20
+   * @readonly
+   * @type {(number | undefined)}
+   * @memberof ExpBarControlController
+   */
+  get routeDepth() {
+    return this.view.modal.routeDepth;
+  }
   /**
    * 初始化state的属性
    *
@@ -40897,23 +40990,22 @@ var TabExpPanelController = class extends ControlController {
    * @memberof TabExpPanelController
    */
   initDefaultPage() {
-    const initFirstPage = () => {
-      this.state.activeName = this.state.tabPages[0].tabTag;
-      this.handleTabChange();
-    };
-    if (!this.state.defaultTabName) {
-      initFirstPage();
-    } else {
+    if (this.state.defaultTabName) {
       const activeTab = this.state.tabPages.find(
         (item) => item.tabTag === this.state.defaultTabName
       );
-      if (!activeTab) {
-        initFirstPage();
-      } else {
+      if (activeTab) {
         this.state.activeName = activeTab.tabTag;
-        this.changeToTab();
+        this.changeToTab(
+          this.activeTabViewPanelModel,
+          // 路由模式下并且有子路由
+          this.routeDepth !== void 0 && hasSubRoute(this.routeDepth)
+        );
+        return;
       }
     }
+    this.state.activeName = this.state.tabPages[0].tabTag;
+    this.handleTabChange();
   }
   /**
    * 切换分页
@@ -40922,8 +41014,11 @@ var TabExpPanelController = class extends ControlController {
    * @protected
    * @param {IDETabViewPanel} [tab=this.activeTabViewPanelModel!]
    */
-  changeToTab(tab = this.activeTabViewPanelModel) {
+  changeToTab(tab = this.activeTabViewPanelModel, isRoutePushed = false) {
     const navViewMsg = this.getNavViewMsg(tab);
+    if (isRoutePushed === true) {
+      navViewMsg.isRoutePushed = true;
+    }
     this.evt.emit("onNavViewChange", { navViewMsg });
   }
   /**
@@ -41299,6 +41394,7 @@ var TreeController = class extends MDControlController {
     super.initState();
     this.state.defaultExpandedKeys = [];
     this.state.expandedKeys = [];
+    this.state.navigational = false;
     this.state.size = 0;
   }
   async onCreated() {
@@ -41392,6 +41488,12 @@ var TreeController = class extends MDControlController {
    * @memberof TreeController
    */
   async onTreeNodeClick(nodeData) {
+    if (this.state.navigational) {
+      const nodeModel = this.getNodeModel(nodeData.nodeId);
+      if (!(nodeModel == null ? void 0 : nodeModel.navAppViewId)) {
+        return;
+      }
+    }
     if (this.state.singleSelect) {
       const { selectedData } = this.state;
       const filterArr = selectedData.filter((item) => item.id !== nodeData.id);
@@ -41557,6 +41659,26 @@ var TreeController = class extends MDControlController {
       children: nodes
     });
   }
+  async expandNodeByKey(expandKeys) {
+    const noExpandKeys = expandKeys.filter(
+      (key) => !this.state.expandedKeys.includes(key)
+    );
+    if (noExpandKeys.length === 0) {
+      return;
+    }
+    const existNodes = this.state.items.filter(
+      (item) => noExpandKeys.includes(item.id)
+    );
+    this.state.expandedKeys.push(...noExpandKeys);
+    if (existNodes.length === 0) {
+      return;
+    }
+    await Promise.all(
+      existNodes.map((node) => {
+        return this.loadNodes(node);
+      })
+    );
+  }
 };
 
 // src/controller/control/wizard-panel/wizard-panel.controller.ts
@@ -45206,9 +45328,16 @@ var ControlEventTrigger = class extends LogicTrigger {
 };
 
 // src/logic-scheduler/executor/app-ui-action-executor.ts
+import { RuntimeModelError as RuntimeModelError63 } from "@ibiz-template/core";
 var AppDEUIActionExecutor = class extends LogicExecutor {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   execute(executeParams) {
+    if (!this.logic.appDEUIActionId) {
+      throw new RuntimeModelError63(
+        this.logic,
+        "\u903B\u8F91\u4E2D\u7F3A\u5C11\u89E6\u53D1\u5E94\u7528\u5B9E\u4F53\u754C\u9762\u884C\u4E3Aid"
+      );
+    }
     UIActionUtil.execAndResolved(this.logic.appDEUIActionId, executeParams);
   }
 };
@@ -45617,6 +45746,7 @@ export {
   getWFSubmitViewId,
   handleAllSettled,
   hasDeCodeName,
+  hasSubRoute,
   importData,
   install,
   installCommand,