@ibiz-template/runtime 0.1.37 → 0.1.38

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

@@ -0,0 +1,19 @@
+import { IChartExpBar } from '@ibiz/model-core';
+import { IExpBarControlController } from './i-exp-bar-control.controller';
+import { IChartExpBarState } from '../../state';
+import { IChartExpBarEvent } from '../../event';
+
+/**
+ * 图表导航栏部件控制器
+ * @author lxm
+ * @date 2023-05-04 01:47:16
+ * @export
+ * @interface ICalendarController
+ * @extends {IMDControlController}
+ */
+export interface IChartExpBarController
+  extends IExpBarControlController<
+    IChartExpBar,
+    IChartExpBarState,
+    IChartExpBarEvent
+  > {}

package/src/interface/controller/controller/control/index.ts

@@ -34,3 +34,4 @@ export * from './i-kanban.controller';
 export * from './i-tree-grid.controller';
 export * from './i-tree-grid-ex.controller';
 export * from './i-medit-view-panel.controller';
+export * from './i-chart-exp-bar.controller';

package/src/interface/controller/event/control/i-chart-exp-bar.event.ts

@@ -0,0 +1,10 @@
+import { IExpBarControlEvent } from './i-exp-bar-control.event';
+
+/**
+ * 图表导航栏事件
+ *
+ * @export
+ * @interface IChartExpBarEvent
+ * @extends {IExpBarControlEvent}
+ */
+export interface IChartExpBarEvent extends IExpBarControlEvent {}

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

@@ -30,3 +30,4 @@ export * from './i-context-menu.event';
 export * from './i-tree-grid.event';
 export * from './i-tree-grid-ex.event';
 export * from './i-medit-view-panel.event';
+export * from './i-chart-exp-bar.event';

package/src/interface/controller/event/view/i-chart-exp-view.event.ts

@@ -0,0 +1,11 @@
+import { IExpViewEvent } from './i-exp-view.event';
+
+/**
+ * 图表导航视图事件
+ *
+ * @author zk
+ * @export
+ * @interface IChartViewEvent
+ * @extends {IMDViewEvent}
+ */
+export type IChartExpViewEvent = IExpViewEvent;

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

@@ -40,3 +40,4 @@ export * from './i-form-pickup-data-view.event';
 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';

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

@@ -0,0 +1,10 @@
+import { IExpBarControlState } from './i-exp-bar-control.state';
+
+/**
+ * 图表导航栏部件状态
+ * @author zk
+ * @export
+ * @interface IChartExpBarState
+ * @extends {IExpBarControlState}
+ */
+export interface IChartExpBarState extends IExpBarControlState {}

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

@@ -36,3 +36,4 @@ export * from './i-kanban.state';
 export * from './i-tree-grid.state';
 export * from './i-tree-grid-ex.state';
 export * from './i-medit-view-panel.state';
+export * from './i-chart-exp-bar.state';

package/src/interface/controller/state/view/i-chart-exp-view.state.ts

@@ -0,0 +1,10 @@
+import { IExpViewState } from './i-exp-view.state';
+
+/**
+ * 图表导航视图UI状态
+ *
+ * @export
+ * @class IChartExpViewState
+ * @extends {IExpViewState}
+ */
+export interface IChartExpViewState extends IExpViewState {}

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

@@ -41,3 +41,4 @@ export * from './i-form-pickup-data-view.state';
 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';

package/src/interface/service/code-list-item/code-list-item.ts

@@ -1,3 +1,5 @@
+import { ISysImage } from '@ibiz/model-core';
+
 /**
  * 返回的代码项格式
  *
@@ -50,4 +52,22 @@ export interface CodeListItem {
    * @type {boolean}
    */
   disableSelect?: boolean;
+
+  /**
+   * 图标对象
+   * @type {ISysImage}
+   */
+  sysImage?: ISysImage;
+
+  /**
+   * 代码项数据
+   * @type {String}
+   */
+  data?: IData;
+
+  /**
+   * 提示信息
+   * @type {String}
+   */
+  tooltip?: string;
 }

package/src/service/index.ts

@@ -4,6 +4,7 @@ export * from './constant';
 export * from './vo';
 export * from './constant';
 export * from './dto/method.dto';
+export { MqttService } from './mqtt/mqtt.service';
 export * from './app-data-entity/app-data-entity';
 
 export { DEServiceUtil } from './de-service-util';

package/src/service/mqtt/mqtt.service.ts

@@ -0,0 +1,117 @@
+import { IPortalMessage } from '@ibiz-template/core';
+import { MqttClient, IClientOptions } from 'mqtt';
+import { QXEvent, createUUID, isNilOrEmpty } from 'qx-util';
+
+/**
+ * mqtt 连接服务
+ *
+ * @author chitanda
+ * @date 2023-10-20 14:10:40
+ * @export
+ * @class MqttService
+ */
+export class MqttService {
+  /**
+   * 接受消息通知
+   *
+   * @author chitanda
+   * @date 2023-10-23 15:10:06
+   */
+  readonly evt: QXEvent<{ message: (msg: IPortalMessage) => void }> =
+    new QXEvent();
+
+  /**
+   * mqtt 连接实例
+   *
+   * @author chitanda
+   * @date 2023-10-20 20:10:44
+   * @type {MqttClient}
+   */
+  client?: MqttClient;
+
+  /**
+   * 连接选项
+   *
+   * @author chitanda
+   * @date 2023-10-20 14:10:25
+   * @protected
+   * @type {IClientOptions}
+   */
+  protected options: IClientOptions = {
+    // 超时时间
+    connectTimeout: 6000,
+    // 认证信息
+    clientId: createUUID(),
+    username: '',
+    password: '',
+    // 心跳时间
+    keepalive: 60,
+    clean: true,
+  };
+
+  /**
+   * Creates an instance of MqttService.
+   *
+   * @author chitanda
+   * @date 2023-10-23 15:10:06
+   * @param {string} mqttTopic
+   * @param {string} token
+   * @param {string} appId
+   */
+  constructor(
+    mqttTopic: string,
+    token: string,
+    protected appId: string,
+  ) {
+    if (isNilOrEmpty(mqttTopic) || isNilOrEmpty(token)) {
+      throw new Error('mqttTopic or token is empty');
+    }
+    this.options.username = mqttTopic;
+    this.options.password = token;
+  }
+
+  /**
+   * mqtt 连接
+   *
+   * @author chitanda
+   * @date 2023-10-23 15:10:58
+   * @return {*}  {Promise<void>}
+   */
+  async connect(): Promise<void> {
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    const module = await import('mqtt/dist/mqtt.min');
+    const mqtt = module.default ? module.default : module;
+    const { location } = window;
+    this.client = mqtt.connect(
+      `ws://${location.host}${ibiz.env.baseUrl}/${this.appId}${ibiz.env.mqttUrl}`,
+      this.options,
+    ) as MqttClient;
+    this.client.on('connect', () => {
+      ibiz.log.debug('mqtt connect');
+    });
+    this.client.on('error', error => {
+      ibiz.log.error('mqtt error', error);
+    });
+    this.client.on('message', (topic, payload) => {
+      this.evt.emit('message', JSON.parse(payload.toString()));
+      ibiz.log.debug('mqtt message', topic, payload.toString());
+    });
+    this.client.on('reconnect', () => {
+      ibiz.log.debug('mqtt reconnect');
+    });
+    this.client.on('close', () => {
+      console.debug('mqtt close');
+    });
+  }
+
+  /**
+   * 结束 mqtt 连接
+   *
+   * @author chitanda
+   * @date 2023-10-23 15:10:37
+   */
+  close(): void {
+    this.client?.end();
+  }
+}

package/src/service/service/code-list/code-list.service.ts

@@ -1,6 +1,7 @@
 import { RuntimeError } from '@ibiz-template/core';
 import { IAppCodeList, IApplication, ICodeItem } from '@ibiz/model-core';
 import { CodeListItem } from '../../../interface';
+import { ScriptFactory } from '../../../utils';
 import { DynamicCodeListCache } from '../../utils';
 
 /**
@@ -98,11 +99,18 @@ export class CodeListService {
     isValueNumber: boolean,
   ): Readonly<CodeListItem>[] {
     return codeItems.map(codeItem => {
-      // todo代码项其他属性，表单数据
       let text = codeItem.text!;
       if (codeItem.textLanguageRes) {
         text = ibiz.i18n.t(codeItem.textLanguageRes.lanResTag!, codeItem.text);
       }
+      // 提示信息
+      let { tooltip } = codeItem;
+      if (codeItem.tooltipLanguageRes) {
+        tooltip = ibiz.i18n.t(
+          codeItem.tooltipLanguageRes.lanResTag!,
+          codeItem.tooltip,
+        );
+      }
       const _codeItem: CodeListItem = {
         text,
         value: isValueNumber ? Number(codeItem.value) : codeItem.value!,
@@ -110,6 +118,12 @@ export class CodeListService {
         id: codeItem.codeName!,
         textCls: codeItem.textCls,
         disableSelect: codeItem.disableSelect,
+        tooltip,
+        // 代码项数据
+        data: codeItem.data
+          ? (ScriptFactory.execSingleLine(codeItem.data) as IData)
+          : undefined,
+        sysImage: codeItem.sysImage,
       };
       if (codeItem.codeItems?.length) {
         _codeItem.children = this.formatStaticItems(

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

@@ -141,7 +141,7 @@ export class DEService implements IAppDEService {
   exec(
     id: string,
     context: IParams,
-    params?: IData,
+    params?: IData | IData[],
     params2?: IParams,
   ): Promise<IHttpResponse> {
     const method = this.getMethod(id);
@@ -165,7 +165,7 @@ export class DEService implements IAppDEService {
   execAc(
     id: string,
     context: IParams,
-    params?: IData,
+    params?: IData | IData[],
     params2: IParams = {},
   ): Promise<IHttpResponse> {
     const method = this.getMethod(id, true);

package/src/service/service/entity/method/de-action.ts

@@ -1,10 +1,11 @@
 import {
   HttpResponse,
   IHttpResponse,
+  RuntimeError,
   RuntimeModelError,
 } from '@ibiz-template/core';
 import { IAppDEAction } from '@ibiz/model-core';
-import { clone } from 'ramda';
+import { isArray, isNil } from 'lodash-es';
 import { Method } from './method';
 import { IDataEntity } from '../../../../interface';
 import { findDELogic } from '../../../../model';
@@ -36,9 +37,27 @@ export class DEActionMethod extends Method {
     return isLocalMode(this.method);
   }
 
+  /**
+   * 处理请求发送参数
+   * @author lxm
+   * @date 2023-10-19 02:50:36
+   * @param {IParams} context 上下文
+   * @param {(IData | IData[])} data 数据对象
+   * @return {*}  {(Promise<IData | IData[]>)}
+   */
+  async inputHandle(
+    context: IParams,
+    data: IData | IData[],
+  ): Promise<IData | IData[]> {
+    if (isArray(data)) {
+      return Promise.all(data.map(item => this.input.handle(context, item)));
+    }
+    return this.input.handle(context, data);
+  }
+
   async exec(
     context: IParams,
-    data?: IData,
+    data?: IData | IData[],
     params?: IParams,
   ): Promise<HttpResponse<IData>> {
     // 实体逻辑处理
@@ -48,21 +67,16 @@ export class DEActionMethod extends Method {
       if (!deLogic) {
         throw new RuntimeModelError(this.method, '缺少实体处理逻辑');
       }
-      return execDELogicAction(
-        deLogic,
-        clone(context),
-        data ? clone(data) : {},
-        params ? clone(params) : {},
-      );
+      return execDELogicAction(deLogic, context, data, params);
     }
 
     if (data && !this.isLocalMode) {
-      data = await this.input.handle(context, data);
+      data = await this.inputHandle(context, data);
     }
 
     // 执行变更属性逻辑
     if (data && !['READ', 'GETDRAFT'].includes(this.method.actionMode!)) {
-      await execFieldLogics(this.entity, 'change', context, data, params || {});
+      await execFieldLogics(this.entity, 'change', context, data, params);
     }
 
     let result: IHttpResponse<IData>;
@@ -100,10 +114,13 @@ export class DEActionMethod extends Method {
       default: {
         let path = this.calcPath(context);
         if (this.method.needResourceKey) {
-          path = `${path}/${
-            context[this.entity.codeName!.toLowerCase()] ||
-            data?.[this.entity.keyAppDEFieldId!]
-          }`;
+          let srfkey = context[this.entity.codeName!.toLowerCase()];
+          if (isNil(srfkey)) {
+            srfkey = isArray(data)
+              ? null
+              : data?.[this.entity.keyAppDEFieldId!];
+          }
+          path = `${path}/${srfkey}`;
         }
         const res = await this.request(path, context, data, params);
         res.data = await this.result.handle(context, res.data);
@@ -112,13 +129,15 @@ export class DEActionMethod extends Method {
     }
 
     // 计算属性逻辑
-    await execFieldLogics(
-      this.entity,
-      'compute',
-      context,
-      result.data,
-      params || {},
-    );
+    if (result.data) {
+      await execFieldLogics(
+        this.entity,
+        'compute',
+        context,
+        result.data,
+        params,
+      );
+    }
 
     return result;
   }
@@ -134,9 +153,12 @@ export class DEActionMethod extends Method {
    */
   async create(
     context: IParams,
-    data: IData,
-    params: IParams,
+    data?: IData | IData[],
+    params?: IParams,
   ): Promise<IHttpResponse<IDataEntity>> {
+    if (!data) {
+      throw new RuntimeError('create行为没有传data');
+    }
     if (this.isLocalMode) {
       return this.createTemp(context, this.createEntity(data));
     }
@@ -182,9 +204,12 @@ export class DEActionMethod extends Method {
    */
   async update(
     context: IParams,
-    data: IData | IDataEntity,
-    params: IParams = {},
+    data?: IData | IData[],
+    params?: IParams,
   ): Promise<IHttpResponse<IDataEntity>> {
+    if (!data) {
+      throw new RuntimeError('update行为没有传data');
+    }
     if (this.isLocalMode) {
       return this.updateTemp(context, this.createEntity(data));
     }
@@ -256,12 +281,20 @@ export class DEActionMethod extends Method {
    */
   async createTemp(
     context: IParams,
-    entity: IData,
+    entity: IData | IData[],
   ): Promise<IHttpResponse<IDataEntity>> {
     try {
       const s = await this.getService();
-      const data = await s.local.add(context, this.createEntity(entity));
-      return new HttpResponse(data);
+      const addData = this.createEntity(entity);
+      let resultData: IDataEntity | IDataEntity[];
+      if (isArray(addData)) {
+        resultData = await Promise.all(
+          addData.map(item => s.local.add(context, item)!),
+        );
+      } else {
+        resultData = await s.local.add(context, addData)!;
+      }
+      return new HttpResponse(resultData);
     } catch (err) {
       return new HttpResponse(err, 500);
     }
@@ -335,15 +368,23 @@ export class DEActionMethod extends Method {
    */
   async updateTemp(
     context: IParams,
-    entity: IData,
+    entity: IData | IData[],
   ): Promise<IHttpResponse<IDataEntity>> {
     try {
       const s = await this.getService();
-      const data = s.local.update(context, this.createEntity(entity))!;
-      if (data) {
-        return new HttpResponse(data);
+      const updateData = this.createEntity(entity);
+      let resultData: IDataEntity | IDataEntity[];
+      if (isArray(updateData)) {
+        resultData = await Promise.all(
+          updateData.map(item => s.local.update(context, item)!),
+        );
+      } else {
+        resultData = await s.local.update(context, updateData)!;
       }
-      return new HttpResponse(data, 500);
+      if (resultData) {
+        return new HttpResponse(resultData);
+      }
+      return new HttpResponse(resultData, 500);
     } catch (err) {
       return new HttpResponse(err, 500);
     }

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

@@ -6,6 +6,7 @@ import {
 import { ascSort, descSort } from 'qx-util';
 import { clone, equals, isEmpty, isNil, where } from 'ramda';
 import { IAppDEDataSet } from '@ibiz/model-core';
+import { isArray } from 'lodash-es';
 import { PSDEDQCondEngine, SearchFilter } from '../../../utils';
 import { Method } from './method';
 import { IDataEntity } from '../../../../interface';
@@ -30,14 +31,17 @@ export class FetchMethod extends Method {
 
   async exec(
     context: IParams,
-    data: IData,
-    params: IParams,
+    params?: IData | IData[],
+    params2?: IParams,
   ): Promise<HttpResponse<IDataEntity[]>> {
+    // 过滤参数，必须是对象
+    const searchParams = params && isArray(params) ? params : params2 || {};
+
     if (this.isLocalMode) {
       // 临时数据
       const items = await this.searchLocal(
         null,
-        new SearchFilter(context, data),
+        new SearchFilter(context, searchParams),
       );
       return new HttpResponse<IDataEntity[]>(items, 200);
     }
@@ -48,12 +52,12 @@ export class FetchMethod extends Method {
       case 'INDEXDE':
       case 'CODELIST':
       case 'MULTIFORM':
-        res = await this.fetchCodeListSet(context, params);
+        res = await this.fetchCodeListSet(context, searchParams);
         break;
       case 'REMOTE':
         {
           const path = this.calcPath(context);
-          res = await this.request(path, context, data, params);
+          res = await this.request(path, context, params, params2);
         }
         break;
       default:
@@ -68,13 +72,10 @@ export class FetchMethod extends Method {
     res.data = items.map(item => this.createEntity(item));
 
     // 计算属性逻辑,每条数据走一遍
-    if (res.data.length) {
-      await Promise.all(
-        res.data.map((item: IData) =>
-          execFieldLogics(this.entity, 'compute', context, item, params),
-        ),
-      );
+    if (res.data) {
+      execFieldLogics(this.entity, 'compute', context, res.data, searchParams);
     }
+
     return res as HttpResponse<IDataEntity[]>;
   }
 

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

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { HttpResponse, RuntimeModelError } from '@ibiz-template/core';
 import { IAppDataEntity, IAppDEMethod } from '@ibiz/model-core';
-import { notNilEmpty } from 'qx-util';
+import { isArray } from 'lodash-es';
 import { Application } from '../../../../application';
 import { AppDataEntity } from '../../../app-data-entity/app-data-entity';
 import { calcResPath } from '../../../utils';
@@ -71,16 +71,17 @@ export abstract class Method {
   /**
    * 执行行为
    *
-   * @author chitanda
-   * @date 2022-10-10 14:10:42
-   * @param {IParams} context
-   * @param {IData} [params={}]
-   * @param {IParams} [params2={}]
+   * @author lxm
+   * @date 2023-10-19 02:42:49
+   * @abstract
+   * @param {IParams} context 上下文
+   * @param {(IData | IData[])} [params] 请求参数
+   * @param {IParams} [params2] 查询参数
    * @return {*}  {Promise<HttpResponse>}
    */
   abstract exec(
     context: IParams,
-    params?: IData,
+    params?: IData | IData[],
     params2?: IParams,
   ): Promise<HttpResponse>;
 
@@ -99,7 +100,7 @@ export abstract class Method {
   protected async request(
     path: string,
     context: IParams,
-    data?: IData,
+    data?: IData | IData[],
     params?: IParams,
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
   ): Promise<HttpResponse<any>> {
@@ -111,7 +112,7 @@ export abstract class Method {
         case 'POST':
           res = await this.app.net.post(
             this.mergeRequestPath(path, methodName),
-            notNilEmpty(data) ? data! : params || {},
+            data || params || {},
           );
           break;
         case 'GET':
@@ -123,7 +124,7 @@ export abstract class Method {
         case 'PUT': {
           res = await this.app.net.put(
             this.mergeRequestPath(path, methodName),
-            notNilEmpty(data) ? data! : params || {},
+            data || params || {},
           );
           break;
         }
@@ -184,17 +185,25 @@ export abstract class Method {
 
   /**
    * 创建实体
-   *
-   * @author chitanda
-   * @date 2022-10-11 22:10:05
+   * @author lxm
+   * @date 2023-10-19 03:22:00
    * @protected
-   * @param {(IData | IDataEntity)} data
-   * @return {*}  {IDataEntity}
+   * @param {(IData[] | IDataEntity[] | IData | IDataEntity)} data
+   * @return {*}  {(IDataEntity | IDataEntity[])}
    */
-  protected createEntity(data: IData | IDataEntity): IDataEntity {
-    if (data instanceof AppDataEntity) {
-      return data.clone();
+  protected createEntity(
+    data: IData[] | IDataEntity[] | IData | IDataEntity,
+  ): IDataEntity | IDataEntity[] {
+    const toEntity = (single: IData | IDataEntity): IDataEntity => {
+      if (single instanceof AppDataEntity) {
+        return single.clone();
+      }
+      return new AppDataEntity(this.entity, single);
+    };
+
+    if (isArray(data)) {
+      return data.map(item => toEntity(item));
     }
-    return new AppDataEntity(this.entity, data);
+    return toEntity(data);
   }
 }