@ibiz-template/runtime 0.7.41-alpha.100 → 0.7.41-alpha.101

package/dist/index.esm.js

@@ -19572,21 +19572,48 @@ import {
   NoticeError,
   RuntimeError
 } from "@ibiz-template/core";
-var DefaultErrorHandler = class {
+var _DefaultErrorHandler = class _DefaultErrorHandler {
+  /**
+   * 判断错误是否重复
+   */
+  static isDuplicate(message) {
+    const { DEDUP_INTERVAL, errorCache } = _DefaultErrorHandler;
+    const now = Date.now();
+    for (const [key, time] of errorCache) {
+      if (now - time >= DEDUP_INTERVAL) {
+        errorCache.delete(key);
+      }
+    }
+    const lastTime = errorCache.get(message);
+    if (lastTime !== void 0) {
+      return true;
+    }
+    errorCache.set(message, now);
+    return false;
+  }
+  /**
+   * 处理错误
+   */
   handle(error) {
     var _a3, _b2;
+    const { isDuplicate } = _DefaultErrorHandler;
     if (error instanceof RuntimeModelError || error instanceof ModelError) {
-      ibiz.message.error(error.message, 10, true);
+      if (!isDuplicate(error.message)) {
+        ibiz.message.error(error.message, 10, true);
+      }
     } else if (error instanceof HttpError) {
       if (error.status === 401) {
-        ibiz.message.error(
-          ibiz.i18n.t("runtime.utils.errorHandler.noPermissionless")
-        );
+        const msg = ibiz.i18n.t("runtime.utils.errorHandler.noPermissionless");
+        if (!isDuplicate(msg)) {
+          ibiz.message.error(msg);
+        }
       } else if (error.status === 404) {
         ibiz.mc.error.send(error);
       } else if (error.status === 500 && ((_b2 = (_a3 = error.response) == null ? void 0 : _a3.data) == null ? void 0 : _b2.type) === "DataEntityRuntimeException") {
-        ibiz.message.error(error.message);
-      } else {
+        if (!isDuplicate(error.message)) {
+          ibiz.message.error(error.message);
+        }
+      } else if (!isDuplicate(error.message)) {
         ibiz.notification.error({
           title: "",
           desc: error.message,
@@ -19594,14 +19621,27 @@ var DefaultErrorHandler = class {
         });
       }
     } else if (error instanceof NoticeError) {
-      ibiz.message.error(error.message, error.duration, error.duration === 0);
+      if (!isDuplicate(error.message)) {
+        ibiz.message.error(error.message, error.duration, error.duration === 0);
+      }
     } else if (error instanceof RuntimeError) {
-      ibiz.message.error(error.message, 10, true);
+      if (!isDuplicate(error.message)) {
+        ibiz.message.error(error.message, 10, true);
+      }
     }
     ibiz.log.error(error);
     return true;
   }
 };
+/**
+ * 错误去重时间间隔（300ms）
+ */
+_DefaultErrorHandler.DEDUP_INTERVAL = 300;
+/**
+ * 错误缓存
+ */
+_DefaultErrorHandler.errorCache = /* @__PURE__ */ new Map();
+var DefaultErrorHandler = _DefaultErrorHandler;
 
 // src/utils/error-handler/error-handler-center.ts
 var ErrorHandlerCenter = class {
@@ -30880,8 +30920,9 @@ var AppMenuController = class extends ControlController {
   }
   async onCreated() {
     var _a3;
-    await super.onCreated();
     this.app = await ibiz.hub.getApp(this.context.srfappid);
+    await calcDynamicMenu(this.model, this.context, this.params);
+    await super.onCreated();
     await this.initAppMenuItemProviders();
     (_a3 = this.model.appMenuItems) == null ? void 0 : _a3.forEach((item) => {
       this.initMenuItemState(item);
@@ -31206,7 +31247,7 @@ var AppMenuController = class extends ControlController {
         }
       });
     };
-    flattenMenus(this.model.appMenuItems);
+    flattenMenus(this.model.appMenuItems || []);
     this.allAppMenuItems = result;
   }
   /**
@@ -72874,14 +72915,19 @@ var FetchMethod = class extends Method {
       }
       const cond = DEDQCondUtil.getCond(this.method);
       const filter = new SearchFilter(context, searchParams);
-      const items = await this.searchLocal(cond, filter);
-      res = new HttpResponse6(items, 200);
+      const { items, total, page, size, totalPages } = await this.searchLocalWithMeta(cond, filter);
+      res = new HttpResponse6(items, 200, "", {
+        "x-total": total,
+        "x-page": page,
+        "x-per-page": size,
+        "x-total-pages": totalPages
+      });
     } else {
       switch (this.method.dataSetType) {
         case "INDEXDE":
         case "CODELIST":
         case "MULTIFORM":
-          res = await this.fetchCodeListSet(context, searchParams);
+          res = await this.fetchCodeListSetWithMeta(context, searchParams);
           break;
         case "REMOTE":
           {
@@ -72970,10 +73016,73 @@ var FetchMethod = class extends Method {
     }
     const { page, size } = filter;
     const start = page * size;
-    const end = (page + 1) * size - 1;
+    const end = (page + 1) * size;
     const items = list.slice(start, end).map((item) => clone53(item));
     return items;
   }
+  /**
+   * 搜索本地数据（带元数据）
+   * @param cond 查询实例
+   * @param filter 过滤对象
+   * @param queryParamKeys 当前实体支持快速搜索的属性
+   * @returns 数据列表和分页信息
+   */
+  async searchLocalWithMeta(cond, filter, queryParamKeys = this.entity.quickSearchAppDEFieldIds) {
+    let list = this.service.local.getList();
+    if (cond) {
+      if (list.length > 0) {
+        list = list.filter((obj) => cond.test(obj, filter));
+      }
+    }
+    if (list.length > 0) {
+      if (filter.query && filter.query !== "") {
+        if (queryParamKeys) {
+          list = list.filter((obj) => {
+            const reg2 = new RegExp(filter.query.toLowerCase());
+            for (let i = 0; i < queryParamKeys.length; i += 1) {
+              const key = queryParamKeys[i];
+              const val = obj[key];
+              if (reg2.test(val.toLowerCase())) {
+                return true;
+              }
+            }
+            return false;
+          });
+        }
+      }
+    }
+    if (!isNil37(filter.sortField) && !isEmpty9(filter.sortField)) {
+      if (filter.sortMode === "DESC") {
+        list = descSort(list, filter.sortField);
+      } else {
+        list = ascSort2(list, filter.sortField);
+      }
+    }
+    if (!isNil37(filter.srfDefaultCond) && !isEmpty9(filter.srfDefaultCond)) {
+      const defaultConds = filter.srfDefaultCond;
+      const defaultCondKeys = Object.keys(defaultConds);
+      list = list.filter((obj) => {
+        for (let i = 0; i < defaultCondKeys.length; i += 1) {
+          const key = defaultCondKeys[i];
+          if (obj[key] === defaultConds[key]) {
+            return true;
+          }
+        }
+        return false;
+      });
+    }
+    const { page, size } = filter;
+    const start = page * size;
+    const end = (page + 1) * size;
+    const items = list.slice(start, end).map((item) => clone53(item));
+    return {
+      items,
+      total: list.length,
+      page,
+      size,
+      totalPages: Math.ceil(list.length / size)
+    };
+  }
   /**
    * 获取代码表数据来源的集合
    * @author lxm
@@ -73002,6 +73111,38 @@ var FetchMethod = class extends Method {
     }));
     return new HttpResponse6(dataSet, 200);
   }
+  /**
+   * 获取代码表数据来源的集合（带元数据）
+   *
+   * @param {IContext} context
+   * @param {IParams} params
+   * @return {*}  {Promise<HttpResponse<IData[]>>}
+   */
+  async fetchCodeListSetWithMeta(context, params) {
+    const { appCodeListId } = this.method;
+    if (!appCodeListId) {
+      throw new RuntimeModelError71(
+        this.method,
+        ibiz.i18n.t("runtime.service.sourceCodeTable")
+      );
+    }
+    const codeItems = await this.app.codeList.get(
+      appCodeListId,
+      context,
+      params
+    );
+    const { keyAppDEFieldId, majorAppDEFieldId } = this.entity;
+    const dataSet = codeItems.map((item) => ({
+      [keyAppDEFieldId]: item.value,
+      [majorAppDEFieldId]: item.text
+    }));
+    return new HttpResponse6(dataSet, 200, "", {
+      "x-total": codeItems.length,
+      "x-page": 0,
+      "x-per-page": codeItems.length,
+      "x-total-pages": 1
+    });
+  }
 };
 
 // src/service/service/entity/method/ac-fetch.ts
@@ -84682,6 +84823,82 @@ function stringifyObj(obj) {
   });
 }
 
+// src/utils/model/index.ts
+import { isBase64, isBase64Image as isBase64Image2, isSvg } from "@ibiz-template/core";
+async function calcDynamicMenu(menu, context, params) {
+  const {
+    appId: appId2,
+    dynamicMode,
+    clsAppDEFieldId,
+    textAppDEFieldId,
+    tipsAppDEFieldId,
+    itemAppDEDataSetId,
+    iconClsAppDEFieldId,
+    itemAppDataEntityId,
+    appFuncTagAppDEFieldId,
+    enableScriptAppDEFieldId,
+    visibleScriptAppDEFieldId
+  } = menu;
+  if (dynamicMode !== 1 || !itemAppDataEntityId || !itemAppDEDataSetId)
+    return;
+  try {
+    const app = ibiz.hub.getApp(appId2);
+    const res = await app.deService.exec(
+      itemAppDataEntityId,
+      itemAppDEDataSetId,
+      context,
+      params
+    );
+    if (res.ok && res.data && Array.isArray(res.data)) {
+      if (!menu.appMenuItems)
+        menu.appMenuItems = [];
+      res.data.forEach((item) => {
+        const menuItem = {
+          appId: appId2,
+          id: item.srfkey,
+          name: item.srfkey,
+          itemType: "MENUITEM",
+          appFuncId: appFuncTagAppDEFieldId ? item[appFuncTagAppDEFieldId] : void 0,
+          caption: textAppDEFieldId ? item[textAppDEFieldId] : item.srfmajortext,
+          tooltip: tipsAppDEFieldId ? item[tipsAppDEFieldId] : item.srfmajortext
+        };
+        if (clsAppDEFieldId && item[clsAppDEFieldId])
+          menuItem.sysCss = { appId: appId2, cssName: item[clsAppDEFieldId] };
+        if (iconClsAppDEFieldId && item[iconClsAppDEFieldId]) {
+          const icon = item[iconClsAppDEFieldId];
+          const imagePath = isBase64Image2(icon) || isBase64(icon) || isSvg(icon) || icon.endsWith("svg") || icon.startsWith("http");
+          menuItem.sysImage = {
+            appId: appId2,
+            [imagePath ? "imagePath" : "cssClass"]: icon
+          };
+        }
+        let visible = true;
+        if (visibleScriptAppDEFieldId && item[visibleScriptAppDEFieldId]) {
+          visible = ScriptFactory.execScriptFn(
+            { context, params },
+            item[visibleScriptAppDEFieldId],
+            { singleRowReturn: true }
+          );
+        }
+        menuItem.hidden = !visible;
+        let enable = true;
+        if (enableScriptAppDEFieldId && item[enableScriptAppDEFieldId]) {
+          enable = ScriptFactory.execScriptFn(
+            { context, params },
+            item[enableScriptAppDEFieldId],
+            { singleRowReturn: true }
+          );
+        }
+        menuItem.valid = enable;
+        if (visible)
+          menu.appMenuItems.push(menuItem);
+      });
+    }
+  } catch (error) {
+    ibiz.log.error(error);
+  }
+}
+
 // src/command/app/open-app-view/open-app-view.ts
 import { ModelError as ModelError30, RuntimeError as RuntimeError70 } from "@ibiz-template/core";
 import { clone as clone59 } from "ramda";
@@ -91656,6 +91873,7 @@ export {
   calcDyUiactionGroup,
   calcDynaClass,
   calcDynaSysParams,
+  calcDynamicMenu,
   calcFilterModelBySchema,
   calcGridLayoutPos,
   calcImportSchemaData,