@ibiz-template/runtime 0.0.3-beta.2 → 0.0.3-beta.4

package/src/utils/app-de-ui-action-util/handler/front-ui-action-handler.ts

@@ -1,7 +1,11 @@
-import { IBizContext } from '@ibiz-template/core';
-import { IPSAppDEUIAction, UnsupportedModelError } from '@ibiz-template/model';
+import { IBizContext, StringUtil } from '@ibiz-template/core';
+import {
+  DefectModelError,
+  IPSAppDEUIAction,
+  UnsupportedModelError,
+} from '@ibiz-template/model';
 import { OpenAppViewCommand } from '../../../command';
-import { IUIActionResult } from '../../../interface';
+import { IModalData, IUIActionResult } from '../../../interface';
 import { UIActionHandler } from './ui-action-handler';
 
 /**
@@ -19,17 +23,20 @@ export class FrontUIActionHandler extends UIActionHandler {
     context: IBizContext,
     data: IData[] | null,
     params: IParams,
-    opts?: IData | undefined,
+    opts?: IParams | undefined,
   ): Promise<IUIActionResult> {
+    const actionResult: IUIActionResult = {};
     switch (action.frontProcessType) {
-      case 'OPENHTMLPAGE':
-        window.open(action.htmlPageUrl, '_blank');
+      case 'OPENHTMLPAGE': {
+        const url = StringUtil.fill(action.htmlPageUrl, context, data?.[0]);
+        window.open(url, '_blank');
         break;
+      }
       case 'TOP':
       case 'WIZARD': {
         const frontPSAppView = action.getFrontPSAppView();
         if (!frontPSAppView) {
-          throw new Error('未配置打开视图');
+          throw new DefectModelError(action, '未配置打开视图');
         }
         await frontPSAppView.fill(true);
         // 处理参数
@@ -39,13 +46,24 @@ export class FrontUIActionHandler extends UIActionHandler {
           data,
           params,
         );
-        await ibiz.commands.execute(
+        const res: IModalData | undefined = await ibiz.commands.execute(
           OpenAppViewCommand.TAG,
           frontPSAppView,
           resultContext,
           resultParams,
           opts,
         );
+        // 打开视图取消操作时，不执行刷新和关闭视图操作。
+        if (res?.ok === false) {
+          actionResult.closeView = false;
+          actionResult.refresh = false;
+          actionResult.cancel = true;
+        }
+
+        if (res?.ok && res.data) {
+          actionResult.data = res.data;
+        }
+
         break;
       }
       default:
@@ -54,6 +72,6 @@ export class FrontUIActionHandler extends UIActionHandler {
           `未支持的前台处理模式[${action.frontProcessType}]`,
         );
     }
-    return {};
+    return actionResult;
   }
 }

package/src/utils/app-de-ui-action-util/handler/ui-action-handler.ts

@@ -1,7 +1,12 @@
-import { IBizContext, RuntimeError } from '@ibiz-template/core';
-import { IPSAppDEUIAction, IPSNavigateContext } from '@ibiz-template/model';
+import { IBizContext } from '@ibiz-template/core';
+import {
+  getPSUIActionByModelObject,
+  IPSAppDEUIAction,
+  IPSNavigateContext,
+} from '@ibiz-template/model';
 import { notNilEmpty } from 'qx-util';
 import { IUIActionHandler, IUIActionResult } from '../../../interface';
+import { execUILogic } from '../../../ui-logic';
 import { convertNavData } from '../../nav-params/nav-params';
 import { AppDEUIActionUtil } from '../app-de-ui-action-util';
 
@@ -21,12 +26,23 @@ export abstract class UIActionHandler implements IUIActionHandler {
     params: IParams,
     opts?: IData | undefined,
   ): Promise<IUIActionResult> {
+    const deUILogic = action.getPSAppDEUILogic();
+    // 界面逻辑替换执行界面行为
+    if (deUILogic && action.uILogicAttachMode === 'REPLACE') {
+      await execUILogic(deUILogic, context, data, params, opts);
+      return {
+        refresh: false,
+        closeView: false,
+      };
+    }
     // **用户操作确认**
     if (!(await this.isConfirm(action))) {
-      return {};
+      return {
+        refresh: false,
+        closeView: false,
+      };
     }
 
-    const { neuron } = opts!;
     const result: IUIActionResult = {
       refresh: action.reloadData,
       closeView: action.closeEditView,
@@ -36,8 +52,22 @@ export abstract class UIActionHandler implements IUIActionHandler {
     const _result = await this.execAction(action, context, data, params, opts);
     Object.assign(result, _result);
 
-    await this.doNextAction(action, context, data, params, opts);
-    await this.handleResult(result, neuron);
+    // 如果是取消操作则中断后续处理逻辑。
+    if (result.cancel === true) {
+      return result;
+    }
+
+    await this.doNextAction(
+      action,
+      context,
+      _result.data || data,
+      params,
+      opts,
+    );
+    // 界面行为执行之后，执行界面逻辑
+    if (deUILogic && action.uILogicAttachMode === 'AFTER') {
+      await execUILogic(deUILogic, context, data, params, opts);
+    }
     return result;
   }
 
@@ -96,39 +126,15 @@ export abstract class UIActionHandler implements IUIActionHandler {
     params: IParams,
     opts?: IData | undefined,
   ): Promise<void> {
-    const nextAction = action.getNextPSUIAction() as IPSAppDEUIAction;
+    const nextAction = (await getPSUIActionByModelObject(
+      action,
+      'getNextPSUIAction',
+    )) as IPSAppDEUIAction;
     if (nextAction) {
       await AppDEUIActionUtil.exec(nextAction, context, data, params, opts);
     }
   }
 
-  /**
-   * 处理结果（刷新和关闭视图）
-   *
-   * @author lxm
-   * @date 2022-10-25 14:10:11
-   * @param {IUIActionResult} result
-   * @param {IData} neuron
-   */
-  async handleResult(result: IUIActionResult, neuron: IData): Promise<void> {
-    // *关闭引用视图,关闭后不再执行刷新
-    if (result.closeView) {
-      if (!neuron.call.closeView) {
-        throw new RuntimeError(`该视图不存在关闭视图能力`);
-      }
-      await neuron.call.closeView();
-      return;
-    }
-
-    // *刷新引用视图
-    if (result.refresh) {
-      if (!neuron.call.refresh) {
-        throw new RuntimeError(`该视图不存在刷新能力`);
-      }
-      await neuron.call.refresh();
-    }
-  }
-
   /**
    * 参数处理(根据数据目标和数据参数，导航参数)
    *

package/src/utils/index.ts

@@ -1,3 +1,4 @@
 export * from './nav-params/nav-params';
 export * from './app-de-ui-action-util';
 export { openRedirectView } from './open-redirect-view/open-redirect-view';
+export * from './verify';

package/src/utils/nav-params/nav-params.ts

@@ -1,4 +1,5 @@
 import { IPSNavigateParam } from '@ibiz-template/model';
+import { isEmpty } from 'lodash-es';
 import { isNilOrEmpty, notNilEmpty } from 'qx-util';
 
 /**
@@ -15,9 +16,14 @@ import { isNilOrEmpty, notNilEmpty } from 'qx-util';
  * @param {...IData[]} origins 转换数据来源集合
  */
 export function convertNavData(
-  naviDatas: IPSNavigateParam[] | IData,
+  naviDatas: IPSNavigateParam[] | IData | undefined | null,
   ...origins: IData[]
 ) {
+  // 如果导航参数不存在或者为空对象，返回{}
+  if (!naviDatas || isEmpty(naviDatas)) {
+    return {};
+  }
+
   if (Object.prototype.toString.call(naviDatas) === '[object Array]') {
     return convertNavDataByArray(naviDatas as IPSNavigateParam[], ...origins);
   }

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

@@ -1,11 +1,13 @@
-import { IBizContext } from '@ibiz-template/core';
+import { IBizContext, RuntimeError } from '@ibiz-template/core';
 import {
   DefectModelError,
   IPSAppDataEntity,
   IPSAppDERedirectView,
   IPSAppRedirectView,
+  IPSModelService,
   UnsupportedModelError,
 } from '@ibiz-template/model';
+import qs from 'qs';
 import { isNilOrEmpty, notNilEmpty } from 'qx-util';
 import { OpenAppViewCommand } from '../../command';
 import { IModalData } from '../../interface';
@@ -43,6 +45,91 @@ export async function openRedirectView(
   );
 }
 
+/**
+ * 本地打开工作流重定向视图
+ *
+ * @description 工作流 appredirectview 特殊处理，全局通过 appredirectview 跳转工作流重定向，均使用此方法
+ * @author chitanda
+ * @date 2023-01-12 11:01:40
+ * @export
+ * @param {IPSAppDERedirectView} appView
+ * @param {IBizContext} context
+ * @param {string} linkUrl
+ */
+export async function toLocalOpenWFRedirectView(
+  modelService: IPSModelService,
+  context: IBizContext,
+  linkUrl: string,
+) {
+  const i = linkUrl.lastIndexOf('?');
+
+  const queryStr: string = decodeURIComponent(
+    linkUrl.substring(i + 1, linkUrl.length),
+  );
+
+  const params = qs.parse(queryStr, { delimiter: ';' }) as IData;
+
+  const deName: string = params.srfdename || '';
+
+  if (!deName) {
+    throw new RuntimeError('重定向参数缺少实体名称');
+  }
+
+  const upperDeName = deName.toUpperCase();
+
+  const { app } = modelService;
+
+  const entity = app.getAllPSAppDataEntities()!.find(item => {
+    return (item.name || item.refM.name) === upperDeName;
+  });
+
+  if (!entity) {
+    throw new RuntimeError(`未找到指定实体: ${deName}`);
+  }
+
+  const deCodeName: string = entity.codeName || entity.refM.codeName;
+
+  params[deCodeName.toLowerCase()] = params[deName.toLowerCase()];
+
+  const deRdView = app.getAllPSAppViews()?.find(view => {
+    const { refM } = view;
+    if (refM.resource === deCodeName && refM.view === 'RedirectView') {
+      return view;
+    }
+    return null;
+  });
+
+  if (!deRdView) {
+    throw new Error(`未找到实体[${deName}]默认重定向视图[RedirectView]`);
+  }
+
+  // 删除跳转用参数
+  delete params.srfdename;
+
+  // 转换 processDefinitionKey 中的工作流流程以及版本到参数中
+  if (params.srfwf !== 'undo') {
+    const tags = params.processDefinitionKey.split('-');
+    const wfTag = tags[3] as string;
+    const wf = wfTag.substring(0, wfTag.lastIndexOf('v'));
+    const wfVersion = wfTag.substring(wfTag.lastIndexOf('v'));
+    params.wf = wf;
+    params.wfVersion = wfVersion;
+  }
+
+  // 工作流附加参数转到上下文里
+  if (params.srfprocessinstanceid) {
+    context.srfprocessinstanceid = params.srfprocessinstanceid;
+    delete params.srfprocessinstanceid;
+  }
+
+  await ibiz.commands.execute(
+    OpenAppViewCommand.TAG,
+    deRdView,
+    context,
+    params,
+  );
+}
+
 /**
  * 打开实体重定向视图
  *
@@ -90,12 +177,24 @@ export async function openDERedirectView(
   ibiz.loading.hideRedirect();
   if (res.ok) {
     curData = res.data;
-    const linkUrl: string = curData.linkurl;
+    let linkUrl: string = curData.linkurl;
     if (linkUrl) {
+      // 工作流param09转的srfprocessinstanceid传递
+      if (context.srfprocessinstanceid) {
+        linkUrl += `;srfprocessinstanceid=${context.srfprocessinstanceid}`;
+      }
       if (linkUrl.startsWith('http://') || linkUrl.startsWith('https://')) {
         window.open(linkUrl, '_blank');
         return { ok: true, data: [] };
       }
+      if (linkUrl.startsWith('appredirectview?')) {
+        await toLocalOpenWFRedirectView(
+          appView.getPSModelService(),
+          context,
+          linkUrl,
+        );
+        return { ok: true, data: [] };
+      }
       return { ok: false, data: [] };
     }
   }
@@ -123,6 +222,11 @@ export async function openDERedirectView(
     } else {
       throw new DefectModelError(refView, `未配置实际引用视图`);
     }
+  } else {
+    throw new DefectModelError(
+      appView,
+      `未找到重定向标识[${rdTag}]或[${deRdTag}]对应视图`,
+    );
   }
   return { ok: true, data: [] };
 }