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

package/out/controller/control/app-menu/app-menu.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-menu.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/app-menu/app-menu.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"app-menu.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/app-menu/app-menu.controller.ts"],"names":[],"mappings":"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"}

package/out/controller/control/app-menu/app-menu.controller.js

@@ -3,6 +3,7 @@ import { AppFuncCommand } from '../../../command';
 import { ControlController } from '../../common';
 import { getAppMenuItemProvider } from '../../../register';
 import { CustomAppMenuController } from './custom-app-menu.controller';
+import { calcDynamicMenu } from '../../../utils';
 /**
  * 应用菜单控制器
  *
@@ -87,8 +88,9 @@ export class AppMenuController extends ControlController {
     }
     async onCreated() {
         var _a;
-        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();
         // 初始化菜单项状态
         (_a = this.model.appMenuItems) === null || _a === void 0 ? void 0 : _a.forEach(item => {
@@ -400,7 +402,7 @@ export class AppMenuController extends ControlController {
                 }
             });
         };
-        flattenMenus(this.model.appMenuItems);
+        flattenMenus(this.model.appMenuItems || []);
         this.allAppMenuItems = result;
     }
     /**

package/out/service/service/entity/method/fetch.d.ts

@@ -26,6 +26,20 @@ export declare class FetchMethod extends Method {
      * @return {*}  {Promise<IDataEntity[]>}
      */
     searchLocal(cond: PSDEDQCondEngine | null, filter: SearchFilter, queryParamKeys?: string[]): Promise<IDataEntity[]>;
+    /**
+     * 搜索本地数据（带元数据）
+     * @param cond 查询实例
+     * @param filter 过滤对象
+     * @param queryParamKeys 当前实体支持快速搜索的属性
+     * @returns 数据列表和分页信息
+     */
+    searchLocalWithMeta(cond: PSDEDQCondEngine | null, filter: SearchFilter, queryParamKeys?: string[]): Promise<{
+        items: IDataEntity[];
+        total: number;
+        page: number;
+        size: number;
+        totalPages: number;
+    }>;
     /**
      * 获取代码表数据来源的集合
      * @author lxm
@@ -35,5 +49,13 @@ export declare class FetchMethod extends Method {
      * @return {*}  {Promise<HttpResponse<IData[]>>}
      */
     protected fetchCodeListSet(context: IContext, params: IParams): Promise<HttpResponse<IData[]>>;
+    /**
+     * 获取代码表数据来源的集合（带元数据）
+     *
+     * @param {IContext} context
+     * @param {IParams} params
+     * @return {*}  {Promise<HttpResponse<IData[]>>}
+     */
+    protected fetchCodeListSetWithMeta(context: IContext, params: IParams): Promise<HttpResponse<IData[]>>;
 }
 //# sourceMappingURL=fetch.d.ts.map

package/out/service/service/entity/method/fetch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGb,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAIjD,OAAO,EAAgB,gBAAgB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9E,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGpD;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,MAAM;IAC7B,MAAM,EAAE,aAAa,CAAC;IAExB,IAAI,CACR,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,CAAC,EAAE,OAAO,EACjB,MAAM,CAAC,EAAE,KAAK,GACb,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC;IAmEvC;;;;;;;;;OASG;IACG,WAAW,CACf,IAAI,EAAE,gBAAgB,GAAG,IAAI,EAC7B,MAAM,EAAE,YAAY,EACpB,cAAc,GAAE,MAAM,EAA0C,GAC/D,OAAO,CAAC,WAAW,EAAE,CAAC;IAsDzB;;;;;;;OAOG;cACa,gBAAgB,CAC9B,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;CAqBlC"}
+{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGb,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAIjD,OAAO,EAAgB,gBAAgB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9E,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGpD;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,MAAM;IAC7B,MAAM,EAAE,aAAa,CAAC;IAExB,IAAI,CACR,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,CAAC,EAAE,OAAO,EACjB,MAAM,CAAC,EAAE,KAAK,GACb,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC;IAyEvC;;;;;;;;;OASG;IACG,WAAW,CACf,IAAI,EAAE,gBAAgB,GAAG,IAAI,EAC7B,MAAM,EAAE,YAAY,EACpB,cAAc,GAAE,MAAM,EAA0C,GAC/D,OAAO,CAAC,WAAW,EAAE,CAAC;IAsDzB;;;;;;OAMG;IACG,mBAAmB,CACvB,IAAI,EAAE,gBAAgB,GAAG,IAAI,EAC7B,MAAM,EAAE,YAAY,EACpB,cAAc,GAAE,MAAM,EAA0C,GAC/D,OAAO,CAAC;QACT,KAAK,EAAE,WAAW,EAAE,CAAC;QACrB,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;IA4DF;;;;;;;OAOG;cACa,gBAAgB,CAC9B,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;IAsBjC;;;;;;OAMG;cACa,wBAAwB,CACtC,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;CAyBlC"}

package/out/service/service/entity/method/fetch.js

@@ -35,15 +35,20 @@ export class FetchMethod extends Method {
             }
             const cond = DEDQCondUtil.getCond(this.method);
             const filter = new SearchFilter(context, searchParams);
-            const items = await this.searchLocal(cond, filter);
-            res = new HttpResponse(items, 200);
+            const { items, total, page, size, totalPages } = await this.searchLocalWithMeta(cond, filter);
+            res = new HttpResponse(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':
                     {
@@ -130,10 +135,77 @@ export class FetchMethod 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 => clone(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 reg = new RegExp(filter.query.toLowerCase());
+                        for (let i = 0; i < queryParamKeys.length; i += 1) {
+                            const key = queryParamKeys[i];
+                            const val = obj[key];
+                            if (reg.test(val.toLowerCase())) {
+                                return true;
+                            }
+                        }
+                        return false;
+                    });
+                }
+            }
+        }
+        if (!isNil(filter.sortField) && !isEmpty(filter.sortField)) {
+            if (filter.sortMode === 'DESC') {
+                // 倒序
+                list = descSort(list, filter.sortField);
+            }
+            else {
+                // 正序
+                list = ascSort(list, filter.sortField);
+            }
+        }
+        if (!isNil(filter.srfDefaultCond) && !isEmpty(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 => clone(item));
+        return {
+            items,
+            total: list.length,
+            page,
+            size,
+            totalPages: Math.ceil(list.length / size),
+        };
+    }
     /**
      * 获取代码表数据来源的集合
      * @author lxm
@@ -155,4 +227,29 @@ export class FetchMethod extends Method {
         }));
         return new HttpResponse(dataSet, 200);
     }
+    /**
+     * 获取代码表数据来源的集合（带元数据）
+     *
+     * @param {IContext} context
+     * @param {IParams} params
+     * @return {*}  {Promise<HttpResponse<IData[]>>}
+     */
+    async fetchCodeListSetWithMeta(context, params) {
+        const { appCodeListId } = this.method;
+        if (!appCodeListId) {
+            throw new RuntimeModelError(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 HttpResponse(dataSet, 200, '', {
+            'x-total': codeItems.length,
+            'x-page': 0,
+            'x-per-page': codeItems.length,
+            'x-total-pages': 1,
+        });
+    }
 }

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

@@ -8,6 +8,21 @@ import { IErrorHandler } from '../../interface';
  * @implements {IErrorHandler}
  */
 export declare class DefaultErrorHandler implements IErrorHandler {
+    /**
+     * 错误去重时间间隔（300ms）
+     */
+    static DEDUP_INTERVAL: number;
+    /**
+     * 错误缓存
+     */
+    static errorCache: Map<string, number>;
+    /**
+     * 判断错误是否重复
+     */
+    static isDuplicate(message: string): boolean;
+    /**
+     * 处理错误
+     */
     handle(error: unknown): boolean | undefined;
 }
 //# sourceMappingURL=default-error-handler.d.ts.map

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.7.41-alpha.100",
+  "version": "0.7.41-alpha.101",
   "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": "f9d085280db4778ad952333525a03889fc37e2ab"
 }