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

package/out/utils/error-handler/default-error-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"default-error-handler.d.ts","sourceRoot":"","sources":["../../../src/utils/error-handler/default-error-handler.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD;;;;;;;GAOG;AACH,qBAAa,mBAAoB,YAAW,aAAa;IACvD,MAAM,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,GAAG,SAAS;CA8B5C"}
+{"version":3,"file":"default-error-handler.d.ts","sourceRoot":"","sources":["../../../src/utils/error-handler/default-error-handler.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD;;;;;;;GAOG;AACH,qBAAa,mBAAoB,YAAW,aAAa;IACvD;;OAEG;IACH,MAAM,CAAC,cAAc,SAAO;IAE5B;;OAEG;IACH,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAEnD;;OAEG;IACH,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAiB5C;;OAEG;IACH,MAAM,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,GAAG,SAAS;CAwC5C"}

package/out/utils/error-handler/default-error-handler.js

@@ -8,23 +8,53 @@ import { RuntimeModelError, ModelError, HttpError, NoticeError, RuntimeError, }
  * @implements {IErrorHandler}
  */
 export 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 !== undefined) {
+            return true;
+        }
+        errorCache.set(message, now);
+        return false;
+    }
+    /**
+     * 处理错误
+     */
     handle(error) {
         var _a, _b;
+        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 &&
                 ((_b = (_a = error.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.type) === 'DataEntityRuntimeException') {
-                ibiz.message.error(error.message);
+                if (!isDuplicate(error.message)) {
+                    ibiz.message.error(error.message);
+                }
             }
-            else {
+            else if (!isDuplicate(error.message)) {
                 ibiz.notification.error({
                     title: '',
                     desc: error.message,
@@ -33,12 +63,24 @@ export class DefaultErrorHandler {
             }
         }
         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 = new Map();

package/out/utils/index.d.ts

@@ -36,4 +36,5 @@ export * from './map-util/map-util';
 export * from './wechat-util/wechat-util';
 export * from './json-util/json-util';
 export * from './stringify-util/stringify-util';
+export * from './model';
 //# sourceMappingURL=index.d.ts.map

package/out/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,cAAc,yBAAyB,CAAC;AACxC,OAAO,EACL,yBAAyB,EACzB,gBAAgB,EAChB,mBAAmB,EACnB,iBAAiB,GAClB,MAAM,yCAAyC,CAAC;AACjD,cAAc,UAAU,CAAC;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,cAAc,uBAAuB,CAAC;AACtC,cAAc,eAAe,CAAC;AAC9B,cAAc,yBAAyB,CAAC;AACxC,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,cAAc,qBAAqB,CAAC;AACpC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,uBAAuB,CAAC;AACtC,cAAc,iCAAiC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,cAAc,yBAAyB,CAAC;AACxC,OAAO,EACL,yBAAyB,EACzB,gBAAgB,EAChB,mBAAmB,EACnB,iBAAiB,GAClB,MAAM,yCAAyC,CAAC;AACjD,cAAc,UAAU,CAAC;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,cAAc,uBAAuB,CAAC;AACtC,cAAc,eAAe,CAAC;AAC9B,cAAc,yBAAyB,CAAC;AACxC,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,cAAc,qBAAqB,CAAC;AACpC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,uBAAuB,CAAC;AACtC,cAAc,iCAAiC,CAAC;AAChD,cAAc,SAAS,CAAC"}

package/out/utils/index.js

@@ -36,3 +36,4 @@ export * from './map-util/map-util';
 export * from './wechat-util/wechat-util';
 export * from './json-util/json-util';
 export * from './stringify-util/stringify-util';
+export * from './model';

package/out/utils/model/index.d.ts

@@ -0,0 +1,7 @@
+import { IAppMenu } from '@ibiz/model-core';
+/**
+ * @description 计算动态菜单
+ * @param {IAppMenu} menu
+ */
+export declare function calcDynamicMenu(menu: IAppMenu, context: IContext, params: IParams): Promise<void>;
+//# sourceMappingURL=index.d.ts.map

package/out/utils/model/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/model/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAgB,MAAM,kBAAkB,CAAC;AAG1D;;;GAGG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,QAAQ,EACd,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,IAAI,CAAC,CAqFf"}

package/out/utils/model/index.js

@@ -0,0 +1,65 @@
+import { isBase64, isBase64Image, isSvg } from '@ibiz-template/core';
+import { ScriptFactory } from '../script';
+/**
+ * @description 计算动态菜单
+ * @param {IAppMenu} menu
+ */
+export async function calcDynamicMenu(menu, context, params) {
+    const { appId, dynamicMode, clsAppDEFieldId, textAppDEFieldId, tipsAppDEFieldId, itemAppDEDataSetId, iconClsAppDEFieldId, itemAppDataEntityId, appFuncTagAppDEFieldId, enableScriptAppDEFieldId, visibleScriptAppDEFieldId, } = menu;
+    if (dynamicMode !== 1 || !itemAppDataEntityId || !itemAppDEDataSetId)
+        return;
+    try {
+        const app = ibiz.hub.getApp(appId);
+        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,
+                    id: item.srfkey,
+                    name: item.srfkey,
+                    itemType: 'MENUITEM',
+                    appFuncId: appFuncTagAppDEFieldId
+                        ? item[appFuncTagAppDEFieldId]
+                        : undefined,
+                    caption: textAppDEFieldId
+                        ? item[textAppDEFieldId]
+                        : item.srfmajortext,
+                    tooltip: tipsAppDEFieldId
+                        ? item[tipsAppDEFieldId]
+                        : item.srfmajortext,
+                };
+                if (clsAppDEFieldId && item[clsAppDEFieldId])
+                    menuItem.sysCss = { appId, cssName: item[clsAppDEFieldId] };
+                if (iconClsAppDEFieldId && item[iconClsAppDEFieldId]) {
+                    const icon = item[iconClsAppDEFieldId];
+                    const imagePath = isBase64Image(icon) ||
+                        isBase64(icon) ||
+                        isSvg(icon) ||
+                        icon.endsWith('svg') ||
+                        icon.startsWith('http');
+                    menuItem.sysImage = {
+                        appId,
+                        [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);
+    }
+}

package/out/utils/script/script-function.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"script-function.d.ts","sourceRoot":"","sources":["../../../src/utils/script/script-function.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAmB,MAAM,iBAAiB,CAAC;AASvE,qBAAa,cAAc;IACzB,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAE7B,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,CAAM;IAEjC,SAAS,CAAC,OAAO,EAAE,mBAAmB,CAAC;gBAGrC,OAAO,EAAE,MAAM,EAAE,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,mBAAoC;IAmB/C;;;;;;;;OAQG;IACH,SAAS,CAAC,UAAU,CAClB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,mBAAmB,GAC3B,MAAM;IAWT;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,mBAAmB,GAAG,IAAI;IA+B5E;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,GAAG,GAAG,EAAE;IAuB7C;;;;;;;OAOG;IACH,SAAS,CAAC,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI;IAkD9D;;;;;;OAMG;IACH,IAAI,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO;CAI/B"}
+{"version":3,"file":"script-function.d.ts","sourceRoot":"","sources":["../../../src/utils/script/script-function.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAmB,MAAM,iBAAiB,CAAC;AASvE,qBAAa,cAAc;IACzB,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAE7B,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,CAAM;IAEjC,SAAS,CAAC,OAAO,EAAE,mBAAmB,CAAC;gBAGrC,OAAO,EAAE,MAAM,EAAE,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,mBAAoC;IAkB/C;;;;;;;;OAQG;IACH,SAAS,CAAC,UAAU,CAClB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,mBAAmB,GAC3B,MAAM;IAWT;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,mBAAmB,GAAG,IAAI;IA+B5E;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,GAAG,GAAG,EAAE;IAuB7C;;;;;;;OAOG;IACH,SAAS,CAAC,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI;IAkD9D;;;;;;OAMG;IACH,IAAI,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO;CAI/B"}

package/out/utils/script/script-function.js

@@ -21,7 +21,6 @@ export class ScriptFunction {
             }
             catch (error) {
                 ibiz.log.error(ibiz.i18n.t('runtime.utils.script.errorReportingScript'), code);
-                throw error;
             }
         };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.7.41-alpha.100",
+  "version": "0.7.41-alpha.102",
   "description": "运行时逻辑库",
   "type": "module",
   "main": "out/index.js",
@@ -37,7 +37,7 @@
     "jsencrypt": "^3.3.2"
   },
   "devDependencies": {
-    "@ibiz-template/core": "^0.7.41-alpha.88",
+    "@ibiz-template/core": "^0.7.41-alpha.101",
     "@ibiz/model-core": "^0.1.86",
     "@types/animejs": "^3.1.12",
     "@types/path-browserify": "^1.0.2",
@@ -68,5 +68,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "fddfbaa15b8d916e4da1cbb9308eb5f766bddb90"
+  "gitHead": "8a357c2719b2128a6d5e93e8ae06224f998ad484"
 }