@ibiz-template/runtime 0.3.2 → 0.3.4

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

@@ -1,10 +1,10 @@
 import { IChartSeriesPie } from '@ibiz/model-core';
-import type { ECElementEvent, PieSeriesOption, SeriesOption } from 'echarts';
+import type { PieSeriesOption, SeriesOption } from 'echarts';
 import { BaseSeriesGenerator, CatalogData } from './base-series-generator';
 
 interface pieSeriesData {
   name: string;
-  value: IData[];
+  value: Array<number | IData | undefined>;
 }
 
 /**
@@ -30,13 +30,9 @@ export class PieSeriesGenerator extends BaseSeriesGenerator<IChartSeriesPie> {
     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];
-  }
 }

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

@@ -1,5 +1,5 @@
 import { IChartSeriesRadar } from '@ibiz/model-core';
-import type { ECElementEvent, RadarSeriesOption, SeriesOption } from 'echarts';
+import type { RadarSeriesOption, SeriesOption } from 'echarts';
 import { mergeDeepRight } from 'ramda';
 import { BaseSeriesGenerator, DEFAULT_GROUP } from './base-series-generator';
 import { RadarCoordSystem } from './radar-coord-system';
@@ -53,7 +53,7 @@ export class RadarSeriesGenerator extends BaseSeriesGenerator<IChartSeriesRadar>
       const catalogData = groupData[group];
       const value = radar.indicatorKeys.map(key => {
         if (catalogData.has(key)) {
-          return catalogData.get(key);
+          return catalogData.get(key)!.value;
         }
         return 0;
       });
@@ -73,8 +73,4 @@ export class RadarSeriesGenerator extends BaseSeriesGenerator<IChartSeriesRadar>
 
     return options as SeriesOption;
   }
-
-  getSrfkeyByParams(params: ECElementEvent): string {
-    return (params.value as IData)[1];
-  }
 }

package/src/controller/control/exp-bar/chart-exp-bar.controller.ts

@@ -1,4 +1,4 @@
-import { IChartExpBar, IDEChart } from '@ibiz/model-core';
+import { IChartExpBar, IDEChart, INavigatable } from '@ibiz/model-core';
 import {
   IChartExpBarState,
   IChartExpBarEvent,
@@ -6,6 +6,8 @@ import {
   INavViewMsg,
 } from '../../../interface';
 import { ExpBarControlController } from './exp-bar.controller';
+import { ChartController } from '../chart';
+import { convertNavData } from '../../../utils';
 
 /**
  * 图表导航栏控制器
@@ -23,6 +25,90 @@ export class ChartExpBarController
   >
   implements IChartExpBarController
 {
+  /**
+   * 导航页面首次打开且没有回显时，
+   * 默认取第一条数据进行导航
+   * 对于不同的导航，第一条可导航的数据可能定义不同，可以重写改方法。
+   * @author lxm
+   * @date 2023-08-10 03:58:15
+   * @protected
+   */
+  protected navByFirstItem(): void {
+    const data = this.xDataController.state.items[0];
+    if (!data) {
+      // 导航视图传空让他导航占位绘制空界面
+      this.state.srfnav = '';
+      this._evt.emit('onNavViewChange', {
+        navViewMsg: {
+          key: '',
+          isCache: this.isCache,
+        },
+      });
+      return;
+    }
+    // 默认选中并激活第一项(这里的第一项是我们自己封装的chartData)
+    const activeSeriesGenerator = (
+      this.xDataController as ChartController
+    ).generator.seriesGenerators.find(generator => {
+      return generator.chartDataArr.length > 0 && generator.model.navAppViewId;
+    });
+    if (activeSeriesGenerator) {
+      this.xDataController.setActive(activeSeriesGenerator.chartDataArr[0]);
+    }
+  }
+
+  /**
+   * 解析参数
+   *
+   * @author zk
+   * @date 2023-05-29 04:05:52
+   * @param {IDETabViewPanel} tabViewPanel
+   * @return {*}
+   * @memberof ExpBarControlController
+   */
+  prepareParams(
+    XDataModel: INavigatable & { appDataEntityId?: string },
+    data: IData,
+    context: IContext,
+    params: IParams,
+  ): { context: IContext; params: IParams } {
+    const { context: tempContext, params: tempParams } = super.prepareParams(
+      XDataModel,
+      data,
+      context,
+      params,
+    );
+    // 序列上或配置导航相关参数
+    if (data._seriesModelId) {
+      const seriesModel = (XDataModel as IDEChart).dechartSerieses?.find(
+        series => {
+          return series.id === data._seriesModelId;
+        },
+      );
+      if (seriesModel) {
+        const { navigateContexts, navigateParams } = seriesModel;
+        // 序列上配的导航视图参数和上下文
+        const tempContext2 = convertNavData(
+          navigateContexts,
+          data,
+          params,
+          tempContext,
+        );
+        const tempParams2 = convertNavData(
+          navigateParams,
+          data,
+          params,
+          tempParams,
+        );
+        return {
+          context: Object.assign(tempContext.clone(), tempContext2),
+          params: tempParams2,
+        };
+      }
+    }
+    return { context: tempContext, params: tempParams };
+  }
+
   /**
    * 获取导航视图
    *
@@ -37,11 +123,18 @@ export class ChartExpBarController
     context: IContext,
     params: IParams,
   ): INavViewMsg {
-    const viewModelId = (this.XDataModel as IDEChart).dechartSerieses?.[0]
-      .navAppViewId;
+    let viewModelId;
+    if (data._seriesModelId) {
+      const seriesModel = (this.XDataModel as IDEChart).dechartSerieses?.find(
+        series => {
+          return series.id === data._seriesModelId;
+        },
+      );
+      viewModelId = seriesModel?.navAppViewId;
+    }
     const result = this.prepareParams(this.XDataModel!, data, context, params);
     return {
-      key: data[this.navKeyName],
+      key: data._uuid,
       context: result.context,
       params: result.params,
       viewId: viewModelId,

package/src/controller/control/form/search-form/search-form.controller.ts

@@ -34,6 +34,7 @@ export class SearchFormController
 
   protected async onCreated(): Promise<void> {
     await super.onCreated();
+    this.preprocessLayoutPanel();
     // 实例部件服务
     this.service = new SearchFormService(this.model);
     await this.service.init(this.context);
@@ -159,4 +160,67 @@ export class SearchFormController
       await this.onSearchButtonClick();
     }
   }
+
+  /**
+   * 根据搜索表单的按钮位置和按钮样式
+   * 预处理部件布局面板模型
+   * @author lxm
+   * @date 2023-11-21 04:17:43
+   * @protected
+   * @return {*}
+   */
+  protected preprocessLayoutPanel(): void {
+    if (!this.controlPanel) {
+      return;
+    }
+    const { searchButtonStyle } = this.model;
+    let deleteRight = false;
+    let deleteBottom = false;
+    const searchButtonPos = this.model.searchButtonPos || 'RIGHT';
+    deleteRight = searchButtonPos === 'BOTTOM';
+    deleteBottom = searchButtonPos !== 'BOTTOM';
+
+    if (searchButtonStyle === 'NONE') {
+      deleteRight = true;
+      deleteBottom = true;
+    }
+
+    /**
+     * 递归面板项
+     * @author lxm
+     * @date 2023-11-21 04:16:36
+     * @param {IData} parent
+     */
+    const recursivePanelItems = (parent: IData): void => {
+      let children: IData[] | undefined;
+      let childrenKey = '';
+      ['rootPanelItems', 'panelItems'].find(key => {
+        if (parent[key]) {
+          children = parent[key];
+          childrenKey = key;
+          return true;
+        }
+        return false;
+      });
+      if (children && children.length > 0) {
+        const newArr: IData[] = [];
+        children.forEach((item: IData) => {
+          const isDelete =
+            (deleteRight && item.id === 'control_buttons_right') ||
+            (deleteBottom && item.id === 'control_buttons_bottom');
+          if (!isDelete) {
+            newArr.push(item);
+            recursivePanelItems(item);
+          }
+        });
+        if (newArr.length < children.length) {
+          parent[childrenKey] = newArr;
+        }
+      }
+    };
+
+    if (deleteBottom || deleteRight) {
+      recursivePanelItems(this.controlPanel);
+    }
+  }
 }

package/src/controller/control/grid/grid/grid.controller.ts

@@ -8,7 +8,12 @@ import {
   RuntimeError,
   RuntimeModelError,
 } from '@ibiz-template/core';
-import { IDEGrid, IDEGridGroupColumn, IDEGridColumn } from '@ibiz/model-core';
+import {
+  IDEGrid,
+  IDEGridGroupColumn,
+  IDEGridColumn,
+  IDEDataExport,
+} from '@ibiz/model-core';
 import { clone } from 'ramda';
 import { GridFieldColumnController } from '../grid-column/grid-field-column/grid-field-column.controller';
 import { GridColumnController } from './grid-column.controller';
@@ -26,6 +31,7 @@ import {
   CodeListItem,
   MDCtrlLoadParams,
   IGridRowState,
+  IExportColumn,
 } from '../../../../interface';
 import { calcDeCodeNameById } from '../../../../model';
 import { getGridColumnProvider } from '../../../../register';
@@ -134,6 +140,22 @@ export class GridController
    */
   aggTitle: string = '合计';
 
+  /**
+   * 数据导出对象
+   * @author lxm
+   * @date 2023-08-07 04:11:00
+   * @type {IDEDataExport}
+   */
+  dataExport: IDEDataExport | undefined;
+
+  /**
+   * 数据导出列
+   * @author lxm
+   * @date 2023-08-07 04:11:00
+   * @type {IDEDataExport}
+   */
+  allExportColumns: IExportColumn[] | undefined;
+
   /**
    * 分组代码表项集合
    * @author lxm
@@ -913,6 +935,35 @@ export class GridController
     return res.data;
   }
 
+  /**
+   * 初始化数据导出列
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-11-21 18:54:16
+   */
+  async findAllExportColumns(
+    dataExport: IDEDataExport,
+  ): Promise<IExportColumn[] | undefined> {
+    const app = ibiz.hub.getApp(this.context.srfappid);
+    const exportColumnsPromises: Promise<IExportColumn>[] | undefined =
+      dataExport.dedataExportItems?.map(async item => {
+        const tempExportColumn: IExportColumn = { ...item };
+        if (item.codeListId) {
+          // 加载代码表模型
+          tempExportColumn.codeList = app.codeList.getCodeList(item.codeListId);
+          tempExportColumn.codeListItems = await app.codeList.get(
+            item.codeListId,
+          );
+        }
+        return tempExportColumn;
+      });
+    // 使用 Promise.all 等待所有 Promise 解析
+    if (exportColumnsPromises) {
+      return Promise.all(exportColumnsPromises);
+    }
+    return undefined;
+  }
+
   /**
    * 数据导出
    *
@@ -921,35 +972,55 @@ export class GridController
    * @memberof MDControlController
    */
   async exportData(_args: { event: MouseEvent; params: IData }): Promise<void> {
-    // 前台导出
-    const items: { [key: string]: GridFieldColumnController } =
-      this.fieldColumns;
+    // 初始化导出对象
+    if (this.model.dedataExportId && !this.dataExport) {
+      this.dataExport = this.dataEntity.appDEDataExports?.find(dataExport => {
+        return dataExport.id === this.model.dedataExportId;
+      });
+      if (this.dataExport) {
+        this.allExportColumns = await this.findAllExportColumns(
+          this.dataExport,
+        );
+      }
+    }
     // 数据格式化
     const formatExcelData = (data: IData[]): IData[] => {
-      // const codeListMap: Map<string, readonly CodeListItem[]> = new Map();
-      // Object.keys(items).forEach((key: string) => {
-      //   if (items[key].codeList) {
-      //     codeListMap.set(key, items[key].codeListItems!);
-      //   }
-      // });
+      const codeListMap: Map<string, readonly CodeListItem[]> = new Map();
+      if (this.allExportColumns && this.allExportColumns.length > 0) {
+        this.allExportColumns?.forEach((exportColumn: IExportColumn) => {
+          if (exportColumn.codeListItems) {
+            codeListMap.set(
+              exportColumn.appDEFieldId!,
+              exportColumn.codeListItems!,
+            );
+          }
+        });
+      } else {
+        Object.keys(this.fieldColumns).forEach((key: string) => {
+          if (this.fieldColumns[key].codeList) {
+            codeListMap.set(key, this.fieldColumns[key].codeListItems!);
+          }
+        });
+      }
       const cloneData = clone(
         data.map(item => {
           return item.getOrigin();
         }),
       );
-      // cloneData.forEach(item => {
-      //   const fields = Object.keys(item);
-      //   fields.forEach((key: string) => {
-      //     if (codeListMap.get(key)) {
-      //       item[key] =
-      //         codeListMap.get(key)!.find(_item => {
-      //           return _item.value === item[key];
-      //         })?.text || item[key];
-      //     }
-      //   });
-      // });
+      cloneData.forEach(item => {
+        const fields = Object.keys(item);
+        fields.forEach((key: string) => {
+          if (codeListMap.get(key)) {
+            item[key] =
+              codeListMap.get(key)!.find(_item => {
+                return _item.value === item[key];
+              })?.text || item[key];
+          }
+        });
+      });
       return cloneData;
     };
+    // 获取导出数据
     const getExportData = async (): Promise<IData[]> => {
       const type = _args.params?.type;
       let data: IData[] = [];
@@ -988,14 +1059,26 @@ export class GridController
         });
       });
     };
+
     // 头部id数组
-    const filterVal = Object.keys(items).map(
-      (key: string) => items[key].model.id!,
-    );
+    let filterVal: string[] = [];
     // 表头数组
-    const header = Object.keys(items).map(
-      (key: string) => items[key].model.caption!,
-    );
+    let header: string[] = [];
+    if (this.allExportColumns && this.allExportColumns.length > 0) {
+      filterVal = this.allExportColumns.map(
+        (column: IExportColumn) => column.appDEFieldId!,
+      );
+      header = this.allExportColumns.map(
+        (column: IExportColumn) => column.caption!,
+      );
+    } else {
+      filterVal = Object.keys(this.fieldColumns).map(
+        (key: string) => this.fieldColumns[key].model.id!,
+      );
+      header = Object.keys(this.fieldColumns).map(
+        (key: string) => this.fieldColumns[key].model.caption!,
+      );
+    }
     // 二维数组
     const data = formatArrayData(filterVal, await getExportData());
     await exportData(header, data, this.model.logicName!);

package/src/controller/control/panel/panel/panel.controller.ts

@@ -15,6 +15,7 @@ import {
   IPanelItemProvider,
   IControlProvider,
   IPanelItemContainerController,
+  IController,
 } from '../../../../interface';
 import { getAllPanelField } from '../../../../model';
 import { getPanelItemProvider } from '../../../../register';
@@ -22,6 +23,7 @@ import { PanelData } from '../../../../service/vo';
 import { ControlController } from '../../../common';
 import { PanelNotifyState } from '../../../constant';
 import { ControllerEvent } from '../../../utils';
+import { CTX } from '../../../ctx';
 
 /**
  * 面板部件控制器
@@ -72,6 +74,8 @@ export class PanelController<
    */
   inputData: IData | undefined;
 
+  container?: IController;
+
   /**
    * 面板数据
    *
@@ -84,6 +88,17 @@ export class PanelController<
     return this.state.data;
   }
 
+  constructor(
+    model: T,
+    context: IContext,
+    params: IParams,
+    ctx: CTX,
+    container?: IController,
+  ) {
+    super(model, context, params, ctx);
+    this.container = container;
+  }
+
   protected initState(): void {
     super.initState();
     this.state.data = {};

package/src/controller/utils/data-file-util/data-file-util.ts

@@ -3,7 +3,7 @@ import {
   IPortalMessage,
   RuntimeError,
 } from '@ibiz-template/core';
-import { IAppDataEntity } from '@ibiz/model-core';
+import { IAppDEDataImport, IAppDataEntity } from '@ibiz/model-core';
 
 // 异步导入URL
 const asyncImportUrl = 'asyncimportdata2';
@@ -65,10 +65,14 @@ function listenAsyncAction(id: string): Promise<void> {
 export async function asyncImportData(
   file: File,
   appDataEntity: IAppDataEntity,
+  dataImport?: IAppDEDataImport,
 ): Promise<void> {
   const data = new FormData();
   data.append('file', file);
-  const url = `${appDataEntity.codeName2!.toLowerCase()}/${asyncImportUrl}`;
+  let url = `${appDataEntity.codeName2!.toLowerCase()}/${asyncImportUrl}`;
+  if (dataImport?.codeName) {
+    url += `?srfimporttag=${dataImport.codeName}`;
+  }
   const res = await ibiz.net.request(url, {
     method: 'post',
     data,
@@ -95,10 +99,14 @@ export async function asyncImportData(
 export async function importData(
   file: File,
   appDataEntity: IAppDataEntity,
+  dataImport?: IAppDEDataImport,
 ): Promise<ImportDataResult> {
   const data = new FormData();
   data.append('file', file);
-  const url = `${appDataEntity.codeName2!.toLowerCase()}/${importUrl}`;
+  let url = `${appDataEntity.codeName2!.toLowerCase()}/${importUrl}`;
+  if (dataImport?.codeName) {
+    url += `?srfimporttag=${dataImport.codeName}`;
+  }
   const res = await ibiz.net.request(url, {
     method: 'post',
     data,

package/src/engine/md-view.engine.ts

@@ -187,6 +187,14 @@ export class MDViewEngine extends ViewEngineBase {
       await this.exportData(args);
       return null;
     }
+    if (key === SysUIActionTag.SEARCH) {
+      await this.searchForm.search();
+      return null;
+    }
+    if (key === SysUIActionTag.RESET) {
+      await this.searchForm.reset();
+      return null;
+    }
     if (key === SysUIActionTag.COPY) {
       this.copy(args);
       return null;

package/src/interface/common/i-app-hub-service/i-app-hub-service.ts

@@ -1,10 +1,10 @@
 import { IAppDataEntity, IAppView, IApplication } from '@ibiz/model-core';
-import { Application } from '../../../application';
 import { Convert } from '../../../hub';
 import { ModelLoaderProvider } from '../../provider';
 import { IAppConfigService } from '../i-app-config-service/i-app-config-service';
 import { IHubController } from '../../controller';
 import { IConfigService } from '../../service';
+import { IAppService } from '../i-app-service/i-app-service';
 
 /**
  * 应用 hub 服务
@@ -152,9 +152,9 @@ export interface IAppHubService {
    * @author chitanda
    * @date 2023-04-23 15:04:46
    * @param {string} [appId=ibiz.env.appId]
-   * @return {*}  {Promise<Application>}
+   * @return {*}  {Promise<IAppService>}
    */
-  getAppAsync(appId?: string): Promise<Application>;
+  getAppAsync(appId?: string): Promise<IAppService>;
 
   /**
    * 获取应用实例
@@ -162,7 +162,7 @@ export interface IAppHubService {
    * @author chitanda
    * @date 2023-04-23 15:04:24
    * @param {(string | IApplication)} [app]
-   * @return {*}  {Application}
+   * @return {*}  {IAppService}
    */
-  getApp(app?: string | IApplication): Application;
+  getApp(app?: string | IApplication): IAppService;
 }

package/src/interface/common/i-app-service/i-app-service.ts

@@ -1,4 +1,11 @@
 import { Net } from '@ibiz-template/core';
+import {
+  IAppDEUIAction,
+  IAppFunc,
+  IApplication,
+  IDEOPPriv,
+  IDEUILogic,
+} from '@ibiz/model-core';
 import {
   AuthorityService,
   CodeListService,
@@ -24,6 +31,15 @@ export interface IAppService {
    */
   readonly appId: string;
 
+  /**
+   * 应用模型
+   *
+   * @author chitanda
+   * @date 2023-11-21 15:11:33
+   * @type {IApplication}
+   */
+  readonly model: IApplication;
+
   /**
    * 请求服务
    *
@@ -68,4 +84,59 @@ export interface IAppService {
    * @type {AuthorityService}
    */
   readonly authority: AuthorityService;
+
+  /**
+   * 应用实体名称到应用实体代码名称的映射
+   *
+   * @author chitanda
+   * @date 2023-11-21 15:11:18
+   * @type {Map<string, string>}
+   */
+  readonly deName2DeCodeName: Map<string, string>;
+
+  /**
+   * 根据 id 查找应用功能
+   *
+   * @author chitanda
+   * @date 2023-04-20 17:04:24
+   * @param {string} id
+   * @return {*}  {(IAppFunc | null)}
+   */
+  getAppFunc(id: string): IAppFunc | null;
+
+  /**
+   * 获取界面行为模型
+   * @author lxm
+   * @date 2023-04-28 05:44:14
+   * @param {string} actionId
+   * @param {string} [_appDataEntityId]
+   * @return {*}
+   */
+  getUIAction(actionId: string): Promise<IAppDEUIAction | undefined>;
+
+  /**
+   * 获取操作标识模型
+   * @author lxm
+   * @date 2023-05-10 11:24:17
+   * @param {string} id
+   * @param {string} [appDataEntityId]
+   * @return {*}  {(Promise<IDEOPPriv | undefined>)}
+   */
+  getOPPriv(
+    id: string,
+    appDataEntityId?: string,
+  ): Promise<IDEOPPriv | undefined>;
+
+  /**
+   * 查找实体的界面逻辑模型
+   * @author lxm
+   * @date 2023-06-14 07:20:30
+   * @param {string} deUILogicId
+   * @param {string} appDataEntityId
+   * @return {*}  {(Promise<IDEUILogic | undefined>)}
+   */
+  getDEUILogic(
+    deUILogicId: string,
+    appDataEntityId: string,
+  ): Promise<IDEUILogic | undefined>;
 }