@ibiz-template/runtime 0.5.0-beta.0 → 0.5.0-beta.2

package/src/ui-action/provider/ui-action-provider-base.ts

@@ -31,7 +31,6 @@ export abstract class UIActionProviderBase implements IUIActionProvider {
     action: IAppDEUIAction,
     args: IUILogicParams,
   ): Promise<IUIActionResult> {
-    const { context, params, data } = args;
     const result: IUIActionResult = {
       refresh: action.reloadData,
       refreshMode: action.refreshMode,
@@ -61,13 +60,20 @@ export abstract class UIActionProviderBase implements IUIActionProvider {
       return this.returnError(result);
     }
 
+    // ** 界面行为执行之后，执行界面逻辑
+    if (action.uilogicAttachMode === 'AFTER') {
+      if (!appDEUILogicId) {
+        throw new RuntimeModelError(action, '没有配置实体界面逻辑');
+      }
+      await execUILogic(
+        appDEUILogicId,
+        appDataEntityId!,
+        this.mergeArgsByResult(args, result),
+      );
+    }
+
     // ** 后续界面行为
-    const nextActionParams = {
-      ...args,
-      context: result.nextContext || context,
-      data: result.data || data,
-      params: result.nextParams || params,
-    };
+    const nextActionParams = this.mergeArgsByResult(args, result);
     if (action.closeEditView) {
       // 关闭视图的情况下，不等待后续界面行为
       this.doNextAction(action, nextActionParams, action.appId);
@@ -85,17 +91,30 @@ export abstract class UIActionProviderBase implements IUIActionProvider {
       }
     }
 
-    // ** 界面行为执行之后，执行界面逻辑
-    if (action.uilogicAttachMode === 'AFTER') {
-      if (!appDEUILogicId) {
-        throw new RuntimeModelError(action, '没有配置实体界面逻辑');
-      }
-      await execUILogic(appDEUILogicId, appDataEntityId!, args);
-    }
-
     return result;
   }
 
+  /**
+   * 根据界面行为逻辑返回值，合并参数获得后续逻辑要用的参数
+   * @author lxm
+   * @date 2023-12-25 02:42:23
+   * @protected
+   * @param {IUILogicParams} args 当前环境的参数
+   * @param {IUIActionResult} result 上一次逻辑执行的结果
+   * @return {*}  {IUILogicParams}
+   */
+  protected mergeArgsByResult(
+    args: IUILogicParams,
+    result: IUIActionResult,
+  ): IUILogicParams {
+    return {
+      ...args,
+      context: result.nextContext || args.context,
+      data: result.data || args.data,
+      params: result.nextParams || args.params,
+    };
+  }
+
   /**
    * 有错误和取消时对result做的处理
    * @author lxm

package/src/utils/index.ts

@@ -4,6 +4,7 @@ export * from './nav-params/nav-params';
 export {
   toLocalOpenWFRedirectView,
   openRedirectView,
+  getDERedirectToView,
 } from './open-redirect-view/open-redirect-view';
 export * from './verify';
 export { LayoutPanelUtil } from './layout-panel-util/layout-panel-util';

package/src/utils/open-redirect-view/open-redirect-view.ts

@@ -12,6 +12,13 @@ import { OpenAppViewCommand } from '../../command';
 import { convertNavData } from '../nav-params/nav-params';
 import { calcDeCodeNameById, findFieldById } from '../../model';
 
+type ToViewParams = {
+  context: IContext;
+  params: IParams;
+  opts: IOpenViewOptions;
+  viewId: string;
+};
+
 /**
  * 打开重定向视图
  *
@@ -53,7 +60,7 @@ export async function toLocalOpenWFRedirectView(
   context: IContext,
   linkUrl: string,
   opts: IOpenViewOptions = {},
-): Promise<void> {
+): Promise<ToViewParams> {
   const i = linkUrl.lastIndexOf('?');
   const queryStr: string = decodeURIComponent(
     linkUrl.substring(i + 1, linkUrl.length),
@@ -98,33 +105,32 @@ export async function toLocalOpenWFRedirectView(
     context.srfprocessinstanceid = params.srfprocessinstanceid;
     delete params.srfprocessinstanceid;
   }
-  await ibiz.commands.execute(
-    OpenAppViewCommand.TAG,
-    deRdView.id,
+
+  return {
     context,
     params,
     opts,
-  );
+    viewId: deRdView.id!,
+  };
 }
 
 /**
- * 打开实体重定向视图
- *
- * @author chitanda
- * @date 2022-09-28 16:09:15
+ * 获取处理后的重定向视图最终要跳转视图的相关信息
+ * @author lxm
+ * @date 2023-12-26 11:16:02
  * @export
  * @param {IAppDERedirectView} appView
- * @param {IContext}
+ * @param {IContext} context
  * @param {IParams} [params={}]
- * @param {IData[]} [data=[]]
- * @return {*}  {Promise<IModalData>}
+ * @param {IOpenViewOptions} [opts={}]
+ * @return {*}  {(Promise<({ type: 'view' } & ToViewParams) | { type: 'url'; url: string }>)}
  */
-export async function openDERedirectView(
+export async function getDERedirectToView(
   appView: IAppDERedirectView,
   context: IContext,
   params: IParams = {},
   opts: IOpenViewOptions = {},
-): Promise<IModalData> {
+): Promise<({ type: 'view' } & ToViewParams) | { type: 'url'; url: string }> {
   // 计算重定向视图上下文参数转换
   const navContext = appView.appViewNavContexts || [];
   const navContextData = convertNavData(navContext, params, context);
@@ -163,20 +169,17 @@ export async function openDERedirectView(
         }
 
         if (linkUrl.startsWith('http://') || linkUrl.startsWith('https://')) {
-          return new Promise(resolve => {
-            const newWindow = window.open(linkUrl, '_blank');
-            if (newWindow) {
-              (newWindow as IData).callback = (): void => {
-                resolve({ ok: true, data: [] });
-              };
-            }
-          });
+          return { type: 'url', url: linkUrl };
         }
         if (linkUrl.startsWith('appredirectview?')) {
-          await toLocalOpenWFRedirectView(context, linkUrl, opts);
-          return { ok: true, data: [] };
+          const toView = await toLocalOpenWFRedirectView(
+            context,
+            linkUrl,
+            opts,
+          );
+          return { type: 'view', ...toView };
         }
-        return { ok: false, data: [] };
+        throw new RuntimeError(`未支持的linkUrl格式:${linkUrl}`);
       }
     }
   } finally {
@@ -191,8 +194,14 @@ export async function openDERedirectView(
   // 拼接当前重定向视图所在应用实体名称为前缀
   const deRdTag = `${entity.name!.toUpperCase()}:${rdTag}`;
   // 所有重定向引用视图
-  const allRefViews = appView.redirectAppViewRefs;
-  const refView = allRefViews?.find(view => {
+  const allRefViews = [];
+  if (appView.redirectAppViewRefs) {
+    allRefViews.push(...appView.redirectAppViewRefs);
+  }
+  if (appView.appViewRefs) {
+    allRefViews.push(...appView.appViewRefs);
+  }
+  const refView = allRefViews.find(view => {
     const matchKey = view.name || view.id;
     // 特殊补充 wfRdTag 匹配，子流程应用特殊模式
     return matchKey === deRdTag || matchKey === rdTag || matchKey === wfRdTag;
@@ -200,19 +209,15 @@ export async function openDERedirectView(
   if (refView) {
     const viewId = refView.refAppViewId;
     if (viewId) {
-      const result = await ibiz.commands.execute(
-        OpenAppViewCommand.TAG,
+      return {
+        type: 'view',
         viewId,
         context,
         params,
-        { ...opts, data: [curData] },
-      );
-      if (result) {
-        return result;
-      }
-    } else {
-      throw new RuntimeModelError(refView, `未配置实际引用视图`);
+        opts: { ...opts, data: [curData] },
+      };
     }
+    throw new RuntimeModelError(refView, `未配置实际引用视图`);
   } else {
     ibiz.log.error(
       '重定向视图引用有：',
@@ -227,7 +232,56 @@ export async function openDERedirectView(
       `未找到重定向标识[${rdTag}]或[${deRdTag}]或工作流[${wfRdTag}]对应视图`,
     );
   }
-  return { ok: true, data: [] };
+}
+
+/**
+ * 打开实体重定向视图
+ *
+ * @author chitanda
+ * @date 2022-09-28 16:09:15
+ * @export
+ * @param {IAppDERedirectView} appView
+ * @param {IContext}
+ * @param {IParams} [params={}]
+ * @param {IData[]} [data=[]]
+ * @return {*}  {Promise<IModalData>}
+ */
+export async function openDERedirectView(
+  appView: IAppDERedirectView,
+  context: IContext,
+  params: IParams = {},
+  opts: IOpenViewOptions = {},
+): Promise<IModalData> {
+  let toView: ({ type: 'view' } & ToViewParams) | { type: 'url'; url: string };
+  try {
+    toView = await getDERedirectToView(appView, context, params, opts);
+  } catch (error) {
+    ibiz.log.error(error);
+    return { ok: false, data: [] };
+  }
+
+  // 返回路径，则用window打开
+  if (toView.type === 'url') {
+    const openUrl = toView.url;
+    return new Promise(resolve => {
+      const newWindow = window.open(openUrl, '_blank');
+      if (newWindow) {
+        (newWindow as IData).callback = (): void => {
+          resolve({ ok: true, data: [] });
+        };
+      }
+    });
+  }
+
+  // 返回视图相关信息，则打开视图
+  const result = await ibiz.commands.execute(
+    OpenAppViewCommand.TAG,
+    toView.viewId,
+    toView.context,
+    toView.params,
+    toView.opts,
+  );
+  return result || { ok: true, data: [] };
 }
 
 /**
@@ -256,7 +310,8 @@ export async function calcDERdTag(
     const { codeName } = findFieldById(entity, typeFieldId)!;
     const value = data[codeName!.toLowerCase()];
     if (notNilEmpty(value)) {
-      return `${value}`;
+      // 因为平台发布出来的标识全都是大写，所以这里也全部转大写
+      return `${value.toUpperCase()}`;
     }
     ibiz.log.warn(
       `重定向视图[${rdView.name}]自定义类别属性[${typeFieldId}]值为空`,

package/src/utils/ui-domain/ui-domain.ts

@@ -1,4 +1,5 @@
 import { createUUID } from 'qx-util';
+import { IParentConfig } from '../../interface';
 
 /**
  * 界面域
@@ -18,6 +19,16 @@ export class UIDomain {
    */
   readonly id: string;
 
+  /**
+   * DTO 父子关系映射
+   *
+   * @author chitanda
+   * @date 2023-12-26 15:12:13
+   * @protected
+   * @type {Map<string, IParentConfig[]>}
+   */
+  protected rsMap: Map<string, IParentConfig[]> = new Map();
+
   /**
    * Creates an instance of UIDomain.
    *
@@ -34,6 +45,37 @@ export class UIDomain {
     }
   }
 
+  /**
+   * 设置当前界面域下，指定实体的相关父关系以及属性。在 DTO 包解析时设置此参数，销毁时清空
+   *
+   * @author chitanda
+   * @date 2023-12-26 15:12:31
+   * @param {string} entity
+   * @param {IParentConfig} config
+   */
+  setDERConfig(deCodeName: string, config: IParentConfig): void {
+    if (!this.rsMap.has(deCodeName)) {
+      this.rsMap.set(deCodeName, []);
+    }
+    const arr = this.rsMap.get(deCodeName)!;
+    arr.push(config);
+  }
+
+  /**
+   * 获取当前界面域下，具体实体的关系(在数据加载完成之后才有值)
+   *
+   * @author chitanda
+   * @date 2023-12-26 16:12:07
+   * @param {string} deCodeName
+   * @return {*}  {IParentConfig[]}
+   */
+  getDERConfig(deCodeName: string): IParentConfig[] {
+    if (this.rsMap.has(deCodeName)) {
+      return this.rsMap.get(deCodeName)!;
+    }
+    return [];
+  }
+
   /**
    * 界面域销毁
    *
@@ -41,6 +83,8 @@ export class UIDomain {
    * @date 2023-12-22 15:12:49
    */
   destroy(): void {
+    // 清空当前域下的父子关系映射
+    this.rsMap.clear();
     const apps = ibiz.hub.getAllApps();
     apps.forEach(app => {
       app.deService.reset({