@ibiz-template/runtime 0.0.3-beta.5 → 0.0.3-beta.7

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

@@ -1,10 +1,7 @@
-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';
@@ -21,56 +18,81 @@ import { AppDEUIActionUtil } from '../app-de-ui-action-util';
 export abstract class UIActionHandler implements IUIActionHandler {
   async exec(
     action: IPSAppDEUIAction,
-    context: IBizContext,
-    data: IData[] | null,
+    context: IContext,
+    data: IDatum[],
     params: IParams,
-    opts?: IData | undefined,
+    opts?: IData,
   ): Promise<IUIActionResult> {
+    const result: IUIActionResult = {
+      refresh: action.reloadData,
+      closeView: action.closeEditView,
+    };
+
+    // ** 界面逻辑替换执行界面行为
     const deUILogic = action.getPSAppDEUILogic();
-    // 界面逻辑替换执行界面行为
     if (deUILogic && action.uILogicAttachMode === 'REPLACE') {
       await execUILogic(deUILogic, context, data, params, opts);
-      return {
-        refresh: false,
-        closeView: false,
-      };
+      return result;
     }
+
     // **用户操作确认**
     if (!(await this.isConfirm(action))) {
-      return {
-        refresh: false,
-        closeView: false,
-      };
+      return this.returnError(result);
     }
 
-    const result: IUIActionResult = {
-      refresh: action.reloadData,
-      closeView: action.closeEditView,
-    };
-
-    // 执行不同类型的界面行为独有逻辑，并且合并result
+    // ** 执行不同类型的界面行为独有逻辑，并且合并result
     const _result = await this.execAction(action, context, data, params, opts);
     Object.assign(result, _result);
-
     // 如果是取消操作则中断后续处理逻辑。
     if (result.cancel === true) {
-      return result;
+      return this.returnError(result);
     }
 
-    await this.doNextAction(
+    // ** 后续界面行为
+    const nextResult = await this.doNextAction(
       action,
-      context,
-      _result.data || data,
-      params,
+      result.nextContext || context,
+      result.data || data,
+      result.nextParams || params,
       opts,
     );
-    // 界面行为执行之后，执行界面逻辑
+    if (nextResult) {
+      Object.assign(result, nextResult);
+      if (nextResult.cancel === true) {
+        return this.returnError(result);
+      }
+    }
+
+    // ** 界面行为执行之后，执行界面逻辑
     if (deUILogic && action.uILogicAttachMode === 'AFTER') {
-      await execUILogic(deUILogic, context, data, params, opts);
+      await execUILogic(
+        deUILogic,
+        result.nextContext || context,
+        result.data || data,
+        result.nextParams || params,
+        opts,
+      );
     }
+
     return result;
   }
 
+  /**
+   * 有错误和取消时对result做的处理
+   * @author lxm
+   * @date 2023-03-15 07:43:21
+   * @protected
+   * @param {IUIActionResult} result
+   * @returns {*}  {IUIActionResult}
+   * @memberof UIActionHandler
+   */
+  protected returnError(result: IUIActionResult): IUIActionResult {
+    return Object.assign(result, {
+      refresh: false,
+      closeView: false,
+    });
+  }
+
   /**
    * 用户操作确认
    *
@@ -93,16 +115,16 @@ export abstract class UIActionHandler implements IUIActionHandler {
    * @date 2022-10-25 15:10:03
    * @abstract
    * @param {IPSAppDEUIAction} action
-   * @param {IBizContext} context
-   * @param {(IData[] | null)} data
+   * @param {IContext} context
+   * @param {(IDatum[])} data
    * @param {IParams} params
    * @param {(IData | undefined)} [opts]
    * @returns {*}  {Promise<IUIActionResult>}
    */
   abstract execAction(
     action: IPSAppDEUIAction,
-    context: IBizContext,
-    data: IData[] | null,
+    context: IContext,
+    data: IDatum[],
     params: IParams,
     opts?: IData | undefined,
   ): Promise<IUIActionResult>;
@@ -113,25 +135,25 @@ export abstract class UIActionHandler implements IUIActionHandler {
    * @author lxm
    * @date 2022-10-25 15:10:54
    * @param {IPSAppDEUIAction} action
-   * @param {IBizContext} context
-   * @param {(IData[] | null)} data
+   * @param {IContext} context
+   * @param {(IDatum[])} data
    * @param {IParams} params
    * @param {(IData | undefined)} [opts]
    * @returns {*}  {Promise<void>}
    */
   async doNextAction(
     action: IPSAppDEUIAction,
-    context: IBizContext,
-    data: IData[] | null,
+    context: IContext,
+    data: IDatum[],
     params: IParams,
     opts?: IData | undefined,
-  ): Promise<void> {
+  ): Promise<IUIActionResult | void> {
     const nextAction = (await getPSUIActionByModelObject(
       action,
       'getNextPSUIAction',
     )) as IPSAppDEUIAction;
     if (nextAction) {
-      await AppDEUIActionUtil.exec(nextAction, context, data, params, opts);
+      return AppDEUIActionUtil.exec(nextAction, context, data, params, opts);
     }
   }
 
@@ -143,80 +165,85 @@ export abstract class UIActionHandler implements IUIActionHandler {
    * @protected
    * @static
    * @param {IPSAppDEUIAction} action 界面行为
-   * @param {IBizContext} context 上下文
-   * @param {(IData[] | null)} data 数据集合
+   * @param {IContext} context 上下文
+   * @param {(IDatum[])} data 数据集合
    * @param {IParams} params 视图参数
    * @returns {*}  {Promise<{
-   *     resultContext: IBizContext; 处理后的上下文
-   *     resultData: IData[]; 处理后的数据集合
+   *     resultContext: IContext; 处理后的上下文
+   *     resultData: IDatum[]; 处理后的数据集合
    *     resultParams: IParams; 处理后的视图参数
    *   }>}
    */
   protected async handleParams(
     action: IPSAppDEUIAction,
-    context: IBizContext,
-    data: IData[] | null,
+    context: IContext,
+    data: IDatum[],
     params: IParams,
   ): Promise<{
-    resultContext: IBizContext;
-    resultData: IData[];
+    resultContext: IContext;
+    resultData: IDatum[];
     resultParams: IParams;
   }> {
-    let resultData = data || [];
+    let resultData: IDatum[] = [];
     // 数据目标不支持提示
-    if (
-      ['SINGLEDATA', 'MULTIDATA', 'MULTIKEY'].indexOf(action.actionTarget) !==
-      -1
-    ) {
+    if (['MULTIDATA', 'MULTIKEY'].indexOf(action.actionTarget) !== -1) {
       throw new Error(
         `数据类型${action.actionTarget}暂未支持,请配置无数据或单项数据主键`,
       );
     }
 
-    // 数据目标为无数据时，清空数据
-    if (action.actionTarget === 'NONE') {
-      resultData = [];
+    // 准备实体名称
+    const appDataEntity = action.getPSAppDataEntity();
+    if (appDataEntity) {
+      await appDataEntity.fill(true);
+    }
+    const deName = appDataEntity?.codeName.toLowerCase();
+    const originData = data[0] || {};
+    const deSrfkey = originData.srfkey || originData[deName || ''];
+
+    // 根据数据目标处理数据集合
+    switch (action.actionTarget) {
+      // 数据目标为无数据时，清空数据
+      case 'NONE':
+        resultData = [];
+        break;
+      // 单项数据给单个数据
+      case 'SINGLEDATA':
+        resultData = [data[0]];
+        break;
+      // 多项数据传递数组
+      case 'MULTIDATA':
+        resultData = data;
+        break;
+      // 单项数据主键，传递包含一个对象的数组，对象里只含有一个主键
+      case 'SINGLEKEY':
+        resultData = deName ? [{ [deName]: deSrfkey }] : [];
+        break;
+      default:
+        break;
     }
 
     // 处理上下文导航参数
-    let tempContext = {};
+    const resultContext = context.clone();
     const navContexts = action.getPSNavigateContexts() || [];
 
-    // 单项数据主键时，在导航参数开头加一个主键的导航参数，可以被配置的同名导航参数覆盖。
+    // 单项数据主键或单项数据时，在导航参数开头加一个主键的导航参数，可以被配置的同名导航参数覆盖。
     // 数据项名称替换主键的取值属性，参数项名称替换处理后主键在上下文的名称
-    const appDataEntity = action.getPSAppDataEntity();
-    const { valueItem, paramItem } = action;
-    if (appDataEntity && action.actionTarget === 'SINGLEKEY') {
-      await appDataEntity?.fill(true);
-      const appDeName = appDataEntity.codeName.toLowerCase();
-      navContexts.unshift({
-        key: paramItem || appDeName,
-        value: valueItem || 'srfkey',
-        rawValue: false,
-      } as IPSNavigateContext);
+    if (deName && ['SINGLEKEY', 'SINGLEDATA'].includes(action.actionTarget)) {
+      const { valueItem, paramItem } = action;
+      const key = paramItem || deName;
+      const value = valueItem ? originData[valueItem] : deSrfkey;
+      resultContext[key] = value;
     }
 
-    if (notNilEmpty(navContexts)) {
-      tempContext = convertNavData(
-        navContexts!,
-        context,
-        params,
-        data?.[0] || {},
-      );
-    }
-    const resultContext = Object.assign(context.clone(), tempContext);
+    // 处理自定义导航上下文
+    const datum = resultData?.[0] || {};
+    const tempContext = convertNavData(navContexts, context, params, datum);
+    Object.assign(resultContext, tempContext);
 
-    // 处理导航视图参数
-    let resultParams: IData = {};
+    // 处理自定义导航视图参数
     const navParams = action.getPSNavigateParams();
-    if (notNilEmpty(navParams)) {
-      resultParams = convertNavData(
-        navParams!,
-        context,
-        params,
-        data?.[0] || {},
-      );
-    }
+    const resultParams = convertNavData(navParams, context, params, datum);
     return { resultContext, resultData, resultParams };
   }
 }

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

@@ -1,4 +1,3 @@
-import { IBizContext } from '@ibiz-template/core';
 import { IPSAppDEUIAction } from '@ibiz-template/model';
 import { IUIActionResult } from '../../../interface';
 import { UIActionHandler } from './ui-action-handler';
@@ -15,8 +14,8 @@ import { UIActionHandler } from './ui-action-handler';
 export class WFWithdrawUIActionHandler extends UIActionHandler {
   async execAction(
     action: IPSAppDEUIAction,
-    context: IBizContext,
-    data: IData[] | null,
+    context: IContext,
+    data: IDatum[] | null,
     params: IParams,
     opts?: IData | undefined,
   ): Promise<IUIActionResult> {
@@ -26,7 +25,7 @@ export class WFWithdrawUIActionHandler extends UIActionHandler {
     });
     let isCloseView = false;
     if (isWithdraw && opts?.neuron) {
-      await opts!.neuron.call.wfWithdraw(context, params, data?.[0] || []);
+      await opts!.neuron.wfWithdraw(context, params, data?.[0] || []);
       isCloseView = true;
     }
     return {

package/src/utils/index.ts

@@ -1,5 +1,9 @@
 export { calcNavParams } from './nav-params/calc-nav-params';
 export * from './nav-params/nav-params';
 export * from './app-de-ui-action-util';
-export { openRedirectView } from './open-redirect-view/open-redirect-view';
+export {
+  toLocalOpenWFRedirectView,
+  openRedirectView,
+} from './open-redirect-view/open-redirect-view';
 export * from './verify';
+export * from './wf-helper/wf-helper';

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

@@ -69,7 +69,7 @@ export function convertNavDataByArray(
         result[naviData.key.toLowerCase()] = findOrigin[naviData.value];
       }
     } else {
-      result[naviData.key.toLowerCase()] = naviData.value;
+      result[naviData.key.toLowerCase()] = naviData.value || null;
     }
   }
   return result;
@@ -104,7 +104,7 @@ export function convertNavDataByObject(naviData: IData, ...origins: IData[]) {
         result[key.toLowerCase()] = findOrigin[valueKey];
       }
     } else {
-      result[key.toLowerCase()] = naviData[key];
+      result[key.toLowerCase()] = naviData[key] || null;
     }
   }
   return result;

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

@@ -1,4 +1,4 @@
-import { IBizContext, RuntimeError } from '@ibiz-template/core';
+import { RuntimeError } from '@ibiz-template/core';
 import {
   DefectModelError,
   IPSAppDataEntity,
@@ -20,16 +20,16 @@ import { convertNavData } from '../nav-params/nav-params';
  * @date 2022-09-28 16:09:13
  * @export
  * @param {IPSAppRedirectView} appView 应用重定向视图
- * @param {IBizContext}
+ * @param {IContext}
  * @param {IParams} [params={}]
  * @param {IData} [data={}]
  * @return {*}  {Promise<IModalData>}
  */
 export async function openRedirectView(
   appView: IPSAppRedirectView,
-  context: IBizContext,
+  context: IContext,
   params: IParams = {},
-  data: IData[] = [],
+  data: IDatum[] = [],
 ): Promise<IModalData> {
   if (appView.instanceof('app.view.IPSAppDERedirectView')) {
     return openDERedirectView(
@@ -53,12 +53,12 @@ export async function openRedirectView(
  * @date 2023-01-12 11:01:40
  * @export
  * @param {IPSAppDERedirectView} appView
- * @param {IBizContext} context
+ * @param {IContext} context
  * @param {string} linkUrl
  */
 export async function toLocalOpenWFRedirectView(
   modelService: IPSModelService,
-  context: IBizContext,
+  context: IContext,
   linkUrl: string,
 ) {
   const i = linkUrl.lastIndexOf('?');
@@ -137,16 +137,16 @@ export async function toLocalOpenWFRedirectView(
  * @date 2022-09-28 16:09:15
  * @export
  * @param {IPSAppDERedirectView} appView
- * @param {IBizContext}
+ * @param {IContext}
  * @param {IParams} [params={}]
- * @param {IData[]} [data=[]]
+ * @param {IDatum[]} [data=[]]
  * @return {*}  {Promise<IModalData>}
  */
 export async function openDERedirectView(
   appView: IPSAppDERedirectView,
-  context: IBizContext,
+  context: IContext,
   params: IParams = {},
-  data: IData[] = [],
+  data: IDatum[] = [],
 ): Promise<IModalData> {
   // 计算重定向视图上下文参数转换
   const navContext = appView.getPSAppViewNavContexts() || [];
@@ -184,8 +184,14 @@ export async function openDERedirectView(
         linkUrl += `;srfprocessinstanceid=${context.srfprocessinstanceid}`;
       }
       if (linkUrl.startsWith('http://') || linkUrl.startsWith('https://')) {
-        window.open(linkUrl, '_blank');
-        return { ok: true, data: [] };
+        return new Promise(resolve => {
+          const newWindow = window.open(linkUrl, '_blank');
+          if (newWindow) {
+            (newWindow as IData).callback = () => {
+              resolve({ ok: true, data: [] });
+            };
+          }
+        });
       }
       if (linkUrl.startsWith('appredirectview?')) {
         await toLocalOpenWFRedirectView(
@@ -199,12 +205,19 @@ export async function openDERedirectView(
     }
   }
   const rdTag = await calcDERdTag(entity, appView, params.srfwf, curData);
+  // !!!工作流临时补充特殊处理标识, 避免补充了工作流流程匹配不上, 再从默认tag匹配!!!
+  const rdTagItems = rdTag.split(':');
+  const wfRdTag =
+    rdTagItems.length === 2 ? rdTag : rdTagItems.slice(0, 2).join(':');
   // 拼接当前重定向视图所在应用实体名称为前缀
   const deRdTag = `${entity.name.toUpperCase()}:${rdTag}`;
   // 所有重定向引用视图
   const allRefViews = appView.getRedirectPSAppViewRefs();
   const refView = allRefViews?.find(view => {
-    return view.name === deRdTag || view.name === rdTag;
+    // 特殊补充 wfRdTag 匹配，子流程应用特殊模式
+    return (
+      view.name === deRdTag || view.name === rdTag || view.name === wfRdTag
+    );
   });
   if (refView) {
     const view = refView.getRefPSAppView();

package/src/utils/wf-helper/wf-helper.ts

@@ -0,0 +1,14 @@
+/**
+ * 预置工作流相关数据处理并生成需要的上下文参数
+ *
+ * @export
+ * @param {IData} data
+ * @returns {*}
+ */
+export function getWFContext(data: IData) {
+  const tempContext: IData = {};
+  if (data.param09) {
+    tempContext.srfprocessinstanceid = data.param09;
+  }
+  return tempContext;
+}

package/src/view-logic/index.ts

@@ -1 +1,3 @@
+export * from './view-logic-trigger';
 export * from './view-logic';
+export { ViewLogicDispatcher } from './view-logic-dispatcher';

package/src/view-logic/view-logic-dispatcher.ts

@@ -0,0 +1,123 @@
+import { IPSAppViewLogic, UnsupportedModelError } from '@ibiz-template/model';
+import {
+  ViewLogicCtrlEventTrigger,
+  ViewLogicCustomTrigger,
+  ViewLogicPanelEventTrigger,
+  ViewLogicTimerTrigger,
+  ViewLogicViewEventTrigger,
+} from './view-logic-trigger';
+
+/**
+ * 视图逻辑分发器
+ * @author lxm
+ * @date 2023-03-20 01:29:47
+ * @export
+ * @class ViewLogicDispatcher
+ */
+export class ViewLogicDispatcher {
+  /**
+   * 自定义事件触发器
+   * @author lxm
+   * @date 2023-03-23 07:59:47
+   * @type {ViewLogicCustomTrigger}
+   */
+  custom: ViewLogicCustomTrigger;
+
+  /**
+   * 定时器触发器
+   * @author lxm
+   * @date 2023-03-23 07:59:59
+   * @type {ViewLogicTimerTrigger}
+   */
+  timer: ViewLogicTimerTrigger;
+
+  /**
+   * 视图事件触发器
+   * @author lxm
+   * @date 2023-03-23 08:00:10
+   * @type {ViewLogicViewEventTrigger}
+   */
+  view: ViewLogicViewEventTrigger;
+
+  /**
+   * 面板事件触发器
+   * @author lxm
+   * @date 2023-03-23 08:00:19
+   * @type {ViewLogicPanelEventTrigger}
+   */
+  panel: ViewLogicPanelEventTrigger;
+
+  /**
+   * 部件事件触发器
+   * @author lxm
+   * @date 2023-03-23 08:01:04
+   * @type {ViewLogicCtrlEventTrigger}
+   */
+  ctrl: ViewLogicCtrlEventTrigger;
+
+  /**
+   *
+   * @author lxm
+   * @date 2023-03-20 01:30:56
+   * @param {IPSAppViewLogic[]} viewLogics 所有视图逻辑集合
+   */
+  constructor(
+    protected defaultContext: IContext,
+    protected defaultParams: IParams,
+  ) {
+    this.custom = new ViewLogicCustomTrigger(defaultContext, defaultParams);
+    this.timer = new ViewLogicTimerTrigger(defaultContext, defaultParams);
+    this.view = new ViewLogicViewEventTrigger(defaultContext, defaultParams);
+    this.panel = new ViewLogicPanelEventTrigger(defaultContext, defaultParams);
+    this.ctrl = new ViewLogicCtrlEventTrigger(defaultContext, defaultParams);
+  }
+
+  /**
+   * 初始化逻辑，根据对应的触发类型注册监听视图逻辑
+   * @author lxm
+   * @date 2023-03-23 08:04:38
+   * @param {IPSAppViewLogic[]} viewLogics
+   * @return {*}  {Promise<void>}
+   */
+  async init(viewLogics: IPSAppViewLogic[]): Promise<void> {
+    await Promise.all(
+      viewLogics.map(logic => {
+        switch (logic.logicTrigger) {
+          // 定时器触发
+          case 'TIMER':
+            return this.timer.listenViewLogic(logic);
+          // 视图事件
+          case 'VIEWEVENT':
+            return this.view.listenViewLogic(logic);
+          // 部件事件
+          case 'CTRLEVENT':
+            return this.ctrl.listenViewLogic(logic);
+          // 面板成员事件
+          case 'PANELEVENT':
+            return this.panel.listenViewLogic(logic);
+          // 自定义
+          case 'CUSTOM':
+            return this.custom.listenViewLogic(logic);
+          default:
+            throw new UnsupportedModelError(
+              logic,
+              `未支持的触发时机${logic.logicTrigger}`,
+            );
+        }
+      }),
+    );
+  }
+
+  /**
+   * 销毁方法
+   * @author lxm
+   * @date 2023-03-20 02:00:49
+   */
+  destroy() {
+    this.timer.destroy();
+    this.ctrl.destroy();
+    this.custom.destroy();
+    this.view.destroy();
+    this.panel.destroy();
+  }
+}

package/src/view-logic/view-logic-trigger/index.ts

@@ -0,0 +1,7 @@
+export { ViewLogicTrigger } from './view-logic-trigger';
+export { ViewLogicTimerTrigger } from './view-logic-timer-trigger';
+export { ViewLogicCustomTrigger } from './view-logic-custom-trigger';
+export { ViewLogicEventTrigger } from './view-logic-event-trigger';
+export { ViewLogicViewEventTrigger } from './view-logic-view-event-trigger';
+export { ViewLogicPanelEventTrigger } from './view-logic-panel-event-trigger';
+export { ViewLogicCtrlEventTrigger } from './view-logic-ctrl-event-trigger';

package/src/view-logic/view-logic-trigger/view-logic-ctrl-event-trigger.ts

@@ -0,0 +1,28 @@
+import { IPSAppViewLogic } from '@ibiz-template/model';
+import { StudioControlEvents } from '../../constant';
+import { ViewLogicEventTrigger } from './view-logic-event-trigger';
+
+/**
+ * 视图逻辑-部件事件类型触发器
+ * @author lxm
+ * @date 2023-03-23 02:33:29
+ * @export
+ * @class ViewLogicEventTrigger
+ * @extends {ViewLogicTrigger}
+ */
+export class ViewLogicCtrlEventTrigger extends ViewLogicEventTrigger {
+  protected getTemplateEventName(name: string) {
+    if (name in StudioControlEvents) {
+      return StudioControlEvents[name as keyof StudioControlEvents];
+    }
+    return super.getTemplateEventName(name);
+  }
+
+  async listenViewLogic(viewlogic: IPSAppViewLogic): Promise<void> {
+    if (viewlogic.logicTrigger !== 'CTRLEVENT') {
+      // 非部件事件类视图逻辑不监听
+      return;
+    }
+    super.listenViewLogic(viewlogic);
+  }
+}