@ibiz-template/runtime 0.3.2 → 0.3.4

package/src/interface/controller/controller/control/i-grid.controller.ts

@@ -1,8 +1,9 @@
-import { IDEGrid } from '@ibiz/model-core';
+import { IDEGrid, IAppCodeList, IDEDataExportItem } from '@ibiz/model-core';
 import { ControlVO } from '../../../../service';
 import { IGridEvent } from '../../event';
 import { IGridRowState, IGridState } from '../../state';
 import { IMDControlController } from './i-md-control.controller';
+import { CodeListItem } from '../../../service';
 
 /**
  * 表格控制器
@@ -67,3 +68,31 @@ export interface IGridController
    */
   validate(row: IGridRowState): Promise<boolean>;
 }
+
+interface AdditionalProperties {
+  /**
+   * 代码表模型
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-11-21 14:13:45
+   */
+  codeList?: IAppCodeList;
+
+  /**
+   * 代码表项
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-11-21 14:13:45
+   */
+  codeListItems?: readonly CodeListItem[];
+}
+
+/**
+ * 封装的导出列模型
+ * @return {*}
+ * @author: zhujiamin
+ * @Date: 2023-11-21 19:04:27
+ */
+export interface IExportColumn
+  extends IDEDataExportItem,
+    AdditionalProperties {}

package/src/interface/controller/controller/control/i-panel.controller.ts

@@ -3,6 +3,7 @@ import { IPanelEvent } from '../../event';
 import { IPanelState } from '../../state';
 import { IControlController } from './i-control.controller';
 import { IPanelItemController } from './panel-item';
+import { IController } from '../i.controller';
 
 /**
  * 面板控制器
@@ -34,6 +35,14 @@ export interface IPanelController<
    */
   data: IData;
 
+  /**
+   * 容器控制器（可能是视图控制器，也可能是部件控制器）
+   * @author lxm
+   * @date 2023-11-21 07:41:31
+   * @type {(IController)}
+   */
+  container?: IController;
+
   /**
    * 部件加载
    *

package/src/interface/controller/state/control/i-chart.state.ts

@@ -9,3 +9,27 @@ import { IMDControlState } from './i-md-control.state';
  * @extends {IMDControlState}
  */
 export interface IChartState extends IMDControlState {}
+
+/**
+ * 图表数据格式
+ *
+ */
+export interface IChartData {
+  /**
+   * 序列模型id
+   *
+   */
+  _seriesModelId?: string;
+
+  /**
+   * 分组名称
+   *
+   */
+  _groupName?: string;
+
+  /**
+   * 分类值
+   *
+   */
+  _catalog?: string;
+}

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

@@ -67,6 +67,102 @@ export interface IAppDEService {
     params2?: IParams,
   ): Promise<IHttpResponse>;
 
+  /**
+   * 获取草稿数据[系统预置]
+   *
+   * @author chitanda
+   * @date 2023-11-21 16:11:34
+   * @param {IParams} context
+   * @param {(IData | IData[])} [params]
+   * @param {IParams} [params2]
+   * @return {*}  {Promise<IHttpResponse>}
+   */
+  getDraft(
+    context: IParams,
+    params?: IData | IData[],
+    params2?: IParams,
+  ): Promise<IHttpResponse>;
+
+  /**
+   * 创建数据[系统预置]
+   *
+   * @author chitanda
+   * @date 2023-11-21 16:11:50
+   * @param {IParams} context
+   * @param {(IData | IData[])} [params]
+   * @param {IParams} [params2]
+   * @return {*}  {Promise<IHttpResponse>}
+   */
+  create(
+    context: IParams,
+    params?: IData | IData[],
+    params2?: IParams,
+  ): Promise<IHttpResponse>;
+
+  /**
+   * 获取数据[系统预置]
+   *
+   * @author chitanda
+   * @date 2023-11-21 16:11:00
+   * @param {IParams} context
+   * @param {(IData | IData[])} [params]
+   * @param {IParams} [params2]
+   * @return {*}  {Promise<IHttpResponse>}
+   */
+  get(
+    context: IParams,
+    params?: IData | IData[],
+    params2?: IParams,
+  ): Promise<IHttpResponse>;
+
+  /**
+   * 更新数据[系统预置]
+   *
+   * @author chitanda
+   * @date 2023-11-21 16:11:09
+   * @param {IParams} context
+   * @param {(IData | IData[])} [params]
+   * @param {IParams} [params2]
+   * @return {*}  {Promise<IHttpResponse>}
+   */
+  update(
+    context: IParams,
+    params?: IData | IData[],
+    params2?: IParams,
+  ): Promise<IHttpResponse>;
+
+  /**
+   * 删除数据[系统预置]
+   *
+   * @author chitanda
+   * @date 2023-11-21 16:11:12
+   * @param {IParams} context
+   * @param {(IData | IData[])} [params]
+   * @param {IParams} [params2]
+   * @return {*}  {Promise<IHttpResponse>}
+   */
+  remove(
+    context: IParams,
+    params?: IData | IData[],
+    params2?: IParams,
+  ): Promise<IHttpResponse>;
+
+  /**
+   * 获取默认数据集[系统预置]
+   *
+   * @author chitanda
+   * @date 2023-11-21 16:11:06
+   * @param {IParams} context
+   * @param {(IData | IData[])} [params]
+   * @param {IParams} [params2]
+   * @return {*}  {Promise<IHttpResponse>}
+   */
+  fetchDefault(
+    context: IParams,
+    params?: IData | IData[],
+    params2?: IParams,
+  ): Promise<IHttpResponse>;
+
   /**
    * 触发实体服务方法 ac 模式
    *

package/src/model/utils/util.ts

@@ -1,7 +1,7 @@
+import { RuntimeModelError } from '@ibiz-template/core';
 import {
   IAppView,
   IAppViewRef,
-  IApplication,
   IControl,
   IModelObject,
   ISysPFPlugin,
@@ -118,14 +118,24 @@ export function parseUserParams(userParams: Record<string, string>): {
  * 从应用里面获取插件配置参数
  *
  * @author chitanda
- * @date 2023-11-01 17:11:28
+ * @date 2023-11-21 14:11:06
  * @export
- * @param {IApplication} app
- * @param {string} id
+ * @param {string} id 插件标识
+ * @param {string} [appId] 当前所在应用标识
  * @return {*}  {ISysPFPlugin}
  */
-export function getPFPlugin(app: IApplication, id: string): ISysPFPlugin {
-  const plugin = app.appPFPluginRefs?.find(item => item.id === id);
+export function getPFPlugin(id: string, appId?: string): ISysPFPlugin {
+  const app = ibiz.hub.getApp(appId);
+  if (!app) {
+    throw new RuntimeModelError(app, '未找到应用');
+  }
+  const { model } = app;
+  if (!model.appPFPluginRefs) {
+    throw new RuntimeModelError(model, '应用未配置插件');
+  }
+  const plugin = model.appPFPluginRefs.find(
+    item => item.pluginCode!.toLowerCase() === id.toLowerCase(),
+  );
   if (!plugin) {
     throw new Error(`未找到插件${id}`);
   }

package/src/service/dto/method.dto.ts

@@ -5,9 +5,9 @@ import {
   IAppDEMethodDTOField,
 } from '@ibiz/model-core';
 import { ModelError } from '@ibiz-template/core';
-import { Application } from '../../application';
 import { AppDataEntity } from '../app-data-entity/app-data-entity';
 import { findModelChild } from '../../model';
+import { IAppService } from '../../interface';
 
 interface listMap {
   [key: number]: IData;
@@ -22,7 +22,7 @@ interface listMap {
  * @class MethodDto
  */
 export class MethodDto {
-  protected app?: Application;
+  protected app?: IAppService;
 
   protected fields!: IAppDEMethodDTOField[];
 
@@ -86,7 +86,9 @@ export class MethodDto {
       const field = this.fields[i];
       const key = field.codeName!.toLowerCase();
       switch (field.type) {
-        case 'SIMPLE': {
+        case 'SIMPLE':
+        case 'SIMPLES':
+        case 'DTO': {
           break;
         }
         case 'DTOS': {

package/src/service/service/config/config.service.ts

@@ -1,5 +1,4 @@
-import { Application } from '../../../application';
-import { IConfigService } from '../../../interface';
+import { IAppService, IConfigService } from '../../../interface';
 
 /**
  * 应用配置存储服务
@@ -10,7 +9,7 @@ import { IConfigService } from '../../../interface';
  * @class ConfigService
  */
 export class ConfigService implements IConfigService {
-  private app: Application;
+  private app: IAppService;
 
   /**
    * Creates an instance of ConfigService.

package/src/service/service/control/control.service.ts

@@ -2,10 +2,10 @@ import { IHttpResponse, clone } from '@ibiz-template/core';
 import { IControl } from '@ibiz/model-core';
 import { ControlVO } from '../../vo/control.vo';
 import { UIMapField } from '../../vo/ui-map-field';
-import { Application } from '../../../application';
+import { IAppService } from '../../../interface';
 
 export class ControlService<T extends IControl = IControl> {
-  app!: Application;
+  app!: IAppService;
 
   /**
    * 部件模型

package/src/service/service/entity/de.service.ts

@@ -151,6 +151,54 @@ export class DEService implements IAppDEService {
     throw new RuntimeError(`${this.model.codeName}未支持「${id}」方法`);
   }
 
+  getDraft(
+    context: IParams,
+    params?: IData | IData[],
+    params2?: IParams,
+  ): Promise<IHttpResponse<IData>> {
+    return this.exec('GetDraft', context, params, params2);
+  }
+
+  create(
+    context: IParams,
+    params?: IData | IData[],
+    params2?: IParams,
+  ): Promise<IHttpResponse<IData>> {
+    return this.exec('Create', context, params, params2);
+  }
+
+  get(
+    context: IParams,
+    params?: IData | IData[],
+    params2?: IParams,
+  ): Promise<IHttpResponse<IData>> {
+    return this.exec('Get', context, params, params2);
+  }
+
+  update(
+    context: IParams,
+    params?: IData | IData[],
+    params2?: IParams,
+  ): Promise<IHttpResponse<IData>> {
+    return this.exec('Update', context, params, params2);
+  }
+
+  remove(
+    context: IParams,
+    params?: IData | IData[],
+    params2?: IParams,
+  ): Promise<IHttpResponse<IData>> {
+    return this.exec('Remove', context, params, params2);
+  }
+
+  fetchDefault(
+    context: IParams,
+    params?: IData | IData[],
+    params2?: IParams,
+  ): Promise<IHttpResponse<IData>> {
+    return this.exec('FetchDefault', context, params, params2);
+  }
+
   /**
    * 执行服务方法 ac 模式
    *

package/src/service/service/entity/method/method.ts

@@ -2,12 +2,11 @@
 import { HttpResponse, RuntimeModelError } from '@ibiz-template/core';
 import { IAppDataEntity, IAppDEMethod } from '@ibiz/model-core';
 import { isArray } from 'lodash-es';
-import { Application } from '../../../../application';
 import { AppDataEntity } from '../../../app-data-entity/app-data-entity';
 import { calcResPath } from '../../../utils';
 import { MethodInput } from './method-input';
 import { MethodReturn } from './method-renturn';
-import { IAppDEService, IDataEntity } from '../../../../interface';
+import { IAppDEService, IAppService, IDataEntity } from '../../../../interface';
 
 /**
  * 应用实体方法
@@ -18,7 +17,7 @@ import { IAppDEService, IDataEntity } from '../../../../interface';
  * @class Method
  */
 export abstract class Method {
-  protected app!: Application;
+  protected app!: IAppService;
 
   /**
    * 输入 DTO

package/src/service/service/work-flow/work-flow.service.ts

@@ -1,7 +1,6 @@
 import { IHttpResponse, RuntimeError } from '@ibiz-template/core';
 import { IAppDataEntity } from '@ibiz/model-core';
-import { Application } from '../../../application';
-import { IWorkFlowService } from '../../../interface';
+import { IAppService, IWorkFlowService } from '../../../interface';
 
 /**
  * 工作流服务
@@ -12,7 +11,7 @@ import { IWorkFlowService } from '../../../interface';
  * @class WorkFlowService
  */
 export class WorkFlowService implements IWorkFlowService {
-  private app!: Application;
+  private app!: IAppService;
 
   /**
    * 常规基础路径

package/src/service/vo/chart-data/chart-data.ts

@@ -0,0 +1,75 @@
+/* eslint-disable no-constructor-return */
+import { createUUID } from 'qx-util';
+import { IDEChartSeries } from '@ibiz/model-core';
+import { IChartData } from '../../../interface';
+
+// 更新属性，缺的补充定义
+function updateKeyDefine(target: IParams, keys: string[]): void {
+  keys.forEach(key => {
+    if (!Object.prototype.hasOwnProperty.call(target, key)) {
+      Object.defineProperty(target, key, {
+        enumerable: true,
+        configurable: true,
+        writable: true,
+        value: undefined,
+      });
+    }
+  });
+}
+
+export class ChartData implements IChartData {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  [key: string | symbol]: any;
+
+  _seriesModelId?: string;
+
+  _catalog?: string;
+
+  _groupName?: string;
+
+  _uuid?: string;
+
+  constructor(
+    deData: IData,
+    seriesModel?: IDEChartSeries,
+    catalog?: string,
+    groupName?: string,
+  ) {
+    this._seriesModelId = seriesModel?.id;
+
+    this._catalog = catalog;
+
+    this._groupName = groupName;
+
+    this._uuid = createUUID();
+
+    return new Proxy<ChartData>(this, {
+      set(target, p, value): boolean {
+        if (Object.prototype.hasOwnProperty.call(deData, p)) {
+          deData[p] = value;
+        } else {
+          target[p] = value;
+        }
+        return true;
+      },
+
+      get(target, p, _receiver): unknown {
+        if (target[p] !== undefined) {
+          return target[p];
+        }
+        if (deData[p] !== undefined) {
+          return deData[p];
+        }
+      },
+
+      ownKeys(target): ArrayLike<string | symbol> {
+        // 整合所有并排除重复
+        const allKeys = [
+          ...new Set([...Object.keys(target), ...Object.keys(deData)]),
+        ];
+        updateKeyDefine(target, allKeys);
+        return allKeys;
+      },
+    });
+  }
+}

package/src/service/vo/chart-data/index.ts

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

package/src/service/vo/index.ts

@@ -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/src/ui-action/provider/front-ui-action-provider.ts

@@ -1,4 +1,9 @@
-import { StringUtil, RuntimeModelError, ModelError } from '@ibiz-template/core';
+import {
+  StringUtil,
+  RuntimeModelError,
+  ModelError,
+  RuntimeError,
+} from '@ibiz-template/core';
 import { IAppDEUIAction, IUIAction } from '@ibiz/model-core';
 import { OpenAppViewCommand } from '../../command';
 import { IUILogicParams, IUIActionResult, IModalData } from '../../interface';
@@ -61,6 +66,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;
@@ -98,4 +112,142 @@ export class FrontUIActionProvider extends UIActionProviderBase {
     }
     throw new RuntimeModelError(action, '自定义类型缺少配置脚本代码');
   }
+
+  /**
+   * 执行打印行为
+   * @protected
+   * @param {IAppDEUIAction} action
+   * @param {IUILogicParams} args
+   * @return {*}
+   */
+  protected async executePrint(
+    action: IAppDEUIAction,
+    args: IUILogicParams,
+  ): Promise<void> {
+    const appDataEntity = await ibiz.hub.getAppDataEntity(
+      action.appDataEntityId!,
+    );
+    const appDEPrint = appDataEntity.appDEPrints?.find(print => {
+      return print.id === action.appDEPrintId;
+    });
+    if (appDEPrint) {
+      let requestUrl: string = '';
+      const { context } = args;
+      if (context && context[appDataEntity.codeName!.toLowerCase()]) {
+        // TODO 临时写死printdata， 非标准，后续优化
+        requestUrl += `/${appDataEntity.codeName2?.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 as Blob);
+        window.open(link, '_blank');
+      } else {
+        throw new RuntimeError('打印失败');
+      }
+    } else {
+      throw new RuntimeError('没有找到实体打印项');
+    }
+  }
+
+  /**
+   * 执行导入行为
+   * @protected
+   * @param {IAppDEUIAction} action
+   * @param {IUILogicParams} args
+   * @return {*}
+   */
+  protected async executeDataImport(
+    action: IAppDEUIAction,
+    _args: IUILogicParams,
+  ): Promise<IUIActionResult> {
+    const appDataEntity = await ibiz.hub.getAppDataEntity(
+      action.appDataEntityId!,
+    );
+    const appDEDataImport = appDataEntity.appDEDataImports?.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 {*}
+   */
+  protected async executeDataExport(
+    action: IAppDEUIAction,
+    _args: IUILogicParams,
+  ): Promise<void> {
+    const appDataEntity = await ibiz.hub.getAppDataEntity(
+      action.appDataEntityId!,
+    );
+    const appDEDataExport = appDataEntity.appDEDataExports?.find(dataExport => {
+      return dataExport.id === action.appDEDataExportId;
+    });
+    if (appDEDataExport) {
+      // TODO 临时写死fetchdefault，应该从appDEDataExport的主表格上获取加载行为，但现在缺主表格模型，后续优化
+      const url: string = `/${appDataEntity.codeName2?.toLowerCase()}/exportdata/fetchdefault?srfexporttag=${
+        appDEDataExport.codeName
+      }`;
+      //  参数
+      const params: IData = {
+        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 as Blob], {
+          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/src/ui-action/provider/sys-ui-action-provider.ts

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