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

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

@@ -0,0 +1,52 @@
+import { IPortalAsyncAction } from '@ibiz-template/core';
+import { QXEvent } from 'qx-util';
+
+/**
+ * 站内信事件
+ * @author lxm
+ * @date 2024-01-26 10:47:41
+ * @interface IAsyncActionEvent
+ */
+export interface IAsyncActionEvent {
+  /**
+   * 所有数据的变更，新增，删除，更新都算
+   * @author lxm
+   * @date 2024-01-26 10:56:50
+   */
+  dataChange: () => void;
+  change: (msg: IPortalAsyncAction) => void;
+  add: (msg: IPortalAsyncAction) => void;
+}
+
+/**
+ * 异步操作逻辑控制器
+ * @author lxm
+ * @date 2024-01-26 09:57:13
+ * @export
+ * @interface IAsyncActionController
+ */
+export interface IAsyncActionController {
+  /**
+   * 事件
+   * @author lxm
+   * @date 2024-01-26 10:48:53
+   * @type {QXEvent<IAsyncActionEvent>}
+   */
+  readonly evt: QXEvent<IAsyncActionEvent>;
+
+  /**
+   * 总条数
+   * @author lxm
+   * @date 2024-01-26 10:00:25
+   * @type {number}
+   */
+  readonly total: number;
+
+  /**
+   * 当前已加载的所有异步操作集合
+   * @author lxm
+   * @date 2024-01-26 10:06:05
+   * @type {IPortalAsyncAction[]}
+   */
+  readonly actions: IPortalAsyncAction[];
+}

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

@@ -0,0 +1,74 @@
+import { IInternalMessage } from '@ibiz-template/core';
+import { QXEvent } from 'qx-util';
+
+/**
+ * 站内信事件
+ * @author lxm
+ * @date 2024-01-26 10:47:41
+ * @interface InternalMessageEvent
+ */
+export interface InternalMessageEvent {
+  /**
+   * 所有数据的变更，新增，删除，更新都算
+   * @author lxm
+   * @date 2024-01-26 10:56:50
+   */
+  dataChange: () => void;
+}
+
+/**
+ * 站内信逻辑控制器
+ * @author lxm
+ * @date 2024-01-26 09:57:13
+ * @export
+ * @interface IInternalMessageController
+ */
+export interface IInternalMessageController {
+  /**
+   * 事件
+   * @author lxm
+   * @date 2024-01-26 10:48:53
+   * @type {QXEvent<InternalMessageEvent>}
+   */
+  readonly evt: QXEvent<InternalMessageEvent>;
+
+  /**
+   * 总条数
+   * @author lxm
+   * @date 2024-01-26 10:00:25
+   * @type {number}
+   */
+  readonly total: number;
+
+  /**
+   * 每次请求加载的条数
+   * @author lxm
+   * @date 2024-01-26 10:00:45
+   * @type {number}
+   */
+  readonly size: number;
+
+  /**
+   * 当前已加载的所有消息集合
+   * @author lxm
+   * @date 2024-01-26 10:06:05
+   * @type {IInternalMessage[]}
+   */
+  readonly messages: IInternalMessage[];
+
+  /**
+   * 加载（会重置数据）
+   * @author lxm
+   * @date 2024-01-26 10:19:31
+   * @return {*}  {Promise<void>}
+   */
+  load(): Promise<void>;
+
+  /**
+   * 加载更多
+   * @author lxm
+   * @date 2024-01-26 10:19:43
+   * @return {*}  {Promise<void>}
+   */
+  loadMore(): Promise<void>;
+}

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

@@ -0,0 +1,36 @@
+import { IAsyncActionController } from './i-async-action.controller';
+import { IInternalMessageController } from './i-internal-message.controller';
+
+export interface INoticeController {
+  /**
+   * 需要处理的通知总数
+   * @author lxm
+   * @date 2024-01-25 04:33:06
+   * @type {number}
+   */
+  total: number;
+
+  /**
+   * 站内信控制器
+   * @author lxm
+   * @date 2024-01-26 09:58:36
+   * @type {IInternalMessageController}
+   */
+  internalMessage: IInternalMessageController;
+
+  /**
+   * 异步操作控制器
+   * @author lxm
+   * @date 2024-01-26 09:58:55
+   * @type {IAsyncActionController}
+   */
+  asyncAction: IAsyncActionController;
+
+  /**
+   * 初始化
+   * @author lxm
+   * @date 2024-01-25 06:47:09
+   * @return {*}  {Promise<void>}
+   */
+  init(): Promise<void>;
+}

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

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

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

@@ -10,7 +10,7 @@ import { IPortalAsyncAction } from '@ibiz-template/core';
  */
 export interface IAsyncActionProvider {
   /**
-   * 绘制组件
+   * 绘制组件（不能是字符串）
    * @author lxm
    * @date 2022-09-20 10:09:50
    * @type {unknown}
@@ -18,13 +18,24 @@ export interface IAsyncActionProvider {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   component: any;
 
+  /**
+   * 绘制函数
+   * @author lxm
+   * @date 2024-01-26 05:38:09
+   */
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  render: (props: IData & { action: IPortalAsyncAction }) => any;
+
   /**
    * 点击事件
    * @author lxm
    * @date 2024-01-15 12:47:22
    * @param {IPortalAsyncAction} asyncAction
    * @param {MouseEvent} event
-   * @return {*}  {boolean} 返回是否隐藏消息popover
+   * @return {*}  {boolean} 返回是否需要隐藏外层组件消息
    */
-  onClick(asyncAction: IPortalAsyncAction, event: MouseEvent): boolean;
+  onClick?(
+    asyncAction: IPortalAsyncAction,
+    event: MouseEvent,
+  ): Promise<boolean>;
 }

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

@@ -18,13 +18,21 @@ export interface IInternalMessageProvider {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   component: any;
 
+  /**
+   * 绘制函数
+   * @author lxm
+   * @date 2024-01-26 05:38:09
+   */
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  render: (props: IData & { message: IInternalMessage }) => any;
+
   /**
    * 点击事件
    * @author lxm
    * @date 2024-01-15 12:47:22
-   * @param {IInternalMessage} asyncAction
+   * @param {IInternalMessage} message
    * @param {MouseEvent} event
    * @return {*}  {boolean} 返回是否隐藏消息popover
    */
-  onClick(asyncAction: IInternalMessage, event: MouseEvent): boolean;
+  onClick?(message: IInternalMessage, event: MouseEvent): Promise<boolean>;
 }

package/src/interface/util/i-animation-util/i-animation-options.ts

@@ -0,0 +1,34 @@
+export interface IAnimationOptions {
+  /**
+   * 动画持续时间
+   *
+   * @author zk
+   * @date 2024-01-24 04:01:29
+   * @type {number}
+   * @memberof IAnimationOptions
+   */
+  duration?: number;
+
+  /**
+   * 是否循环
+   *
+   * @author zk
+   * @date 2024-01-24 04:01:19
+   * @type {false}
+   * @memberof IAnimationOptions
+   */
+  loop?: false;
+
+  /**
+   * 运行速度曲线
+   *
+   * @author zk
+   * @date 2024-01-25 01:01:52
+   * @type {string}
+   * @memberof IAnimationOptions
+   */
+  easing?: string;
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  [key: string | symbol]: any;
+}

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

@@ -0,0 +1,34 @@
+import { IPortalAsyncAction } from '@ibiz-template/core';
+
+/**
+ * 系统全局消息通知的呈现工具类
+ *
+ * @author lxm
+ * @date 2024-01-26 05:09:14
+ * @export
+ * @interface INoticeUtil
+ */
+export interface INoticeUtil {
+  /**
+   * 展示异步操作的通知
+   * @author lxm
+   * @date 2024-01-26 04:40:10
+   * @param {IPortalAsyncAction} asyncAction
+   */
+  showAsyncAction(asyncAction: IPortalAsyncAction): void;
+
+  /**
+   * 展示正在执行的相关信息的通知
+   * @author lxm
+   * @date 2024-01-26 05:11:55
+   * @param {{ num: number }} info
+   */
+  showDoingNotice(info: { num: number }): void;
+
+  /**
+   * 关闭正在执行的相关信息的通知
+   * @author lxm
+   * @date 2024-01-26 05:13:12
+   */
+  closeDoingNotice(): void;
+}

package/src/interface/util/i-open-view-util/i-open-view-util.ts

@@ -1,4 +1,4 @@
-import { IModalData } from '../../common';
+import { IModalData, IPopoverOptions } from '../../common';
 
 /**
  * 打开视图工具类
@@ -83,6 +83,7 @@ export interface IOpenViewUtil {
     event: MouseEvent,
     context: IContext,
     params?: IParams,
+    options?: IPopoverOptions,
   ): Promise<IModalData>;
 
   /**

package/src/interface/util/index.ts

@@ -16,3 +16,5 @@ export type { IOverlayPopoverContainer } from './i-overlay-popover-container/i-o
 export type { IScriptFunctionOpts } from './script/i-script-function';
 export type { IExcelUtil } from './i-excel-util/i-excel-util';
 export type { IViewStack, IViewStackEvent } from './i-view-stack/i-view-stack';
+export type { IAnimationOptions } from './i-animation-util/i-animation-options';
+export type { INoticeUtil } from './i-notice-util/i-notice-util';

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

@@ -1,4 +1,4 @@
-import { RuntimeError } from '@ibiz-template/core';
+import { IPortalAsyncAction, RuntimeError } from '@ibiz-template/core';
 import { IAsyncActionProvider } from '../../interface';
 
 /** 界面行为适配器前缀 */
@@ -34,15 +34,15 @@ function getProvider(key: string): IAsyncActionProvider | undefined {
  * @return {*}  {Promise<IAsyncActionProvider>}
  */
 export function getAsyncActionProvider(
-  actiontype: string,
+  action: IPortalAsyncAction,
 ): IAsyncActionProvider {
   const provider: IAsyncActionProvider | undefined = getProvider(
-    actiontype || 'DEFAULT',
+    action.actiontype || 'DEFAULT',
   );
 
   // 找异步操作类型
   if (!provider) {
-    throw new RuntimeError(`找不异步操作类型${actiontype}对应的适配器`);
+    throw new RuntimeError(`找不异步操作类型${action.actiontype}对应的适配器`);
   } else {
     return provider;
   }

package/src/register/helper/internal-message-register.ts

@@ -40,12 +40,12 @@ export function getInternalMessageProvider(
   msg: IInternalMessage,
 ): IInternalMessageProvider {
   const provider: IInternalMessageProvider | undefined = getProvider(
-    msg.message_type || 'DEFAULT',
+    msg.content_type || 'DEFAULT',
   );
 
   // 找异步操作类型
   if (!provider) {
-    throw new RuntimeError(`找不站内信类型${msg.message_type}对应的适配器`);
+    throw new RuntimeError(`找不站内信类型${msg.content_type}对应的适配器`);
   } else {
     return provider;
   }

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

@@ -193,6 +193,7 @@ export class MethodDto {
    * @return {*}  {Promise<IDataEntity[]>}
    */
   async sets(context: IContext, data: IData[]): Promise<IDataEntity[]> {
+    const uiDomain = ibiz.uiDomainManager.get(context.srfsessionid);
     return Promise.all(
       data.map(async datum => {
         const all = this.fields
@@ -206,7 +207,22 @@ export class MethodDto {
               if (!field.refAppDataEntityId) {
                 return;
               }
+
+              // 获取当前需要打包子数据的关系配置
+              const configs = uiDomain.getDERConfig(field.refAppDataEntityId!);
+
+              // 查找当前 dto 实体在关系配置中和本实体的关系配置
+              const deRs = configs.find(rs => {
+                return rs.majorAppDataEntityId === this.entity.id;
+              });
+
               const dto = await this.getFieldDto(context, field);
+
+              if (!deRs) {
+                // 如果没有关系配置，则清空本地缓存再设置。如果已经配置关系的 MethodReturn.handle 时会清理掉缓存
+                dto.service.local.clear();
+              }
+
               const items: IData[] = datum[key];
               if (items && items.length > 0) {
                 const pKey = datum[this.entity.keyAppDEFieldId!];

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

@@ -111,5 +111,6 @@ export class MqttService {
    */
   close(): void {
     this.client?.end();
+    this.evt.reset();
   }
 }

package/src/service/service/auth/v7-auth.service.ts

@@ -138,6 +138,11 @@ export class V7AuthService implements IAuthService {
               true,
             );
           }
+
+          // 刷新token之后用新的token重连mqtt
+          ibiz.hub.getAllApps().forEach(app => {
+            app.initMqtt();
+          });
         }
         // 下一次延时做准备
         this.extendLogin();

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

@@ -279,18 +279,13 @@ export class DEActionMethod extends Method {
         resultData = await Promise.all(
           addData.map(
             item =>
-              this.service.local.add(
-                context,
-                this.attach(context, item),
-                false,
-              )!,
+              this.service.local.add(context, this.attach(context, item))!,
           ),
         );
       } else {
         resultData = await this.service.local.add(
           context,
           this.attach(context, addData),
-          false,
         )!;
       }
       return new HttpResponse(resultData);
@@ -500,18 +495,13 @@ export class DEActionMethod extends Method {
         resultData = await Promise.all(
           updateData.map(
             item =>
-              this.service.local.update(
-                context,
-                this.attach(context, item),
-                false,
-              )!,
+              this.service.local.update(context, this.attach(context, item))!,
           ),
         );
       } else {
         resultData = await this.service.local.update(
           context,
           this.attach(context, updateData),
-          false,
         )!;
       }
       if (resultData) {

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

@@ -8,7 +8,7 @@ export class InternalMessageService implements IInternalMessageService {
    * @author lxm
    * @date 2024-01-23 02:06:47
    */
-  baseUrl = '/extension/internal_messages';
+  protected baseUrl = '/extension/internal_messages';
 
   /**
    * 获取站内信的集合
@@ -20,13 +20,18 @@ export class InternalMessageService implements IInternalMessageService {
   async fetch(
     params: IParams = {},
   ): Promise<IHttpResponse<IInternalMessage[]>> {
-    // const res = await ibiz.net.post(
-    //   `${this.baseUrl}/fetch_cur_receiver`,
-    //   params,
-    // );
-    const res: IData = {
-      ok: true,
+    // 默认的查询参数
+    const fetchParams = {
+      page: 0,
+      size: 20,
+      sort: 'update_time,desc',
     };
+    Object.assign(fetchParams, params);
+
+    const res = await ibiz.net.post(
+      `${this.baseUrl}/fetch_cur_receiver`,
+      fetchParams,
+    );
     if (res.headers) {
       if (res.headers['x-page']) {
         res.page = Number(res.headers['x-page']);
@@ -41,17 +46,6 @@ export class InternalMessageService implements IInternalMessageService {
     if (isNil(res.data)) {
       res.data = [];
     }
-
-    res.page = params.page;
-    res.total = 34;
-    res.data = Array.from({ length: params.size }, (_, i) => ({
-      id: i + 1,
-      status: 'RECEIVED',
-      title: `标题${i + 1}`,
-      content: `内容${i + 1}长内容`,
-      short_content: `内容${i + 1}短内容`,
-      create_time: new Date().toISOString(),
-    }));
     return res as IHttpResponse<IInternalMessage[]>;
   }
 

package/src/service/utils/de-cache/de-cache.ts

@@ -95,19 +95,14 @@ export class DECache {
    *
    * @param {*} context
    * @param {IDataEntity} entity
-   * @param {boolean} [ignoreDuplicate=true] 是否忽略主键重复（不忽略报错，忽略则覆盖）
    * @return {*}  {boolean}
    * @memberof EntityCache
    */
-  add(
-    context: IContext,
-    entity: IDataEntity,
-    ignoreDuplicate = true,
-  ): IDataEntity | null {
+  add(context: IContext, entity: IDataEntity): IDataEntity | null {
     // 联合主键相关数据处理
     if (this.isUnionKey) {
       this.calcUnionKey(entity);
-      if (ignoreDuplicate === false && this.checkData(context, entity.srfkey)) {
+      if (this.checkData(context, entity.srfkey)) {
         throw new RuntimeError(
           `新建联合主键数据失败，已有主键为${entity.srfkey}的数据`,
         );
@@ -164,25 +159,16 @@ export class DECache {
    *
    * @param {IContext} context
    * @param {IDataEntity} entity
-   * @param {boolean} [ignoreDuplicate=true] 是否忽略主键重复（不忽略报错，忽略则覆盖）
    * @return {*}  {IDataEntity}
    * @memberof EntityCache
    */
-  update(
-    context: IContext,
-    entity: IDataEntity,
-    ignoreDuplicate = true,
-  ): IDataEntity | null {
+  update(context: IContext, entity: IDataEntity): IDataEntity | null {
     const oldKey = entity.srfkey!;
     // 联合主键相关数据处理
     if (this.isUnionKey) {
       this.calcUnionKey(entity);
       // 只在临时数据的新建更新时，主键改变的时候，检测变更之后的主键是否已经存在
-      if (
-        ignoreDuplicate === false &&
-        oldKey !== entity.srfkey &&
-        this.checkData(context, entity.srfkey)
-      ) {
+      if (oldKey !== entity.srfkey && this.checkData(context, entity.srfkey)) {
         throw new RuntimeError(
           `更新联合主键数据失败，已有主键为${entity.srfkey}的数据`,
         );

package/src/service/utils/dyna-sys-params/dyna-sys-params.ts

@@ -0,0 +1,66 @@
+import { getMatchResPath } from '../res-path/res-path';
+
+/**
+ * 计算动态系统接口参数
+ * @author lxm
+ * @date 2024-01-25 03:30:18
+ * @export
+ * @param {string} appDataEntityId 实体id
+ * @param {IContext} context 视图上下文
+ * @param {{
+ *     viewParams?: IParams; 视图参数
+ *     appId?: string; 应用id
+ *   }} [opts={}]
+ */
+export async function calcDynaSysParams(
+  appDataEntityId: string,
+  context: IContext,
+  opts: {
+    viewParams?: IParams;
+    appId?: string;
+  } = {},
+): Promise<{
+  srfkey?: string | undefined;
+  srfparentkey?: string | undefined;
+  srfparentdeanme?: string | undefined;
+}> {
+  const appId = opts.appId || context.srfappid;
+  const viewParams = opts.viewParams || {};
+  const loadModelParams: {
+    srfkey?: string;
+    srfparentkey?: string;
+    srfparentdeanme?: string;
+  } = {};
+
+  const appDe = await ibiz.hub.getAppDataEntity(appDataEntityId, appId);
+
+  // *计算srfkey
+  if (viewParams.srfkey) {
+    loadModelParams.srfkey = viewParams.srfkey;
+  } else {
+    // * 计算资源路径上下文参数
+    // 主键
+    const srfkey = context[appDe.codeName!.toLowerCase()];
+    if (srfkey) {
+      loadModelParams.srfkey = srfkey;
+    }
+  }
+
+  // *计算上层父实体主键和name
+  if (viewParams.srfparentkey && viewParams.srfparentdeanme) {
+    loadModelParams.srfparentkey = viewParams.srfparentkey;
+    loadModelParams.srfparentdeanme = viewParams.srfparentdeanme;
+  } else {
+    // 上层资源路径主实体名称和主键
+    const match = getMatchResPath(context, appDe);
+    if (match && match.keys.length > 1) {
+      const parentDeKey = match.keys[match.keys.length - 2];
+      loadModelParams.srfparentkey =
+        viewParams.srfparentkey || context[parentDeKey];
+      loadModelParams.srfparentdeanme =
+        viewParams.srfparentdeanme || parentDeKey;
+    }
+  }
+
+  return loadModelParams;
+}

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

@@ -108,7 +108,7 @@ export class DynamicCodeListCache {
       const { predefinedType } = this.codeList;
       if (predefinedType) {
         this.isPredefined = true;
-        if (!['OPERATOR', 'RUNTIME'].includes(predefinedType)) {
+        if (!['OPERATOR', 'RUNTIME', 'DEMAINSTATE'].includes(predefinedType)) {
           throw new ModelError(
             this.codeList,
             `预定义类型${predefinedType}暂不支持`,
@@ -249,11 +249,14 @@ export class DynamicCodeListCache {
 
     // *预定义加载
     if (this.isPredefined && this.codeList.codeName) {
-      const index = this.codeList.codeName.indexOf('__');
-      const tag =
-        index !== -1
-          ? this.codeList.codeName.substring(index + 2)
-          : this.codeList.codeName;
+      let tag = this.codeList.codeName;
+      if (this.codeList.predefinedType === 'OPERATOR') {
+        const index = this.codeList.codeName.indexOf('__');
+        tag =
+          index !== -1
+            ? this.codeList.codeName.substring(index + 2)
+            : this.codeList.codeName;
+      }
       const res = await app.net.get(
         `/dictionaries/codelist/${tag}`,
         tempParams,

package/src/service/utils/index.ts

@@ -6,3 +6,4 @@ export { DECache } from './de-cache/de-cache';
 export { getMatchResPath, calcResPath } from './res-path/res-path';
 export { SearchFilter } from './search-filter/search-filter';
 export { fieldValueToBoolean } from './util/util';
+export { calcDynaSysParams } from './dyna-sys-params/dyna-sys-params';