@ibiz-template/runtime 0.3.2 → 0.3.4

package/out/service/vo/chart-data/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/chart-data/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC"}

package/out/service/vo/chart-data/index.js

@@ -0,0 +1 @@
+export { ChartData } from './chart-data';

package/out/service/vo/index.d.ts

@@ -4,4 +4,5 @@ export * from './ui-map-field';
 export * from './calendar-item-data';
 export * from './map-data';
 export * from './panel-data';
+export * from './chart-data';
 //# sourceMappingURL=index.d.ts.map

package/out/service/vo/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/service/vo/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/service/vo/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC"}

package/out/service/vo/index.js

@@ -4,3 +4,4 @@ export * from './ui-map-field';
 export * from './calendar-item-data';
 export * from './map-data';
 export * from './panel-data';
+export * from './chart-data';

package/out/ui-action/provider/front-ui-action-provider.d.ts

@@ -22,5 +22,29 @@ export declare class FrontUIActionProvider extends UIActionProviderBase {
      * @return {*}
      */
     protected doOther(action: IAppDEUIAction, args: IUILogicParams): IUIActionResult;
+    /**
+     * 执行打印行为
+     * @protected
+     * @param {IAppDEUIAction} action
+     * @param {IUILogicParams} args
+     * @return {*}
+     */
+    protected executePrint(action: IAppDEUIAction, args: IUILogicParams): Promise<void>;
+    /**
+     * 执行导入行为
+     * @protected
+     * @param {IAppDEUIAction} action
+     * @param {IUILogicParams} args
+     * @return {*}
+     */
+    protected executeDataImport(action: IAppDEUIAction, _args: IUILogicParams): Promise<IUIActionResult>;
+    /**
+     * 执行导出行为
+     * @protected
+     * @param {IAppDEUIAction} action
+     * @param {IUILogicParams} args
+     * @return {*}
+     */
+    protected executeDataExport(action: IAppDEUIAction, _args: IUILogicParams): Promise<void>;
 }
 //# sourceMappingURL=front-ui-action-provider.d.ts.map

package/out/ui-action/provider/front-ui-action-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"front-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/front-ui-action-provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAa,MAAM,kBAAkB,CAAC;AAE7D,OAAO,EAAE,cAAc,EAAE,eAAe,EAAc,MAAM,iBAAiB,CAAC;AAE9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,qBAAsB,SAAQ,oBAAoB;IACvD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IAuD3B;;;;;;;;OAQG;IAEH,SAAS,CAAC,OAAO,CACf,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,eAAe;CAYnB"}
+{"version":3,"file":"front-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/front-ui-action-provider.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAa,MAAM,kBAAkB,CAAC;AAE7D,OAAO,EAAE,cAAc,EAAE,eAAe,EAAc,MAAM,iBAAiB,CAAC;AAE9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,qBAAsB,SAAQ,oBAAoB;IACvD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IAgE3B;;;;;;;;OAQG;IAEH,SAAS,CAAC,OAAO,CACf,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,eAAe;IAalB;;;;;;OAMG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;IAiChB;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,cAAc,GACpB,OAAO,CAAC,eAAe,CAAC;IA8B3B;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,cAAc,GACpB,OAAO,CAAC,IAAI,CAAC;CA4CjB"}

package/out/ui-action/provider/front-ui-action-provider.js

@@ -1,4 +1,4 @@
-import { StringUtil, RuntimeModelError, ModelError } from '@ibiz-template/core';
+import { StringUtil, RuntimeModelError, ModelError, RuntimeError, } from '@ibiz-template/core';
 import { OpenAppViewCommand } from '../../command';
 import { ScriptFactory } from '../../utils';
 import { UIActionProviderBase } from './ui-action-provider-base';
@@ -42,6 +42,15 @@ export class FrontUIActionProvider extends UIActionProviderBase {
                 }
                 break;
             }
+            case 'PRINT':
+                await this.executePrint(action, args);
+                break;
+            case 'DATAIMP':
+                actionResult = await this.executeDataImport(action, args);
+                break;
+            case 'DATAEXP':
+                await this.executeDataExport(action, args);
+                break;
             case 'OTHER':
                 actionResult = this.doOther(action, args);
                 break;
@@ -69,4 +78,122 @@ export class FrontUIActionProvider extends UIActionProviderBase {
         }
         throw new RuntimeModelError(action, '自定义类型缺少配置脚本代码');
     }
+    /**
+     * 执行打印行为
+     * @protected
+     * @param {IAppDEUIAction} action
+     * @param {IUILogicParams} args
+     * @return {*}
+     */
+    async executePrint(action, args) {
+        var _a, _b;
+        const appDataEntity = await ibiz.hub.getAppDataEntity(action.appDataEntityId);
+        const appDEPrint = (_a = appDataEntity.appDEPrints) === null || _a === void 0 ? void 0 : _a.find(print => {
+            return print.id === action.appDEPrintId;
+        });
+        if (appDEPrint) {
+            let requestUrl = '';
+            const { context } = args;
+            if (context && context[appDataEntity.codeName.toLowerCase()]) {
+                // TODO 临时写死printdata， 非标准，后续优化
+                requestUrl += `/${(_b = appDataEntity.codeName2) === null || _b === void 0 ? void 0 : _b.toLowerCase()}/printdata/${context[appDataEntity.codeName.toLowerCase()]}?srfprinttag=${appDEPrint.codeName}`;
+            }
+            else {
+                throw new RuntimeError('没有找到数据主键');
+            }
+            const res = await ibiz.net.request(requestUrl, {
+                method: 'get',
+                responseType: 'blob',
+            });
+            if (res.ok) {
+                const link = window.URL.createObjectURL(res.data);
+                window.open(link, '_blank');
+            }
+            else {
+                throw new RuntimeError('打印失败');
+            }
+        }
+        else {
+            throw new RuntimeError('没有找到实体打印项');
+        }
+    }
+    /**
+     * 执行导入行为
+     * @protected
+     * @param {IAppDEUIAction} action
+     * @param {IUILogicParams} args
+     * @return {*}
+     */
+    async executeDataImport(action, _args) {
+        var _a;
+        const appDataEntity = await ibiz.hub.getAppDataEntity(action.appDataEntityId);
+        const appDEDataImport = (_a = appDataEntity.appDEDataImports) === null || _a === void 0 ? void 0 : _a.find(dataImport => dataImport.id === action.appDEDataImportId);
+        if (appDEDataImport) {
+            const modal = ibiz.overlay.createModal('DataImport', {
+                dismiss: () => modal.dismiss(),
+                appDataEntity,
+                dataImport: appDEDataImport,
+            }, {
+                width: 'auto',
+                placement: 'center',
+            });
+            modal.present();
+            await modal.onWillDismiss();
+            return {
+                refresh: true,
+                refreshMode: 1,
+            };
+        }
+        throw new RuntimeError('没有找到实体导入项');
+    }
+    /**
+     * 执行导出行为
+     * @protected
+     * @param {IAppDEUIAction} action
+     * @param {IUILogicParams} args
+     * @return {*}
+     */
+    async executeDataExport(action, _args) {
+        var _a, _b;
+        const appDataEntity = await ibiz.hub.getAppDataEntity(action.appDataEntityId);
+        const appDEDataExport = (_a = appDataEntity.appDEDataExports) === null || _a === void 0 ? void 0 : _a.find(dataExport => {
+            return dataExport.id === action.appDEDataExportId;
+        });
+        if (appDEDataExport) {
+            // TODO 临时写死fetchdefault，应该从appDEDataExport的主表格上获取加载行为，但现在缺主表格模型，后续优化
+            const url = `/${(_b = appDataEntity.codeName2) === null || _b === void 0 ? void 0 : _b.toLowerCase()}/exportdata/fetchdefault?srfexporttag=${appDEDataExport.codeName}`;
+            //  参数
+            const params = {
+                page: 0,
+                size: appDEDataExport.maxRowCount ? appDEDataExport.maxRowCount : 1000,
+                responseType: 'blob',
+            };
+            const res = await ibiz.net.request(url, {
+                method: 'post',
+                data: params,
+                responseType: 'blob',
+            });
+            if (res.status === 200) {
+                let fileName = `${appDataEntity.logicName}表.xlsx`;
+                fileName = decodeURIComponent(fileName);
+                const blob = new Blob([res.data], {
+                    type: 'application/vnd.ms-excel',
+                });
+                const elink = document.createElement('a');
+                elink.download = fileName;
+                elink.style.display = 'none';
+                elink.href = URL.createObjectURL(blob);
+                document.body.appendChild(elink);
+                elink.click();
+                URL.revokeObjectURL(elink.href); // 释放URL 对象
+                document.body.removeChild(elink);
+            }
+            else {
+                throw new RuntimeError('导出请求失败');
+            }
+        }
+        else {
+            throw new RuntimeError('没有找到实体导出项');
+        }
+    }
 }

package/out/ui-action/provider/sys-ui-action-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sys-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/sys-ui-action-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,mBAAoB,SAAQ,oBAAoB;IAC3D,OAAO,CAAC,mBAAmB,CAoCxB;IAEG,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;CAc5B"}
+{"version":3,"file":"sys-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/sys-ui-action-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,mBAAoB,SAAQ,oBAAoB;IAC3D,OAAO,CAAC,mBAAmB,CAsCxB;IAEG,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;CAc5B"}

package/out/ui-action/provider/sys-ui-action-provider.js

@@ -48,6 +48,8 @@ export class SysUIActionProvider extends UIActionProviderBase {
             ['GRIDVIEW_SAVEROWACTION', 'SaveRow'],
             ['APP_LOGIN', 'Login'],
             ['APP_LOGOUT', 'logout'],
+            ['UTIL_RESET', 'Reset'],
+            ['UTIL_SEARCH', 'Search'],
         ]);
     }
     async execAction(action, args) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,7 +29,7 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.3.0",
+    "@ibiz-template/core": "^0.3.4",
     "@ibiz/model-core": "^0.0.20",
     "@types/path-browserify": "^1.0.2",
     "@types/qs": "^6.9.10",
@@ -59,5 +59,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "792b2b2a3c96a844e7f6d17f47fed4aefdebe2d3"
+  "gitHead": "a6a5031e07ec179ddb6c855023243fe5006290e7"
 }

package/src/app-hub.ts

@@ -1,7 +1,7 @@
 import { IAppDataEntity, IAppView, IApplication } from '@ibiz/model-core';
 import { RuntimeError } from '@ibiz-template/core';
 import { Application } from './application';
-import { IAppHubService, ModelLoaderProvider } from './interface';
+import { IAppHubService, IAppService, ModelLoaderProvider } from './interface';
 import { AppConfigService, Convert } from './hub';
 import { HubController } from './controller';
 import { ConfigService } from './service';
@@ -329,9 +329,9 @@ export class AppHub implements IAppHubService {
    * @author chitanda
    * @date 2023-04-17 21:04:41
    * @param {string} [key=ibiz.env.appId]
-   * @return {*}  {Promise<Application>}
+   * @return {*}  {Promise<IAppService>}
    */
-  async getAppAsync(key: string = ibiz.env.appId): Promise<Application> {
+  async getAppAsync(key: string = ibiz.env.appId): Promise<IAppService> {
     return this.createApp(key);
   }
 
@@ -341,9 +341,9 @@ export class AppHub implements IAppHubService {
    * @author chitanda
    * @date 2023-04-17 22:04:42
    * @param {(string | IApplication)} [app]
-   * @return {*}  {Application}
+   * @return {*}  {IAppService}
    */
-  getApp(app?: string | IApplication): Application {
+  getApp(app?: string | IApplication): IAppService {
     let key: string | null = null;
     if (app) {
       if (app instanceof Object) {

package/src/constant/sys-uiaction-tag.ts

@@ -91,6 +91,10 @@ export enum SysUIActionTag {
    * 搜索
    */
   'SEARCH' = 'Search',
+  /**
+   * 重置
+   */
+  'RESET' = 'Reset',
   /**
    * 完成
    */

package/src/controller/common/control/control.controller.ts

@@ -5,7 +5,7 @@ import {
   IViewLayoutPanel,
 } from '@ibiz/model-core';
 import { IBizContext, IBizParams, NoticeError } from '@ibiz-template/core';
-import { isNil } from 'ramda';
+import { clone, isNil } from 'ramda';
 import { notNilEmpty } from 'qx-util';
 import { BaseController } from '..';
 import { CTX } from '../../ctx';
@@ -110,7 +110,7 @@ export class ControlController<
       `${model.controlType}_DEFAULT`,
     );
     if (panelModel) {
-      this.controlPanel = panelModel;
+      this.controlPanel = clone(panelModel);
     }
 
     this.updateContextParams({});

package/src/controller/control/app-menu/app-menu.controller.ts

@@ -4,12 +4,12 @@ import {
   RuntimeModelError,
 } from '@ibiz-template/core';
 import { IAppMenu, IAppMenuItem } from '@ibiz/model-core';
-import { Application } from '../../../application';
 import { AppFuncCommand } from '../../../command';
 import {
   IAppMenuState,
   IAppMenuEvent,
   IAppMenuController,
+  IAppService,
 } from '../../../interface';
 import { AppCounter } from '../../../service';
 import { ControlController } from '../../common';
@@ -27,7 +27,7 @@ export class AppMenuController
   extends ControlController<IAppMenu, IAppMenuState, IAppMenuEvent>
   implements IAppMenuController
 {
-  app!: Application;
+  app!: IAppService;
 
   protected initState(): void {
     super.initState();

package/src/controller/control/calendar/calendar.controller.ts

@@ -88,12 +88,35 @@ export class CalendarController
     await this.afterLoad(args, items);
     this.state.isLoaded = true;
     this.state.items = items;
+    this.sortItems();
     await this.evt.emit('onLoadSuccess', {
       isInitialLoad,
     });
     return items;
   }
 
+  /**
+   * 前台排序（时间轴类型）
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-11-22 15:16:43
+   */
+  protected sortItems(): void {
+    if (this.model.calendarStyle === 'TIMELINE') {
+      this.state.items.sort((a: ICalendarItemData, b: ICalendarItemData) => {
+        const x = a.beginTime;
+        const y = b.beginTime;
+        let result = 0;
+        if (dayjs(x).isAfter(y)) {
+          result = -1;
+        } else if (dayjs(x).isBefore(y)) {
+          result = 1;
+        }
+        return result;
+      });
+    }
+  }
+
   /**
    * 获取当前选中的日期
    *
@@ -163,8 +186,12 @@ export class CalendarController
     if (extraParams) {
       Object.assign(resultParams, extraParams);
     }
-    const timeParam = this.getCurSelectDate(resultParams);
-    Object.assign(resultParams, timeParam);
+
+    // 时间轴类型不需要开始结束时间参数
+    if (this.model.calendarStyle !== 'TIMELINE') {
+      const timeParam = this.getCurSelectDate(resultParams);
+      Object.assign(resultParams, timeParam);
+    }
     return resultParams;
   }
 

package/src/controller/control/chart/chart.controller.ts

@@ -25,6 +25,12 @@ export class ChartController
    */
   chart?: EChartsType;
 
+  /**
+   * 图表选项生成器
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-11-23 14:07:39
+   */
   generator!: ChartOptionsGenerator;
 
   /**
@@ -70,9 +76,11 @@ export class ChartController
   initChart(chart: EChartsType): void {
     this.chart = chart;
     this.chart.on('click', params => {
-      const srfkey = this.generator.getSrfkeyByParams(params);
-      const activeData = this.state.items.find(item => item.srfkey === srfkey);
-      console.log('实体数据', activeData);
+      const activeData = this.generator.getChartDataByParams(params);
+      console.log('激活数据', activeData);
+      if (activeData) {
+        this.setActive(activeData);
+      }
     });
   }
 

package/src/controller/control/chart/generator/base-series-generator.ts

@@ -15,6 +15,8 @@ import {
   ChartOptionsGenerator,
   parseUserParams,
 } from './chart-options-generator';
+import { IChartData } from '../../../../interface';
+import { ChartData } from '../../../../service';
 
 dayjs.extend(minMax);
 dayjs.extend(isSameOrBefore);
@@ -30,12 +32,12 @@ export type SingleData = {
   value: number;
 
   /**
-   * 完整的实体数据
+   * 图表数据
    * @author lxm
    * @date 2023-06-09 09:31:27
-   * @type {IData}
+   * @type {IChartData}
    */
-  deData?: IData;
+  chartData?: IChartData;
 };
 /** 分类数据，key是分类属性的值 */
 export type CatalogData = Map<string, SingleData>;
@@ -102,6 +104,14 @@ export class BaseSeriesGenerator<T extends IDEChartSeries = IDEChartSeries> {
    */
   groupData?: GroupData;
 
+  /**
+   * 根据分组处理出来的图表数据数组
+   * @author lxm
+   * @date 2023-06-09 02:58:28
+   * @type {GroupData}
+   */
+  chartDataArr: IChartData[] = [];
+
   /**
    * 静态的序列options
    * @author lxm
@@ -223,6 +233,29 @@ export class BaseSeriesGenerator<T extends IDEChartSeries = IDEChartSeries> {
     return isExclude ? undefined : val;
   }
 
+  /**
+   * 准备图表数据
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-11-23 15:24:12
+   */
+  protected prepareChartData(
+    groupData: GroupData,
+    deData: IData,
+    catalog: string,
+    group: string,
+  ): void {
+    if (this.groupField) {
+      Object.assign(deData, { [this.groupField]: group });
+    }
+    if (this.catalogField) {
+      Object.assign(deData, { [this.catalogField]: catalog });
+    }
+    const tempChartData = new ChartData(deData, this.model, catalog, group);
+    groupData[group].get(catalog)!.chartData = tempChartData;
+    this.chartDataArr?.push(tempChartData);
+  }
+
   /**
    * 计算分组数据
    * @author lxm
@@ -233,6 +266,8 @@ export class BaseSeriesGenerator<T extends IDEChartSeries = IDEChartSeries> {
   protected calcGroupData(data: IData[]): GroupData {
     // 清空分组数据
     this.groupData = {};
+    // 清空图表数据数组
+    this.chartDataArr = [];
     const groupData = this.groupData!;
     // 分组属性代码表和分类属性代码表
     const { seriesCodeListId, catalogCodeListId } = this.model;
@@ -274,6 +309,19 @@ export class BaseSeriesGenerator<T extends IDEChartSeries = IDEChartSeries> {
       );
       // 分类属性没值的数据排除
       if (!catalog) {
+        // 有代码表时，也需要封装chartData，此时值定死为0
+        if (catalogCodeListId && this.autoCompleteCategory) {
+          const codeListItems =
+            this.chartGenerator.codeListMap.get(catalogCodeListId)!;
+          codeListItems.forEach(x => {
+            this.prepareChartData(
+              groupData,
+              { [this.valueField!]: 0 },
+              x.text,
+              group,
+            );
+          });
+        }
         return;
       }
 
@@ -286,7 +334,18 @@ export class BaseSeriesGenerator<T extends IDEChartSeries = IDEChartSeries> {
         groupData[group].get(catalog)!.value,
         item[this.valueField],
       );
-      groupData[group].get(catalog)!.deData = item;
+
+      // 没有chartData说明是第一条，有chartData说明是累加数据，自己封装里面的deData
+      if (!groupData[group].get(catalog)!.chartData) {
+        this.prepareChartData(groupData, item, catalog, group);
+      } else {
+        this.prepareChartData(
+          groupData,
+          { [this.valueField!]: groupData[group].get(catalog)!.value },
+          catalog,
+          group,
+        );
+      }
     });
 
     return groupData;
@@ -325,7 +384,7 @@ export class BaseSeriesGenerator<T extends IDEChartSeries = IDEChartSeries> {
 
   /**
    * 生成每条序列的data,由于不同图表类型格式不同所以为any
-   * 默认提供的是二维数组，按[X轴，y轴]格式
+   * 默认提供的是二维数组，按[x轴, y轴, 图表数据]格式
    * @author lxm
    * @date 2023-06-09 03:38:07
    * @param {CatalogData} catalogData
@@ -335,7 +394,7 @@ export class BaseSeriesGenerator<T extends IDEChartSeries = IDEChartSeries> {
   protected calcSeriesData(catalogData: CatalogData): any {
     const temData: IData[] = [];
     catalogData.forEach((catalog, key) => {
-      temData.push([key, catalog.value, catalog.deData?.srfkey]);
+      temData.push([key, catalog.value, catalog.chartData]);
     });
     return temData;
   }
@@ -355,14 +414,17 @@ export class BaseSeriesGenerator<T extends IDEChartSeries = IDEChartSeries> {
   }
 
   /**
-   * 通过事件的params获取主键
+   * 通过echarts事件的params获取封装好的图表数据
    * @author lxm
    * @date 2023-06-09 10:56:25
    * @param {ECElementEvent} params
    * @return {*}  {string}
    */
-  getSrfkeyByParams(params: ECElementEvent): string {
-    return (params.value as IData)[2];
+  getChartDataByParams(params: ECElementEvent): IData | undefined {
+    if (this.groupData && Object.keys(this.groupData).length === 1) {
+      return this.groupData[DEFAULT_GROUP].get(params.name)?.chartData;
+    }
+    return this.groupData?.[params.seriesName!].get(params.name)?.chartData;
   }
 
   /**

package/src/controller/control/chart/generator/chart-options-generator.ts

@@ -115,6 +115,14 @@ export class ChartOptionsGenerator {
    */
   codeListMap: Map<string, Readonly<CodeListItem[]>> = new Map();
 
+  /**
+   * 维护图表序列index对应序列生成器Map
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-11-22 17:27:15
+   */
+  seriesGeneratorIndexMap: Map<number, BaseSeriesGenerator> = new Map();
+
   constructor(private model: IDEChart) {
     const {
       dechartTitle,
@@ -353,12 +361,18 @@ export class ChartOptionsGenerator {
     // 生成seriesOptions
     const seriesOption: SeriesOption[] = [];
     this.seriesGenerators.forEach(generator => {
+      const startIndex = seriesOption.length; // 记录当前生成器开始的索引
       const series = generator.calcByData(data);
       if (series instanceof Array) {
         seriesOption.push(...series);
       } else {
         seriesOption.push(series);
       }
+      const endIndex = seriesOption.length - 1; // 记录当前生成器结束的索引
+      // 将生成器和对应的索引范围存入映射
+      for (let i = startIndex; i <= endIndex; i++) {
+        this.seriesGeneratorIndexMap.set(i, generator);
+      }
     });
     this.options.series = seriesOption;
 
@@ -391,12 +405,19 @@ export class ChartOptionsGenerator {
     return this.options;
   }
 
-  getSrfkeyByParams(params: ECElementEvent): string {
-    const generator = this.seriesGenerators[params.seriesIndex!];
+  /**
+   * 根据echarts给的params得到图表数据
+   * @param {ECElementEvent} params
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-11-22 16:11:50
+   */
+  getChartDataByParams(params: ECElementEvent): IData | undefined {
+    const generator = this.seriesGeneratorIndexMap.get(params.seriesIndex!);
     if (!generator) {
       throw new RuntimeError(`找不到${params.seriesIndex}序列的generator！`);
     }
-    return generator.getSrfkeyByParams(params);
+    return generator.getChartDataByParams(params);
   }
 
   // protected calcRadarSeries(data: IData[], series: IChartSeriesFunnel) {

package/src/controller/control/chart/generator/funnel-series-generator.ts

@@ -1,10 +1,10 @@
 import { IChartSeriesFunnel } from '@ibiz/model-core';
-import type { ECElementEvent, FunnelSeriesOption, SeriesOption } from 'echarts';
+import type { FunnelSeriesOption, SeriesOption } from 'echarts';
 import { BaseSeriesGenerator, CatalogData } from './base-series-generator';
 
 interface funnelSeriesData {
   name: string;
-  value: IData[];
+  value: Array<number | IData | undefined>;
 }
 
 /**
@@ -30,13 +30,9 @@ export class FunnelSeriesGenerator extends BaseSeriesGenerator<IChartSeriesFunne
     catalogData.forEach((catalog, key) => {
       temData.push({
         name: key,
-        value: [catalog.value, catalog.deData?.srfkey],
+        value: [catalog.value, catalog.chartData],
       });
     });
     return temData;
   }
-
-  getSrfkeyByParams(params: ECElementEvent): string {
-    return (params.value as IData)[1];
-  }
 }