@ibiz-template/runtime 0.7.9 → 0.7.11

package/out/app-hub.d.ts

@@ -114,6 +114,14 @@ export declare class AppHub implements IAppHubService {
      * @type {string}
      */
     defaultAppIndexViewName: string;
+    /**
+     * 默认页面
+     *
+     * @author tony001
+     * @date 2024-05-09 13:05:58
+     * @type {(IModel | undefined)}
+     */
+    defaultPage: IModel | undefined;
     /**
      * 计算应用视图 标识
      *

package/out/app-hub.d.ts.map

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

package/out/application.d.ts

@@ -117,9 +117,9 @@ export declare class Application implements IAppService {
      * @author tony001
      * @date 2024-04-23 11:04:27
      * @param {string} id
-     * @return {*}  {(IAppUtil | null)}
+     * @return {*}  {(IAppUtil | undefined)}
      */
-    getAppUtil(id: string): IAppUtil | null;
+    getAppUtil(id: string, type?: 'CUSTOM' | 'DEFAULT'): IAppUtil | undefined;
     /**
      * 获取界面行为模型
      * @author lxm

package/out/application.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../src/application.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAY,MAAM,qBAAqB,CAAC;AACpD,OAAO,EACL,cAAc,EACd,QAAQ,EACR,QAAQ,EACR,YAAY,EACZ,SAAS,EACT,UAAU,EACX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,gBAAgB,EAChB,eAAe,EACf,aAAa,EACb,aAAa,EACb,WAAW,EACZ,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C;;;;;;;;GAQG;AACH,qBAAa,WAAY,YAAW,WAAW;aAkFjB,KAAK,EAAE,YAAY;IAjF/C;;;;;;;OAOG;IACH,IAAI,KAAK,IAAI,MAAM,CAElB;IAED;;;;;;OAMG;IACH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAE5D;;;;;;OAMG;IACH,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC;IAEpC;;;;;OAKG;IACH,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC;IAElC;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC;IAEnC;;;;;;OAMG;IACH,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC;IAErC;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,WAAW,CAAC;IAEnB;;;;;;OAMG;gBACyB,KAAK,EAAE,YAAY;IAc/C;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAM3B;;;;;;;OAOG;cACa,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IAWlD;;;;;;;OAOG;IACH,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI;IAMvC;;;;;;;OAOG;IACH,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI;IAMvC;;;;;;;OAOG;IACG,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IAqBxE;;;;;;;OAOG;IACG,SAAS,CACb,EAAE,EAAE,MAAM,EACV,eAAe,CAAC,EAAE,MAAM,GACvB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IAajC;;;;;;;OAOG;IACG,YAAY,CAChB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAUlC;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAwB/B;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAGhB"}
+{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../src/application.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAY,MAAM,qBAAqB,CAAC;AACpD,OAAO,EACL,cAAc,EACd,QAAQ,EACR,QAAQ,EACR,YAAY,EACZ,SAAS,EACT,UAAU,EACX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,gBAAgB,EAChB,eAAe,EACf,aAAa,EACb,aAAa,EACb,WAAW,EACZ,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C;;;;;;;;GAQG;AACH,qBAAa,WAAY,YAAW,WAAW;aAkFjB,KAAK,EAAE,YAAY;IAjF/C;;;;;;;OAOG;IACH,IAAI,KAAK,IAAI,MAAM,CAElB;IAED;;;;;;OAMG;IACH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAE5D;;;;;;OAMG;IACH,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC;IAEpC;;;;;OAKG;IACH,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC;IAElC;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC;IAEnC;;;;;;OAMG;IACH,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC;IAErC;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,WAAW,CAAC;IAEnB;;;;;;OAMG;gBACyB,KAAK,EAAE,YAAY;IAc/C;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAM3B;;;;;;;OAOG;cACa,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IAWlD;;;;;;;OAOG;IACH,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI;IAMvC;;;;;;;OAOG;IACH,UAAU,CACR,EAAE,EAAE,MAAM,EACV,IAAI,GAAE,QAAQ,GAAG,SAAqB,GACrC,QAAQ,GAAG,SAAS;IAavB;;;;;;;OAOG;IACG,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IAqBxE;;;;;;;OAOG;IACG,SAAS,CACb,EAAE,EAAE,MAAM,EACV,eAAe,CAAC,EAAE,MAAM,GACvB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IAajC;;;;;;;OAOG;IACG,YAAY,CAChB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAUlC;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAwB/B;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAGhB"}

package/out/application.js

@@ -95,12 +95,19 @@ export class Application {
      * @author tony001
      * @date 2024-04-23 11:04:27
      * @param {string} id
-     * @return {*}  {(IAppUtil | null)}
+     * @return {*}  {(IAppUtil | undefined)}
      */
-    getAppUtil(id) {
+    getAppUtil(id, type = 'DEFAULT') {
         const appUtils = this.model.appUtils || [];
-        const appUtil = appUtils.find(item => item.id === id);
-        return appUtil || null;
+        let appUtil;
+        // 自定义类型使用应用功能组件功能标记识别，反之使用使用应用功能组件标识识别
+        if (type === 'CUSTOM') {
+            appUtil = appUtils.find(item => item.utilTag === id);
+        }
+        else {
+            appUtil = appUtils.find(item => item.id === id);
+        }
+        return appUtil;
     }
     /**
      * 获取界面行为模型

package/out/controller/common/view/view.controller.d.ts.map

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

package/out/controller/common/view/view.controller.js

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { notNilEmpty } from 'qx-util';
-import { HttpError, IBizContext, RuntimeError, } from '@ibiz-template/core';
+import { HttpError, IBizContext, Namespace, RuntimeError, } from '@ibiz-template/core';
 import { isEmpty, isNil, isNotNil } from 'ramda';
 import { LoadingState } from '../../utils/loading/loading.state';
 import { SysUIActionTag } from '../../../constant';
@@ -397,6 +397,7 @@ export class ViewController extends BaseController {
      * @return {*}  {Promise<void>}
      */
     async alertViewMessage(messages) {
+        var _a, _b;
         const [message, ...rest] = messages;
         const modalParams = {
             title: message.title,
@@ -404,27 +405,36 @@ export class ViewController extends BaseController {
             options: {
                 showClose: message.removeMode !== 0,
                 showConfirmButton: message.removeMode !== 0,
-                callback: () => {
-                    if (message.removeMode === 1) {
-                        localStorage.setItem(message.key, '1');
-                    }
-                },
+                customClass: ((_a = message.sysCss) === null || _a === void 0 ? void 0 : _a.cssName) || '',
             },
         };
+        if (message.layoutPanel && modalParams.options) {
+            const alertClass = new Namespace('view-message').m('alert');
+            modalParams.options.customClass = `${modalParams.options.customClass || ''} ${alertClass}`;
+            // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
+            modalParams.options.message = () => {
+                return ibiz.render.renderCtrlShell(message.layoutPanel, this.context, this.params, { data: message.data });
+            };
+        }
         // userTag为确认按钮文本
         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') {
-            await ibiz.modal.error(modalParams);
+        try {
+            if (message.messageType === 'WARN') {
+                await ibiz.modal.warning(modalParams);
+            }
+            else if (message.messageType === 'ERROR') {
+                await ibiz.modal.error(modalParams);
+            }
+            else {
+                await ibiz.modal.info(modalParams);
+            }
         }
-        else {
-            await ibiz.modal.info(modalParams);
+        finally {
+            (_b = this.viewMsgController) === null || _b === void 0 ? void 0 : _b.setMsgRemoveModeStorage(message);
         }
         if (rest.length) {
             this.alertViewMessage(rest);

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

@@ -0,0 +1,124 @@
+import { IAppMenu } from '@ibiz/model-core';
+import { ConfigService, UtilService } from '../../../service';
+import { AppMenuController } from './app-menu.controller';
+import { ICustomDesign } from '../../../interface';
+/**
+ * 自定义菜单控制器
+ *
+ * @author tony001
+ * @date 2024-05-09 15:05:50
+ * @export
+ * @class CustomAppMenuController
+ */
+export declare class CustomAppMenuController implements ICustomDesign {
+    protected model: IAppMenu;
+    protected menu: AppMenuController;
+    /**
+     * 应用配置存储服务
+     *
+     * @author tony001
+     * @date 2024-05-09 15:05:49
+     * @type {(ConfigService | undefined)}
+     */
+    config: ConfigService | undefined;
+    /**
+     * 应用功能组件服务
+     *
+     * @author tony001
+     * @date 2024-05-09 15:05:33
+     * @type {(UtilService | undefined)}
+     */
+    util: UtilService | undefined;
+    /**
+     * 上下文对象
+     *
+     * @author tony001
+     * @date 2024-05-09 15:05:43
+     * @type {IContext}
+     */
+    context: IContext;
+    /**
+     * 视图参数
+     *
+     * @author tony001
+     * @date 2024-05-09 15:05:54
+     * @type {IParams}
+     */
+    params: IParams;
+    /**
+     *自定义定制范围类型（public：公开，personal：个人，data：数据，默认是按照个人区分，配置了应用功能组件才生效）
+     *
+     * @author tony001
+     * @date 2024-05-09 17:05:43
+     * @type {('public' | 'personal' | 'data')}
+     */
+    type: 'public' | 'personal' | 'data';
+    /**
+     *所属数据类型（仅限自定义定制为data类型时生效，配置了应用功能组件才生效）
+     *
+     * @author tony001
+     * @date 2024-05-09 17:05:55
+     * @type {string}
+     */
+    ownerType: string;
+    /**
+     *所属数据标识（仅限自定义定制为data类型时生效，配置了应用功能组件才生效）
+     *
+     * @author tony001
+     * @date 2024-05-09 17:05:10
+     * @type {string}
+     */
+    ownerId: string;
+    /**
+     * Creates an instance of CustomAppMenuController.
+     * @author tony001
+     * @date 2024-05-09 15:05:33
+     * @param {IAppMenu} model
+     * @param {AppMenuController} menu
+     */
+    constructor(model: IAppMenu, menu: AppMenuController);
+    /**
+     * 初始化
+     *
+     * @author tony001
+     * @date 2024-05-09 15:05:40
+     * @private
+     */
+    private init;
+    /**
+     * 获取资源标识（仅用于功能组件服务）
+     *
+     * @author tony001
+     * @date 2024-05-09 16:05:48
+     * @private
+     * @return {*}  {string}
+     */
+    private getResourceTag;
+    /**
+     * 加载自定义模型
+     *
+     * @author tony001
+     * @date 2024-05-09 17:05:57
+     * @return {*}  {Promise<IData>}
+     */
+    loadCustomModelData(): Promise<IData>;
+    /**
+     * 重置自定义模型
+     *
+     * @author tony001
+     * @date 2024-05-09 17:05:14
+     * @return {*}  {Promise<IData>}
+     */
+    resetCustomModelData(): Promise<IData>;
+    /**
+     * 保存自定义模型
+     *
+     * @author tony001
+     * @date 2024-05-09 17:05:51
+     * @param {IData[]} model
+     * @param {IData} [opts={}]
+     * @return {*}  {Promise<IData>}
+     */
+    saveCustomModelData(model: IData[], opts?: IData): Promise<IData>;
+}
+//# sourceMappingURL=custom-app-menu.controller.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"custom-app-menu.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/app-menu/custom-app-menu.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAY,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD;;;;;;;GAOG;AACH,qBAAa,uBAAwB,YAAW,aAAa;IAwEzD,SAAS,CAAC,KAAK,EAAE,QAAQ;IACzB,SAAS,CAAC,IAAI,EAAE,iBAAiB;IAxEnC;;;;;;OAMG;IACH,MAAM,EAAE,aAAa,GAAG,SAAS,CAAC;IAElC;;;;;;OAMG;IACH,IAAI,EAAE,WAAW,GAAG,SAAS,CAAC;IAE9B;;;;;;OAMG;IACH,OAAO,EAAE,QAAQ,CAAC;IAElB;;;;;;OAMG;IACH,MAAM,EAAE,OAAO,CAAC;IAEhB;;;;;;OAMG;IACH,IAAI,EAAE,QAAQ,GAAG,UAAU,GAAG,MAAM,CAAc;IAElD;;;;;;OAMG;IACH,SAAS,EAAE,MAAM,CAAM;IAEvB;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,CAAM;IAErB;;;;;;OAMG;gBAES,KAAK,EAAE,QAAQ,EACf,IAAI,EAAE,iBAAiB;IAOnC;;;;;;OAMG;IACH,OAAO,CAAC,IAAI;IAkBZ;;;;;;;OAOG;IACH,OAAO,CAAC,cAAc;IActB;;;;;;OAMG;IACG,mBAAmB,IAAI,OAAO,CAAC,KAAK,CAAC;IAc3C;;;;;;OAMG;IACG,oBAAoB,IAAI,OAAO,CAAC,KAAK,CAAC;IAI5C;;;;;;;;OAQG;IACG,mBAAmB,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,IAAI,GAAE,KAAU,GAAG,OAAO,CAAC,KAAK,CAAC;CAmB5E"}

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

@@ -0,0 +1,136 @@
+import { ConfigService, UtilService } from '../../../service';
+/**
+ * 自定义菜单控制器
+ *
+ * @author tony001
+ * @date 2024-05-09 15:05:50
+ * @export
+ * @class CustomAppMenuController
+ */
+export class CustomAppMenuController {
+    /**
+     * Creates an instance of CustomAppMenuController.
+     * @author tony001
+     * @date 2024-05-09 15:05:33
+     * @param {IAppMenu} model
+     * @param {AppMenuController} menu
+     */
+    constructor(model, menu) {
+        this.model = model;
+        this.menu = menu;
+        /**
+         *自定义定制范围类型（public：公开，personal：个人，data：数据，默认是按照个人区分，配置了应用功能组件才生效）
+         *
+         * @author tony001
+         * @date 2024-05-09 17:05:43
+         * @type {('public' | 'personal' | 'data')}
+         */
+        this.type = 'personal';
+        /**
+         *所属数据类型（仅限自定义定制为data类型时生效，配置了应用功能组件才生效）
+         *
+         * @author tony001
+         * @date 2024-05-09 17:05:55
+         * @type {string}
+         */
+        this.ownerType = '';
+        /**
+         *所属数据标识（仅限自定义定制为data类型时生效，配置了应用功能组件才生效）
+         *
+         * @author tony001
+         * @date 2024-05-09 17:05:10
+         * @type {string}
+         */
+        this.ownerId = '';
+        this.context = menu.context;
+        this.params = menu.params;
+        this.init();
+    }
+    /**
+     * 初始化
+     *
+     * @author tony001
+     * @date 2024-05-09 15:05:40
+     * @private
+     */
+    init() {
+        var _a;
+        // 默认走个人
+        this.type = 'personal';
+        this.ownerId = this.context.srfpersonid;
+        // 初始化服务
+        const app = ibiz.hub.getApp(this.context.srfappid);
+        const menuUtil = app.getAppUtil('DYNAMENU', 'CUSTOM');
+        if (menuUtil) {
+            this.util = new UtilService(menuUtil);
+        }
+        else {
+            this.config = new ConfigService(this.model.appId, 'menu', `menu_${this.menu.view.name.toLowerCase()}_${(_a = this.model.codeName) === null || _a === void 0 ? void 0 : _a.toLowerCase()}`);
+        }
+    }
+    /**
+     * 获取资源标识（仅用于功能组件服务）
+     *
+     * @author tony001
+     * @date 2024-05-09 16:05:48
+     * @private
+     * @return {*}  {string}
+     */
+    getResourceTag() {
+        var _a;
+        const base = `${this.context.srfappid}_menu_${this.menu.view.name.toLowerCase()}_${(_a = this.model.codeName) === null || _a === void 0 ? void 0 : _a.toLowerCase()}`;
+        switch (this.type) {
+            case 'personal':
+                return `${base}_${this.context.srfpersonid}`;
+            case 'data':
+                return `${base}_${this.ownerType}_${this.ownerId}`;
+            default:
+                return base;
+        }
+    }
+    /**
+     * 加载自定义模型
+     *
+     * @author tony001
+     * @date 2024-05-09 17:05:57
+     * @return {*}  {Promise<IData>}
+     */
+    async loadCustomModelData() {
+        let res;
+        if (this.util) {
+            res = await this.util.load(this.getResourceTag(), this.context, this.params);
+        }
+        else {
+            res = await this.config.load();
+        }
+        return res;
+    }
+    /**
+     * 重置自定义模型
+     *
+     * @author tony001
+     * @date 2024-05-09 17:05:14
+     * @return {*}  {Promise<IData>}
+     */
+    async resetCustomModelData() {
+        return {};
+    }
+    /**
+     * 保存自定义模型
+     *
+     * @author tony001
+     * @date 2024-05-09 17:05:51
+     * @param {IData[]} model
+     * @param {IData} [opts={}]
+     * @return {*}  {Promise<IData>}
+     */
+    async saveCustomModelData(model, opts = {}) {
+        if (this.util) {
+            await this.util.save(this.getResourceTag(), this.context, Object.assign(Object.assign({}, this.params), { type: this.type, ownerType: this.ownerType, ownerId: this.ownerId, modelId: this.model.id }), model);
+        }
+        else {
+            await this.config.save(model);
+        }
+        return model;
+    }
+}

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

@@ -1,2 +1,3 @@
 export * from './app-menu.controller';
+export * from './custom-app-menu.controller';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/app-menu/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/app-menu/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,8BAA8B,CAAC"}

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

@@ -1 +1,2 @@
 export * from './app-menu.controller';
+export * from './custom-app-menu.controller';

package/out/controller/control/chart/generator/chart-options-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chart-options-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/chart-options-generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EAEb,oBAAoB,EACpB,oBAAoB,EACpB,cAAc,EAEf,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,cAAc,EACd,WAAW,EACX,WAAW,EACX,QAAQ,EACR,cAAc,EACd,aAAa,EACd,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAM9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,KAAK,CAmBzE;AAED,qBAAa,qBAAqB;IAoEpB,OAAO,CAAC,KAAK;IAnEzB;;;;;OAKG;IACH,MAAM,EAAG,cAAc,CAAC;IAExB;;;;;OAKG;IACH,aAAa,EAAE,aAAa,CAI1B;IAEF;;;;;OAKG;IACH,OAAO,EAAE,aAAa,CAAM;IAE5B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,aAAa,CAAC;IAE/B;;;;;OAKG;IACH,gBAAgB,EAAE,mBAAmB,EAAE,CAAM;IAE7C;;;;;OAKG;IACH,QAAQ,gCAAuC;IAE/C;;;;OAIG;IACH,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC,CAAa;IAE/D;;;;;OAKG;IACH,uBAAuB,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAa;gBAElD,KAAK,EAAE,QAAQ;IAoCnC,SAAS,CAAC,oBAAoB,IAAI,IAAI;IAoCtC,SAAS,CAAC,eAAe,CAAC,UAAU,EAAE,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC;IAmB5E,SAAS,CAAC,gBAAgB,CACxB,WAAW,EAAE,cAAc,GAC1B,aAAa,CAAC,QAAQ,CAAC;IAe1B,SAAS,CAAC,gBAAgB,CACxB,WAAW,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE,GACzC,oBAAoB,EAAE,GAAG,oBAAoB,EAAE;IA2ClD;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAS7D;;;;;;OAMG;IACH,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAKtC;;;;;;;;;OASG;IACG,YAAY,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAyBrE;;;;;;OAMG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,aAAa;IAoE/C;;;;;;OAMG;IACH,oBAAoB,CAAC,MAAM,EAAE,cAAc,GAAG,KAAK,GAAG,SAAS;CAkEhE"}
+{"version":3,"file":"chart-options-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/chart-options-generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EAEb,oBAAoB,EACpB,oBAAoB,EACpB,cAAc,EAEf,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,cAAc,EACd,WAAW,EACX,WAAW,EACX,QAAQ,EACR,cAAc,EACd,aAAa,EACd,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAM9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AA2BrD;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,KAAK,CAmBzE;AAED,qBAAa,qBAAqB;IAoEpB,OAAO,CAAC,KAAK;IAnEzB;;;;;OAKG;IACH,MAAM,EAAG,cAAc,CAAC;IAExB;;;;;OAKG;IACH,aAAa,EAAE,aAAa,CAI1B;IAEF;;;;;OAKG;IACH,OAAO,EAAE,aAAa,CAAM;IAE5B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,aAAa,CAAC;IAE/B;;;;;OAKG;IACH,gBAAgB,EAAE,mBAAmB,EAAE,CAAM;IAE7C;;;;;OAKG;IACH,QAAQ,gCAAuC;IAE/C;;;;OAIG;IACH,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC,CAAa;IAE/D;;;;;OAKG;IACH,uBAAuB,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAa;gBAElD,KAAK,EAAE,QAAQ;IAoCnC,SAAS,CAAC,oBAAoB,IAAI,IAAI;IAoCtC,SAAS,CAAC,eAAe,CAAC,UAAU,EAAE,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC;IAmB5E,SAAS,CAAC,gBAAgB,CACxB,WAAW,EAAE,cAAc,GAC1B,aAAa,CAAC,QAAQ,CAAC;IAe1B,SAAS,CAAC,gBAAgB,CACxB,WAAW,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE,GACzC,oBAAoB,EAAE,GAAG,oBAAoB,EAAE;IA2ClD;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAS7D;;;;;;OAMG;IACH,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAKtC;;;;;;;;;OASG;IACG,YAAY,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAyBrE;;;;;;OAMG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,aAAa;IAoE/C;;;;;;OAMG;IACH,oBAAoB,CAAC,MAAM,EAAE,cAAc,GAAG,KAAK,GAAG,SAAS;CAkEhE"}

package/out/controller/control/chart/generator/chart-options-generator.js

@@ -1,4 +1,5 @@
 import { mergeDeepRight } from 'ramda';
+import { isObject, isString } from 'qx-util';
 import { RuntimeError } from '@ibiz-template/core';
 import { LineSeriesGenerator } from './line-series-generator';
 import { BarSeriesGenerator } from './bar-series-generator';
@@ -6,6 +7,31 @@ import { FunnelSeriesGenerator } from './funnel-series-generator';
 import { PieSeriesGenerator } from './pie-series-generator';
 import { ScatterSeriesGenerator } from './scatter-series-generator';
 import { RadarSeriesGenerator } from './radar-series-generator';
+/**
+ * 递归地检查对象中的字符串，如果字符串表示一个函数，则将其转换为实际的函数。
+ * @author ljx
+ * @date 2024-05-08 18:03:07
+ * @param {object} option - 要处理的对象。
+ * @return {*}  {IData}
+ */
+const convertStringFunc = (option) => {
+    const regex = /function\s*\(\s*|\s*function\s*\(\s*/;
+    const result = {};
+    Object.keys(option).forEach(key => {
+        if (isString(option[key]) && regex.test(option[key])) {
+            const strFunction = `return ${option[key]}`;
+            // eslint-disable-next-line no-new-func
+            result[key] = new Function(strFunction)();
+        }
+        else if (isObject(option[key])) {
+            result[key] = convertStringFunc(option[key]);
+        }
+        else {
+            result[key] = option[key];
+        }
+    });
+    return result;
+};
 /**
  * 解析userParams
  * @author lxm
@@ -33,7 +59,7 @@ export function parseUserParams(userParams) {
             }
         });
     }
-    return option;
+    return convertStringFunc(option);
 }
 export class ChartOptionsGenerator {
     constructor(model) {

package/out/controller/control/dashboard/custom-dashboard.controller.d.ts

@@ -1,7 +1,7 @@
 import { IDashboard } from '@ibiz/model-core';
-import { IBizParams } from '@ibiz-template/core';
 import { ConfigService, UtilService } from '../../../service';
 import { DashboardController } from './dashboard.controller';
+import { ICustomDesign } from '../../../interface';
 /**
  * 自定义数据看板部件控制器
  * @author lxm
@@ -9,7 +9,9 @@ import { DashboardController } from './dashboard.controller';
  * @export
  * @class CustomDashboardController
  */
-export declare class CustomDashboardController {
+export declare class CustomDashboardController implements ICustomDesign {
+    protected model: IDashboard;
+    protected dashboard: DashboardController;
     /**
      * 自定义布局模型数据
      *
@@ -38,13 +40,6 @@ export declare class CustomDashboardController {
      * @memberof CustomDashboardController
      */
     portletConfig: IData;
-    /**
-     * 看板模型
-     *
-     * @author: zhujiamin
-     * @Date: 2023-09-20 16:43:39
-     */
-    model: IDashboard;
     /**
      * 应用配置存储服务
      *
@@ -74,9 +69,9 @@ export declare class CustomDashboardController {
      *
      * @author tony001
      * @date 2024-04-24 14:04:42
-     * @type {IBizParams}
+     * @type {IParams}
      */
-    params: IBizParams;
+    params: IParams;
     /**
      * 自定义定制范围类型（public：公开，personal：个人，data：数据，默认是按照个人区分，配置了应用功能组件才生效）
      *
@@ -117,7 +112,7 @@ export declare class CustomDashboardController {
      */
     private init;
     /**
-     * 获取资源标识
+     * 获取资源标识（仅用于功能组件服务）
      *
      * @author tony001
      * @date 2024-04-24 14:04:55
@@ -144,6 +139,6 @@ export declare class CustomDashboardController {
      * @author: zhujiamin
      * @Date: 2023-09-20 16:22:49
      */
-    saveCustomModelData(model: IData[], config?: IData): Promise<IData>;
+    saveCustomModelData(model: IData[], opts?: IData): Promise<IData>;
 }
 //# sourceMappingURL=custom-dashboard.controller.d.ts.map

package/out/controller/control/dashboard/custom-dashboard.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"custom-dashboard.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/dashboard/custom-dashboard.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAE7D;;;;;;GAMG;AACH,qBAAa,yBAAyB;IACpC;;;;;OAKG;IACH,eAAe,EAAE,KAAK,EAAE,CAAM;IAE9B;;;;;OAKG;IACH,YAAY,EAAE,MAAM,CAAM;IAE1B;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAM;IAExB;;;;;OAKG;IACH,aAAa,EAAE,KAAK,CAAM;IAE1B;;;;;OAKG;IACH,KAAK,EAAE,UAAU,CAAC;IAElB;;;;;;OAMG;IACH,MAAM,EAAE,aAAa,GAAG,SAAS,CAAC;IAElC;;;;;;OAMG;IACH,IAAI,EAAE,WAAW,GAAG,SAAS,CAAC;IAE9B;;;;;;OAMG;IACH,OAAO,EAAE,QAAQ,CAAC;IAElB;;;;;;OAMG;IACH,MAAM,EAAE,UAAU,CAAC;IAEnB;;;;;;OAMG;IACH,IAAI,EAAE,QAAQ,GAAG,UAAU,GAAG,MAAM,CAAc;IAElD;;;;;;OAMG;IACH,SAAS,EAAE,MAAM,CAAM;IAEvB;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,CAAM;IAErB;;;;;OAKG;gBACS,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,mBAAmB;IAO7D;;;;;;OAMG;IACH,OAAO,CAAC,IAAI;IA+BZ;;;;;;;OAOG;IACH,OAAO,CAAC,cAAc;IActB;;;;;OAKG;IACG,mBAAmB,IAAI,OAAO,CAAC,KAAK,CAAC;IA0B3C;;;;OAIG;IACG,oBAAoB,IAAI,OAAO,CAAC,KAAK,CAAC;IAK5C;;;;;OAKG;IACG,mBAAmB,CACvB,KAAK,EAAE,KAAK,EAAE,EACd,MAAM,GAAE,KAAU,GACjB,OAAO,CAAC,KAAK,CAAC;CA8BlB"}
+{"version":3,"file":"custom-dashboard.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/dashboard/custom-dashboard.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD;;;;;;GAMG;AACH,qBAAa,yBAA0B,YAAW,aAAa;IAuG3D,SAAS,CAAC,KAAK,EAAE,UAAU;IAC3B,SAAS,CAAC,SAAS,EAAE,mBAAmB;IAvG1C;;;;;OAKG;IACH,eAAe,EAAE,KAAK,EAAE,CAAM;IAE9B;;;;;OAKG;IACH,YAAY,EAAE,MAAM,CAAM;IAE1B;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAM;IAExB;;;;;OAKG;IACH,aAAa,EAAE,KAAK,CAAM;IAE1B;;;;;;OAMG;IACH,MAAM,EAAE,aAAa,GAAG,SAAS,CAAC;IAElC;;;;;;OAMG;IACH,IAAI,EAAE,WAAW,GAAG,SAAS,CAAC;IAE9B;;;;;;OAMG;IACH,OAAO,EAAE,QAAQ,CAAC;IAElB;;;;;;OAMG;IACH,MAAM,EAAE,OAAO,CAAC;IAEhB;;;;;;OAMG;IACH,IAAI,EAAE,QAAQ,GAAG,UAAU,GAAG,MAAM,CAAc;IAElD;;;;;;OAMG;IACH,SAAS,EAAE,MAAM,CAAM;IAEvB;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,CAAM;IAErB;;;;;OAKG;gBAES,KAAK,EAAE,UAAU,EACjB,SAAS,EAAE,mBAAmB;IAO1C;;;;;;OAMG;IACH,OAAO,CAAC,IAAI;IA+BZ;;;;;;;OAOG;IACH,OAAO,CAAC,cAAc;IActB;;;;;OAKG;IACG,mBAAmB,IAAI,OAAO,CAAC,KAAK,CAAC;IA0B3C;;;;OAIG;IACG,oBAAoB,IAAI,OAAO,CAAC,KAAK,CAAC;IAK5C;;;;;OAKG;IACG,mBAAmB,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,IAAI,GAAE,KAAU,GAAG,OAAO,CAAC,KAAK,CAAC;CA8B5E"}

package/out/controller/control/dashboard/custom-dashboard.controller.js

@@ -14,6 +14,8 @@ export class CustomDashboardController {
      * @param {CTX} ctx 跨组件上下文环境，内部机制不暴露
      */
     constructor(model, dashboard) {
+        this.model = model;
+        this.dashboard = dashboard;
         /**
          * 自定义布局模型数据
          *
@@ -66,7 +68,6 @@ export class CustomDashboardController {
          * @type {string}
          */
         this.ownerId = '';
-        this.model = model;
         this.context = dashboard.context;
         this.params = dashboard.params;
         this.init(dashboard.controlParams);
@@ -103,7 +104,7 @@ export class CustomDashboardController {
         }
     }
     /**
-     * 获取资源标识
+     * 获取资源标识（仅用于功能组件服务）
      *
      * @author tony001
      * @date 2024-04-24 14:04:55
@@ -130,7 +131,7 @@ export class CustomDashboardController {
      */
     async loadCustomModelData() {
         let res;
-        if (this.model.appDynaDashboardUtilId) {
+        if (this.util) {
             res = await this.util.load(this.getResourceTag(), this.context, this.params);
         }
         else {
@@ -165,8 +166,8 @@ export class CustomDashboardController {
      * @author: zhujiamin
      * @Date: 2023-09-20 16:22:49
      */
-    async saveCustomModelData(model, config = {}) {
-        Object.assign(this.portletConfig, config);
+    async saveCustomModelData(model, opts = {}) {
+        Object.assign(this.portletConfig, opts);
         let res;
         const data = {
             model,
@@ -174,7 +175,7 @@ export class CustomDashboardController {
             rowH: this.layoutRowH,
             config: this.portletConfig,
         };
-        if (this.model.appDynaDashboardUtilId) {
+        if (this.util) {
             res = await this.util.save(this.getResourceTag(), this.context, Object.assign(Object.assign({}, this.params), { type: this.type, ownerType: this.ownerType, ownerId: this.ownerId, modelId: this.model.id }), data);
         }
         else {