@ibiz-template/runtime 0.5.7-alpha.2 → 0.5.7-alpha.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.5.7-alpha.2",
+  "version": "0.5.7-alpha.4",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -30,8 +30,9 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.5.7-alpha.0",
-    "@ibiz/model-core": "^0.1.7",
+    "@ibiz-template/core": "^0.5.7-alpha.4",
+    "@ibiz/model-core": "^0.1.8",
+    "@types/animejs": "^3.1.12",
     "@types/path-browserify": "^1.0.2",
     "@types/qs": "^6.9.11",
     "@types/systemjs": "^6.13.5",
@@ -48,7 +49,7 @@
   },
   "peerDependencies": {
     "@ibiz-template/core": "^0.5.0-beta.0",
-    "@ibiz/model-core": "^0.1.7",
+    "@ibiz/model-core": "^0.1.8",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.7",
     "echarts": "^5.4.3",
@@ -60,5 +61,8 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "1f04c8345f5b91063b3163f1f057eeb8b6a0ce1b"
+  "dependencies": {
+    "animejs": "^3.2.2"
+  },
+  "gitHead": "8e644e8b907662a8510d34b18f91c609b3781968"
 }

package/src/app-hub.ts

@@ -10,6 +10,7 @@ import {
 import { AppConfigService, Convert } from './hub';
 import { HubController } from './controller';
 import { ConfigService } from './service';
+import { NoticeController } from './controller/notification';
 
 /**
  * 运行时总集
@@ -112,6 +113,8 @@ export class AppHub implements IAppHubService {
    */
   config = new AppConfigService();
 
+  notice = new NoticeController();
+
   /**
    * 默认首页视图名称
    *

package/src/application.ts

@@ -130,22 +130,7 @@ export class Application implements IAppService {
   async init(): Promise<void> {
     await this.authority.init();
     await this.loadAppModelStyle();
-    if (
-      ibiz.env.enableMqtt &&
-      ibiz.appData &&
-      ibiz.appData.mqtttopic &&
-      ibiz.auth.isAnonymous !== true
-    ) {
-      this.mqtt = new MqttService(
-        ibiz.appData.mqtttopic,
-        getToken()!,
-        this.model.appId!,
-      );
-      this.mqtt.evt.on('message', message => {
-        ibiz.mc.command.asyncAction.next(message);
-      });
-      await this.mqtt.connect();
-    }
+    await this.initMqtt();
   }
 
   /**
@@ -254,4 +239,34 @@ export class Application implements IAppService {
       return logic.id === deUILogicId;
     });
   }
+
+  /**
+   * 初始化Mqtt服务
+   * @author lxm
+   * @date 2024-01-25 10:47:06
+   * @return {*}  {Promise<void>}
+   */
+  async initMqtt(): Promise<void> {
+    // 如果已经存在，即重新初始化，把旧的销毁
+    if (this.mqtt) {
+      this.mqtt.close();
+    }
+
+    if (
+      ibiz.env.enableMqtt &&
+      ibiz.appData &&
+      ibiz.appData.mqtttopic &&
+      ibiz.auth.isAnonymous !== true
+    ) {
+      this.mqtt = new MqttService(
+        ibiz.appData.mqtttopic,
+        getToken()!,
+        this.model.appId!,
+      );
+      this.mqtt.evt.on('message', message => {
+        ibiz.mc.command.next(message);
+      });
+      await this.mqtt.connect();
+    }
+  }
 }

package/src/constant/index.ts

@@ -7,3 +7,4 @@ export { ValueOP } from './value-op';
 export { ViewCallTag } from './view-call-tag';
 export { ViewMode } from './view-mode';
 export { ViewType } from './view-type';
+export { PresetIdentifier } from './preset-identifier';

package/src/constant/preset-identifier.ts

@@ -0,0 +1,15 @@
+/* eslint-disable no-shadow */
+/**
+ * 内置标识符
+ *
+ * @author zk
+ * @date 2024-01-24 10:01:11
+ * @export
+ * @enum {number}
+ */
+export enum PresetIdentifier {
+  /**
+   * 消息组件
+   */
+  MESSAGE = 'preset-message',
+}

package/src/controller/common/editor/editor.controller.ts

@@ -1,5 +1,9 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { IEditor, INavigateParamContainer } from '@ibiz/model-core';
+import {
+  IEditor,
+  IEditorItem,
+  INavigateParamContainer,
+} from '@ibiz/model-core';
 import { DataTypes } from '@ibiz-template/core';
 import dayjs from 'dayjs';
 import { convertNavData } from '../../../utils';
@@ -163,6 +167,12 @@ export class EditorController<T extends IEditor = IEditor>
         this.style.height = `${height}px`;
       }
     }
+    // 值项过滤掉自身
+    if (this.model.editorItems) {
+      this.model.editorItems = this.model.editorItems.filter(
+        (item: IEditorItem) => item.id !== this.model.id,
+      );
+    }
   }
 
   /**

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

@@ -266,6 +266,12 @@ export class ExpBarControlController<
         // 默认选中第一条并导航
         this.navByFirstItem();
       }
+    } else {
+      // 刷新后需要重新进行导航，计算导航上下文等参数的变更
+      const data = this.xDataController.state.selectedData;
+      if (data[0]) {
+        this.xDataController.setActive(data[0]);
+      }
     }
   }
 

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

@@ -63,6 +63,23 @@ export class TreeExpBarController
    */
   navNodeModelIds: string[] = [];
 
+  /**
+   * 组件挂载
+   *
+   */
+  protected async onMounted(): Promise<void> {
+    super.onMounted();
+    if (this.xDataController) {
+      this.xDataController.evt.on('onAfterRefreshParent', _event => {
+        // 刷新后需要重新进行导航，计算导航上下文等参数的变更
+        const data = this.xDataController.state.selectedData;
+        if (data[0]) {
+          this.xDataController.setActive(data[0]);
+        }
+      });
+    }
+  }
+
   /**
    * 获取指定节点模型
    *

package/src/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-ua-column/tree-grid-ex-ua-column.controller.ts

@@ -1,6 +1,10 @@
 /* eslint-disable no-param-reassign */
-import { RuntimeModelError } from '@ibiz-template/core';
-import { IDETreeUAColumn, IUIActionGroupDetail } from '@ibiz/model-core';
+import {
+  IDETreeNodeUAColumn,
+  IDETreeUAColumn,
+  IUIActionGroup,
+  IUIActionGroupDetail,
+} from '@ibiz/model-core';
 import { UIActionUtil } from '../../../../../ui-action';
 import { ButtonContainerState, UIActionButtonState } from '../../../../utils';
 import { TreeGridExColumnController } from '../tree-grid-ex-column/tree-grid-ex-column.controller';
@@ -17,6 +21,65 @@ import { TreeGridExRowState } from '../../tree-grid-ex-row.state';
  * @extends {TreeGridExColumnController<IDETreeUAColumn>}
  */
 export class TreeGridExUAColumnController extends TreeGridExColumnController<IDETreeUAColumn> {
+  /**
+   * 该树表格列对应不同节点模型的节点列控制器
+   * @author lxm
+   * @date 2024-01-08 05:40:56
+   * @type {Map<string, IDETreeNodeUAColumn>}
+   */
+  nodeColumnMap: Map<string, IDETreeNodeUAColumn> = new Map();
+
+  async init(): Promise<void> {
+    await this.onInit();
+    await this.initNodeColumnMap();
+  }
+
+  /**
+   * 解析模型初始化节点对应的节点列模型
+   * @author lxm
+   * @date 2024-01-24 02:41:05
+   */
+  initNodeColumnMap(): void {
+    this.treeGrid.model.detreeNodes?.forEach(node => {
+      if (node.treeNodeType !== 'DE') {
+        return;
+      }
+      const nodeColumn = node.detreeNodeColumns?.find(
+        (column: IDETreeNodeUAColumn) => {
+          return column.detreeColumnId === this.model.id;
+        },
+      );
+
+      // 没有指定树表格列的不创建
+      if (nodeColumn) {
+        this.nodeColumnMap.set(node.id!, nodeColumn);
+      }
+    });
+  }
+
+  /**
+   * 获取界面行为组mode
+   * @author lxm
+   * @date 2024-01-24 04:13:03
+   * @param {ITreeGridExRowState} row
+   * @return {*}  {(IUIActionGroup | undefined)}
+   */
+  getUIActionGroup(row: ITreeGridExRowState): IUIActionGroup | undefined {
+    let { deuiactionGroup } = this.model;
+
+    // 对应节点数据项配置了的时候拿数据项的界面行为组
+    if (
+      row.data._nodeType === 'DE' &&
+      this.nodeColumnMap.get(row.data._nodeId)
+    ) {
+      const nodeColumn = this.nodeColumnMap.get(row.data._nodeId)!;
+      if (nodeColumn.deuiactionGroup) {
+        deuiactionGroup = nodeColumn.deuiactionGroup;
+      }
+    }
+    return deuiactionGroup;
+  }
+
   /**
    * 给rowController初始化操作列的状态
    *
@@ -26,10 +89,11 @@ export class TreeGridExUAColumnController extends TreeGridExColumnController<IDE
    */
   initActionStates(row: ITreeGridExRowState): void {
     // 操作列按钮状态控制
-    const { deuiactionGroup } = this.model;
+    const deuiactionGroup = this.getUIActionGroup(row);
+
     if (!deuiactionGroup) {
+      ibiz.log.warn(`${this.model.id}操作列没有配置界面行为组`);
       return;
-      throw new RuntimeModelError(this.model, '操作列没有配置界面行为组');
     }
     if (!deuiactionGroup.uiactionGroupDetails?.length) {
       ibiz.log.debug('操作列界面行为组没有配置界面行为');

package/src/controller/notification/async-action.controller.ts

@@ -0,0 +1,163 @@
+import { QXEvent } from 'qx-util';
+import { IPortalAsyncAction, IPortalMessage } from '@ibiz-template/core';
+import { clone } from 'ramda';
+import { isNil, isNumber } from 'lodash-es';
+import dayjs from 'dayjs';
+import { AsyncActionService } from '../../service';
+import { IAsyncActionController, IAsyncActionEvent } from '../../interface';
+
+export class AsyncActionController implements IAsyncActionController {
+  readonly evt: QXEvent<IAsyncActionEvent> = new QXEvent();
+
+  total: number = 0;
+
+  actions: IPortalAsyncAction[] = [];
+
+  /**
+   * 正在处理中的数量
+   * @author lxm
+   * @date 2024-01-25 04:51:18
+   * @type {number}
+   */
+  doingNum: number = 0;
+
+  /**
+   * 结束的状态值集合
+   * @author lxm
+   * @date 2024-01-25 05:08:26
+   * @protected
+   */
+  protected finishedStates = [30, 40];
+
+  /**
+   * 请求服务
+   * @author lxm
+   * @date 2024-01-25 04:50:12
+   * @protected
+   */
+  protected service = new AsyncActionService();
+
+  async init(): Promise<void> {
+    this.listenMessage();
+  }
+
+  /**
+   * 监听全局的实时消息
+   * @author lxm
+   * @date 2024-01-25 04:47:36
+   */
+  protected listenMessage(): void {
+    ibiz.mc.command.asyncAction.on(async (msg: IPortalMessage) => {
+      if (!msg.data || msg.subtype !== 'ASYNCACTION') {
+        return;
+      }
+
+      const asyncAction = this.formatAsyncAction(
+        msg.data as IPortalAsyncAction,
+      );
+
+      const findIndex = this.actions.findIndex(
+        item => item.asyncacitonid === asyncAction.asyncacitonid,
+      );
+
+      if (findIndex === -1) {
+        this.add(asyncAction);
+      } else {
+        this.update(asyncAction);
+      }
+    });
+  }
+
+  /**
+   * 格式化数据
+   * @author lxm
+   * @date 2024-01-25 05:03:47
+   * @protected
+   * @param {IPortalAsyncAction} data
+   * @return {*}  {IPortalAsyncAction}
+   */
+  protected formatAsyncAction(data: IPortalAsyncAction): IPortalAsyncAction {
+    // 处理时间日期为毫秒值时，转换成字符串。
+    const dateFields = [
+      'begintime',
+      'endtime',
+      'createdate',
+      'updatedate',
+    ] as const;
+    dateFields.forEach(key => {
+      if (isNumber(data[key])) {
+        data[key] = dayjs(data[key]).format('YYYY-MM-DD HH:mm:ss');
+      }
+    });
+
+    if (!isNil(data.actionresult)) {
+      try {
+        const json = JSON.parse(data.actionresult as string);
+        data.actionresult = json;
+      } catch (error) {
+        // 不是对象类型就是字符串。
+      }
+    }
+
+    if (!isNil(data.completionrate)) {
+      const num = Number(data.completionrate);
+      if (Number.isNaN(num)) {
+        data.completionrate = undefined;
+      } else {
+        data.completionrate = num;
+      }
+    }
+
+    return data;
+  }
+
+  /**
+   * 添加一条新消息
+   * @author lxm
+   * @date 2024-01-25 04:58:37
+   * @protected
+   * @param {IPortalAsyncAction} action
+   */
+  protected add(action: IPortalAsyncAction): void {
+    this.actions.unshift(action);
+
+    // 非结束状态的消息加一
+    if (!this.finishedStates.includes(action.actionstate)) {
+      this.doingNum += 1;
+      ibiz.notice.showDoingNotice({ num: this.doingNum });
+    } else {
+      this.noticeResult(action);
+    }
+    this.evt.emit('add', clone(action));
+    this.evt.emit('dataChange');
+  }
+
+  /**
+   * 添加一条新消息
+   * @author lxm
+   * @date 2024-01-25 04:58:37
+   * @protected
+   * @param {IPortalAsyncAction} action
+   */
+  protected update(action: IPortalAsyncAction): void {
+    const index = this.actions.findIndex(
+      item => item.asyncacitonid === action.asyncacitonid,
+    );
+    this.actions.splice(index, 1, action);
+
+    // 执行结束的减一
+    if (this.finishedStates.includes(action.actionstate)) {
+      this.doingNum -= 1;
+      if (this.doingNum <= 0) {
+        ibiz.notice.closeDoingNotice();
+      }
+      this.noticeResult(action);
+    }
+    this.evt.emit('change', clone(action));
+    this.evt.emit('dataChange');
+  }
+
+  protected noticeResult(action: IPortalAsyncAction): void {
+    ibiz.notice.showAsyncAction(action);
+  }
+}

package/src/controller/notification/index.ts

@@ -0,0 +1 @@
+export { NoticeController } from './notice.controller';

package/src/controller/notification/internal-message.controller.ts

@@ -0,0 +1,64 @@
+import { IInternalMessage } from '@ibiz-template/core';
+import { QXEvent } from 'qx-util';
+import {
+  IInternalMessageController,
+  InternalMessageEvent,
+} from '../../interface';
+import { InternalMessageService } from '../../service';
+
+export class InternalMessageController implements IInternalMessageController {
+  readonly evt: QXEvent<InternalMessageEvent> = new QXEvent();
+
+  total: number = 0;
+
+  /**
+   * 当前分页
+   * @author lxm
+   * @date 2024-01-26 10:06:28
+   * @type {number}
+   */
+  page: number = 0;
+
+  size: number = 20;
+
+  messages: IInternalMessage[] = [];
+
+  protected service = new InternalMessageService();
+
+  async init(): Promise<void> {
+    this.load();
+  }
+
+  async load(): Promise<void> {
+    await this.fetch(false);
+  }
+
+  async loadMore(): Promise<void> {
+    await this.fetch(true);
+  }
+
+  protected async fetch(loadMore: boolean = false): Promise<void> {
+    // *计算查询参数
+    if (loadMore === false) {
+      this.page = 0;
+    } else {
+      this.page += 1;
+    }
+
+    const fetchParams = {
+      page: this.page,
+      size: this.size,
+      sort: 'update_time,desc',
+    };
+
+    const res = await this.service.fetch(fetchParams);
+    this.total = res.total!;
+
+    if (loadMore) {
+      this.messages.push(...res.data);
+    } else {
+      this.messages = res.data;
+    }
+    this.evt.emit('dataChange');
+  }
+}

package/src/controller/notification/notice.controller.ts

@@ -0,0 +1,16 @@
+import { INoticeController } from '../../interface';
+import { AsyncActionController } from './async-action.controller';
+import { InternalMessageController } from './internal-message.controller';
+
+export class NoticeController implements INoticeController {
+  total = 0;
+
+  asyncAction = new AsyncActionController();
+
+  internalMessage = new InternalMessageController();
+
+  async init(): Promise<void> {
+    await this.internalMessage.init();
+    await this.asyncAction.init();
+  }
+}

package/src/global/global-util/global-util.ts

@@ -9,6 +9,8 @@ import {
   DefaultErrorHandler,
   ErrorHandlerCenter,
   ViewStack,
+  AnimeUtil,
+  FileUtil,
 } from '../../utils';
 
 /**
@@ -83,6 +85,24 @@ export class GlobalUtil {
    */
   readonly viewStack = new ViewStack();
 
+  /**
+   * 动画工具类
+   *
+   * @author zk
+   * @date 2024-01-22 09:01:33
+   * @memberof GlobalUtil
+   */
+  readonly anime = new AnimeUtil();
+
+  /**
+   * 文件工具类
+   *
+   * @author zk
+   * @date 2024-01-26 04:01:24
+   * @memberof GlobalUtil
+   */
+  readonly file = new FileUtil();
+
   constructor() {
     this.error.register(new DefaultErrorHandler());
   }

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

@@ -2,7 +2,7 @@ import { IAppDataEntity, IAppView, IApplication } from '@ibiz/model-core';
 import { Convert } from '../../../hub';
 import { ModelLoaderProvider } from '../../provider';
 import { IAppConfigService } from '../i-app-config-service/i-app-config-service';
-import { IHubController } from '../../controller';
+import { IHubController, INoticeController } from '../../controller';
 import { IAppDEService, IConfigService } from '../../service';
 import { IAppService } from '../i-app-service/i-app-service';
 
@@ -58,6 +58,14 @@ export interface IAppHubService {
    */
   config: IAppConfigService;
 
+  /**
+   * 全局消息总控制器
+   * @author lxm
+   * @date 2024-01-25 06:49:19
+   * @type {INoticeController}
+   */
+  notice: INoticeController;
+
   /**
    * 注册模型加载适配器
    *

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

@@ -10,6 +10,7 @@ import {
   AuthorityService,
   CodeListService,
   DEServiceUtil,
+  MqttService,
 } from '../../../service';
 import { IConfigService } from '../../service';
 
@@ -94,6 +95,15 @@ export interface IAppService {
    */
   readonly deName2DeCodeName: Map<string, string>;
 
+  /**
+   * mqtt 服务
+   *
+   * @author chitanda
+   * @date 2023-10-23 15:10:18
+   * @type {MqttService}
+   */
+  mqtt?: MqttService;
+
   /**
    * 根据 id 查找应用功能
    *
@@ -139,4 +149,12 @@ export interface IAppService {
     deUILogicId: string,
     appDataEntityId: string,
   ): Promise<IDEUILogic | undefined>;
+
+  /**
+   * 初始化Mqtt服务
+   * @author lxm
+   * @date 2024-01-25 10:47:06
+   * @return {*}  {Promise<void>}
+   */
+  initMqtt(): Promise<void>;
 }

package/src/interface/common/i-popover-options/i-popover-options.ts

@@ -30,7 +30,7 @@ interface AxesOffsets {
  * @export
  * @interface IPopoverOptions
  */
-export interface IPopoverOptions {
+export interface IPopoverOptions<O = unknown> {
   /**
    * 宽度
    *
@@ -82,4 +82,13 @@ export interface IPopoverOptions {
    * @type {boolean}
    */
   noArrow?: boolean;
+
+  /**
+   * 原始飘窗参数
+   *
+   * @author chitanda
+   * @date 2024-01-26 09:01:20
+   * @type {O}
+   */
+  options?: O;
 }

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

@@ -3,3 +3,4 @@ export * from './common';
 export * from './i.controller';
 export * from './view';
 export * from './editor';
+export * from './notice';