@ibiz-template/runtime 0.7.41-alpha.11 → 0.7.41-alpha.110

package/out/controller/control/calendar/calendar.service.js

@@ -1,6 +1,7 @@
 import { RuntimeError } from '@ibiz-template/core';
 import { clone } from 'ramda';
-import { MDControlService, CalendarItemData } from '../../../service';
+import { CalendarItemData } from '../../../service';
+import { MDControlService } from '../../../service/service/control/md-control.service';
 /**
  * 日历部件服务
  *
@@ -11,48 +12,71 @@ import { MDControlService, CalendarItemData } from '../../../service';
  * @extends {MDControlService<ISysCalendar>}
  */
 export class CalendarService extends MDControlService {
+    constructor() {
+        super(...arguments);
+        /**
+         * @description 加载更多信息数据
+         * @type {{
+         *     [modelId: string]: ILoadMoreItem;
+         *   }}
+         * @memberof CalendarService
+         */
+        this.loadMore = {};
+    }
+    /**
+     * @description 删除单条数据
+     * @param {string} appDataEntityId 实体标识
+     * @param {IContext} context 上下文
+     * @param {IParams} [params={}] 视图参数
+     * @param {string} [removeAppDEActionId='remove'] 删除实体行为标识
+     * @returns {*}  {Promise<IHttpResponse>}
+     * @memberof CalendarService
+     */
+    async removeItem(appDataEntityId, context, params = {}, removeAppDEActionId = 'remove') {
+        const res = await this.app.deService.exec(appDataEntityId, removeAppDEActionId, context, undefined, params);
+        return res;
+    }
     /**
      * 执行查询多条数据的方法
      *
      * @author zk
      * @date 2023-08-08 10:08:47
      * @param {IContext} context
-     * @param {IParams} [params={}]
+     * @param {IParams} params
      * @return {*}  Promise<ICalendarItemData[]>
      * @memberof CalendarService
      */
-    async search(context, params = {}) {
+    async search(context, params, opts) {
         const { sysCalendarItems } = this.model;
-        if (!sysCalendarItems) {
+        if (!sysCalendarItems)
             return [];
-        }
         const promises = sysCalendarItems.map(async (item) => {
             const fetchAction = item.appDEDataSetId || 'fetchdefault';
             const tempContext = context.clone();
-            const tempParams = this.handleRequestParams(item, params);
-            if (item.maxSize) {
-                tempParams.size = item.maxSize;
-            }
+            const tempParams = this.handleRequestParams(item, params, opts);
             return this.exec2(fetchAction, tempContext, tempParams, undefined, item.appDataEntityId);
         });
         const resArray = await Promise.all(promises);
         // 二维数组
         const twoDimensionalArray = resArray.map((res, index) => {
-            return this.setCalendarConfigData(res.data, index);
+            var _a;
+            return this.setCalendarConfigData(res.data, index, Number((_a = res.headers) === null || _a === void 0 ? void 0 : _a['x-total-pages']) || 0, opts === null || opts === void 0 ? void 0 : opts.isLoadMore);
         });
         return twoDimensionalArray.flat();
     }
     /**
-     * 设置日历项配置
-     *
-     * @author zk
-     * @date 2023-08-08 06:08:14
+     * @description 设置日历项配置
+     * @private
      * @param {IData[]} items
      * @param {number} index
-     * @return {*}  {ICalendarItemData[]}
+     * @param {number} totalPage
+     * @param {boolean} [isLoadMore=false]
+     * @returns {*}  {ICalendarItemData[]}
      * @memberof CalendarService
      */
-    setCalendarConfigData(items, index) {
+    setCalendarConfigData(items, index, totalPage, isLoadMore = false) {
+        var _a;
+        var _b;
         const { sysCalendarItems } = this.model;
         if (!sysCalendarItems) {
             throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.calendar.noFoundModel'));
@@ -61,9 +85,25 @@ export class CalendarService extends MDControlService {
         if (!calendarItem) {
             throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.calendar.noFoundModel'));
         }
-        return items.map(item => {
+        const itemType = calendarItem.itemType;
+        (_a = (_b = this.loadMore)[itemType]) !== null && _a !== void 0 ? _a : (_b[itemType] = {
+            curPage: 0,
+            totalPage: 0,
+            items: [],
+        });
+        const moreData = this.loadMore[itemType];
+        moreData.totalPage = totalPage;
+        const data = items.map(item => {
             return new CalendarItemData(calendarItem, item);
         });
+        if (isLoadMore) {
+            moreData.curPage += 1;
+            moreData.items.push(...data);
+        }
+        else {
+            moreData.items = [...data];
+        }
+        return [...moreData.items];
     }
     /**
      * 执行方法实体方法（通过实体id和方法名）
@@ -157,15 +197,17 @@ export class CalendarService extends MDControlService {
         ];
     }
     /**
-     * 处理请求参数
-     *
+     * @description 处理请求参数
      * @private
      * @param {ISysCalendarItem} item
      * @param {IParams} params
-     * @return {*}  {IParams}
+     * @param {CalendarFetchOpts} [opts]
+     * @returns {*}  {IParams}
      * @memberof CalendarService
      */
-    handleRequestParams(item, params) {
+    handleRequestParams(item, params, opts) {
+        var _a;
+        var _b, _c;
         const tempParams = clone(params);
         const { srfstartdate, srfenddate } = tempParams;
         if (srfstartdate && srfenddate) {
@@ -173,8 +215,22 @@ export class CalendarService extends MDControlService {
                 searchconds: this.getSearchConds(item, params),
             });
         }
+        const { maxSize, itemType, endTimeAppDEFieldId, beginTimeAppDEFieldId } = item;
         delete tempParams.srfstartdate;
         delete tempParams.srfenddate;
+        tempParams.size = maxSize || 1000;
+        if (opts) {
+            const { isLoadMore, sortField } = opts;
+            if (isLoadMore) {
+                (_a = (_b = this.loadMore)[_c = itemType]) !== null && _a !== void 0 ? _a : (_b[_c] = {
+                    curPage: 0,
+                    totalPage: 0,
+                    items: [],
+                });
+                tempParams.page = this.loadMore[itemType].curPage;
+            }
+            tempParams.sort = `${sortField === 'beginTime' ? beginTimeAppDEFieldId === null || beginTimeAppDEFieldId === void 0 ? void 0 : beginTimeAppDEFieldId.toLowerCase() : endTimeAppDEFieldId === null || endTimeAppDEFieldId === void 0 ? void 0 : endTimeAppDEFieldId.toLowerCase()},desc`;
+        }
         return tempParams;
     }
 }

package/out/controller/control/caption-bar/caption-bar.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"caption-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/caption-bar/caption-bar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,qBAAqB,EACtB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAGjD;;;;;;;;GAQG;AACH,qBAAa,oBACX,SAAQ,iBAAiB,CAAC,WAAW,EAAE,gBAAgB,EAAE,gBAAgB,CACzE,YAAW,qBAAqB;IAEhC,SAAS,CAAC,SAAS,IAAI,IAAI;cAOX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAmB1C;;;;;OAKG;IACH,kBAAkB,IAAI,IAAI;CAQ3B"}
+{"version":3,"file":"caption-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/caption-bar/caption-bar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,qBAAqB,EACtB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAGjD;;;;;;;;GAQG;AACH,qBAAa,oBACX,SAAQ,iBAAiB,CAAC,WAAW,EAAE,gBAAgB,EAAE,gBAAgB,CACzE,YAAW,qBAAqB;IAEhC,SAAS,CAAC,SAAS,IAAI,IAAI;cAOX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB1C;;;;;OAKG;IACH,kBAAkB,IAAI,IAAI;CAQ3B"}

package/out/controller/control/caption-bar/caption-bar.controller.js

@@ -20,7 +20,15 @@ export class CaptionBarController extends ControlController {
         await super.onCreated();
         this.view.evt.on('onViewInfoChange', ({ caption: _caption, dataInfo }) => {
             const { showDataInfoBar } = this.view.model;
-            this.state.caption = `${this.view.model.caption}${showDataInfoBar && dataInfo ? `-${dataInfo}` : ''}`;
+            if (ibiz.config.view.onlyShowDataInfo && showDataInfoBar && dataInfo) {
+                this.state.caption = dataInfo;
+            }
+            else if (!ibiz.config.view.enableDataInfoBar) {
+                this.state.caption = `${this.view.model.caption}`;
+            }
+            else {
+                this.state.caption = `${this.view.model.caption}${showDataInfoBar && dataInfo ? `-${dataInfo}` : ''}`;
+            }
             this.setBrowserTabTitle();
         });
         this.view.evt.on('onDataChange', ({ dataArg }) => {

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

@@ -2,19 +2,17 @@ import { IDEChart } from '@ibiz/model-core';
 import type { EChartsOption, EChartsType } from 'echarts';
 import { ChartOptionsGenerator } from './generator/chart-options-generator';
 import { ChartService } from './chart.service';
-import { IChartController, IChartEvent, IChartState, MDCtrlLoadParams } from '../../../interface';
+import { IChartEvent, IChartState, IChartController, MDCtrlLoadParams } from '../../../interface';
 import { MDControlController } from '../../common';
 import { ControllerEvent } from '../../utils';
 export declare class ChartController extends MDControlController<IDEChart, IChartState, IChartEvent> implements IChartController {
     service: ChartService;
     protected get _evt(): ControllerEvent<IChartEvent>;
     /**
-     * echarts对象
-     * @author lxm
-     * @date 2023-06-07 09:36:58
-     * @type {EChartsType}
+     * echarts实例
+     * @type {EChartsType | undefined}
      */
-    chart?: EChartsType;
+    chart: EChartsType | undefined;
     /**
      * 图表选项生成器
      * @return {*}
@@ -23,12 +21,10 @@ export declare class ChartController extends MDControlController<IDEChart, IChar
      */
     generator: ChartOptionsGenerator;
     /**
-     * 最终使用的echarts配置
-     * @author lxm
-     * @date 2023-06-07 09:51:09
-     * @type {EChartsOption}
+     * echarts配置项
+     * @type {EChartsOption | undefined}
      */
-    options?: EChartsOption;
+    options: EChartsOption | undefined;
     /**
      * 图表tooltip的默认状态
      *
@@ -41,10 +37,10 @@ export declare class ChartController extends MDControlController<IDEChart, IChar
     /**
      * 改变tooltip的显示状态
      *
-     * @param {boolean} [tag=true]
+     * @param {boolean} [state=true]
      * @memberof ChartController
      */
-    changeTooltipState(tag?: boolean): void;
+    changeTooltipState(state?: boolean): void;
     /**
      * 计算当前点击序列的模型
      *
@@ -92,6 +88,12 @@ export declare class ChartController extends MDControlController<IDEChart, IChar
      * @memberof ChartController
      */
     handleMultipleSerieGridData(): void;
+    spanMethod(data: {
+        row: IData;
+        column: IData;
+        rowIndex: number;
+        columnIndex: number;
+    }): number[];
     /**
      * 计算表格数据
      *
@@ -125,6 +127,42 @@ export declare class ChartController extends MDControlController<IDEChart, IChar
      * @date 2023-06-09 09:37:25
      */
     resizeChart(): void;
+    /**
+     * @description 跳转第一页
+     * @returns {*}  {Promise<IData[]>}
+     * @memberof ChartController
+     */
+    goToFirstPage(): Promise<IData[]>;
+    /**
+     * @description 跳转上一页
+     * @returns {*}  {Promise<IData[]>}
+     * @memberof ChartController
+     */
+    goToPreviousPage(): Promise<IData[]>;
+    /**
+     * @description 跳转下一页
+     * @returns {*}  {Promise<IData[]>}
+     * @memberof ChartController
+     */
+    goToNextPage(): Promise<IData[]>;
+    /**
+     * @description 跳转最后一页
+     * @returns {*}  {Promise<IData[]>}
+     * @memberof ChartController
+     */
+    goToLastPage(): Promise<IData[]>;
+    /**
+     * @description 转换各类多语言
+     * @protected
+     * @memberof ChartController
+     */
+    protected convertMultipleLanguages(): void;
+    /**
+     * @description 生命周期-销毁完成
+     * @protected
+     * @returns {*}  {Promise<void>}
+     * @memberof ChartController
+     */
     protected onDestroyed(): Promise<void>;
 }
 //# sourceMappingURL=chart.controller.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"chart.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/chart/chart.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EACL,gBAAgB,EAChB,WAAW,EACX,WAAW,EACX,gBAAgB,EACjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,qBAAa,eACX,SAAQ,mBAAmB,CAAC,QAAQ,EAAE,WAAW,EAAE,WAAW,CAC9D,YAAW,gBAAgB;IAEnB,OAAO,EAAE,YAAY,CAAC;IAE9B,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,WAAW,CAAC,CAEjD;IAED;;;;;OAKG;IACH,KAAK,CAAC,EAAE,WAAW,CAAC;IAEpB;;;;;OAKG;IACH,SAAS,EAAG,qBAAqB,CAAC;IAElC;;;;;OAKG;IACH,OAAO,CAAC,EAAE,aAAa,CAAC;IAExB;;;;OAIG;IACH,YAAY,UAAQ;IAEpB,SAAS,CAAC,SAAS,IAAI,IAAI;cAUX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBpC,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAUzE;;;;;OAKG;IACI,kBAAkB,CAAC,GAAG,GAAE,OAAc,GAAG,IAAI;IAyBpD;;;;;OAKG;IACI,uBAAuB,CAAC,GAAG,EAAE,KAAK,GAAG,KAAK,GAAG,SAAS;IA8B7D;;;;;;OAMG;IACI,wBAAwB,CAAC,GAAG,EAAE,KAAK,GAAG,KAAK;IA4ElD;;;;OAIG;IACI,cAAc,IAAI,IAAI;IAc7B;;;;;;OAMG;IACI,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAW/C;;;;;;OAMG;IACI,yBAAyB,IAAI,IAAI;IAuDxC;;;;;;;;OAQG;IACI,2BAA2B,IAAI,IAAI;IAwD1C;;;;OAIG;IACI,eAAe,IAAI,IAAI;IAU9B;;;;;OAKG;IACH,SAAS,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI;IAanC;;;;;;OAMG;IACG,WAAW,CAAC,IAAI,GAAE,KAAK,EAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBlE;;;;OAIG;IACG,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBlC;;;;OAIG;IACH,WAAW,IAAI,IAAI;cAMH,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAK7C"}
+{"version":3,"file":"chart.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/chart/chart.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EACL,WAAW,EACX,WAAW,EACX,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,qBAAa,eACX,SAAQ,mBAAmB,CAAC,QAAQ,EAAE,WAAW,EAAE,WAAW,CAC9D,YAAW,gBAAgB;IAEnB,OAAO,EAAE,YAAY,CAAC;IAE9B,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,WAAW,CAAC,CAEjD;IAED;;;OAGG;IACH,KAAK,EAAE,WAAW,GAAG,SAAS,CAAC;IAE/B;;;;;OAKG;IACH,SAAS,EAAG,qBAAqB,CAAC;IAElC;;;OAGG;IACH,OAAO,EAAE,aAAa,GAAG,SAAS,CAAC;IAEnC;;;;OAIG;IACH,YAAY,UAAQ;IAEpB,SAAS,CAAC,SAAS,IAAI,IAAI;cAUX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBpC,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAUzE;;;;;OAKG;IACI,kBAAkB,CAAC,KAAK,GAAE,OAAc,GAAG,IAAI;IAyBtD;;;;;OAKG;IACI,uBAAuB,CAAC,GAAG,EAAE,KAAK,GAAG,KAAK,GAAG,SAAS;IA8B7D;;;;;;OAMG;IACI,wBAAwB,CAAC,GAAG,EAAE,KAAK,GAAG,KAAK;IA4ElD;;;;OAIG;IACI,cAAc,IAAI,IAAI;IAc7B;;;;;;OAMG;IACI,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAW/C;;;;;;OAMG;IACI,yBAAyB,IAAI,IAAI;IA0ExC;;;;;;;;OAQG;IACI,2BAA2B,IAAI,IAAI;IA6DnC,UAAU,CAAC,IAAI,EAAE;QACtB,GAAG,EAAE,KAAK,CAAC;QACX,MAAM,EAAE,KAAK,CAAC;QACd,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,EAAE,MAAM,CAAC;KACrB,GAAG,MAAM,EAAE;IA2BZ;;;;OAIG;IACI,eAAe,IAAI,IAAI;IAU9B;;;;;OAKG;IACH,SAAS,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI;IAanC;;;;;;OAMG;IACG,WAAW,CAAC,IAAI,GAAE,KAAK,EAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBlE;;;;OAIG;IACG,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBlC;;;;OAIG;IACH,WAAW,IAAI,IAAI;IAMnB;;;;OAIG;IACG,aAAa,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAIvC;;;;OAIG;IACG,gBAAgB,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAI1C;;;;OAIG;IACG,YAAY,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAItC;;;;OAIG;IACG,YAAY,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAItC;;;;OAIG;IACH,SAAS,CAAC,wBAAwB,IAAI,IAAI;IA4C1C;;;;;OAKG;cACa,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAK7C"}

package/out/controller/control/chart/chart.controller.js

@@ -50,12 +50,12 @@ export class ChartController extends MDControlController {
     /**
      * 改变tooltip的显示状态
      *
-     * @param {boolean} [tag=true]
+     * @param {boolean} [state=true]
      * @memberof ChartController
      */
-    changeTooltipState(tag = true) {
+    changeTooltipState(state = true) {
         if (this.chart && this.options && this.options.tooltip) {
-            if (tag) {
+            if (state) {
                 this.chart.setOption({
                     tooltip: {
                         show: this.tooltipState,
@@ -238,33 +238,24 @@ export class ChartController extends MDControlController {
         const serie = this.generator.seriesGenerators[0];
         // 单序列，构建表格数据，第一列为分组属性，第二列为值属性的值，第三列为百分比
         const { catalogField, valueField, groupData } = serie;
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const fields = serie.chartGenerator.entity.appDEFields;
-        // 获取到分类和值属性的title,构建表头
-        const cataTitle = fields.find((field) => {
-            return field.id === catalogField;
-        });
-        const valueTitle = fields.find((field) => {
-            return field.id === valueField;
-        });
         const tempGridHeader = [
             {
                 id: catalogField,
-                name: cataTitle === null || cataTitle === void 0 ? void 0 : cataTitle.logicName,
+                name: ibiz.i18n.t('runtime.controller.control.chart.catalogField'),
             },
             {
                 id: valueField,
-                name: valueTitle === null || valueTitle === void 0 ? void 0 : valueTitle.logicName,
+                name: ibiz.i18n.t('runtime.controller.control.chart.value'),
             },
             {
                 id: 'srfpercent',
-                name: '百分比',
+                name: ibiz.i18n.t('runtime.controller.control.chart.percent'),
             },
         ];
-        this.state.gridHeaders = tempGridHeader;
         const tempData = [];
         const total = this.computeTotal(valueField);
         if (groupData && groupData.$default_group) {
+            // 普通单序列
             const group = groupData.$default_group;
             for (const [key, value] of group) {
                 const tempValue = Number.isNaN(Number(value.value))
@@ -285,6 +276,36 @@ export class ChartController extends MDControlController {
                 tempData.push(tempItem);
             }
         }
+        else if (groupData) {
+            tempGridHeader.unshift({
+                id: 'srfSerieGroup',
+                name: ibiz.i18n.t('runtime.controller.control.chart.serieGroup'),
+            });
+            // 根据名称模拟的多序列
+            Object.keys(groupData).forEach((key) => {
+                const group = groupData[key];
+                for (const [_key, value] of group) {
+                    const tempValue = Number.isNaN(Number(value.value))
+                        ? 0
+                        : Number(value.value);
+                    let percent = '';
+                    if (total === 0 || Number.isNaN(Number(value.value))) {
+                        percent = '0%';
+                    }
+                    else {
+                        percent = `${Math.round((tempValue / total) * 100)}%`;
+                    }
+                    const tempItem = {
+                        srfSerieGroup: key,
+                        [catalogField]: _key,
+                        [valueField]: tempValue,
+                        srfpercent: percent,
+                    };
+                    tempData.push(tempItem);
+                }
+            });
+        }
+        this.state.gridHeaders = tempGridHeader;
         this.state.gridData = tempData;
     }
     /**
@@ -300,29 +321,31 @@ export class ChartController extends MDControlController {
         // 多序列,表格第一列使用分组属性的值，后续其他列通过其他序列计算后动态组装,
         const tempHeaders = [];
         const tempData = [];
+        tempHeaders.push({
+            id: 'srfGroupName',
+            name: ibiz.i18n.t('runtime.controller.control.chart.serieGroup'),
+        });
         this.generator.seriesGenerators.forEach((serie) => {
-            const { catalogField, valueField, groupData } = serie;
+            const { catalogField, valueField, groupData, seriesName } = serie;
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            const fields = serie.chartGenerator.entity.appDEFields;
             const _index = tempHeaders.findIndex((item) => {
                 return item.id === catalogField;
             });
             if (_index < 0) {
-                const cataTitle = fields.find((field) => {
-                    return field.id === catalogField.toLowerCase();
-                });
                 tempHeaders.push({
                     id: catalogField,
-                    name: cataTitle === null || cataTitle === void 0 ? void 0 : cataTitle.logicName,
+                    name: ibiz.i18n.t('runtime.controller.control.chart.catalogField'),
                 });
             }
-            const valueTitle = fields.find((field) => {
-                return field.id === valueField.toLowerCase();
-            });
-            tempHeaders.push({
-                id: valueField,
-                name: valueTitle === null || valueTitle === void 0 ? void 0 : valueTitle.logicName,
+            const temp = tempHeaders.find(item => {
+                return item.id === valueField;
             });
+            if (!temp) {
+                tempHeaders.push({
+                    id: valueField,
+                    name: ibiz.i18n.t('runtime.controller.control.chart.value'),
+                });
+            }
             if (groupData && groupData.$default_group) {
                 const group = groupData.$default_group;
                 for (const [key, value] of group) {
@@ -330,10 +353,11 @@ export class ChartController extends MDControlController {
                         ? 0
                         : Number(value.value);
                     const index = tempData.findIndex((item) => {
-                        return item[catalogField] === key;
+                        return (item[catalogField] === key && item.srfGroupName === seriesName);
                     });
                     if (index < 0) {
                         const tempItem = {
+                            srfGroupName: seriesName,
                             [catalogField]: key,
                             [valueField]: tempValue,
                         };
@@ -349,6 +373,32 @@ export class ChartController extends MDControlController {
         this.state.gridHeaders = tempHeaders;
         this.state.gridData = tempData;
     }
+    spanMethod(data) {
+        var _a;
+        const { row, column, rowIndex, columnIndex } = data;
+        if (column.property === 'srfGroupName') {
+            // 只有第一列或有值时才和并
+            const allow = columnIndex === 0 || row.srfGroupName;
+            // 第二行开始合并
+            if (rowIndex > 0 &&
+                allow &&
+                row.srfGroupName === ((_a = this.state.gridData[rowIndex - 1]) === null || _a === void 0 ? void 0 : _a.srfGroupName)) {
+                return [0, 0];
+            }
+            // 第一行计算出合并长度
+            let rowspan = 1;
+            for (let i = rowIndex + 1; i < this.state.gridData.length; i++) {
+                if (allow && this.state.gridData[i].srfGroupName === row.srfGroupName) {
+                    rowspan += 1;
+                }
+                else {
+                    break;
+                }
+            }
+            return [rowspan, 1];
+        }
+        return [1, 1];
+    }
     /**
      * 计算表格数据
      *
@@ -378,7 +428,7 @@ export class ChartController extends MDControlController {
                 this.setActive(activeData);
             }
         });
-        if (this.state.optionsReady) {
+        if (this.state.optionsReady && this.chart) {
             this.updateChart();
         }
     }
@@ -407,7 +457,8 @@ export class ChartController extends MDControlController {
      */
     async updateChart() {
         if (!this.chart) {
-            throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.chart.noInitialised'));
+            ibiz.log.error(ibiz.i18n.t('runtime.controller.control.chart.noInitialised'));
+            return;
         }
         if (!this.options) {
             throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.chart.noCalculated'));
@@ -426,6 +477,77 @@ export class ChartController extends MDControlController {
             this.chart.resize();
         }
     }
+    /**
+     * @description 跳转第一页
+     * @returns {*}  {Promise<IData[]>}
+     * @memberof ChartController
+     */
+    async goToFirstPage() {
+        return [];
+    }
+    /**
+     * @description 跳转上一页
+     * @returns {*}  {Promise<IData[]>}
+     * @memberof ChartController
+     */
+    async goToPreviousPage() {
+        return [];
+    }
+    /**
+     * @description 跳转下一页
+     * @returns {*}  {Promise<IData[]>}
+     * @memberof ChartController
+     */
+    async goToNextPage() {
+        return [];
+    }
+    /**
+     * @description 跳转最后一页
+     * @returns {*}  {Promise<IData[]>}
+     * @memberof ChartController
+     */
+    async goToLastPage() {
+        return [];
+    }
+    /**
+     * @description 转换各类多语言
+     * @protected
+     * @memberof ChartController
+     */
+    convertMultipleLanguages() {
+        var _a, _b;
+        const { emptyText, dechartTitle, chartXAxises, chartYAxises, dechartSerieses, emptyTextLanguageRes, } = this.model;
+        if (emptyTextLanguageRes === null || emptyTextLanguageRes === void 0 ? void 0 : emptyTextLanguageRes.lanResTag)
+            this.model.emptyText = ibiz.i18n.t(emptyTextLanguageRes.lanResTag, emptyText);
+        // 图表标题多语言
+        if ((_a = dechartTitle === null || dechartTitle === void 0 ? void 0 : dechartTitle.titleLanguageRes) === null || _a === void 0 ? void 0 : _a.lanResTag)
+            dechartTitle.title = ibiz.i18n.t(dechartTitle.titleLanguageRes.lanResTag, dechartTitle.title);
+        if ((_b = dechartTitle === null || dechartTitle === void 0 ? void 0 : dechartTitle.subTitleLanguageRes) === null || _b === void 0 ? void 0 : _b.lanResTag)
+            dechartTitle.subTitle = ibiz.i18n.t(dechartTitle.subTitleLanguageRes.lanResTag, dechartTitle.subTitle);
+        // 序列多语言
+        dechartSerieses === null || dechartSerieses === void 0 ? void 0 : dechartSerieses.forEach(series => {
+            var _a;
+            if ((_a = series.capLanguageRes) === null || _a === void 0 ? void 0 : _a.lanResTag)
+                series.caption = ibiz.i18n.t(series.capLanguageRes.lanResTag, series.caption);
+        });
+        // 坐标轴多语言
+        chartXAxises === null || chartXAxises === void 0 ? void 0 : chartXAxises.forEach(axis => {
+            var _a;
+            if ((_a = axis.capLanguageRes) === null || _a === void 0 ? void 0 : _a.lanResTag)
+                axis.caption = ibiz.i18n.t(axis.capLanguageRes.lanResTag, axis.caption);
+        });
+        chartYAxises === null || chartYAxises === void 0 ? void 0 : chartYAxises.forEach(axis => {
+            var _a;
+            if ((_a = axis.capLanguageRes) === null || _a === void 0 ? void 0 : _a.lanResTag)
+                axis.caption = ibiz.i18n.t(axis.capLanguageRes.lanResTag, axis.caption);
+        });
+    }
+    /**
+     * @description 生命周期-销毁完成
+     * @protected
+     * @returns {*}  {Promise<void>}
+     * @memberof ChartController
+     */
     async onDestroyed() {
         var _a;
         window.removeEventListener('resize', this.resizeChart);

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

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

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

@@ -1,4 +1,5 @@
 /* eslint-disable no-unused-expressions */
+/* eslint-disable eqeqeq */
 import { plus, RuntimeModelError, toNumberOrNil } from '@ibiz-template/core';
 import dayjs from 'dayjs';
 import minMax from 'dayjs/plugin/minMax';
@@ -9,7 +10,7 @@ import isoWeek from 'dayjs/plugin/isoWeek';
 import { clone, isNil, mergeDeepRight } from 'ramda';
 import { parseUserParams, } from './chart-options-generator';
 import { ChartData } from '../../../../service';
-import { generateYearWeekRange } from '../../../utils';
+import { generateYearWeekRange } from '../../../../utils';
 dayjs.extend(minMax);
 dayjs.extend(isSameOrBefore);
 dayjs.extend(quarterOfYear);
@@ -153,19 +154,16 @@ export class BaseSeriesGenerator {
      * @return {*}  {(string | undefined)}
      */
     translateVal(codeListKey, val, isExclude = false) {
-        if (isNil(val)) {
+        if (isNil(val))
             return undefined;
-        }
-        if (isNil(codeListKey)) {
+        if (isNil(codeListKey))
             return val;
-        }
         const codeListItems = this.chartGenerator.codeListMap.get(codeListKey);
         if (codeListItems === null || codeListItems === void 0 ? void 0 : codeListItems.length) {
-            const find = codeListItems.find(x => x.value === val);
-            if (find) {
+            const find = codeListItems.find(x => x.value == val);
+            if (find)
                 return find.text;
-            }
-            return '未定义';
+            return ibiz.i18n.t('runtime.common.undefined');
         }
         return isExclude ? undefined : val;
     }
@@ -291,9 +289,11 @@ export class BaseSeriesGenerator {
             this.chartGenerator.model.controlParam &&
             ((_a = this.chartGenerator.model.controlParam.ctrlParams) === null || _a === void 0 ? void 0 : _a.NOSORT)) {
             // 不依照代码表排序
-            const orginItem = Array.from(new Set(data.map((_data) => {
+            const orginItem = Array.from(new Set(data
+                .map((_data) => {
                 return _data[codename];
-            })));
+            })
+                .filter(val => !!val)));
             const cloneItem = clone(codeListItems);
             cloneItem.sort((a, b) => {
                 const aIndex = orginItem.findIndex((_code) => {
@@ -685,6 +685,8 @@ export class BaseSeriesGenerator {
                 dates.push(dayjs(date));
             });
         });
+        if (!dates.length)
+            return;
         // 使用 dayjs 的 max() 和 min() 方法找出最大和最小日期
         const maxDate = dayjs.max(dates);
         const minDate = dayjs.min(dates);
@@ -797,6 +799,8 @@ export class BaseSeriesGenerator {
                 dates.push(date);
             });
         });
+        if (!dates.length)
+            return;
         // 补全每组缺失的日期值，防止横坐标绘制异常
         dates.forEach(date => {
             Object.keys(data).forEach(key => {