@ibiz-template/runtime 0.7.3 → 0.7.5

package/dist/index.esm.js

@@ -628,17 +628,35 @@ function convertNavData(navParams, ...origins) {
   return convertNavDataByArray(navParamsArr, ...origins);
 }
 function getVal(origins, key) {
+  const keys = key.split(".");
+  let currentVal;
   const findOrigin = origins.find((item) => {
     if (isNilOrEmpty(item)) {
       return false;
     }
+    if (keys.length > 1) {
+      currentVal = item;
+      for (let i = 0; i < keys.length; i++) {
+        const k = keys[i];
+        if (currentVal && (currentVal[k] || Object.prototype.hasOwnProperty.call(currentVal, k))) {
+          currentVal = currentVal[k];
+        } else {
+          currentVal = void 0;
+          break;
+        }
+      }
+      return currentVal !== void 0;
+    }
     return (
       // proxy数据判断是否能拿到值
       item[key] || // 上下文等判断是否有这个属性，如果有且值为空，则赋该空值
       Object.prototype.hasOwnProperty.call(item, key)
     );
   });
-  return { find: !!findOrigin, value: findOrigin == null ? void 0 : findOrigin[key] };
+  return {
+    find: !!findOrigin,
+    value: keys.length > 1 ? currentVal : findOrigin == null ? void 0 : findOrigin[key]
+  };
 }
 function convertNavDataByArray(naviDatas, ...origins) {
   const regex = /\$\{[^}]*\}/g;
@@ -9368,7 +9386,7 @@ var ControlService = class {
    */
   async handleItemPrivilege(data, context) {
     const { enableItemPrivilege, appDataEntityId } = this.model;
-    if (enableItemPrivilege && appDataEntityId) {
+    if (data && enableItemPrivilege && appDataEntityId) {
       const deAuthority = await this.app.authority.getService(appDataEntityId);
       const items = Array.isArray(data) ? data : [data];
       items.forEach((item) => {
@@ -12409,6 +12427,46 @@ var MarkOpenDataService = class {
   }
 };
 
+// src/service/service/util/util.service.ts
+var UtilService = class {
+  /**
+   * Creates an instance of UtilService.
+   * @author tony001
+   * @date 2024-04-23 11:04:49
+   * @param {IApplication} appModel
+   */
+  constructor(appModel) {
+    this.appModel = appModel;
+  }
+  /**
+   * 加载指定数据
+   *
+   * @author tony001
+   * @date 2024-04-23 11:04:22
+   * @param {string} tag
+   * @param {IContext} context
+   * @param {IParams} params
+   * @return {*}  {Promise<IData>}
+   */
+  async load(tag, context, params) {
+    throw new Error("\u6682\u672A\u5B9E\u73B0");
+  }
+  /**
+   * 保存指定数据
+   *
+   * @author tony001
+   * @date 2024-04-23 12:04:36
+   * @param {string} tag
+   * @param {IContext} context
+   * @param {IParams} params
+   * @param {IData} data
+   * @return {*}  {Promise<IData>}
+   */
+  async save(tag, context, params, data) {
+    throw new Error("\u6682\u672A\u5B9E\u73B0");
+  }
+};
+
 // src/service/vo/tree-node-data/tree-node-data.ts
 import { createUUID as createUUID5 } from "qx-util";
 var TreeNodeData = class {
@@ -13814,6 +13872,7 @@ var Application = class {
     this.deService = new DEServiceUtil(model);
     this.codeList = new CodeListService(model);
     this.authority = new AuthorityService(model);
+    this.utilservice = new UtilService(model);
   }
   /**
    * 当前应用标识
@@ -13869,6 +13928,19 @@ var Application = class {
     const item = items.find((func) => func.id === id);
     return item || null;
   }
+  /**
+   * 根据id获取应用功能组件
+   *
+   * @author tony001
+   * @date 2024-04-23 11:04:27
+   * @param {string} id
+   * @return {*}  {(IAppUtil | null)}
+   */
+  getAppUtil(id) {
+    const appUtils = this.model.appUtils || [];
+    const appUtil = appUtils.find((item) => item.id === id);
+    return appUtil || null;
+  }
   /**
    * 获取界面行为模型
    * @author lxm
@@ -15584,8 +15656,9 @@ 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 isNil21, mergeRight as mergeRight3 } from "ramda";
+var VIEW_MSG_PREFIX = "VIEW_MSG";
 var ViewMsgController = class _ViewMsgController {
-  constructor(msgGroupId) {
+  constructor(msgGroupId, tag = "") {
     this.msgGroupId = msgGroupId;
     /**
      * 视图消息map
@@ -15593,6 +15666,14 @@ var ViewMsgController = class _ViewMsgController {
      * @date 2023-09-22 05:38:03
      */
     this.viewMsgMap = /* @__PURE__ */ new Map();
+    /**
+     * 视图消息tag
+     *
+     * @author zhanghengfeng
+     * @date 2024-04-23 19:04:58
+     */
+    this.tag = "";
+    this.tag = "".concat(VIEW_MSG_PREFIX, "_").concat(tag);
   }
   /**
    * 初始化方法，从全局获取视图消息组和视图消息的模型
@@ -15680,7 +15761,9 @@ var ViewMsgController = class _ViewMsgController {
         })
       );
     }
-    return result;
+    return result.filter(
+      (item) => !(item.removeMode === 1 && localStorage.getItem(item.key))
+    );
   }
   /**
    * 计算静态消息数据(或者动态的里面静态的配置)
@@ -15694,6 +15777,7 @@ var ViewMsgController = class _ViewMsgController {
     const { position: position1 } = detail;
     const viewMsg = this.viewMsgMap.get(detail.appViewMsgId);
     const {
+      codeName,
       title,
       message,
       removeMode,
@@ -15703,6 +15787,7 @@ var ViewMsgController = class _ViewMsgController {
     const { userTag, userTag2, userTag3, userTag4 } = viewMsg;
     const position = position1 || position2;
     return {
+      key: "".concat(this.tag, "_").concat(codeName),
       title,
       message,
       position,
@@ -15783,6 +15868,9 @@ var ViewMsgController = class _ViewMsgController {
       if (removeModeField && !isNil21(item[removeModeField])) {
         message.removeMode = item[removeModeField];
       }
+      if (!isNil21(item.srfkey)) {
+        message.key = "".concat(this.tag, "_").concat(item.srfkey);
+      }
       return mergeRight3(basicMsg, message);
     });
     return deViewMessages;
@@ -16106,10 +16194,13 @@ var ViewController = class extends BaseController {
    * @date 2023-09-20 09:19:20
    */
   async initViewMsg() {
-    const { appViewMsgGroupId } = this.model;
+    const { appViewMsgGroupId, codeName } = this.model;
     if (appViewMsgGroupId) {
       this.state.viewMessages = { TOP: [], BOTTOM: [], BODY: [], POPUP: [] };
-      this.viewMsgController = new ViewMsgController(appViewMsgGroupId);
+      this.viewMsgController = new ViewMsgController(
+        appViewMsgGroupId,
+        "".concat(codeName, "_").concat(this.modal.mode)
+      );
       await this.viewMsgController.init(this.context);
       const messages = await this.viewMsgController.calcViewMessages(
         this.context,
@@ -16136,12 +16227,16 @@ var ViewController = class extends BaseController {
     const [message, ...rest] = messages;
     const modalParams = {
       title: message.title,
-      desc: message.message
-      // todo 待模型修复
-      // options: {
-      //   showClose: message.removeMode !== 0,
-      //   showConfirmButton: message.removeMode !== 0,
-      // },
+      desc: message.message,
+      options: {
+        showClose: message.removeMode !== 0,
+        showConfirmButton: message.removeMode !== 0,
+        callback: () => {
+          if (message.removeMode === 1) {
+            localStorage.setItem(message.key, "1");
+          }
+        }
+      }
     };
     if (message.extraParams.userTag) {
       Object.assign(modalParams, {
@@ -20573,6 +20668,9 @@ var UILogicParam = class {
     } else if (m.appGlobalParam) {
       let value = ibiz.util.getGlobalParam();
       if (m.paramFieldName) {
+        if (!value.hasOwnProperty(m.paramFieldName)) {
+          value[m.paramFieldName] = {};
+        }
         value = value[m.paramFieldName];
       }
       ctx.params[tag] = value;
@@ -20593,6 +20691,9 @@ var UILogicParam = class {
     } else if (m.routeViewSessionParam) {
       let value = parameters.view.getTopView().state;
       if (m.paramFieldName) {
+        if (!value.hasOwnProperty(m.paramFieldName)) {
+          value[m.paramFieldName] = {};
+        }
         value = value[m.paramFieldName];
       }
       ctx.params[tag] = value;
@@ -20605,6 +20706,9 @@ var UILogicParam = class {
     } else if (m.viewSessionParam) {
       let value = parameters.view.state;
       if (m.paramFieldName) {
+        if (!value.hasOwnProperty(m.paramFieldName)) {
+          value[m.paramFieldName] = {};
+        }
         value = value[m.paramFieldName];
       }
       ctx.params[tag] = value;
@@ -27182,7 +27286,7 @@ import {
   RuntimeError as RuntimeError56,
   RuntimeModelError as RuntimeModelError63
 } from "@ibiz-template/core";
-import { clone as clone27 } from "ramda";
+import { clone as clone27, isNil as isNil28 } from "ramda";
 import dayjs5 from "dayjs";
 
 // src/controller/control/grid/grid/grid.service.ts
@@ -27467,6 +27571,16 @@ var GridController = class extends MDControlController {
   get allowRowEdit() {
     return !!this.model.enableRowEdit && this.state.rowEditOpen;
   }
+  /**
+   * 允许使用行编辑次序调整
+   * @author zzq
+   * @date 2024-04-22 17:52:07
+   * @readonly
+   * @type {boolean}
+   */
+  get enableRowEditOrder() {
+    return !!this.model.enableRowEditOrder;
+  }
   /**
    * 单元格超出呈现模式
    * @author lxm
@@ -27644,7 +27758,34 @@ var GridController = class extends MDControlController {
     }
     this.calcColumnFixed();
   }
+  /**
+   * 本地排序items
+   * @author zzq
+   * @date 2024-04-22 19:30:55
+   * @param {IData[]} items
+   */
+  sortItems(items) {
+    const sortField = this.model.orderValueAppDEFieldId;
+    if (!sortField || !this.enableRowEditOrder) {
+      return;
+    }
+    items.forEach((item) => {
+      const sortValue = item[sortField];
+      if (isNil28(sortValue)) {
+        item[sortField] = 0;
+      } else {
+        const toNum = Number(sortValue);
+        if (Number.isNaN(toNum)) {
+          throw new RuntimeError56(
+            "".concat(item.srfmajortext, "\u7684\u6392\u5E8F\u5C5E\u6027\u65E0\u6CD5\u8F6C\u6362\u6210\u6570\u503C")
+          );
+        }
+      }
+    });
+    items.sort((a, b) => a[sortField] - b[sortField]);
+  }
   async afterLoad(args, items) {
+    this.sortItems(this.state.items);
     await super.afterLoad(args, items);
     await handleAllSettled(
       Object.values(this.fieldColumns).map(async (fieldColumn) => {
@@ -28523,13 +28664,70 @@ var GridController = class extends MDControlController {
     }
     super.actionNotification(tag, { ...opts || {} });
   }
+  /**
+   * 拖拽变更事件处理回调
+   * @author: zzq
+   * @date 2024-04-22 18:12:58
+   * @return {*}  {Promise<void>}
+   */
+  async onDragChange() {
+    const sortField = this.model.orderValueAppDEFieldId;
+    const getNextSort = (num) => {
+      return num + (100 - num % 100);
+    };
+    const changedArr = this.state.rows.map((row) => row.data);
+    let lastSort;
+    const modifiedItems = [];
+    changedArr.forEach((item) => {
+      if (lastSort === void 0) {
+        lastSort = item[sortField] || 100;
+        if (!item[sortField]) {
+          item[sortField] = lastSort;
+          modifiedItems.push(item);
+        }
+      } else {
+        if (!item[sortField] || lastSort >= item[sortField]) {
+          item[sortField] = getNextSort(lastSort);
+          modifiedItems.push(item);
+        }
+        lastSort = item[sortField];
+      }
+    });
+    this.updateChangedItems(modifiedItems);
+  }
+  /**
+   * 更新改变项数据
+   * @author: zzq
+   * @date 2024-04-22 17:12:58
+   * @return {*}  {Promise<void>}
+   */
+  async updateChangedItems(changedItems) {
+    try {
+      await Promise.all(
+        changedItems.map(async (item) => {
+          const deName = calcDeCodeNameById(this.model.appDataEntityId);
+          const tempContext = this.context.clone();
+          tempContext[deName] = item.srfkey;
+          const res = await this.service.update(tempContext, item);
+          if (res.data) {
+            const index = this.state.items.findIndex(
+              (x) => x.srfkey === item.srfkey
+            );
+            this.state.items.splice(index, 1, res.data);
+          }
+        })
+      );
+    } finally {
+      await this.afterLoad({}, this.state.items);
+    }
+  }
 };
 
 // src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts
 import { DataTypes as DataTypes4, ModelError as ModelError29, plus as plus2 } from "@ibiz-template/core";
 import dayjs6 from "dayjs";
 import { debounce as debounce2 } from "lodash-es";
-import { clone as clone28, isNil as isNil28 } from "ramda";
+import { clone as clone28, isNil as isNil29 } from "ramda";
 var GridFieldColumnController = class extends GridColumnController {
   constructor() {
     super(...arguments);
@@ -28741,11 +28939,11 @@ var GridFieldColumnController = class extends GridColumnController {
    */
   calcFieldAgg(items) {
     const { aggField, aggMode, aggValueFormat, unitName } = this.model;
-    if (isNil28(aggMode) || aggMode === "NONE") {
+    if (isNil29(aggMode) || aggMode === "NONE") {
       return;
     }
     const fieldName = aggField || this.model.id;
-    items = items.filter((item) => !isNil28(item[fieldName]));
+    items = items.filter((item) => !isNil29(item[fieldName]));
     let aggValue;
     if (this.grid.model.aggMode === "PAGE") {
       switch (aggMode) {
@@ -30706,7 +30904,7 @@ var SearchBarFilterItemsController = class extends SearchBarFilterController {
 
 // src/controller/control/search-bar/interface-util.ts
 import { recursiveIterate as recursiveIterate9 } from "@ibiz-template/core";
-import { isNil as isNil29 } from "ramda";
+import { isNil as isNil30 } from "ramda";
 function getOriginFilterNodes() {
   return [
     {
@@ -30728,7 +30926,7 @@ function validateFilterNodes(filterNodes) {
     }
     if (node.nodeType === "FIELD") {
       hasFilter = true;
-      hasError = !node.field || !node.valueOP || isNil29(node.value);
+      hasError = !node.field || !node.valueOP || isNil30(node.value);
     } else if (node.nodeType === "ITEMS") {
       hasError = !node.field || !node.valueOP;
     } else {
@@ -31753,7 +31951,7 @@ import {
   RuntimeModelError as RuntimeModelError66,
   recursiveIterate as recursiveIterate11
 } from "@ibiz-template/core";
-import { isNil as isNil30 } from "ramda";
+import { isNil as isNil31 } from "ramda";
 
 // src/controller/control/tree/tree.service.ts
 import { ModelError as ModelError30 } from "@ibiz-template/core";
@@ -32831,7 +33029,7 @@ var TreeController = class extends MDControlController {
    * @return {*}  {void}
    */
   onDEDataChange(msg) {
-    if (!isNil30(msg.triggerKey) && msg.triggerKey === this.triggerKey) {
+    if (!isNil31(msg.triggerKey) && msg.triggerKey === this.triggerKey) {
       return;
     }
     if (msg.subtype === "OBJECTCREATED") {
@@ -33204,7 +33402,7 @@ var WizardPanelController = class extends ControlController {
 
 // src/controller/control/md-ctrl/md-ctrl.controller.ts
 import { RuntimeModelError as RuntimeModelError67 } from "@ibiz-template/core";
-import { isNil as isNil31 } from "ramda";
+import { isNil as isNil32 } from "ramda";
 
 // src/controller/control/md-ctrl/md-ctrl.service.ts
 var MDCtrlService = class extends MDControlService {
@@ -33433,7 +33631,7 @@ var MDCtrlController = class extends MDControlController {
       const groupMap = /* @__PURE__ */ new Map();
       items.forEach((item) => {
         const groupVal = item[groupAppDEFieldId];
-        if (isNil31(groupVal)) {
+        if (isNil32(groupVal)) {
           return;
         }
         if (!groupMap.has(groupVal)) {
@@ -33510,7 +33708,7 @@ var MDCtrlController = class extends MDControlController {
 
 // src/controller/control/kanban/kanban.controller.ts
 import { RuntimeError as RuntimeError62, RuntimeModelError as RuntimeModelError68 } from "@ibiz-template/core";
-import { isNil as isNil32 } from "ramda";
+import { isNil as isNil33 } from "ramda";
 
 // src/controller/control/kanban/kanban.service.ts
 var KanbanService = class extends DataViewControlService {
@@ -33596,7 +33794,7 @@ var KanbanController = class extends DataViewControlController {
     const isAsc = minorSortDir === "ASC";
     items.forEach((item) => {
       const sortValue = item[sortField];
-      if (isNil32(sortValue)) {
+      if (isNil33(sortValue)) {
         item[sortField] = 0;
       } else {
         const toNum = Number(sortValue);
@@ -33739,7 +33937,7 @@ var KanbanController = class extends DataViewControlController {
       const groupMap = /* @__PURE__ */ new Map();
       items.forEach((item) => {
         const groupVal = item[groupAppDEFieldId];
-        if (isNil32(groupVal)) {
+        if (isNil33(groupVal)) {
           return;
         }
         if (!groupMap.has(groupVal)) {
@@ -36681,7 +36879,7 @@ import { QXEvent as QXEvent10 } from "qx-util";
 // src/controller/notification/async-action.controller.ts
 import { QXEvent as QXEvent8 } from "qx-util";
 import { clone as clone33 } from "ramda";
-import { isNil as isNil33, isNumber as isNumber2 } from "lodash-es";
+import { isNil as isNil34, isNumber as isNumber2 } from "lodash-es";
 import dayjs8 from "dayjs";
 var AsyncActionController = class {
   constructor() {
@@ -36756,14 +36954,14 @@ var AsyncActionController = class {
         data[key] = dayjs8(data[key]).format("YYYY-MM-DD HH:mm:ss");
       }
     });
-    if (!isNil33(data.actionresult)) {
+    if (!isNil34(data.actionresult)) {
       try {
         const json = JSON.parse(data.actionresult);
         data.actionresult = json;
       } catch (error) {
       }
     }
-    if (!isNil33(data.completionrate)) {
+    if (!isNil34(data.completionrate)) {
       const num = Number(data.completionrate);
       if (Number.isNaN(num)) {
         data.completionrate = void 0;
@@ -37882,10 +38080,7 @@ var MDViewEngine = class extends ViewEngineBase {
    * @return {*}  {Promise<void>}
    */
   async onXDataActive(event) {
-    const res = await this.openData(event);
-    if (!res.cancel) {
-      this.refresh();
-    }
+    await this.openData(event);
   }
   // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
   async call(key, args) {
@@ -39681,6 +39876,7 @@ export {
   UIDomainManager,
   UILOGINNODE_PROVIDER_PREFIX,
   UIMapField,
+  UtilService,
   V7AuthService,
   VIEW_PROVIDER_PREFIX,
   ValueExUtil,