@ibiz-template/runtime 0.5.7-alpha.3 → 0.5.7-alpha.5

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/search-bar/entity-schema.ts

@@ -1,6 +1,5 @@
 import { IDropDownList, IEditor, ISearchBarFilter } from '@ibiz/model-core';
 import { ValueOP } from '../../../constant';
-import { SearchBarController } from './search-bar.controller';
 import { ExcludeOPs } from './search-bar-filter.controller';
 
 type ISchemaField = {
@@ -124,7 +123,8 @@ function getEditor(field: ISchemaField, op: string): IEditor {
  */
 export async function calcFilterModelBySchema(
   json: IData,
-  c: SearchBarController,
+  appDataEntityId: string,
+  modelAppId: string,
 ): Promise<ISearchBarFilter[]> {
   if (!json.properties) {
     return [];
@@ -166,8 +166,8 @@ export async function calcFilterModelBySchema(
   // 属性codeName对应的属性id
   const codeNameToId: { [p: string]: string } = {};
   const dataEntity = await ibiz.hub.getAppDataEntity(
-    c.model.appDataEntityId!,
-    c.model.appId,
+    appDataEntityId,
+    modelAppId,
   );
   dataEntity.appDEFields?.forEach(field => {
     codeNameToId[field.codeName!.toLowerCase()] = field.id!;

package/src/controller/control/search-bar/index.ts

@@ -1,2 +1,4 @@
 export * from './search-bar.controller';
 export { SearchBarFilterController } from './search-bar-filter.controller';
+export * from './entity-schema';
+export * from './use-searchcond';

package/src/controller/control/search-bar/search-bar-filter.controller.ts

@@ -1,5 +1,9 @@
 import { RuntimeModelError } from '@ibiz-template/core';
-import { IAppDEField, ISearchBarFilter } from '@ibiz/model-core';
+import {
+  IAppDEField,
+  IAppDataEntity,
+  ISearchBarFilter,
+} from '@ibiz/model-core';
 import {
   IEditorContainerController,
   IEditorController,
@@ -7,7 +11,6 @@ import {
 } from '../../../interface';
 import { findFieldById } from '../../../model';
 import { getEditorProvider } from '../../../register';
-import { SearchBarController } from './search-bar.controller';
 import { ValueOP } from '../../../constant';
 
 /** 不需要编辑器的OP */
@@ -29,13 +32,9 @@ export class SearchBarFilterController implements IEditorContainerController {
 
   valueFormat: string | undefined;
 
-  get context(): IContext {
-    return this.searchBar.context;
-  }
+  context: IContext;
 
-  get params(): IParams {
-    return this.searchBar.params;
-  }
+  params: IParams;
 
   dataType: number | undefined;
 
@@ -90,12 +89,18 @@ export class SearchBarFilterController implements IEditorContainerController {
 
   constructor(
     public model: ISearchBarFilter,
-    public searchBar: SearchBarController,
+    public appDataEntity: IAppDataEntity,
+    context: IContext,
+    params: IParams,
   ) {
+    // 上下文、参数
+    this.context = context;
+    this.params = params;
+
     // 实体属性
     let field: IAppDEField | undefined;
     if (model.appDEFieldId) {
-      field = findFieldById(searchBar.appDataEntity, model.appDEFieldId)!;
+      field = findFieldById(appDataEntity, model.appDEFieldId)!;
     }
     this.fieldName = field ? field.codeName!.toLowerCase() : model.id!;
 

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

@@ -1,15 +1,10 @@
-import {
-  RuntimeError,
-  mergeInLeft,
-  recursiveIterate,
-} from '@ibiz-template/core';
+import { mergeInLeft } from '@ibiz-template/core';
 import { IAppDataEntity, ISearchBar, ISearchBarFilter } from '@ibiz/model-core';
-import { clone, isNil } from 'ramda';
+import { clone } from 'ramda';
 import {
   ISearchBarState,
   ISearchBarEvent,
   ISearchBarController,
-  IFilterNode,
   IBackendSearchBarGroup,
   IGridController,
 } from '../../../interface';
@@ -19,6 +14,11 @@ import { SearchBarFilterController } from './search-bar-filter.controller';
 import { SearchBarService } from './search-bar.service';
 import { getEntitySchema } from '../../utils';
 import { calcFilterModelBySchema } from './entity-schema';
+import {
+  calcSearchConds,
+  getOriginFilterNodes,
+  parseFilters,
+} from './use-searchcond';
 
 /**
  * 搜索栏控制器
@@ -106,7 +106,7 @@ export class SearchBarController
    * @author lxm
    * @date 2024-01-05 10:10:37
    */
-  addSchemaFilters = false;
+  addSchemaFilters = true;
 
   /**
    * 表格控制器
@@ -184,7 +184,11 @@ export class SearchBarController
     if (!json) {
       return;
     }
-    const addSearchBarFilters = await calcFilterModelBySchema(json, this);
+    const addSearchBarFilters = await calcFilterModelBySchema(
+      json,
+      this.model.appDataEntityId!,
+      this.model.appId,
+    );
 
     const mergeFilters: ISearchBarFilter[] = [];
     this.model.searchBarFilters?.forEach(filter => {
@@ -304,7 +308,7 @@ export class SearchBarController
    * @date 2023-10-16 03:52:44
    */
   resetFilter(): void {
-    this.state.filterNodes = this.getOriginFilterNodes();
+    this.state.filterNodes = getOriginFilterNodes();
     this.evt.emit('onSearch', undefined);
   }
 
@@ -318,7 +322,12 @@ export class SearchBarController
   protected async initSearchBarFilters(): Promise<void> {
     if (this.searchBarFilters?.length) {
       this.searchBarFilters.forEach(item => {
-        const filterController = new SearchBarFilterController(item, this);
+        const filterController = new SearchBarFilterController(
+          item,
+          this.appDataEntity,
+          this.context,
+          this.params,
+        );
         this.filterControllers.push(filterController);
       });
       await Promise.all(
@@ -337,91 +346,8 @@ export class SearchBarController
     if (!this.enableFilter) {
       return;
     }
-    let hasFilter = false; // 是否有过滤项
-    let hasError = false; // 是否有过滤项格式不正确
-    recursiveIterate(this.state.filterNodes[0], (node: IFilterNode) => {
-      if (node.leaf) {
-        if (node.field && node.valueOP && !isNil(node.value)) {
-          hasFilter = true;
-        } else {
-          // 如果过滤项不给
-          hasError = true;
-        }
-      }
-    });
-    if (hasFilter && !hasError) {
-      const filter = [this.formatFilters(this.state.filterNodes[0])];
-      return filter;
-    }
-  }
-
-  /**
-   * 格式化过滤项 （后续如果修改这里的逻辑记得把下方的反推函数parseFilters也跟着修改！）
-   * @author lxm
-   * @date 2023-10-16 03:45:41
-   * @param {IFilterNode} node
-   * @return {*}  {IData}
-   */
-  formatFilters(node: IFilterNode): IData {
-    if (!node.leaf) {
-      return {
-        condtype: 'GROUP',
-        condop: node.logicType,
-        bnotmode: false,
-        searchconds: node.children.map(item => this.formatFilters(item)),
-      };
-    }
-
-    return {
-      condtype: 'DEFIELD',
-      fieldname: node.field,
-      condop: node.valueOP,
-      value: node.value,
-    };
-  }
-
-  /**
-   * 根据格式化后的过滤项反推出过滤项树节点数据集合
-   * @param {IData} data
-   * @return {*}
-   * @author: zhujiamin
-   * @Date: 2023-12-28 09:47:45
-   */
-  parseFilters(data: IData): IFilterNode {
-    if (data.condtype === 'GROUP') {
-      return {
-        leaf: false,
-        logicType: data.condop === 'AND' ? 'AND' : 'OR',
-        children: (data.searchconds || []).map((item: IData) =>
-          this.parseFilters(item),
-        ),
-      };
-    }
-    if (data.condtype === 'DEFIELD') {
-      return {
-        leaf: true,
-        field: data.fieldname || null,
-        valueOP: data.condop || null,
-        value: data.value || null,
-      };
-    }
-    throw new RuntimeError(`无效的condtype:${data.condtype}`);
-  }
-
-  /**
-   * 获取初始过滤项树节点数据集合
-   * @return {*}
-   * @author: zhujiamin
-   * @Date: 2023-12-21 17:29:47
-   */
-  protected getOriginFilterNodes(): IFilterNode[] {
-    return [
-      {
-        leaf: false,
-        logicType: 'AND',
-        children: [{ leaf: true, field: null, valueOP: null, value: null }],
-      },
-    ];
+    const searchconds = calcSearchConds(this.state.filterNodes);
+    return searchconds;
   }
 
   /**
@@ -611,11 +537,11 @@ export class SearchBarController
     ) {
       // 根据后台标准的searchconds计算出 前端回显的树形结构FilterNodes
       const filterNodes = groupItem.searchGroupData.searchconds.map(item =>
-        this.parseFilters(item),
+        parseFilters(item),
       );
       this.state.filterNodes = filterNodes;
     } else {
-      this.state.filterNodes = this.getOriginFilterNodes();
+      this.state.filterNodes = getOriginFilterNodes();
     }
     if (this.grid && groupItem && groupItem.searchGroupData) {
       this.grid.setGroupParams(groupItem.searchGroupData);

package/src/controller/control/search-bar/use-searchcond.ts

@@ -0,0 +1,100 @@
+import { RuntimeError, recursiveIterate } from '@ibiz-template/core';
+import { isNil } from 'ramda';
+import { IFilterNode } from '../../../interface';
+
+/**
+ * 获取初始过滤项树节点数据集合
+ * @return {*}
+ * @author: zhujiamin
+ * @Date: 2023-12-21 17:29:47
+ */
+export function getOriginFilterNodes(): IFilterNode[] {
+  return [
+    {
+      leaf: false,
+      logicType: 'AND',
+      children: [{ leaf: true, field: null, valueOP: null, value: null }],
+    },
+  ];
+}
+
+/**
+ * 格式化过滤项 （后续如果修改这里的逻辑记得把下方的反推函数parseFilters也跟着修改！）
+ * @author lxm
+ * @date 2023-10-16 03:45:41
+ * @param {IFilterNode} node
+ * @return {*}  {IData}
+ */
+export function formatFilters(node: IFilterNode): IData {
+  if (!node.leaf) {
+    return {
+      condtype: 'GROUP',
+      condop: node.logicType,
+      bnotmode: false,
+      searchconds: node.children.map(item => formatFilters(item)),
+    };
+  }
+
+  return {
+    condtype: 'DEFIELD',
+    fieldname: node.field,
+    condop: node.valueOP,
+    value: node.value,
+  };
+}
+
+/**
+ * 根据格式化后的过滤项反推出过滤项树节点数据集合
+ * @param {IData} data
+ * @return {*}
+ * @author: zhujiamin
+ * @Date: 2023-12-28 09:47:45
+ */
+export function parseFilters(data: IData): IFilterNode {
+  if (data.condtype === 'GROUP') {
+    return {
+      leaf: false,
+      logicType: data.condop === 'AND' ? 'AND' : 'OR',
+      children: (data.searchconds || []).map((item: IData) =>
+        parseFilters(item),
+      ),
+    };
+  }
+  if (data.condtype === 'DEFIELD') {
+    return {
+      leaf: true,
+      field: data.fieldname || null,
+      valueOP: data.condop || null,
+      value: data.value || null,
+    };
+  }
+  throw new RuntimeError(`无效的condtype:${data.condtype}`);
+}
+
+/**
+ * 根据filterNodes计算出SearchConds
+ * @param {IData} data
+ * @return {*}
+ * @author: zhujiamin
+ * @Date: 2023-12-28 09:47:45
+ */
+export function calcSearchConds(
+  filterNodes: IFilterNode[],
+): IData[] | undefined {
+  let hasFilter = false; // 是否有过滤项
+  let hasError = false; // 是否有过滤项格式不正确
+  recursiveIterate(filterNodes[0], (node: IFilterNode) => {
+    if (node.leaf) {
+      if (node.field && node.valueOP && !isNil(node.value)) {
+        hasFilter = true;
+      } else {
+        // 如果过滤项不给
+        hasError = true;
+      }
+    }
+  });
+  if (hasFilter && !hasError) {
+    const filter = [formatFilters(filterNodes[0])];
+    return filter;
+  }
+}

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

@@ -10,6 +10,7 @@ import {
   ErrorHandlerCenter,
   ViewStack,
   AnimeUtil,
+  FileUtil,
 } from '../../utils';
 
 /**
@@ -93,6 +94,15 @@ export class 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;
+
   /**
    * 注册模型加载适配器
    *