@ibiz-template/runtime 0.2.18-dev.1 → 0.2.18

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

@@ -6,10 +6,10 @@ import {
 import { IAppDataEntity } from '@ibiz/model-core';
 
 // 异步导入URL
-const asyncImportUrl = '/asyncimportdata2';
+const asyncImportUrl = 'asyncimportdata2';
 
 // 标准导入url
-const importUrl = '/importdata2';
+const importUrl = 'importdata2';
 
 // 导入结果类型
 export type ImportDataResult = {
@@ -33,33 +33,17 @@ export type IExportDataResult = {
  * @param {string} id
  * @return {*}  {Promise<ImportDataResult>}
  */
-function listenAsyncAction(id: string): Promise<ImportDataResult> {
+function listenAsyncAction(id: string): Promise<void> {
   return new Promise(resolve => {
     const callBack = (msg: IPortalMessage): void => {
       // 兼容接口返回类型与实际返回类型不一致
       const messageid = msg.messageid || (msg.data as IData).asyncacitonid;
-      if (
-        id === messageid &&
-        (msg.data as IPortalAsyncAction).actionstate === 30
-      ) {
-        // 返回结果是字符串， 需解析
-        try {
-          const result = JSON.parse(
-            (msg.data as IPortalAsyncAction).actionresult as string,
-          );
-          resolve(result as ImportDataResult);
-        } catch (error) {
-          throw new RuntimeError('解析数据发生错误');
-        } finally {
-          // 异步作业结束 取消订阅
-          ibiz.mc.command.asyncAction.off(callBack);
-        }
-      } else if ((msg.data as IPortalAsyncAction).actionstate === 40) {
-        resolve({
-          total: 0,
-          success: 0,
-          message: (msg.data as IPortalAsyncAction).actionresult as string,
-        });
+      if (id !== messageid) {
+        return;
+      }
+      const state = (msg.data as IPortalAsyncAction).actionstate;
+      if (state === 30 || state === 40) {
+        resolve();
         // 异步作业结束 取消订阅
         ibiz.mc.command.asyncAction.off(callBack);
       }
@@ -81,7 +65,7 @@ function listenAsyncAction(id: string): Promise<ImportDataResult> {
 export async function asyncImportData(
   file: File,
   appDataEntity: IAppDataEntity,
-): Promise<ImportDataResult> {
+): Promise<void> {
   const data = new FormData();
   data.append('file', file);
   const url = `${appDataEntity.codeName2!.toLowerCase()}/${asyncImportUrl}`;
@@ -90,7 +74,12 @@ export async function asyncImportData(
     data,
     headers: { 'Content-Type': 'multipart/form-data' },
   });
-  return listenAsyncAction(res.data.asyncacitonid);
+  await listenAsyncAction(res.data.asyncacitonid);
+  // 模拟表单通知 刷新表格
+  ibiz.mc.command.send(
+    { srfdecodename: appDataEntity.codeName },
+    'OBJECTCREATED',
+  );
 }
 
 /**

package/src/install.ts

@@ -1,7 +1,11 @@
 import { GlobalConfig } from './config/global-config';
 import { RegisterCenter } from './register/register-center';
 import { installCommand } from './command';
-import { presetAppCounterProvider, V7AuthService } from './service';
+import {
+  AsyncActionService,
+  presetAppCounterProvider,
+  V7AuthService,
+} from './service';
 import { AppHub } from './app-hub';
 import { EngineFactory } from './engine';
 import { GlobalUtil } from './global';
@@ -27,6 +31,8 @@ export function install(): void {
   ibiz.config = new GlobalConfig();
   // 挂载认证服务
   ibiz.auth = new V7AuthService();
+  // 挂载异步操作服务
+  ibiz.asyncAction = new AsyncActionService();
   // 挂载引擎工厂
   ibiz.engine = new EngineFactory();
   // 安装默认指令

package/src/interface/controller/event/argument/form-detail.event.ts

@@ -0,0 +1,51 @@
+import { EventBase } from './base.event';
+
+/* eslint-disable no-shadow */
+export enum FormDetailEventName {
+  /**
+   * 点击
+   */
+  CLICK = 'onClick',
+  /**
+   * 聚焦
+   */
+  FOCUS = 'onFocus',
+  /**
+   * 失焦
+   */
+  BLUR = 'onBlur',
+  /**
+   * 值变更
+   */
+  CHANGE = 'onChange',
+  /**
+   * 回车
+   */
+  ENTER = 'onEnter',
+}
+
+/**
+ * 表单成员事件
+ * @author lxm
+ * @date 2023-08-09 10:52:48
+ * @export
+ * @interface FormDetailEvent
+ * @extends {EventBase}
+ */
+export interface FormDetailEvent extends EventBase {
+  /**
+   * 触发的表单成员名称
+   * @author lxm
+   * @date 2023-03-26 02:02:16
+   * @type {string}
+   */
+  formDetailName: string;
+
+  /**
+   * 触发的表单成员事件的名称
+   * @author lxm
+   * @date 2023-07-26 11:00:37
+   * @type {FormDetailEventName}
+   */
+  formDetailEventName: FormDetailEventName;
+}

package/src/interface/controller/event/argument/index.ts

@@ -8,3 +8,6 @@ export type { ControlTriggerEvent } from './control-trigger.event';
 export type { NavViewChangeEvent } from './nav-view-change.event';
 export type { RowEditChangeEvent } from './row-edit-change.event';
 export type { PanelItemEvent } from './panel-item.event';
+export type { FormDetailEvent } from './form-detail.event';
+export { FormDetailEventName } from './form-detail.event';
+export { PanelItemEventName } from './panel-item.event';

package/src/interface/controller/event/argument/panel-item.event.ts

@@ -1,5 +1,29 @@
 import { EventBase } from './base.event';
 
+/* eslint-disable no-shadow */
+export enum PanelItemEventName {
+  /**
+   * 点击
+   */
+  CLICK = 'onClick',
+  /**
+   * 聚焦
+   */
+  FOCUS = 'onFocus',
+  /**
+   * 失焦
+   */
+  BLUR = 'onBlur',
+  /**
+   * 值变更
+   */
+  CHANGE = 'onChange',
+  /**
+   * 回车
+   */
+  ENTER = 'onEnter',
+}
+
 /**
  * 面板成员事件
  * @author lxm
@@ -23,5 +47,5 @@ export interface PanelItemEvent extends EventBase {
    * @date 2023-07-26 11:00:37
    * @type {string}
    */
-  panelItemEventName: string;
+  panelItemEventName: PanelItemEventName;
 }

package/src/interface/controller/event/control/i-form.event.ts

@@ -1,4 +1,5 @@
-import { EventBase } from '../argument';
+import { PartialWithObject } from '@ibiz-template/core';
+import { EventBase, FormDetailEvent } from '../argument';
 import { IControlEvent } from './i-control.event';
 
 /**
@@ -51,4 +52,16 @@ export interface IFormEvent extends IControlEvent {
     event: EventBase;
     emitArgs: undefined;
   };
+
+  /**
+   * 表单里的成员事件监听
+   * @author lxm
+   * @date 2023-03-26 06:15:06
+   * @param {EventBase} event
+   * @return {*}  {Promise<void>}
+   */
+  onFormDetailEvent: {
+    event: FormDetailEvent;
+    emitArgs: PartialWithObject<FormDetailEvent, EventBase>;
+  };
 }

package/src/interface/controller/event/view/i-map-view.event.ts

@@ -0,0 +1,12 @@
+import { IMDViewEvent } from './i-md-view.event';
+
+/**
+ * 地图视图事件
+ *
+ * @author lxm
+ * @date 2022-09-13 10:09:00
+ * @export
+ * @interface IMapViewEvent
+ * @extends {IMDViewEvent}
+ */
+export type IMapViewEvent = IMDViewEvent;

package/src/interface/controller/event/view/index.ts

@@ -41,3 +41,4 @@ export * from './i-tree-grid-view.event';
 export * from './i-tree-grid-ex-view.event';
 export * from './i-medit-view9.event';
 export * from './i-chart-exp-view.event';
+export * from './i-map-view.event';

package/src/interface/controller/state/view/i-map-view.state.ts

@@ -0,0 +1,10 @@
+import { IMDViewState } from './i-md-view.state';
+
+/**
+ * 地图视图UI状态
+ *
+ * @export
+ * @class IMapViewState
+ * @extends {IMDViewState}
+ */
+export interface IMapViewState extends IMDViewState {}

package/src/interface/controller/state/view/index.ts

@@ -42,3 +42,4 @@ export * from './i-tree-grid-view.state';
 export * from './i-tree-grid-ex-view.state';
 export * from './i-medit-view9.state';
 export * from './i-chart-exp-view.state';
+export * from './i-map-view.state';

package/src/interface/provider/i-async-action.provider.ts

@@ -0,0 +1,29 @@
+import { IPortalAsyncAction } from '@ibiz-template/core';
+
+/**
+ * 异步操作适配器的接口
+ *
+ * @author lxm
+ * @date 2022-09-19 19:09:10
+ * @export
+ * @interface IAsyncActionProvider
+ */
+export interface IAsyncActionProvider {
+  /**
+   * 绘制组件
+   * @author lxm
+   * @date 2022-09-20 10:09:50
+   * @type {unknown}
+   */
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  component: any;
+
+  /**
+   * 点击事件
+   * @author lxm
+   * @date 2023-11-14 09:30:39
+   * @param {IPortalAsyncAction} asyncAction
+   * @param {MouseEvent} event
+   */
+  onClick(asyncAction: IPortalAsyncAction, event: MouseEvent): void;
+}

package/src/interface/provider/index.ts

@@ -10,3 +10,4 @@ export type * from './i-editor.provider';
 export type * from './i-portlet.provider';
 export type { IAppCounterProvider } from './i-app-counter.provider';
 export type { IUILogicNodeProvider } from './i-ui-login-node.provider';
+export type { IAsyncActionProvider } from './i-async-action.provider';

package/src/interface/service/service/i-async-action.service.ts

@@ -0,0 +1,29 @@
+import { IHttpResponse, IPortalAsyncAction } from '@ibiz-template/core';
+
+/**
+ * 异步操作服务
+ *
+ * @author chitanda
+ * @date 2023-08-17 16:08:08
+ * @export
+ * @interface IAuthService
+ */
+export interface IAsyncActionService {
+  /**
+   * 获取异步操作的集合
+   * @author lxm
+   * @date 2023-11-15 10:55:25
+   * @param {IParams} [params={}]
+   * @return {*}  {Promise<IHttpResponse<IPortalAsyncAction[]>>}
+   */
+  fetch(params?: IParams): Promise<IHttpResponse<IPortalAsyncAction[]>>;
+
+  /**
+   * 获取单条异步操作
+   * @author lxm
+   * @date 2023-11-15 10:57:08
+   * @param {string} actionID
+   * @return {*}  {Promise<IHttpResponse<IPortalAsyncAction[]>>}
+   */
+  get(actionID: string): Promise<IHttpResponse<IPortalAsyncAction[]>>;
+}

package/src/interface/service/service/index.ts

@@ -4,3 +4,4 @@ export type { IAppDEService } from './i-app-de.service';
 export type { IAuthService } from './i-auth.service';
 export type { IFileService } from './i-file.service';
 export type { IWorkFlowService } from './i-wf.service';
+export type { IAsyncActionService } from './i-async-action.service';

package/src/model/utils/util.ts

@@ -21,10 +21,13 @@ export function findModelChild(
   models: IModelObject[],
   id: string,
 ): IModelObject | null {
-  if (models) {
-    const model = models.find(
-      item => item.id!.toLowerCase() === id.toLowerCase(),
-    );
+  if (models && id) {
+    const model = models.find(item => {
+      if (item.id) {
+        return item.id.toLowerCase() === id.toLowerCase();
+      }
+      return false;
+    });
     if (model) {
       return model;
     }

package/src/register/helper/async-action-register.ts

@@ -0,0 +1,47 @@
+import { RuntimeError } from '@ibiz-template/core';
+import { IAsyncActionProvider } from '../../interface';
+
+/** 界面行为适配器前缀 */
+export const ASYNC_ACTION_PROVIDER_PREFIX = 'ASYNC_ACTION';
+
+/**
+ * 注册界面行为适配器
+ * @author lxm
+ * @date 2023-05-06 09:14:16
+ * @export
+ * @param {string} key
+ * @param {() => IAsyncActionProvider} callback 生成界面行为适配器的回调
+ */
+export function registerAsyncActionProvider(
+  key: string,
+  callback: () => IAsyncActionProvider,
+): void {
+  ibiz.register.register(`${ASYNC_ACTION_PROVIDER_PREFIX}_${key}`, callback);
+}
+
+function getProvider(key: string): IAsyncActionProvider | undefined {
+  return ibiz.register.get(
+    `${ASYNC_ACTION_PROVIDER_PREFIX}_${key}`,
+  ) as IAsyncActionProvider;
+}
+
+/**
+ * 获取界面行为适配器
+ * @author lxm
+ * @date 2023-05-06 09:29:23
+ * @export
+ * @param {IAppView} model
+ * @return {*}  {Promise<IAsyncActionProvider>}
+ */
+export function getAsyncActionProvider(
+  actiontype: string,
+): IAsyncActionProvider {
+  const provider: IAsyncActionProvider | undefined = getProvider(actiontype);
+
+  // 找异步操作类型
+  if (!provider) {
+    throw new RuntimeError(`找不异步操作类型${actiontype}对应的适配器`);
+  } else {
+    return provider;
+  }
+}

package/src/register/helper/index.ts

@@ -8,3 +8,4 @@ export * from './portlet-register';
 export * from './ui-action-register';
 export * from './ui-logic-node-register';
 export * from './view-register';
+export * from './async-action-register';

package/src/service/app-data-entity/app-data-entity.ts

@@ -46,11 +46,11 @@ export class AppDataEntity implements IDataEntity {
    * Creates an instance of AppDataEntity.
    *
    * @author chitanda
-   * @date 2022-10-11 21:10:21
+   * @date 2023-11-16 15:11:08
    * @param {IAppDataEntity} entity
-   * @param {(IData | AppDataEntity)} data
+   * @param {(IData | AppDataEntity)} [data={}]
    */
-  constructor(entity: IAppDataEntity, data: IData | AppDataEntity) {
+  constructor(entity: IAppDataEntity, data: IData | AppDataEntity = {}) {
     Object.defineProperty(this, '_entity', {
       enumerable: false,
       configurable: true,

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

@@ -9,6 +9,10 @@ import { Application } from '../../application';
 import { AppDataEntity } from '../app-data-entity/app-data-entity';
 import { findModelChild } from '../../model';
 
+interface listMap {
+  [key: number]: IData;
+}
+
 /**
  * 应用实体服务方法转换 DTO
  *
@@ -37,6 +41,35 @@ export class MethodDto {
     }
   }
 
+  /**
+   * 转换数组成ListMap
+   *
+   * @param {IData[]} arr
+   * @return {*} listMap
+   */
+  private convertArrayToListMap(arr: IData[]): listMap {
+    const result: listMap = {};
+    arr.forEach((obj, index) => {
+      result[index + 1] = obj;
+    });
+    return result;
+  }
+
+  /**
+   * 转换ListMap成数组
+   *
+   * @param {listMap} obj
+   * @return {*} IData[]
+   */
+  private convertListMapToArray(obj: listMap): IData[] {
+    const result: IData[] = [];
+    Object.keys(obj).forEach(key => {
+      const index = parseInt(key, 10);
+      result[index - 1] = obj[index];
+    });
+    return result;
+  }
+
   /**
    * 请求参数组合 DTO
    *
@@ -57,24 +90,31 @@ export class MethodDto {
           break;
         }
         case 'DTOS': {
-          if (data[key] !== undefined) {
-            break;
-          }
-          // 没有实体id的不处理
-          if (!field.refAppDataEntityId) {
-            break;
-          }
-          const dto = await this.getFieldDto(field);
-          const service = await this.app!.deService.getService(
-            field.refAppDataEntityId!,
-          );
-          const items: IData[] = service.local.getList(context);
-          if (items) {
-            const arr = [];
-            for (let j = 0; j < items.length; j++) {
-              arr.push(await dto.get(context, items[j]));
+          if (field.listMap) {
+            params[key] =
+              data[key] && data[key].length > 0
+                ? this.convertArrayToListMap(data[key])
+                : null;
+          } else {
+            if (data[key] !== undefined) {
+              break;
+            }
+            // 没有实体id的不处理
+            if (!field.refAppDataEntityId) {
+              break;
+            }
+            const dto = await this.getFieldDto(field);
+            const service = await this.app!.deService.getService(
+              field.refAppDataEntityId!,
+            );
+            const items: IData[] = service.local.getList(context);
+            if (items) {
+              const arr = [];
+              for (let j = 0; j < items.length; j++) {
+                arr.push(await dto.get(context, items[j]));
+              }
+              params[key] = arr;
             }
-            params[key] = arr;
           }
           break;
         }
@@ -108,17 +148,21 @@ export class MethodDto {
         const all = this.fields
           .filter(field => field.type === 'DTOS')
           .map(async field => {
-            // 没有实体id的不处理
-            if (!field.refAppDataEntityId) {
-              return;
-            }
             const key = field.codeName!.toLowerCase();
-            const dto = await this.getFieldDto(field);
-            const items: IData[] = datum[key];
-            if (items) {
-              await dto.sets(context, items);
+            if (field.listMap && typeof datum[key] === 'object') {
+              datum[key] = this.convertListMapToArray(datum[key]);
             } else {
-              await dto.sets(context, []);
+              // 没有实体id的不处理
+              if (!field.refAppDataEntityId) {
+                return;
+              }
+              const dto = await this.getFieldDto(field);
+              const items: IData[] = datum[key];
+              if (items) {
+                await dto.sets(context, items);
+              } else {
+                await dto.sets(context, []);
+              }
             }
           });
         for (let i = 0; i < all.length; i++) {

package/src/service/service/async-action/async-action.service.ts

@@ -0,0 +1,37 @@
+import { IHttpResponse, IPortalAsyncAction } from '@ibiz-template/core';
+import { IAsyncActionService } from '../../../interface';
+
+/**
+ * 异步操作服务
+ * @author lxm
+ * @date 2023-11-15 10:52:06
+ * @export
+ * @class AsyncActionService
+ */
+export class AsyncActionService implements IAsyncActionService {
+  /**
+   * 获取异步操作的集合
+   * @author lxm
+   * @date 2023-11-15 10:55:25
+   * @param {IParams} [params={}]
+   * @return {*}  {Promise<IHttpResponse<IPortalAsyncAction[]>>}
+   */
+  async fetch(
+    params: IParams = {},
+  ): Promise<IHttpResponse<IPortalAsyncAction[]>> {
+    const res = await ibiz.net.post('/portal/asyncaction/all', params);
+    return res as IHttpResponse<IPortalAsyncAction[]>;
+  }
+
+  /**
+   * 获取单条异步操作
+   * @author lxm
+   * @date 2023-11-15 10:57:08
+   * @param {string} actionID
+   * @return {*}  {Promise<IHttpResponse<IPortalAsyncAction[]>>}
+   */
+  async get(actionID: string): Promise<IHttpResponse<IPortalAsyncAction[]>> {
+    const res = await ibiz.net.get(`/portal/asyncaction/${actionID}`);
+    return res as IHttpResponse<IPortalAsyncAction[]>;
+  }
+}

package/src/service/service/index.ts

@@ -6,3 +6,4 @@ export { WorkFlowService } from './work-flow/work-flow.service';
 export * from './control';
 export * from './authority';
 export { V7AuthService } from './auth/v7-auth.service';
+export { AsyncActionService } from './async-action/async-action.service';

package/src/types.ts

@@ -13,6 +13,7 @@ import {
   IGlobalConfig,
   IAppHubService,
   IAuthService,
+  IAsyncActionService,
 } from './interface';
 import { LogicSchedulerCenter } from './logic-scheduler';
 import { RegisterCenter } from './register/register-center';
@@ -132,6 +133,15 @@ declare module '@ibiz-template/core' {
      */
     auth: IAuthService;
 
+    /**
+     * 异步操作服务
+     *
+     * @author chitanda
+     * @date 2022-07-20 10:07:33
+     * @type {IAuthService}
+     */
+    asyncAction: IAsyncActionService;
+
     /**
      * 引擎工厂
      * @author lxm

package/src/utils/handlebars/handlebars.ts

@@ -49,7 +49,9 @@ export class HandlebarsUtil {
       return this.p;
     }
     this.p = import('handlebars');
-    this.hsb = await this.p;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const module = (await this.p) as any;
+    this.hsb = module.default || module;
     this.p = null;
     installHelpers(this.hsb);
     return this.hsb;