@ibiz-template/runtime 0.5.7-alpha.8 → 0.6.0-alpha.0

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

@@ -1,6 +1,6 @@
 import { RuntimeError, recursiveIterate } from '@ibiz-template/core';
 import { isNil } from 'ramda';
-import { IFilterNode } from '../../../interface';
+import { IFilterLeafNode, IFilterNode } from '../../../interface';
 
 /**
  * 获取初始过滤项树节点数据集合
@@ -35,12 +35,18 @@ export function formatFilters(node: IFilterNode): IData {
     };
   }
 
-  return {
+  const leafNode = node as IFilterLeafNode;
+  const temp: IData = {
     condtype: 'DEFIELD',
     fieldname: node.field,
     condop: node.valueOP,
     value: node.value,
   };
+
+  if (leafNode.valueItem) {
+    temp.valueItem = leafNode.valueItem;
+  }
+  return temp;
 }
 
 /**
@@ -66,6 +72,7 @@ export function parseFilters(data: IData): IFilterNode {
       field: data.fieldname || null,
       valueOP: data.condop || null,
       value: data.value || null,
+      valueItem: data.valueItem || undefined,
     };
   }
   throw new RuntimeError(`无效的condtype:${data.condtype}`);

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

@@ -2,15 +2,23 @@ import { IInternalMessage, IPortalMessage } from '@ibiz-template/core';
 import { QXEvent } from 'qx-util';
 import {
   IInternalMessageController,
-  InternalMessageEvent,
+  IInternalMessageEvent,
 } from '../../interface';
 import { InternalMessageService } from '../../service';
 
+function isHTML(str: string): boolean {
+  if (str === '') return false;
+  const doc = new DOMParser().parseFromString(str, 'text/html');
+  return Array.from(doc.body.childNodes).some(node => node.nodeType === 1);
+}
+
 export class InternalMessageController implements IInternalMessageController {
-  readonly evt: QXEvent<InternalMessageEvent> = new QXEvent();
+  readonly evt: QXEvent<IInternalMessageEvent> = new QXEvent();
 
   total: number = 0;
 
+  unreadCount: number = 0;
+
   /**
    * 当前分页
    * @author lxm
@@ -23,21 +31,53 @@ export class InternalMessageController implements IInternalMessageController {
 
   messages: IInternalMessage[] = [];
 
+  unreadOnly = false;
+
   protected service = new InternalMessageService();
 
   async init(): Promise<void> {
-    this.load();
+    await this.load();
     this.listenMqtt();
+    await this.refreshUnreadCount();
   }
 
   async load(): Promise<void> {
-    await this.fetch(false);
+    try {
+      await this.fetch(false);
+    } catch (error) {
+      ibiz.log.error(error);
+    }
   }
 
   async loadMore(): Promise<void> {
     await this.fetch(true);
   }
 
+  async refreshUnreadCount(): Promise<void> {
+    try {
+      this.unreadCount = await this.service.getUnreadNum();
+      this.evt.emit('unreadCountChange', this.unreadCount);
+    } catch (error) {
+      ibiz.log.error(error);
+    }
+  }
+
+  /**
+   * 切换是否只读
+   * @author lxm
+   * @date 2024-02-04 10:21:22
+   * @param {val} [boolean] 是否只读
+   */
+  toggleUnReadOnly(val?: boolean): void {
+    const nextVal = val === undefined ? !this.unreadOnly : val;
+    if (this.unreadOnly === nextVal) {
+      return;
+    }
+    this.unreadOnly = nextVal;
+    this.evt.emit('unreadOnlyChange', this.unreadOnly);
+    this.load();
+  }
+
   protected async fetch(loadMore: boolean = false): Promise<void> {
     // *计算查询参数
     if (loadMore === false) {
@@ -46,12 +86,31 @@ export class InternalMessageController implements IInternalMessageController {
       this.page += 1;
     }
 
-    const fetchParams = {
+    const fetchParams: IParams = {
       page: this.page,
       size: this.size,
       sort: 'update_time,desc',
     };
 
+    // 是否只搜索未读
+    if (this.unreadOnly) {
+      fetchParams.searchconds = [
+        {
+          condtype: 'GROUP',
+          condop: 'AND',
+          bnotmode: false,
+          searchconds: [
+            {
+              condop: 'EQ',
+              condtype: 'DEFIELD',
+              fieldname: 'status',
+              value: 'RECEIVED',
+            },
+          ],
+        },
+      ];
+    }
+
     const res = await this.service.fetch(fetchParams);
     this.total = res.total!;
 
@@ -60,6 +119,7 @@ export class InternalMessageController implements IInternalMessageController {
     } else {
       this.messages = res.data;
     }
+
     this.evt.emit('dataChange');
   }
 
@@ -77,7 +137,43 @@ export class InternalMessageController implements IInternalMessageController {
       }
 
       // todo 目前会有一种情况，不带data，弹右下角消息提示
-      ibiz.notification.info({ desc: msg.content, position: 'bottom-right' });
+      if (msg.content) {
+        ibiz.notification.info({
+          isHtmlDesc: isHTML(msg.content),
+          desc: msg.content,
+          position: 'bottom-right',
+        });
+      }
     });
   }
+
+  async markRead(message: IInternalMessage): Promise<void> {
+    if (message.status !== 'RECEIVED') {
+      return;
+    }
+    const find = this.messages.find(msg => msg.id === message.id);
+    if (!find) {
+      return;
+    }
+
+    // todo 后台接口适配
+    await this.service.markRead(message.id);
+    // find.status = 'READ';
+    // this.unreadCount -= 1;
+
+    this.evt.emit('unreadCountChange', this.unreadCount);
+    this.evt.emit('dataChange');
+  }
+
+  /**
+   * 获取完整信息
+   * @author lxm
+   * @date 2024-01-30 05:03:25
+   * @param {string} id
+   * @return {*}  {Promise<IInternalMessage>}
+   */
+  async get(id: string): Promise<IInternalMessage> {
+    const res = await this.service.get(id);
+    return res.data;
+  }
 }

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

@@ -1,8 +1,11 @@
-import { INoticeController } from '../../interface';
+import { QXEvent } from 'qx-util';
+import { INoticeController, INoticeEvent } from '../../interface';
 import { AsyncActionController } from './async-action.controller';
 import { InternalMessageController } from './internal-message.controller';
 
 export class NoticeController implements INoticeController {
+  readonly evt: QXEvent<INoticeEvent> = new QXEvent();
+
   total = 0;
 
   asyncAction = new AsyncActionController();
@@ -12,5 +15,10 @@ export class NoticeController implements INoticeController {
   async init(): Promise<void> {
     await this.internalMessage.init();
     await this.asyncAction.init();
+
+    this.internalMessage.evt.on('unreadCountChange', () => {
+      this.total = this.internalMessage.unreadCount;
+      this.evt.emit('totalChange', this.total);
+    });
   }
 }

package/src/hub/config/app-view-config-service.ts

@@ -1,4 +1,5 @@
 import { RuntimeError } from '@ibiz-template/core';
+import { IAppView } from '@ibiz/model-core';
 import { IAppViewConfigService, IViewConfig } from '../../interface';
 
 /**
@@ -38,6 +39,33 @@ export class AppViewConfigService implements IAppViewConfigService {
     return id;
   }
 
+  /**
+   * 获取视图自定义Option
+   *
+   * @author zk
+   * @date 2024-01-31 11:01:20
+   * @protected
+   * @param {IAppView} model
+   * @return {*}  {IData}
+   * @memberof AppViewConfigService
+   */
+  protected getCustomOption(model: IAppView): { modalOption: IData } {
+    const { appViewParams } = model;
+    // 解析ModalOption参数
+    const optionProperty = appViewParams?.find(
+      item => item.id === 'modaloption',
+    )?.value;
+    let modalOption = {};
+    if (optionProperty) {
+      try {
+        modalOption = JSON.parse(optionProperty);
+      } catch (error) {
+        ibiz.log.error(`视图参数modalOption 解析失败：${error}`);
+      }
+    }
+    return { modalOption };
+  }
+
   has(key: string): boolean {
     const id = this.calcAppViewId(key);
     return this.viewConfigs.has(id);
@@ -66,6 +94,7 @@ export class AppViewConfigService implements IAppViewConfigService {
         height: model.height,
         appDataEntityId: model.appDataEntityId,
         redirectView: model.redirectView,
+        ...this.getCustomOption(model),
       });
     }
     return this.viewConfigs.get(id)!;

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

@@ -46,6 +46,10 @@ export interface IViewConfig {
    * 是否是重定向视图
    */
   redirectView?: boolean;
+  /**
+   * modal参数
+   */
+  modalOption?: IData;
 }
 
 export interface IAppViewConfigService {

package/src/interface/common/i-open-view-options/i-open-view-options.ts

@@ -37,4 +37,14 @@ export interface IOpenViewOptions {
    * @type {MouseEvent}
    */
   event?: MouseEvent;
+
+  /**
+   * 模态参数
+   *
+   * @author zk
+   * @date 2024-02-01 02:02:21
+   * @type {IData}
+   * @memberof IOpenViewOptions
+   */
+  modalOption?: IData;
 }

package/src/interface/controller/controller/notice/i-internal-message.controller.ts

@@ -7,13 +7,26 @@ import { QXEvent } from 'qx-util';
  * @date 2024-01-26 10:47:41
  * @interface InternalMessageEvent
  */
-export interface InternalMessageEvent {
+export interface IInternalMessageEvent {
   /**
    * 所有数据的变更，新增，删除，更新都算
    * @author lxm
    * @date 2024-01-26 10:56:50
    */
   dataChange: () => void;
+
+  /**
+   * 未读数量变更
+   * @author lxm
+   * @date 2024-01-30 02:46:55
+   */
+  unreadCountChange: (num: number) => void;
+  /**
+   * 是否只显示未读变更
+   * @author lxm
+   * @date 2024-01-30 02:46:55
+   */
+  unreadOnlyChange: (val: boolean) => void;
 }
 
 /**
@@ -28,9 +41,9 @@ export interface IInternalMessageController {
    * 事件
    * @author lxm
    * @date 2024-01-26 10:48:53
-   * @type {QXEvent<InternalMessageEvent>}
+   * @type {QXEvent<IInternalMessageEvent>}
    */
-  readonly evt: QXEvent<InternalMessageEvent>;
+  readonly evt: QXEvent<IInternalMessageEvent>;
 
   /**
    * 总条数
@@ -56,6 +69,22 @@ export interface IInternalMessageController {
    */
   readonly messages: IInternalMessage[];
 
+  /**
+   * 未读消息个数
+   * @author lxm
+   * @date 2024-01-30 02:39:54
+   * @type {number}
+   */
+  readonly unreadCount: number;
+
+  /**
+   * 是否只查询未读的消息
+   * @author lxm
+   * @date 2024-02-04 10:26:00
+   * @type {boolean}
+   */
+  unreadOnly: boolean;
+
   /**
    * 加载（会重置数据）
    * @author lxm
@@ -71,4 +100,38 @@ export interface IInternalMessageController {
    * @return {*}  {Promise<void>}
    */
   loadMore(): Promise<void>;
+
+  /**
+   * 刷新未读数据条数
+   * @author lxm
+   * @date 2024-02-04 09:37:58
+   * @return {*}  {Promise<void>}
+   */
+  refreshUnreadCount(): Promise<void>;
+
+  /**
+   * 把某条消息记录标记为已读
+   * @author lxm
+   * @date 2024-01-30 02:31:17
+   * @param {IInternalMessage} message
+   * @return {*}  {Promise<void>}
+   */
+  markRead(message: IInternalMessage): Promise<void>;
+
+  /**
+   * 获取完整消息
+   * @author lxm
+   * @date 2024-01-30 05:03:51
+   * @param {string} id
+   * @return {*}  {Promise<IInternalMessage>}
+   */
+  get(id: string): Promise<IInternalMessage>;
+
+  /**
+   * 切换是否只读
+   * @author lxm
+   * @date 2024-02-04 10:21:22
+   * @param {val} [boolean] 是否只读
+   */
+  toggleUnReadOnly(val?: boolean): void;
 }

package/src/interface/controller/controller/notice/i-notice.controller.ts

@@ -1,7 +1,25 @@
+import { QXEvent } from 'qx-util';
 import { IAsyncActionController } from './i-async-action.controller';
 import { IInternalMessageController } from './i-internal-message.controller';
 
+export interface INoticeEvent {
+  /**
+   * 需要处理的通知总数变更
+   * @author lxm
+   * @date 2024-01-26 10:56:50
+   */
+  totalChange: (total: number) => void;
+}
+
 export interface INoticeController {
+  /**
+   * 事件
+   * @author lxm
+   * @date 2024-01-26 10:48:53
+   * @type {QXEvent<InternalMessageEvent>}
+   */
+  readonly evt: QXEvent<INoticeEvent>;
+
   /**
    * 需要处理的通知总数
    * @author lxm

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

@@ -1,9 +1,9 @@
-export type { INoticeController } from './i-notice.controller';
+export type { INoticeController, INoticeEvent } from './i-notice.controller';
 export type {
   IAsyncActionController,
   IAsyncActionEvent,
 } from './i-async-action.controller';
 export type {
   IInternalMessageController,
-  InternalMessageEvent,
+  IInternalMessageEvent,
 } from './i-internal-message.controller';

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

@@ -44,6 +44,14 @@ export interface IGridState extends IMDControlState {
    * @type {boolean}
    */
   rowEditOpen: boolean;
+
+  /**
+   * 表格popover层级
+   * @author fzh
+   * @date 2024-02-04 18:57:18
+   * @type {number}
+   */
+  zIndex?: number;
 }
 
 export interface IGridRowState {

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

@@ -76,6 +76,22 @@ export interface IFilterLeafNode {
    * @type {string}
    */
   valueOP: string | null;
+
+  /**
+   * 禁用，禁止修改
+   * @author lxm
+   * @date 2024-02-01 02:51:40
+   * @type {boolean}
+   */
+  disabled?: boolean;
+
+  /**
+   * 值项的值
+   * @author lxm
+   * @date 2024-02-04 06:40:17
+   * @type {unknown}
+   */
+  valueItem?: unknown;
 }
 
 export type IFilterNode = IFilterBranchNode | IFilterLeafNode;

package/src/interface/provider/i-internal-message.provider.ts

@@ -15,8 +15,7 @@ export interface IInternalMessageProvider {
    * @date 2022-09-20 10:09:50
    * @type {unknown}
    */
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  component: any;
+  component: unknown;
 
   /**
    * 绘制函数

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

@@ -87,6 +87,7 @@ export interface IAppDEService {
     context: IContext,
     params?: IData | IData[],
     params2?: IParams,
+    header?: IData,
   ): Promise<IHttpResponse>;
 
   /**

package/src/interface/service/service/i-internal-message.service.ts

@@ -25,5 +25,22 @@ export interface IInternalMessageService {
    * @param {string} actionID
    * @return {*}  {Promise<IHttpResponse<IInternalMessage[]>>}
    */
-  get(actionID: string): Promise<IHttpResponse<IInternalMessage[]>>;
+  get(actionID: string): Promise<IHttpResponse<IInternalMessage>>;
+
+  /**
+   * 设置已读
+   * @author lxm
+   * @date 2024-02-04 03:59:52
+   * @param {string} messageId
+   * @return {*}  {Promise<void>}
+   */
+  markRead(messageId: string): Promise<void>;
+
+  /**
+   * 获取未读数据的总条数
+   * @author lxm
+   * @date 2024-02-04 09:35:06
+   * @return {*}  {Promise<number>}
+   */
+  getUnreadNum(): Promise<number>;
 }

package/src/interface/service/service/i-mark-open-data.service.ts

@@ -1,7 +1,9 @@
-import { IHttpResponse } from '@ibiz-template/core';
+import { IHttpResponse, IMarkOpenData } from '@ibiz-template/core';
 
 export type MarkOpenDataActionType = 'VIEW' | 'EDIT' | 'UPDATE' | 'CLOSE';
 
+export type MarkOpenDataCallbackFun = (data: IMarkOpenData) => void;
+
 export interface IMarkOpenDataService {
   /**
    * 获取站内信的集合
@@ -15,4 +17,32 @@ export interface IMarkOpenDataService {
     key: string,
     action: MarkOpenDataActionType,
   ): Promise<IHttpResponse>;
+
+  /**
+   * 监听指定实体指定主键的消息
+   * @author lxm
+   * @date 2024-02-01 04:45:31
+   * @param {string} deName
+   * @param {string} key
+   * @param {CallbackFun} callback
+   */
+  subscribe(
+    deName: string,
+    key: string,
+    callback: MarkOpenDataCallbackFun,
+  ): void;
+
+  /**
+   * 取消监听指定实体指定主键的消息
+   * @author lxm
+   * @date 2024-02-01 04:48:19
+   * @param {string} deName
+   * @param {string} key
+   * @param {MarkOpenDataCallbackFun} callback
+   */
+  unsubscribe(
+    deName: string,
+    key: string,
+    callback: MarkOpenDataCallbackFun,
+  ): void;
 }

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

@@ -9,4 +9,5 @@ export type { IInternalMessageService } from './i-internal-message.service';
 export type {
   MarkOpenDataActionType,
   IMarkOpenDataService,
+  MarkOpenDataCallbackFun,
 } from './i-mark-open-data.service';

package/src/interface/util/i-notification-util/i-notification-util.ts

@@ -23,6 +23,15 @@ export interface NotificationParams {
    * @type {string}
    */
   desc?: string;
+
+  /**
+   * 描述是否是html字符串
+   * @author lxm
+   * @date 2024-02-04 03:18:25
+   * @type {boolean}
+   */
+  isHtmlDesc?: boolean;
+
   /**
    * 自动关闭的延时，单位秒，不关闭可以写 0
    *

package/src/logic-scheduler/executor/app-de-ui-logic-executor.ts

@@ -20,6 +20,6 @@ export class AppDEUILogicExecutor extends LogicExecutor {
     if (!appDEUILogicId) {
       throw new RuntimeModelError(this.logic, '没有配置实体界面逻辑');
     }
-    execUILogic(appDEUILogicId!, appDataEntityId!, executeParams);
+    return execUILogic(appDEUILogicId!, appDataEntityId!, executeParams);
   }
 }

package/src/logic-scheduler/executor/app-ui-logic-executor.ts

@@ -119,7 +119,7 @@ export class AppUILogicExecutor extends LogicExecutor {
       openView,
       tempContext,
       tempParams,
-      rest,
+      { ...rest, openMode: openViewRef.openMode },
     );
   }
 
@@ -251,7 +251,7 @@ export class AppUILogicExecutor extends LogicExecutor {
       newViewRef.refAppViewId,
       tempContext,
       tempParams,
-      rest,
+      { ...rest, openMode: newViewRef.openMode },
     );
 
     // 执行批添加新建逻辑

package/src/service/de-service-util.ts

@@ -195,8 +195,9 @@ export class DEServiceUtil {
     context: IContext,
     params?: IData | IData[] | undefined,
     params2?: IParams | undefined,
+    header?: IData,
   ): Promise<IHttpResponse<IData>> {
     const service = await this.getService(context, appDataEntityId);
-    return service.exec(methodName, context, params, params2);
+    return service.exec(methodName, context, params, params2, header);
   }
 }

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

@@ -1,10 +1,10 @@
 import { IHttpResponse, clone } from '@ibiz-template/core';
-import { IControl } from '@ibiz/model-core';
+import { IAjaxControl } from '@ibiz/model-core';
 import { ControlVO } from '../../vo/control.vo';
 import { UIMapField } from '../../vo/ui-map-field';
 import { IAppService } from '../../../interface';
 
-export class ControlService<T extends IControl = IControl> {
+export class ControlService<T extends IAjaxControl = IAjaxControl> {
   app!: IAppService;
 
   /**
@@ -72,16 +72,34 @@ export class ControlService<T extends IControl = IControl> {
     data?: IData,
     params?: IParams,
   ): Promise<IHttpResponse> {
+    const header = this.handleCustomRequestHeader();
     const res = await this.app.deService.exec(
       this.model.appDataEntityId!,
       methodName,
       context,
       data,
       params,
+      header,
     );
     return res;
   }
 
+  /**
+   * 处理自定义请求头
+   *
+   * @author zk
+   * @date 2024-02-02 11:02:55
+   * @memberof ControlService
+   */
+  protected handleCustomRequestHeader(): IData {
+    const customHeader = {};
+    const { enableItemPrivilege } = this.model;
+    if (enableItemPrivilege) {
+      Object.assign(customHeader, { srfdataaccaction: true });
+    }
+    return customHeader;
+  }
+
   /**
    * 处理响应
    *