@ibiz-template/runtime 0.7.26-alpha.1 → 0.7.26

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

@@ -1,4 +1,4 @@
-import { mergeDeepRight } from 'ramda';
+import { clone, mergeDeepRight } from 'ramda';
 import { isObject, isString } from 'qx-util';
 import { RuntimeError } from '@ibiz-template/core';
 import { LineSeriesGenerator } from './line-series-generator';
@@ -246,6 +246,113 @@ export class ChartOptionsGenerator {
         });
         return AxisOption;
     }
+    /**
+     * 处理轴布局位置
+     *
+     * @param {CodeListItem[]} items
+     * @param {number} padding
+     * @param {number} total
+     * @param {number} index
+     * @param {boolean} isRow 是否横向
+     * @return {*}
+     * @memberof ChartOptionsGenerator
+     */
+    handleAxisLayout(items, padding, total, index, isRow = true) {
+        const axisData = items.map((code) => {
+            if (isRow) {
+                return {
+                    value: code.text,
+                    textStyle: {
+                        padding: [0, padding * (total - 1 - index), 0, 0],
+                    },
+                };
+            }
+            return {
+                value: code.text,
+                textStyle: {
+                    padding: [padding * (total - 1 - index), 0, 0, 0],
+                },
+            };
+        });
+        return axisData;
+    }
+    /**
+     * 处理轴层级
+     *
+     * @param {IData[]} tempaxis
+     * @param {number} index
+     * @param {IData[]} axisData
+     * @return {*}
+     * @memberof ChartOptionsGenerator
+     */
+    handleAxisLevel(tempaxis, index, axisData) {
+        const tempAxisData = [];
+        if (index === 0) {
+            return axisData;
+        }
+        let length = 1;
+        for (let i = 0; i < tempaxis.length; i++) {
+            length *= tempaxis[i].data.length;
+        }
+        for (let i = 0; i < length; i++) {
+            tempAxisData.push(...axisData);
+        }
+        return tempAxisData;
+    }
+    /**
+     * 合并轴参数
+     *
+     * @param {(IData[] | IData)} axisData
+     * @param {IData[]} tempAxis
+     * @return {*}
+     * @memberof ChartOptionsGenerator
+     */
+    mergeAxisData(axisData, tempAxis) {
+        if (axisData && Array.isArray(axisData)) {
+            return [...axisData, ...tempAxis];
+        }
+        return [axisData, ...tempAxis];
+    }
+    /**
+     * 处理分区模式下序列模型的坐标轴位置
+     *
+     * @param {IData[]} seriesModel
+     * @param {IData} opts
+     * @memberof ChartOptionsGenerator
+     */
+    handleSeriesModelCoordinateAxis(seriesModel, opts) {
+        const { xAxisParam, yAxisParam } = opts;
+        const xaxis = [];
+        const yaxis = [];
+        for (let i = 0; i < seriesModel.length; i++) {
+            const tempXAxis = clone(xAxisParam);
+            const tempYAxis = clone(yAxisParam);
+            Object.assign(tempXAxis, { gridIndex: i });
+            Object.assign(tempYAxis, { gridIndex: i });
+            // 需要模板支持解析数组参数
+            tempYAxis.axisLabel.formatter = function (_param) {
+                if (_param === 0) {
+                    return `{top|${_param}}`;
+                }
+                return `{bottom|${_param}}`;
+            };
+            if (i !== seriesModel.length - 1) {
+                tempXAxis.name = '';
+                tempXAxis.axisLine.show = false;
+                tempXAxis.axisLabel.show = false;
+                tempXAxis.axisTick.show = false;
+            }
+            if (tempYAxis.showTitle) {
+                Object.assign(tempYAxis, {
+                    name: seriesModel[i].serieText,
+                });
+            }
+            xaxis.push(tempXAxis);
+            yaxis.push(tempYAxis);
+        }
+        this.chartUserParam.xAxis = xaxis;
+        this.chartUserParam.yAxis = yaxis;
+    }
     /**
      * 初始化多分类的X轴配置
      *
@@ -253,78 +360,109 @@ export class ChartOptionsGenerator {
      * @memberof ChartOptionsGenerator
      */
     async initMultiCatalogxAxis(context, params) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         const { controlParam } = this.model;
-        if (controlParam && ((_a = controlParam.ctrlParams) === null || _a === void 0 ? void 0 : _a.CATALOGFIELDS)) {
+        // 分区模式 ，计算多个图表位置
+        if (controlParam && ((_a = controlParam.ctrlParams) === null || _a === void 0 ? void 0 : _a.ZONE)) {
+            const length = (_b = this.model.dechartSerieses) === null || _b === void 0 ? void 0 : _b.length;
+            if (length) {
+                const height = 90 / length;
+                const items = [];
+                for (let i = 0; i < length; i++) {
+                    const top = i * height + 5;
+                    const bottom = 100 - (height + top);
+                    items.push({
+                        top: `${top}%`,
+                        bottom: `${bottom}%`,
+                        containLabel: true,
+                    });
+                }
+                if (this.chartUserParam) {
+                    this.chartUserParam.grid = items;
+                    this.handleSeriesModelCoordinateAxis(this.model.dechartSerieses, {
+                        xAxisParam: ((_c = this.chartUserParam) === null || _c === void 0 ? void 0 : _c.xAxis) || {},
+                        yAxisParam: ((_d = this.chartUserParam) === null || _d === void 0 ? void 0 : _d.yAxis) || {},
+                    });
+                }
+            }
+        }
+        // 判断是否为多分类模式
+        if (controlParam && ((_e = controlParam.ctrlParams) === null || _e === void 0 ? void 0 : _e.CATALOGFIELDS)) {
             try {
                 // 获取分类分层配置
                 const tempCatalogFields = JSON.parse(controlParam.ctrlParams.CATALOGFIELDS);
                 const tempaxis = [];
                 let titleshow = true;
-                let labelshoww = true;
+                let labelshow = true;
                 let gridIndex = 0;
+                // 需要一个分类属性组成的JSON数组
                 if (Array.isArray(tempCatalogFields)) {
                     const app = ibiz.hub.getApp(context.srfappid);
-                    if (this.chartUserParam && this.chartUserParam.xAxis) {
-                        if (Array.isArray(this.chartUserParam.xAxis)) {
-                            const tempconfig = this.chartUserParam.xAxis[this.chartUserParam.xAxis.length - 1];
-                            titleshow =
-                                tempconfig.name === undefined ? true : !!tempconfig.name;
-                            labelshoww =
-                                ((_b = tempconfig.axisLabel) === null || _b === void 0 ? void 0 : _b.show) === undefined
-                                    ? true
-                                    : (_c = tempconfig.axisLabel) === null || _c === void 0 ? void 0 : _c.show;
+                    if (this.chartUserParam) {
+                        let tempconfig = {};
+                        // 判断图表是否为横向条形图
+                        if (((_f = controlParam.ctrlParams) === null || _f === void 0 ? void 0 : _f.MODE) === 'ROW') {
+                            // 获取yAxis配置数据
+                            if (Array.isArray(this.chartUserParam.yAxis)) {
+                                tempconfig =
+                                    this.chartUserParam.yAxis[this.chartUserParam.yAxis.length - 1];
+                            }
+                            else {
+                                // 计算轴标题和轴标签是否显示
+                                tempconfig = this.chartUserParam.yAxis;
+                            }
+                        }
+                        else if (Array.isArray(this.chartUserParam.xAxis)) {
+                            // 获取xAxis配置数据
+                            tempconfig =
+                                this.chartUserParam.xAxis[this.chartUserParam.xAxis.length - 1];
                         }
                         else {
+                            tempconfig = this.chartUserParam.xAxis;
+                        }
+                        // 计算轴标题和轴标签是否显示
+                        if (tempconfig) {
                             titleshow =
-                                this.chartUserParam.xAxis.name === undefined
-                                    ? true
-                                    : !!this.chartUserParam.xAxis.name;
-                            labelshoww =
-                                ((_d = this.chartUserParam.xAxis.axisLabel) === null || _d === void 0 ? void 0 : _d.show) === undefined
+                                tempconfig.name === undefined ? true : !!tempconfig.name;
+                            labelshow =
+                                ((_g = tempconfig.axisLabel) === null || _g === void 0 ? void 0 : _g.show) === undefined
                                     ? true
-                                    : (_e = this.chartUserParam.xAxis.axisLabel) === null || _e === void 0 ? void 0 : _e.show;
+                                    : (_h = tempconfig.axisLabel) === null || _h === void 0 ? void 0 : _h.show;
                         }
                     }
+                    // 计算图表使用的grid配置
                     if (this.chartUserParam &&
                         this.chartUserParam.grid &&
                         Array.isArray(this.chartUserParam.grid)) {
                         gridIndex = this.chartUserParam.grid.length - 1;
                     }
+                    // 获取分类代码表，最后一个分类是作为序列分类处理的，
                     await Promise.all(tempCatalogFields
                         .slice(0, -1)
                         .map(async (catalog, index) => {
+                        var _a;
                         if (catalog.mode === 'codelist' && catalog.codelistId) {
                             const codeListItems = await app.codeList.get(catalog.codelistId, context, params);
                             if (codeListItems) {
-                                const tempxAxisData = [];
-                                const xAxisData = codeListItems.map((code) => {
-                                    return {
-                                        value: code.text,
-                                        textStyle: {
-                                            lineHeight: 45 * (tempCatalogFields.length - 1 - index),
-                                        },
-                                    };
-                                });
-                                if (index === 0) {
+                                if (((_a = controlParam.ctrlParams) === null || _a === void 0 ? void 0 : _a.MODE) === 'ROW') {
+                                    // 计算条形图时yAxis的配置以及图表的四周间隔
+                                    const yAxisData = this.handleAxisLayout(codeListItems, 40, tempCatalogFields.length, index);
+                                    // 开始计算每一层的标签刻度个数，并动态生成相应个数的配置数据
+                                    const tempxAxisData = this.handleAxisLevel(tempaxis, index, yAxisData);
                                     tempaxis.push({
-                                        show: labelshoww,
+                                        show: labelshow,
                                         gridIndex,
                                         type: 'category',
-                                        data: xAxisData,
-                                        position: 'bottom',
+                                        data: tempxAxisData,
+                                        position: 'left',
                                     });
                                 }
                                 else {
-                                    let length = 1;
-                                    for (let i = 0; i < tempaxis.length; i++) {
-                                        length *= tempaxis[i].data.length;
-                                    }
-                                    for (let i = 0; i < length; i++) {
-                                        tempxAxisData.push(...xAxisData);
-                                    }
+                                    // 计算横轴在分层下的xAxis配置以及图表四周间隔
+                                    const xAxisData = this.handleAxisLayout(codeListItems, 24, tempCatalogFields.length, index, false);
+                                    const tempxAxisData = this.handleAxisLevel(tempaxis, index, xAxisData);
                                     tempaxis.push({
-                                        show: labelshoww,
+                                        show: labelshow,
                                         gridIndex,
                                         type: 'category',
                                         data: tempxAxisData,
@@ -334,63 +472,87 @@ export class ChartOptionsGenerator {
                             }
                         }
                     }));
+                    // 计算分类分层显示情况下的轴标题
                     const mergeName = tempCatalogFields
                         .map((catalog) => {
                         return catalog.name;
                     })
                         .join('/');
-                    tempaxis.push({
-                        type: 'category',
-                        gridIndex,
-                        show: titleshow,
-                        data: [
-                            {
-                                value: mergeName,
-                                textStyle: {
-                                    lineHeight: labelshoww ? 45 * tempCatalogFields.length : 45,
-                                },
-                            },
-                        ],
-                        position: 'bottom',
-                    });
+                    let catalogLength = tempCatalogFields.length;
+                    if (!labelshow) {
+                        catalogLength = 1;
+                    }
+                    if (!titleshow) {
+                        catalogLength -= 1;
+                    }
                     if (this.chartUserParam) {
-                        if (this.chartUserParam.xAxis &&
-                            Array.isArray(this.chartUserParam.xAxis)) {
-                            this.chartUserParam.xAxis = [
-                                ...this.chartUserParam.xAxis,
-                                ...tempaxis,
-                            ];
-                        }
-                        else if (this.chartUserParam.xAxis) {
-                            this.chartUserParam.xAxis = [
-                                this.chartUserParam.xAxis,
-                                ...tempaxis,
-                            ];
-                        }
                         if (!this.chartUserParam.grid) {
                             this.chartUserParam.grid = {};
                         }
-                        let { length } = tempCatalogFields;
-                        if (!labelshoww) {
-                            length = 1;
-                        }
-                        if (!titleshow) {
-                            length -= 1;
-                        }
-                        if (length === 0) {
-                            Object.assign(this.chartUserParam.grid, {
-                                bottom: 45,
+                        if (((_j = controlParam.ctrlParams) === null || _j === void 0 ? void 0 : _j.MODE) === 'ROW') {
+                            // 动态计算条形图四周的间隙
+                            if (catalogLength === 0) {
+                                Object.assign(this.chartUserParam.grid, {
+                                    bottom: 45,
+                                });
+                            }
+                            else {
+                                Object.assign(this.chartUserParam.grid, {
+                                    left: (catalogLength + 1) * 40,
+                                });
+                            }
+                            // 计算完纵轴分层布局数据并合并用户参数
+                            tempaxis.push({
+                                type: 'category',
+                                gridIndex,
+                                show: titleshow,
+                                data: [
+                                    {
+                                        value: mergeName.split('').join('\n'),
+                                        textStyle: {
+                                            padding: [0, catalogLength * 40, 0, 0],
+                                        },
+                                    },
+                                ],
+                                position: 'left',
                             });
+                            if (this.chartUserParam.yAxis) {
+                                this.chartUserParam.yAxis = this.mergeAxisData(this.chartUserParam.yAxis, tempaxis);
+                            }
                         }
                         else {
-                            Object.assign(this.chartUserParam.grid, {
-                                bottom: (length > 2 ? length - 1 : length) * 45,
+                            if (catalogLength === 0) {
+                                Object.assign(this.chartUserParam.grid, {
+                                    bottom: 30,
+                                });
+                            }
+                            else {
+                                Object.assign(this.chartUserParam.grid, {
+                                    bottom: (catalogLength + 1) * 24,
+                                });
+                            }
+                            tempaxis.push({
+                                type: 'category',
+                                gridIndex,
+                                show: titleshow,
+                                data: [
+                                    {
+                                        value: mergeName,
+                                        textStyle: {
+                                            padding: [24 * catalogLength, 0, 0, 0],
+                                        },
+                                    },
+                                ],
+                                position: 'bottom',
                             });
+                            if (this.chartUserParam.xAxis) {
+                                this.chartUserParam.xAxis = this.mergeAxisData(this.chartUserParam.xAxis, tempaxis);
+                            }
                         }
                     }
                 }
             }
-            catch (_f) {
+            catch (_k) {
                 throw new Error(ibiz.i18n.t('runtime.control.chart.errorJson'));
             }
         }

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

@@ -1 +1 @@
-{"version":3,"file":"radar-series-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/radar-series-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,KAAK,EAAqB,YAAY,EAAE,MAAM,SAAS,CAAC;AAE/D,OAAO,EAAE,mBAAmB,EAAiB,MAAM,yBAAyB,CAAC;AAG7E;;;;;;;GAOG;AACH,qBAAa,oBAAqB,SAAQ,mBAAmB,CAAC,iBAAiB,CAAC;IAC9E,SAAS,CAAC,iBAAiB,IAAI,YAAY;IAM3C;;;;;OAKG;IACH,oBAAoB,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI;IAoBzC,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,YAAY,GAAG,YAAY,EAAE;CA4B1D"}
+{"version":3,"file":"radar-series-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/radar-series-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,KAAK,EAAqB,YAAY,EAAE,MAAM,SAAS,CAAC;AAE/D,OAAO,EAAE,mBAAmB,EAAiB,MAAM,yBAAyB,CAAC;AAG7E;;;;;;;GAOG;AACH,qBAAa,oBAAqB,SAAQ,mBAAmB,CAAC,iBAAiB,CAAC;IAC9E,SAAS,CAAC,iBAAiB,IAAI,YAAY;IAM3C;;;;;OAKG;IACH,oBAAoB,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI;IAuBzC,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,YAAY,GAAG,YAAY,EAAE;CA4B1D"}

package/out/controller/control/chart/generator/radar-series-generator.js

@@ -1,4 +1,4 @@
-import { mergeDeepRight } from 'ramda';
+import { clone, mergeDeepRight } from 'ramda';
 import { BaseSeriesGenerator, DEFAULT_GROUP } from './base-series-generator';
 import { RadarCoordSystem } from './radar-coord-system';
 /**
@@ -21,7 +21,10 @@ export class RadarSeriesGenerator extends BaseSeriesGenerator {
      * @param {IData[]} data
      */
     calcRadarCoordSystem(data) {
-        const groupData = this.calcGroupData(data);
+        const tempItems = data.map((item) => {
+            return clone(item);
+        });
+        const groupData = this.calcGroupData(tempItems);
         // 创建雷达坐标系对象
         if (!this.chartGenerator.radarMap.has(this.catalogField)) {
             this.chartGenerator.radarMap.set(this.catalogField, new RadarCoordSystem(this.chartGenerator.radarMap.size));

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

@@ -73,7 +73,7 @@ export declare class CustomDashboardController implements ICustomDesign {
      */
     params: IParams;
     /**
-     * 自定义定制范围类型（public：公开，personal：个人，data：数据，默认是按照个人区分，配置了应用功能组件才生效）
+     * 自定义定制范围类型（public：公开，personal：个人，data：数据，dynamic: 自定义动态,默认是按照个人区分，配置了应用功能组件才生效）
      *
      * @author tony001
      * @date 2024-04-24 19:04:47
@@ -96,13 +96,6 @@ export declare class CustomDashboardController implements ICustomDesign {
      * @type {string}
      */
     ownerId: string;
-    /**
-     * 是否多模式
-     *
-     * @type {boolean}
-     * @memberof CustomDashboardController
-     */
-    multiMode: boolean;
     /**
      * Creates an instance of BaseController.
      * @author lxm

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,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;IA+GpD,KAAK,EAAE,UAAU;IACjB,SAAS,EAAE,mBAAmB;IA/GvC;;;;;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,GAAG,SAAS,CAAc;IAE9D;;;;;;OAMG;IACH,SAAS,EAAE,MAAM,CAAM;IAEvB;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,CAAM;IAErB;;;;;OAKG;IACH,SAAS,EAAE,OAAO,CAAS;IAE3B;;;;;OAKG;gBAEM,KAAK,EAAE,UAAU,EACjB,SAAS,EAAE,mBAAmB;IAOvC;;;;;;OAMG;IACH,OAAO,CAAC,IAAI;IAmCZ;;;;;;;OAOG;IACH,OAAO,CAAC,cAAc;IAgBtB;;;;;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"}
+{"version":3,"file":"custom-dashboard.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/dashboard/custom-dashboard.controller.ts"],"names":[],"mappings":"AACA,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;IAuGpD,KAAK,EAAE,UAAU;IACjB,SAAS,EAAE,mBAAmB;IAvGvC;;;;;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,GAAG,SAAS,CAAc;IAE9D;;;;;;OAMG;IACH,SAAS,EAAE,MAAM,CAAM;IAEvB;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,CAAM;IAErB;;;;;OAKG;gBAEM,KAAK,EAAE,UAAU,EACjB,SAAS,EAAE,mBAAmB;IAOvC;;;;;;OAMG;IACH,OAAO,CAAC,IAAI;IAkCZ;;;;;;;OAOG;IACH,OAAO,CAAC,cAAc;IAgBtB;;;;;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

@@ -45,7 +45,7 @@ export class CustomDashboardController {
          */
         this.portletConfig = {};
         /**
-         * 自定义定制范围类型（public：公开，personal：个人，data：数据，默认是按照个人区分，配置了应用功能组件才生效）
+         * 自定义定制范围类型（public：公开，personal：个人，data：数据，dynamic: 自定义动态,默认是按照个人区分，配置了应用功能组件才生效）
          *
          * @author tony001
          * @date 2024-04-24 19:04:47
@@ -68,13 +68,6 @@ export class CustomDashboardController {
          * @type {string}
          */
         this.ownerId = '';
-        /**
-         * 是否多模式
-         *
-         * @type {boolean}
-         * @memberof CustomDashboardController
-         */
-        this.multiMode = false;
         this.context = dashboard.context;
         this.params = dashboard.params;
         this.init(dashboard.controlParams);
@@ -102,7 +95,6 @@ export class CustomDashboardController {
             this.ownerId = this.context[controlParams.owner_id];
         }
         if (controlParams.multimode === 'true') {
-            this.multiMode = true;
             this.type = 'dynamic';
         }
         // 配置了应用功能组件则走应用功能组件服务存储，否则走rt的config存储

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

@@ -31,6 +31,14 @@ export declare class DashboardController extends ControlController<IDashboard, I
     portlets: {
         [key: string]: IPortletController;
     };
+    /**
+     * 启用动态
+     *
+     * @author tony001
+     * @date 2024-06-27 11:06:24
+     * @type {boolean}
+     */
+    enableDynamic: boolean;
     protected initState(): void;
     protected onCreated(): Promise<void>;
     /**
@@ -58,6 +66,23 @@ export declare class DashboardController extends ControlController<IDashboard, I
      * @memberof DashboardController
      */
     resetPortlets(): Promise<void>;
+    /**
+     * 加载动态
+     *
+     * @author tony001
+     * @date 2024-06-27 16:06:21
+     * @return {*}  {Promise<IData[]>}
+     */
+    loadAllDynaPortlet(): Promise<IData[]>;
+    /**
+     * 通过指定标识加载门户部件
+     *
+     * @author tony001
+     * @date 2024-06-27 17:06:12
+     * @param {string} id
+     * @return {*}  {(Promise<IDBPortletPart | undefined>)}
+     */
+    loadDynaPortletById(id: string): Promise<IDBPortletPart | undefined>;
     /**
      * 通知所有表单成员表单操作过程中的数据变更
      *

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

@@ -1 +1 @@
-{"version":3,"file":"dashboard.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/dashboard/dashboard.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAEV,cAAc,EACf,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,eAAe,EACf,eAAe,EACf,oBAAoB,EACpB,gBAAgB,EAChB,kBAAkB,EAClB,2BAA2B,EAC5B,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAGjD;;;;;;;;GAQG;AACH,qBAAa,mBACX,SAAQ,iBAAiB,CAAC,UAAU,EAAE,eAAe,EAAE,eAAe,CACtE,YAAW,oBAAoB;IAE/B;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAAA;KAAE,CAAM;IAEpD;;;;;;OAMG;IACH,QAAQ,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB,CAAA;KAAE,CAAM;IAErD,SAAS,CAAC,SAAS,IAAI,IAAI;cAIX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB1C;;;;;;;;OAQG;IACG,YAAY,CAChB,aAAa,EAAE,cAAc,EAAE,EAC/B,MAAM,CAAC,EAAE,2BAA2B,GACnC,OAAO,CAAC,IAAI,CAAC;IAwChB;;;;;;OAMG;IACG,kBAAkB,CAAC,MAAM,GAAE,KAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAW3D;;;;;OAKG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAQpC;;;;;;OAMG;IACG,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;CAQnD"}
+{"version":3,"file":"dashboard.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/dashboard/dashboard.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,UAAU,EAEV,cAAc,EACf,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EACL,eAAe,EACf,eAAe,EACf,oBAAoB,EACpB,gBAAgB,EAChB,kBAAkB,EAClB,2BAA2B,EAC5B,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAGjD;;;;;;;;GAQG;AACH,qBAAa,mBACX,SAAQ,iBAAiB,CAAC,UAAU,EAAE,eAAe,EAAE,eAAe,CACtE,YAAW,oBAAoB;IAE/B;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAAA;KAAE,CAAM;IAEpD;;;;;;OAMG;IACH,QAAQ,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB,CAAA;KAAE,CAAM;IAErD;;;;;;OAMG;IACH,aAAa,EAAE,OAAO,CAAS;IAE/B,SAAS,CAAC,SAAS,IAAI,IAAI;cAIX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAoB1C;;;;;;;;OAQG;IACG,YAAY,CAChB,aAAa,EAAE,cAAc,EAAE,EAC/B,MAAM,CAAC,EAAE,2BAA2B,GACnC,OAAO,CAAC,IAAI,CAAC;IAwChB;;;;;;OAMG;IACG,kBAAkB,CAAC,MAAM,GAAE,KAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAW3D;;;;;OAKG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAQpC;;;;;;OAMG;IACG,kBAAkB,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAkB5C;;;;;;;OAOG;IACG,mBAAmB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IAmB1E;;;;;;OAMG;IACG,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;CAQnD"}

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

@@ -1,3 +1,4 @@
+import { clone } from 'ramda';
 import { ControlType } from '../../../constant';
 import { getPortletProvider } from '../../../register';
 import { handleAllSettled } from '../../../utils';
@@ -31,13 +32,26 @@ export class DashboardController extends ControlController {
          * @type {{ [key: string]: IPortletController }}
          */
         this.portlets = {};
+        /**
+         * 启用动态
+         *
+         * @author tony001
+         * @date 2024-06-27 11:06:24
+         * @type {boolean}
+         */
+        this.enableDynamic = false;
     }
     initState() {
         super.initState();
     }
     async onCreated() {
+        this.model.enableCustomized = true;
         await super.onCreated();
         await this.initPortlets(this.model.controls);
+        // 设置启用动态
+        if (this.controlParams.enabledynamic === 'true') {
+            this.enableDynamic = true;
+        }
         // 实体门户视图监听视图数据变更，刷新界面行为组的状态。
         const { appDataEntityId } = this.view.model;
         if (appDataEntityId) {
@@ -117,6 +131,44 @@ export class DashboardController extends ControlController {
         });
         this.evt.emit('onResetPortlet', undefined);
     }
+    /**
+     * 加载动态
+     *
+     * @author tony001
+     * @date 2024-06-27 16:06:21
+     * @return {*}  {Promise<IData[]>}
+     */
+    async loadAllDynaPortlet() {
+        var _a;
+        const app = ibiz.hub.getApp(ibiz.env.appId);
+        const res = await app.deService.exec('psappportlet', 'fetchdefault', this.context, {
+            size: 1000,
+            n_pssysappid_eq: app.model.codeName,
+            n_dynamodelflag_noteq: 0,
+        });
+        if (res && ((_a = res.data) === null || _a === void 0 ? void 0 : _a.length) > 0) {
+            return res.data;
+        }
+        return [];
+    }
+    /**
+     * 通过指定标识加载门户部件
+     *
+     * @author tony001
+     * @date 2024-06-27 17:06:12
+     * @param {string} id
+     * @return {*}  {(Promise<IDBPortletPart | undefined>)}
+     */
+    async loadDynaPortletById(id) {
+        const app = ibiz.hub.getApp(ibiz.env.appId);
+        const tempContext = clone(this.context);
+        Object.assign(tempContext, { psappportlet: id });
+        const res = await app.deService.exec('psappportlet', 'get', tempContext, this.params);
+        if (res && res.data && res.data.controlmodel) {
+            const controlModel = JSON.parse(res.data.controlmodel);
+            return (await ibiz.hub.translationModelToDsl(controlModel, 'CTRL'));
+        }
+    }
     /**
      * 通知所有表单成员表单操作过程中的数据变更
      *

package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form.controller.d.ts

@@ -57,6 +57,13 @@ export declare class FormMDCtrlFormController extends FormMDCtrlController {
      * @type {string}
      */
     deName: string;
+    /**
+     * 数据集合
+     *
+     * @type {IData[]}
+     * @memberof FormMDCtrlFormController
+     */
+    items: IData[];
     /**
      * 初始化
      *
@@ -74,6 +81,13 @@ export declare class FormMDCtrlFormController extends FormMDCtrlController {
      * @return {*}  {Promise<void>}
      */
     fetchData(): Promise<void>;
+    /**
+     * 更新数据
+     * - 仅支持更新临时数据
+     * @return {*}  {Promise<void>}
+     * @memberof FormMDCtrlFormController
+     */
+    updateData(): Promise<void>;
     /**
      * 表单状态变更通知
      *

package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-mdctrl-form.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form.controller.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACpB,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEhE;;;;;;;;;GASG;AACH,qBAAa,wBAAyB,SAAQ,oBAAoB;IAChE;;;;;;OAMG;IACK,KAAK,EAAE,mBAAmB,CAAC;IAEnC;;;;OAIG;IACH,oBAAoB,UAAS;IAE7B,SAAS,CAAC,WAAW,IAAI,mBAAmB;IAI5C;;;;OAIG;IACH,OAAO,mCAA0C;IAEjD;;;;;;OAMG;IACH,YAAY,EAAG,gBAAgB,CAAC;IAEhC;;;;;OAKG;IACH,OAAO,EAAG,eAAe,CAAC;IAE1B;;;;;OAKG;IACH,MAAM,EAAG,MAAM,CAAC;IAEhB;;;;;;;;OAQG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB7B;;;;;OAKG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAoBhC;;;;;OAKG;IACG,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAK5D;;;;;;OAMG;IACH,iBAAiB,CAAC,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,mBAAmB,GAAG,IAAI;IA6BpE;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IASlC;;;;;;OAMG;IACG,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBvC;;;;OAIG;IACH,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI;IAkB5B,OAAO,IAAI,IAAI;IAIT,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IActD;;;;;OAKG;IACH,SAAS,CAAC,oBAAoB,IAAI,IAAI;CAKvC"}
+{"version":3,"file":"form-mdctrl-form.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-form.controller.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACpB,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEhE;;;;;;;;;GASG;AACH,qBAAa,wBAAyB,SAAQ,oBAAoB;IAChE;;;;;;OAMG;IACK,KAAK,EAAE,mBAAmB,CAAC;IAEnC;;;;OAIG;IACH,oBAAoB,UAAS;IAE7B,SAAS,CAAC,WAAW,IAAI,mBAAmB;IAI5C;;;;OAIG;IACH,OAAO,mCAA0C;IAEjD;;;;;;OAMG;IACH,YAAY,EAAG,gBAAgB,CAAC;IAEhC;;;;;OAKG;IACH,OAAO,EAAG,eAAe,CAAC;IAE1B;;;;;OAKG;IACH,MAAM,EAAG,MAAM,CAAC;IAEhB;;;;;OAKG;IACH,KAAK,EAAE,KAAK,EAAE,CAAM;IAEpB;;;;;;;;OAQG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB7B;;;;;OAKG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAqBhC;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAkBjC;;;;;OAKG;IACG,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAK5D;;;;;;OAMG;IACH,iBAAiB,CAAC,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,mBAAmB,GAAG,IAAI;IA6BpE;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IASlC;;;;;;OAMG;IACG,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBvC;;;;OAIG;IACH,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI;IAkB5B,OAAO,IAAI,IAAI;IAIT,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IActD;;;;;OAKG;IACH,SAAS,CAAC,oBAAoB,IAAI,IAAI;CAKvC"}