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

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

@@ -1,10 +1,11 @@
 import { clone } from 'ramda';
+import { recursiveIterate } from '@ibiz-template/core';
 import { ControlType } from '../../../constant';
 import { getPortletProvider } from '../../../register';
 import { handleAllSettled } from '../../../utils';
 import { ControlController } from '../../common';
 import { getOriginData } from '../../utils';
-import { filterPortletByConfig, filterPortletByID, generateCacheKy, getFilterSearchConds, getPortletModelByID, } from './dashboard.util';
+import { deepFillSubAppId, filterPortletByConfig, filterPortletByID, generateCacheKy, getFilterSearchConds, getPortletModelByID, } from './dashboard.util';
 /**
  * 数据看板部件控制器
  * @author lxm
@@ -88,6 +89,22 @@ export class DashboardController extends ControlController {
     getCustomDashboard() {
         return this.customDashboard;
     }
+    /**
+     * @description 设置移动端自定义数据看板部件控制器
+     * @param {MobCustomDashboardController} mobCustomDashboard
+     * @memberof DashboardController
+     */
+    setMobCustomDashboard(mobCustomDashboard) {
+        this.mobCustomDashboard = mobCustomDashboard;
+    }
+    /**
+     * @description 获取移动端自定义数据看板部件控制器
+     * @returns {*}  {(MobCustomDashboardController | undefined)}
+     * @memberof DashboardController
+     */
+    getMobCustomDashboard() {
+        return this.mobCustomDashboard;
+    }
     /**
      * 初始化子门户部件
      *
@@ -171,7 +188,7 @@ export class DashboardController extends ControlController {
      */
     async loadAllDynaPortlet() {
         var _a;
-        const app = ibiz.hub.getApp(ibiz.env.appId);
+        const app = ibiz.hub.getApp(this.model.appId);
         const result = [];
         // 存在动态代码表标识
         if (this.controlParams.dynamiccodelist) {
@@ -212,14 +229,27 @@ export class DashboardController extends ControlController {
      * @return {*}  {(Promise<IDBPortletPart | undefined>)}
      */
     async loadDynaPortletById(id) {
-        const app = ibiz.hub.getApp(ibiz.env.appId);
+        var _a;
+        const app = ibiz.hub.getApp(this.model.appId);
         const tempContext = clone(this.context);
         Object.assign(tempContext, { psappportlet: id });
         const res = await app.deService.exec('psappportlet', 'get', tempContext, this.params);
         this.dynaPortletMap.set(id, res.data);
         if (res && res.data && res.data.controlmodel) {
             const controlModel = JSON.parse(res.data.controlmodel);
-            return (await ibiz.hub.translationModelToDsl(controlModel, 'CTRL'));
+            const result = (await ibiz.hub.translationModelToDsl(controlModel, 'CTRL'));
+            const appId = res.data.pssysappid;
+            if (appId) {
+                const mainApp = ibiz.hub.getApp(ibiz.env.appId);
+                const targetApp = (_a = mainApp.model.subAppRefs) === null || _a === void 0 ? void 0 : _a.find(subAppRef => {
+                    var _a;
+                    return (_a = subAppRef.id) === null || _a === void 0 ? void 0 : _a.endsWith(appId);
+                });
+                if (targetApp && targetApp.id) {
+                    deepFillSubAppId(result, targetApp.id);
+                }
+            }
+            return result;
         }
     }
     /**
@@ -257,7 +287,10 @@ export class DashboardController extends ControlController {
         }
         const items = [];
         Object.values(this.portlets).forEach((portlet) => {
-            if (portlet.model && portlet.model.portletType !== 'FILTER') {
+            if (portlet.model &&
+                portlet.model.portletType !== 'FILTER' &&
+                portlet.model.portletType !== 'RAWITEM' &&
+                portlet.model.portletType !== 'CONTAINER') {
                 items.push(portlet.model);
             }
         });
@@ -289,7 +322,7 @@ export class DashboardController extends ControlController {
         var _a;
         if (!this.customDashboard)
             return;
-        const app = ibiz.hub.getApp(ibiz.env.appId);
+        const app = ibiz.hub.getApp(this.model.appId);
         // 新建
         if (isNewFilter) {
             // 仿真过滤器占位
@@ -319,7 +352,12 @@ export class DashboardController extends ControlController {
         }
         // 设置缓存
         const searchCondCacheKey = generateCacheKy(this.context, this, model.id);
-        localStorage.setItem(searchCondCacheKey, JSON.stringify(searchconds));
+        if (searchconds) {
+            localStorage.setItem(searchCondCacheKey, JSON.stringify(searchconds));
+        }
+        else {
+            localStorage.removeItem(searchCondCacheKey);
+        }
         // 存数
         const result = await this.customDashboard.saveCustomModelData(this.customDashboard.customModelData, { [model.id]: { srftitle: model.title } }, { [model.id]: { config, searchconds } });
         this.evt.emit('onSavePortlet', result);
@@ -362,7 +400,7 @@ export class DashboardController extends ControlController {
                         var _a, _b;
                         const filterParam = this.customDashboard.portletFilter[key];
                         const { config, searchconds } = filterParam;
-                        const app = ibiz.hub.getApp(ibiz.env.appId);
+                        const app = ibiz.hub.getApp(this.model.appId);
                         const targetFilter = (_a = app.model.appPortlets) === null || _a === void 0 ? void 0 : _a.find((portletModel) => {
                             return portletModel.id === key;
                         });
@@ -433,7 +471,7 @@ export class DashboardController extends ControlController {
             }
         }
         if (params.searchconds && params.searchconds.length > 0) {
-            result.params = params;
+            result.params = [params];
         }
         return result;
     }
@@ -448,4 +486,19 @@ export class DashboardController extends ControlController {
     getPortlet(type, id) {
         return this.portlets[id];
     }
+    /**
+     * @description 转换各类多语言
+     * @protected
+     * @memberof IDashboardController
+     */
+    convertMultipleLanguages() {
+        recursiveIterate(this.model, (item) => {
+            var _a;
+            if ((_a = item.titleLanguageRes) === null || _a === void 0 ? void 0 : _a.lanResTag) {
+                item.title = ibiz.i18n.t(item.titleLanguageRes.lanResTag, item.title);
+            }
+        }, {
+            childrenFields: ['controls'],
+        });
+    }
 }

package/out/controller/control/dashboard/dashboard.util.d.ts

@@ -69,4 +69,15 @@ export declare function filterPortletByID(id: string, context: IContext, items:
  * @return {*}  {string[]}
  */
 export declare function filterPortletByConfig(config: IData, items: string[]): string[];
+/**
+ * 递归填充子门户部件的子应用标识
+ * @param model
+ * @param appId
+ */
+export declare function deepFillSubAppId(model: IModel, appId: string): void;
+/**
+ * 递归删除子门户部件的子应用标识
+ * @param model
+ */
+export declare function deepDeleteSubAppId(model: IModel): void;
 //# sourceMappingURL=dashboard.util.d.ts.map

package/out/controller/control/dashboard/dashboard.util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dashboard.util.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/dashboard/dashboard.util.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,cAAc,EAIf,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,oBAAoB,EACpB,aAAa,EAId,MAAM,oBAAoB,CAAC;AAG5B;;;;;;;;GAQG;AACH,wBAAgB,gCAAgC,CAC9C,oBAAoB,EAAE,cAAc,EAAE,GACrC,aAAa,EAAE,CA0CjB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,QAAQ,EACjB,SAAS,EAAE,oBAAoB,EAC/B,GAAG,EAAE,MAAM,GACV,MAAM,CAER;AAED;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,KAAK,GAAG,SAAS,EAC9B,oBAAoB,EAAE,cAAc,EAAE,GAAG,SAAS,GACjD,aAAa,GAAG,SAAS,CAgB3B;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CACjC,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,KAAK,EAAE,GAAG,SAAS,GAC1B,MAAM,GAAG,SAAS,CAapB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,iBAAiB,CAC/B,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,QAAQ,EACjB,KAAK,EAAE,cAAc,EAAE,EACvB,MAAM,GAAE,OAAe,GACtB,cAAc,EAAE,CAuClB;AAED;;;;;;;;;GASG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,KAAK,EACb,KAAK,EAAE,MAAM,EAAE,GACd,MAAM,EAAE,CAUV"}
+{"version":3,"file":"dashboard.util.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/dashboard/dashboard.util.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,cAAc,EAIf,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,oBAAoB,EACpB,aAAa,EAId,MAAM,oBAAoB,CAAC;AAG5B;;;;;;;;GAQG;AACH,wBAAgB,gCAAgC,CAC9C,oBAAoB,EAAE,cAAc,EAAE,GACrC,aAAa,EAAE,CA0CjB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,QAAQ,EACjB,SAAS,EAAE,oBAAoB,EAC/B,GAAG,EAAE,MAAM,GACV,MAAM,CAER;AAED;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,KAAK,GAAG,SAAS,EAC9B,oBAAoB,EAAE,cAAc,EAAE,GAAG,SAAS,GACjD,aAAa,GAAG,SAAS,CAc3B;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CACjC,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,KAAK,EAAE,GAAG,SAAS,GAC1B,MAAM,GAAG,SAAS,CAapB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,iBAAiB,CAC/B,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,QAAQ,EACjB,KAAK,EAAE,cAAc,EAAE,EACvB,MAAM,GAAE,OAAe,GACtB,cAAc,EAAE,CAuClB;AAED;;;;;;;;;GASG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,KAAK,EACb,KAAK,EAAE,MAAM,EAAE,GACd,MAAM,EAAE,CAUV;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAiBnE;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAiBtD"}

package/out/controller/control/dashboard/dashboard.util.js

@@ -76,13 +76,12 @@ export function generateCacheKy(context, dashboard, key) {
  */
 export function getFilterSearchConds(searchConds, filterDEDQConditions) {
     let result;
+    // 存在自定义条件时，以自定义条件为准；若无自定义条件，则以过滤器自带的默认过滤参数为准
     if (searchConds) {
         result = clone(searchConds);
     }
-    if (filterDEDQConditions) {
-        if (!result || !result.searchconds) {
-            result = { condop: 'AND', condtype: 'GROUP', searchconds: [] };
-        }
+    else if (filterDEDQConditions) {
+        result = { condop: 'AND', condtype: 'GROUP', searchconds: [] };
         const modelSearchConds = filterDEDQConditions2SearchConds(filterDEDQConditions);
         if (modelSearchConds && modelSearchConds.length > 0) {
             result.searchconds.push(...modelSearchConds);
@@ -189,3 +188,50 @@ export function filterPortletByConfig(config, items) {
     }
     return effectivePortlets;
 }
+/**
+ * 递归填充子门户部件的子应用标识
+ * @param model
+ * @param appId
+ */
+export function deepFillSubAppId(model, appId) {
+    model.appId = appId;
+    const keys = Object.keys(model);
+    keys.forEach(key => {
+        const value = model[key];
+        if (value && typeof value === 'object') {
+            if (Array.isArray(value)) {
+                value.forEach(item => {
+                    if (item && typeof item === 'object') {
+                        deepFillSubAppId(item, appId);
+                    }
+                });
+            }
+            else {
+                deepFillSubAppId(value, appId);
+            }
+        }
+    });
+}
+/**
+ * 递归删除子门户部件的子应用标识
+ * @param model
+ */
+export function deepDeleteSubAppId(model) {
+    delete model.appId;
+    const keys = Object.keys(model);
+    keys.forEach(key => {
+        const value = model[key];
+        if (value && typeof value === 'object') {
+            if (Array.isArray(value)) {
+                value.forEach(item => {
+                    if (item && typeof item === 'object') {
+                        deepDeleteSubAppId(item);
+                    }
+                });
+            }
+            else {
+                deepDeleteSubAppId(value);
+            }
+        }
+    });
+}

package/out/controller/control/dashboard/index.d.ts

@@ -2,4 +2,5 @@ export * from './dashboard.controller';
 export * from './custom-dashboard.controller';
 export * from './dashboard.util';
 export * from './portlet/index';
+export * from './mob-custom-dashboard.controller';
 //# sourceMappingURL=index.d.ts.map

package/out/controller/control/dashboard/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/dashboard/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/dashboard/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,mCAAmC,CAAC"}

package/out/controller/control/dashboard/index.js

@@ -2,3 +2,4 @@ export * from './dashboard.controller';
 export * from './custom-dashboard.controller';
 export * from './dashboard.util';
 export * from './portlet/index';
+export * from './mob-custom-dashboard.controller';

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

@@ -0,0 +1,102 @@
+import { IDashboard } from '@ibiz/model-core';
+import { ConfigService, UtilService } from '../../../service';
+import { IMobCustomDesign } from '../../../interface';
+import { DashboardController } from './dashboard.controller';
+export declare class MobCustomDashboardController implements IMobCustomDesign {
+    model: IDashboard;
+    dashboard: DashboardController;
+    /**
+     * @description 应用配置存储服务
+     * @type {(ConfigService | undefined)}
+     * @memberof MobCustomDashboardController
+     */
+    config: ConfigService | undefined;
+    /**
+     * @description 应用功能组件服务
+     * @type {(UtilService | undefined)}
+     * @memberof MobCustomDashboardController
+     */
+    util: UtilService | undefined;
+    /**
+     * @description 上下文对象
+     * @type {IContext}
+     * @memberof MobCustomDashboardController
+     */
+    context: IContext;
+    /**
+     * @description 视图参数
+     * @type {IParams}
+     * @memberof MobCustomDashboardController
+     */
+    params: IParams;
+    /**
+     * @description 门户部件列表
+     * @type {(string[] | undefined)}
+     * @memberof MobCustomDashboardController
+     */
+    portlets: string[] | undefined;
+    /**
+     * @description 忽略的门户部件类型列表
+     * @type {string[]}
+     * @memberof MobCustomDashboardController
+     */
+    ignoreType: string[];
+    /**
+     * @description 自定义定制范围类型（public：公开，personal：个人，data：数据，默认是按照个人区分，配置了应用功能组件才生效）
+     * @type {('public' | 'personal' | 'data')}
+     * @memberof MobCustomDashboardController
+     */
+    type: 'public' | 'personal' | 'data';
+    /**
+     * @description 所属数据类型（仅限自定义定制为data类型时生效，配置了应用功能组件才生效）
+     * @type {string}
+     * @memberof MobCustomDashboardController
+     */
+    ownerType: string;
+    /**
+     * @description 所属数据标识（仅限自定义定制为data类型时生效，配置了应用功能组件才生效）
+     * @type {string}
+     * @memberof MobCustomDashboardController
+     */
+    ownerId: string;
+    /**
+     * @description 多数据模式，启用时请求参数从上下文中获取srfdynadashboardid的值
+     * @type {boolean}
+     * @memberof MobCustomDashboardController
+     */
+    multiMode: boolean;
+    constructor(model: IDashboard, dashboard: DashboardController);
+    /**
+     * @description 初始化
+     * @private
+     * @param {IData} controlParams
+     * @memberof MobCustomDashboardController
+     */
+    private init;
+    /**
+     * @description 获取资源标识（仅用于功能组件服务）
+     * @private
+     * @returns {*}  {string}
+     * @memberof MobCustomDashboardController
+     */
+    private getResourceTag;
+    /**
+     * @description 更新门户部件状态
+     * @memberof MobCustomDashboardController
+     */
+    updatePortletState(): void;
+    /**
+     * @description 加载门户部件数据
+     * @returns {*}  {Promise<void>}
+     * @memberof MobCustomDashboardController
+     */
+    load(): Promise<void>;
+    /**
+     * @description 保存门户部件数据
+     * @param {string[]} portlets
+     * @returns {*}  {Promise<void>}
+     * @memberof MobCustomDashboardController
+     */
+    save(portlets: string[]): Promise<void>;
+}
+//# sourceMappingURL=mob-custom-dashboard.controller.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"mob-custom-dashboard.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/dashboard/mob-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,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAE7D,qBAAa,4BAA6B,YAAW,gBAAgB;IAwE1D,KAAK,EAAE,UAAU;IACjB,SAAS,EAAE,mBAAmB;IAxEvC;;;;OAIG;IACH,MAAM,EAAE,aAAa,GAAG,SAAS,CAAC;IAElC;;;;OAIG;IACH,IAAI,EAAE,WAAW,GAAG,SAAS,CAAC;IAE9B;;;;OAIG;IACH,OAAO,EAAE,QAAQ,CAAC;IAElB;;;;OAIG;IACH,MAAM,EAAE,OAAO,CAAC;IAEhB;;;;OAIG;IACH,QAAQ,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAE/B;;;;OAIG;IACH,UAAU,EAAE,MAAM,EAAE,CAAiB;IAErC;;;;OAIG;IACH,IAAI,EAAE,QAAQ,GAAG,UAAU,GAAG,MAAM,CAAc;IAElD;;;;OAIG;IACH,SAAS,EAAE,MAAM,CAAM;IAEvB;;;;OAIG;IACH,OAAO,EAAE,MAAM,CAAM;IAErB;;;;OAIG;IACH,SAAS,EAAE,OAAO,CAAS;gBAGlB,KAAK,EAAE,UAAU,EACjB,SAAS,EAAE,mBAAmB;IAOvC;;;;;OAKG;IACH,OAAO,CAAC,IAAI;IAkCZ;;;;;OAKG;IACH,OAAO,CAAC,cAAc;IAkBtB;;;OAGG;IACH,kBAAkB,IAAI,IAAI;IAY1B;;;;OAIG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAiB3B;;;;;OAKG;IACG,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CA6B9C"}

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

@@ -0,0 +1,153 @@
+import { ConfigService, UtilService } from '../../../service';
+export class MobCustomDashboardController {
+    constructor(model, dashboard) {
+        this.model = model;
+        this.dashboard = dashboard;
+        /**
+         * @description 忽略的门户部件类型列表
+         * @type {string[]}
+         * @memberof MobCustomDashboardController
+         */
+        this.ignoreType = ['CONTAINER'];
+        /**
+         * @description 自定义定制范围类型（public：公开，personal：个人，data：数据，默认是按照个人区分，配置了应用功能组件才生效）
+         * @type {('public' | 'personal' | 'data')}
+         * @memberof MobCustomDashboardController
+         */
+        this.type = 'personal';
+        /**
+         * @description 所属数据类型（仅限自定义定制为data类型时生效，配置了应用功能组件才生效）
+         * @type {string}
+         * @memberof MobCustomDashboardController
+         */
+        this.ownerType = '';
+        /**
+         * @description 所属数据标识（仅限自定义定制为data类型时生效，配置了应用功能组件才生效）
+         * @type {string}
+         * @memberof MobCustomDashboardController
+         */
+        this.ownerId = '';
+        /**
+         * @description 多数据模式，启用时请求参数从上下文中获取srfdynadashboardid的值
+         * @type {boolean}
+         * @memberof MobCustomDashboardController
+         */
+        this.multiMode = false;
+        this.context = dashboard.context;
+        this.params = dashboard.params;
+        this.init(dashboard.controlParams);
+    }
+    /**
+     * @description 初始化
+     * @private
+     * @param {IData} controlParams
+     * @memberof MobCustomDashboardController
+     */
+    init(controlParams) {
+        var _a, _b;
+        // 默认走个人
+        this.type = 'personal';
+        this.ownerId = this.context.srfpersonid;
+        // 识别动态控件参数
+        if (controlParams.type) {
+            this.type = controlParams.type;
+        }
+        if (controlParams.owner_type) {
+            this.ownerType = controlParams.owner_type;
+        }
+        if (controlParams.owner_id) {
+            this.ownerId = this.context[controlParams.owner_id];
+        }
+        if (controlParams.multimode === 'true') {
+            this.multiMode = true;
+        }
+        // 配置了应用功能组件则走应用功能组件服务存储，否则走rt的config存储
+        if (this.model.appDynaDashboardUtilId) {
+            const app = ibiz.hub.getApp(this.context.srfappid);
+            this.util = new UtilService(app.getAppUtil(this.model.appDynaDashboardUtilId));
+        }
+        else {
+            this.config = new ConfigService(this.model.appId, 'dynadashboard', `dashboard_${((_a = this.model.appDataEntityId) === null || _a === void 0 ? void 0 : _a.toLowerCase()) || 'app'}_${(_b = this.model.codeName) === null || _b === void 0 ? void 0 : _b.toLowerCase()}`);
+        }
+    }
+    /**
+     * @description 获取资源标识（仅用于功能组件服务）
+     * @private
+     * @returns {*}  {string}
+     * @memberof MobCustomDashboardController
+     */
+    getResourceTag() {
+        var _a, _b;
+        // 启用多数据模式，直接返回上下文中srfdynadashboardid作为路径参数
+        if (this.multiMode) {
+            return this.context.srfdynadashboardid;
+        }
+        const base = `${this.context.srfappid}_dashboard_${((_a = this.model.appDataEntityId) === null || _a === void 0 ? void 0 : _a.toLowerCase()) || 'app'}_${(_b = this.model.codeName) === null || _b === void 0 ? void 0 : _b.toLowerCase()}`;
+        switch (this.type) {
+            case 'personal':
+                return `${base}_${this.context.srfpersonid}`;
+            case 'data':
+                return `${base}_${this.ownerType}_${this.ownerId}`;
+            default:
+                return base;
+        }
+    }
+    /**
+     * @description 更新门户部件状态
+     * @memberof MobCustomDashboardController
+     */
+    updatePortletState() {
+        if (this.portlets) {
+            const portlets = new Set(this.portlets);
+            Object.entries(this.dashboard.portlets).forEach(([key, portlet]) => {
+                if (this.ignoreType.includes(portlet.model.portletType)) {
+                    return;
+                }
+                portlet.state.visible = portlets.has(key);
+            });
+        }
+    }
+    /**
+     * @description 加载门户部件数据
+     * @returns {*}  {Promise<void>}
+     * @memberof MobCustomDashboardController
+     */
+    async load() {
+        let res;
+        if (this.util) {
+            res = await this.util.load(this.getResourceTag(), this.context, this.params);
+        }
+        else if (this.config) {
+            res = await this.config.load();
+        }
+        if (res && Array.isArray(res.portlets)) {
+            this.portlets = res.portlets;
+            this.updatePortletState();
+        }
+    }
+    /**
+     * @description 保存门户部件数据
+     * @param {string[]} portlets
+     * @returns {*}  {Promise<void>}
+     * @memberof MobCustomDashboardController
+     */
+    async save(portlets) {
+        const data = {
+            portlets,
+        };
+        if (this.util) {
+            const 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);
+            if (res && res.ok) {
+                this.portlets = portlets;
+                this.updatePortletState();
+            }
+        }
+        else if (this.config) {
+            const res = await this.config.save(data);
+            if (res) {
+                this.portlets = portlets;
+                this.updatePortletState();
+            }
+        }
+    }
+}

package/out/controller/control/dashboard/portlet/filter-portlet/filter-portlet.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filter-portlet.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/dashboard/portlet/filter-portlet/filter-portlet.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAkB,MAAM,kBAAkB,CAAC;AACxE,OAAO,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EACL,2BAA2B,EAE3B,aAAa,EACd,MAAM,0BAA0B,CAAC;AAclC;;;;;;GAMG;AACH,qBAAa,uBACX,SAAQ,qBAAqB,CAAC,oBAAoB,CAClD,YAAW,2BAA2B;IAEtC;;;;;OAKG;IACK,KAAK,EAAE,kBAAkB,CAAC;IAElC;;;;;;OAMG;IACI,YAAY,EAAE,KAAK,CAAM;IAEhC;;;;;;OAMG;IACI,gBAAgB,EAAE,KAAK,EAAE,CAAM;IAEtC;;;;;;OAMG;IACI,WAAW,EAAE,aAAa,GAAG,SAAS,CAAC;IAE9C;;;;;;;OAOG;IACH,SAAS,CAAC,kBAAkB,EAAE,MAAM,CAAM;IAE1C;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IA2BvC;;;;;;OAMG;IACH,cAAc,IAAI,aAAa,GAAG,SAAS;IAO3C;;;;;;;OAOG;IACH,SAAS,CAAC,0BAA0B,IAAI,MAAM,EAAE;IAyBhD;;;;;;OAMG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAqBrC;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IAwBhC;;;;;;OAMG;IACG,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;CAQzC"}
+{"version":3,"file":"filter-portlet.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/dashboard/portlet/filter-portlet/filter-portlet.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAkB,MAAM,kBAAkB,CAAC;AAExE,OAAO,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EACL,2BAA2B,EAE3B,aAAa,EACd,MAAM,0BAA0B,CAAC;AAelC;;;;;;GAMG;AACH,qBAAa,uBACX,SAAQ,qBAAqB,CAAC,oBAAoB,CAClD,YAAW,2BAA2B;IAEtC;;;;;OAKG;IACK,KAAK,EAAE,kBAAkB,CAAC;IAElC;;;;;;OAMG;IACI,YAAY,EAAE,KAAK,CAAM;IAEhC;;;;;;OAMG;IACI,gBAAgB,EAAE,KAAK,EAAE,CAAM;IAEtC;;;;;;OAMG;IACI,WAAW,EAAE,aAAa,GAAG,SAAS,CAAC;IAE9C;;;;;;;OAOG;IACH,SAAS,CAAC,kBAAkB,EAAE,MAAM,CAAM;IAE1C;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAqDvC;;;;;;OAMG;IACH,cAAc,IAAI,aAAa,GAAG,SAAS;IAO3C;;;;;;;OAOG;IACH,SAAS,CAAC,0BAA0B,IAAI,MAAM,EAAE;IA8BhD;;;;;;OAMG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAqBrC;;;;;;OAMG;IACG,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IAwBhC;;;;;;OAMG;IACG,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;CAQzC"}

package/out/controller/control/dashboard/portlet/filter-portlet/filter-portlet.controller.js

@@ -1,6 +1,7 @@
+import { recursiveIterate } from '@ibiz-template/core';
 import { PortletPartController } from '../portlet-part/portlet-part.controller';
 import { filterNode2SearchCondEx, SearchCondEx2filterNode, } from '../../../search-bar';
-import { filterPortletByConfig, filterPortletByID, generateCacheKy, getFilterSearchConds, } from '../../dashboard.util';
+import { filterDEDQConditions2SearchConds, filterPortletByConfig, filterPortletByID, generateCacheKy, getFilterSearchConds, } from '../../dashboard.util';
 import { handleAllSettled } from '../../../../../utils';
 /**
  * @description 门户部件控制器（过滤器）
@@ -56,12 +57,33 @@ export class FilterPortletController extends PortletPartController {
             this.filterConfig =
                 ((_a = customDashboard.portletFilter[this.model.id]) === null || _a === void 0 ? void 0 : _a.config) || {};
             const cacheSearchConds = localStorage.getItem(this.searchCondCacheKey);
-            this.searchConds = cacheSearchConds
-                ? JSON.parse(cacheSearchConds)
-                : (_b = customDashboard.portletFilter[this.model.id]) === null || _b === void 0 ? void 0 : _b.searchconds;
+            this.searchConds =
+                cacheSearchConds && cacheSearchConds !== 'undefined'
+                    ? JSON.parse(cacheSearchConds)
+                    : (_b = customDashboard.portletFilter[this.model.id]) === null || _b === void 0 ? void 0 : _b.searchconds;
+            // 如果没有自定义条件，存在预置条件，则界面需绘制预置条件
             if (this.searchConds) {
                 this.state.filterNode = SearchCondEx2filterNode(this.searchConds);
             }
+            else if (this.model.filterDEDQConditions) {
+                const modelSearchConds = filterDEDQConditions2SearchConds(this.model.filterDEDQConditions);
+                if (modelSearchConds && modelSearchConds.length > 0) {
+                    const tempFieldSearchConds = [];
+                    recursiveIterate(modelSearchConds[0], (item) => {
+                        if (item.condtype === 'DEFIELD') {
+                            tempFieldSearchConds.push(item);
+                        }
+                    }, {
+                        childrenFields: ['searchconds'],
+                    });
+                    this.searchConds = {
+                        condop: 'AND',
+                        condtype: 'GROUP',
+                        searchconds: tempFieldSearchConds,
+                    };
+                    this.state.filterNode = SearchCondEx2filterNode(this.searchConds);
+                }
+            }
         }
     }
     /**
@@ -85,7 +107,10 @@ export class FilterPortletController extends PortletPartController {
     computeEffectivePortletIDs() {
         const items = [];
         Object.values(this.dashboard.portlets).forEach((portlet) => {
-            if (portlet.model && portlet.model.portletType !== 'FILTER') {
+            if (portlet.model &&
+                portlet.model.portletType !== 'FILTER' &&
+                portlet.model.portletType !== 'RAWITEM' &&
+                portlet.model.portletType !== 'CONTAINER') {
                 items.push(portlet.model);
             }
         });

package/out/controller/control/dashboard/portlet/portlet-part/portlet-part.controller.d.ts

@@ -1,5 +1,5 @@
 import { IDBPortletPart, IUIActionGroupDetail } from '@ibiz/model-core';
-import { IPortletController, IDashboardController, IPortletContainerController, DataChangeEvent, IController } from '../../../../../interface';
+import { IController, DataChangeEvent, IPortletController, IDashboardController, IPortletContainerController } from '../../../../../interface';
 import { PortletPartState } from './portlet-part.state';
 /**
  * 门户部件控制器基类
@@ -161,6 +161,13 @@ export declare class PortletPartController<T extends IDBPortletPart = IDBPortlet
      * @Date: 2023-09-22 17:39:44
      */
     onDataChange(event: DataChangeEvent): void;
+    /**
+     * @description 初始化界面行为组
+     * @protected
+     * @returns {*}  {Promise<void>}
+     * @memberof PortletPartController
+     */
+    protected initUIActions(): Promise<void>;
     /**
      * 初始化标题右侧界面行为按钮的状态
      *

package/out/controller/control/dashboard/portlet/portlet-part/portlet-part.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"portlet-part.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/dashboard/portlet/portlet-part/portlet-part.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAQxE,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,2BAA2B,EAC3B,eAAe,EACf,WAAW,EAEZ,MAAM,0BAA0B,CAAC;AAKlC,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGxD;;;;;;;;GAQG;AACH,qBAAa,qBAAqB,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc,CAC1E,YAAW,kBAAkB;IAE7B,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;OAKG;IACH,KAAK,EAAE,gBAAgB,CAAC;IAExB;;;;;;OAMG;IACH,QAAQ,CAAC,SAAS,EAAE,oBAAoB,CAAC;IAEzC;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,2BAA2B,CAAC;IAE9C;;;;;;;OAOG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;;;;;OAMG;IACI,MAAM,EAAE,OAAO,CAAC;IAEvB;;;;;OAKG;IACI,MAAM,EAAE,KAAK,CAAM;IAE1B;;;;;;OAMG;IACH,IAAI,cAAc,IAAI,MAAM,EAAE,CAE7B;IAED;;;;;;OAMG;IACH,IAAI,iBAAiB,IAAI,WAAW,GAAG,SAAS,CAK/C;IAED;;;;;OAKG;IACH,IAAI,cAAc,IAAI,cAAc,GAAG,IAAI,CAS1C;IAED;;;;;;;OAOG;gBAED,KAAK,EAAE,CAAC,EACR,SAAS,EAAE,oBAAoB,EAC/B,MAAM,CAAC,EAAE,2BAA2B;IAkBtC;;;;;;OAMG;IACH,eAAe,IAAI,OAAO,GAAG,SAAS;IAKtC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IA8BvC;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,IAAI,gBAAgB;IAIzC;;;;;;OAMG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAU9B;;;;;;OAMG;IACH,UAAU,IAAI,IAAI;IAalB;;;;;OAKG;IACG,SAAS,CAAC,MAAM,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAY7C;;;;OAIG;IACH,WAAW,IAAI,IAAI;IAcnB;;;;;;OAMG;IACH,YAAY,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAc1C;;;;;;OAMG;IACG,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IA8BvC;;;;;;;OAOG;IACG,aAAa,CACjB,MAAM,EAAE,oBAAoB,EAC5B,KAAK,EAAE,UAAU,EACjB,IAAI,GAAE,KAAK,EAAO,GACjB,OAAO,CAAC,IAAI,CAAC;IAkChB;;;;;;OAMG;IACG,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAWlD;;;;;OAKG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAS1C;;;;OAIG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAIjC"}
+{"version":3,"file":"portlet-part.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/dashboard/portlet/portlet-part/portlet-part.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAQxE,OAAO,EACL,WAAW,EACX,eAAe,EAEf,kBAAkB,EAClB,oBAAoB,EACpB,2BAA2B,EAC5B,MAAM,0BAA0B,CAAC;AAUlC,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGxD;;;;;;;;GAQG;AACH,qBAAa,qBAAqB,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc,CAC1E,YAAW,kBAAkB;IAE7B,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;OAKG;IACH,KAAK,EAAE,gBAAgB,CAAC;IAExB;;;;;;OAMG;IACH,QAAQ,CAAC,SAAS,EAAE,oBAAoB,CAAC;IAEzC;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,2BAA2B,CAAC;IAE9C;;;;;;;OAOG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;;;;;OAMG;IACI,MAAM,EAAE,OAAO,CAAC;IAEvB;;;;;OAKG;IACI,MAAM,EAAE,KAAK,CAAM;IAE1B;;;;;;OAMG;IACH,IAAI,cAAc,IAAI,MAAM,EAAE,CAE7B;IAED;;;;;;OAMG;IACH,IAAI,iBAAiB,IAAI,WAAW,GAAG,SAAS,CAK/C;IAED;;;;;OAKG;IACH,IAAI,cAAc,IAAI,cAAc,GAAG,IAAI,CAS1C;IAED;;;;;;;OAOG;gBAED,KAAK,EAAE,CAAC,EACR,SAAS,EAAE,oBAAoB,EAC/B,MAAM,CAAC,EAAE,2BAA2B;IAkBtC;;;;;;OAMG;IACH,eAAe,IAAI,OAAO,GAAG,SAAS;IAKtC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IA0BvC;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,IAAI,gBAAgB;IAIzC;;;;;;OAMG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAU9B;;;;;;OAMG;IACH,UAAU,IAAI,IAAI;IAalB;;;;;OAKG;IACG,SAAS,CAAC,MAAM,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAY7C;;;;OAIG;IACH,WAAW,IAAI,IAAI;IAUnB;;;;;;OAMG;IACH,YAAY,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAc1C;;;;;OAKG;cACa,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAM9C;;;;;;OAMG;IACG,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IA6BvC;;;;;;;OAOG;IACG,aAAa,CACjB,MAAM,EAAE,oBAAoB,EAC5B,KAAK,EAAE,UAAU,EACjB,IAAI,GAAE,KAAK,EAAO,GACjB,OAAO,CAAC,IAAI,CAAC;IAkChB;;;;;;OAMG;IACG,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAWlD;;;;;OAKG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAO1C;;;;OAIG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAIjC"}