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

package/out/utils/app-de-ui-action-util/handler/front-ui-action-handler.js

@@ -1,4 +1,5 @@
-import { UnsupportedModelError } from '@ibiz-template/model';
+import { StringUtil } from '@ibiz-template/core';
+import { DefectModelError, UnsupportedModelError, } from '@ibiz-template/model';
 import { OpenAppViewCommand } from '../../../command';
 import { UIActionHandler } from './ui-action-handler';
 /**
@@ -12,25 +13,37 @@ import { UIActionHandler } from './ui-action-handler';
  */
 export class FrontUIActionHandler extends UIActionHandler {
     async execAction(action, context, data, params, opts) {
+        const actionResult = {};
         switch (action.frontProcessType) {
-            case 'OPENHTMLPAGE':
-                window.open(action.htmlPageUrl, '_blank');
+            case 'OPENHTMLPAGE': {
+                const url = StringUtil.fill(action.htmlPageUrl, context, data === null || data === void 0 ? void 0 : 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);
                 // 处理参数
                 const { resultContext, resultParams } = await this.handleParams(action, context, data, params);
-                await ibiz.commands.execute(OpenAppViewCommand.TAG, frontPSAppView, resultContext, resultParams, opts);
+                const res = await ibiz.commands.execute(OpenAppViewCommand.TAG, frontPSAppView, resultContext, resultParams, opts);
+                // 打开视图取消操作时，不执行刷新和关闭视图操作。
+                if ((res === null || res === void 0 ? void 0 : res.ok) === false) {
+                    actionResult.closeView = false;
+                    actionResult.refresh = false;
+                    actionResult.cancel = true;
+                }
+                if ((res === null || res === void 0 ? void 0 : res.ok) && res.data) {
+                    actionResult.data = res.data;
+                }
                 break;
             }
             default:
                 throw new UnsupportedModelError(action, `未支持的前台处理模式[${action.frontProcessType}]`);
         }
-        return {};
+        return actionResult;
     }
 }

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

@@ -47,15 +47,6 @@ export declare abstract class UIActionHandler implements IUIActionHandler {
      * @returns {*}  {Promise<void>}
      */
     doNextAction(action: IPSAppDEUIAction, context: IBizContext, data: IData[] | null, params: IParams, opts?: IData | undefined): Promise<void>;
-    /**
-     * 处理结果（刷新和关闭视图）
-     *
-     * @author lxm
-     * @date 2022-10-25 14:10:11
-     * @param {IUIActionResult} result
-     * @param {IData} neuron
-     */
-    handleResult(result: IUIActionResult, neuron: IData): Promise<void>;
     /**
      * 参数处理(根据数据目标和数据参数，导航参数)
      *

package/out/utils/app-de-ui-action-util/handler/ui-action-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-action-handler.d.ts","sourceRoot":"","sources":["../../../../src/utils/app-de-ui-action-util/handler/ui-action-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAgB,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAsB,MAAM,sBAAsB,CAAC;AAE5E,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAIvE;;;;;;;GAOG;AACH,8BAAsB,eAAgB,YAAW,gBAAgB;IACzD,IAAI,CACR,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,EACpB,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,KAAK,GAAG,SAAS,GACvB,OAAO,CAAC,eAAe,CAAC;IAqB3B;;;;;;;OAOG;IACG,SAAS,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IAO3D;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,UAAU,CACjB,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,EACpB,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,KAAK,GAAG,SAAS,GACvB,OAAO,CAAC,eAAe,CAAC;IAE3B;;;;;;;;;;;OAWG;IACG,YAAY,CAChB,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,EACpB,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,KAAK,GAAG,SAAS,GACvB,OAAO,CAAC,IAAI,CAAC;IAOhB;;;;;;;OAOG;IACG,YAAY,CAAC,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBzE;;;;;;;;;;;;;;;;OAgBG;cACa,YAAY,CAC1B,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,EACpB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC;QACT,aAAa,EAAE,WAAW,CAAC;QAC3B,UAAU,EAAE,KAAK,EAAE,CAAC;QACpB,YAAY,EAAE,OAAO,CAAC;KACvB,CAAC;CA0DH"}
+{"version":3,"file":"ui-action-handler.d.ts","sourceRoot":"","sources":["../../../../src/utils/app-de-ui-action-util/handler/ui-action-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAEL,gBAAgB,EAEjB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAKvE;;;;;;;GAOG;AACH,8BAAsB,eAAgB,YAAW,gBAAgB;IACzD,IAAI,CACR,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,EACpB,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,KAAK,GAAG,SAAS,GACvB,OAAO,CAAC,eAAe,CAAC;IA8C3B;;;;;;;OAOG;IACG,SAAS,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IAO3D;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,UAAU,CACjB,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,EACpB,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,KAAK,GAAG,SAAS,GACvB,OAAO,CAAC,eAAe,CAAC;IAE3B;;;;;;;;;;;OAWG;IACG,YAAY,CAChB,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,EACpB,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,KAAK,GAAG,SAAS,GACvB,OAAO,CAAC,IAAI,CAAC;IAUhB;;;;;;;;;;;;;;;;OAgBG;cACa,YAAY,CAC1B,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,EACpB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC;QACT,aAAa,EAAE,WAAW,CAAC;QAC3B,UAAU,EAAE,KAAK,EAAE,CAAC;QACpB,YAAY,EAAE,OAAO,CAAC;KACvB,CAAC;CA0DH"}

package/out/utils/app-de-ui-action-util/handler/ui-action-handler.js

@@ -1,5 +1,7 @@
-import { IBizContext, RuntimeError } from '@ibiz-template/core';
+import { IBizContext } from '@ibiz-template/core';
+import { getPSUIActionByModelObject, } from '@ibiz-template/model';
 import { notNilEmpty } from 'qx-util';
+import { execUILogic } from '../../../ui-logic';
 import { convertNavData } from '../../nav-params/nav-params';
 import { AppDEUIActionUtil } from '../app-de-ui-action-util';
 /**
@@ -12,11 +14,22 @@ import { AppDEUIActionUtil } from '../app-de-ui-action-util';
  */
 export class UIActionHandler {
     async exec(action, context, data, params, opts) {
+        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 = {
             refresh: action.reloadData,
             closeView: action.closeEditView,
@@ -24,8 +37,15 @@ export class UIActionHandler {
         // 执行不同类型的界面行为独有逻辑，并且合并result
         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;
     }
     /**
@@ -55,36 +75,11 @@ export class UIActionHandler {
      * @returns {*}  {Promise<void>}
      */
     async doNextAction(action, context, data, params, opts) {
-        const nextAction = action.getNextPSUIAction();
+        const nextAction = (await getPSUIActionByModelObject(action, 'getNextPSUIAction'));
         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, neuron) {
-        // *关闭引用视图,关闭后不再执行刷新
-        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/out/utils/index.d.ts

@@ -1,4 +1,5 @@
 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';
 //# sourceMappingURL=index.d.ts.map

package/out/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAC3E,cAAc,UAAU,CAAC"}

package/out/utils/index.js

@@ -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/out/utils/nav-params/nav-params.d.ts

@@ -12,7 +12,7 @@ import { IPSNavigateParam } from '@ibiz-template/model';
  * @param {IPSNavigateParam[]} naviDatas 导航参数
  * @param {...IData[]} origins 转换数据来源集合
  */
-export declare function convertNavData(naviDatas: IPSNavigateParam[] | IData, ...origins: IData[]): IData;
+export declare function convertNavData(naviDatas: IPSNavigateParam[] | IData | undefined | null, ...origins: IData[]): IData;
 /**
  * 通过模型中的导航数组 转换导航数据(如导航上下文，导航视图参数)
  * - 把%xxx%,转换成origins元素里对应叫xxx的值

package/out/utils/nav-params/nav-params.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nav-params.d.ts","sourceRoot":"","sources":["../../../src/utils/nav-params/nav-params.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGxD;;;;;;;;;;;;GAYG;AACH,wBAAgB,cAAc,CAC5B,SAAS,EAAE,gBAAgB,EAAE,GAAG,KAAK,EACrC,GAAG,OAAO,EAAE,KAAK,EAAE,SASpB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,qBAAqB,CACnC,SAAS,EAAE,gBAAgB,EAAE,EAC7B,GAAG,OAAO,EAAE,KAAK,EAAE,SAyBpB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,KAAK,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,SAoB1E"}
+{"version":3,"file":"nav-params.d.ts","sourceRoot":"","sources":["../../../src/utils/nav-params/nav-params.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAIxD;;;;;;;;;;;;GAYG;AACH,wBAAgB,cAAc,CAC5B,SAAS,EAAE,gBAAgB,EAAE,GAAG,KAAK,GAAG,SAAS,GAAG,IAAI,EACxD,GAAG,OAAO,EAAE,KAAK,EAAE,SAcpB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,qBAAqB,CACnC,SAAS,EAAE,gBAAgB,EAAE,EAC7B,GAAG,OAAO,EAAE,KAAK,EAAE,SAyBpB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,KAAK,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,SAoB1E"}

package/out/utils/nav-params/nav-params.js

@@ -1,3 +1,4 @@
+import { isEmpty } from 'lodash-es';
 import { isNilOrEmpty, notNilEmpty } from 'qx-util';
 /**
  * 转换导航数据(如导航上下文，导航视图参数)
@@ -13,6 +14,10 @@ import { isNilOrEmpty, notNilEmpty } from 'qx-util';
  * @param {...IData[]} origins 转换数据来源集合
  */
 export function convertNavData(naviDatas, ...origins) {
+    // 如果导航参数不存在或者为空对象，返回{}
+    if (!naviDatas || isEmpty(naviDatas)) {
+        return {};
+    }
     if (Object.prototype.toString.call(naviDatas) === '[object Array]') {
         return convertNavDataByArray(naviDatas, ...origins);
     }

package/out/utils/open-redirect-view/open-redirect-view.d.ts

@@ -1,5 +1,5 @@
 import { IBizContext } from '@ibiz-template/core';
-import { IPSAppDataEntity, IPSAppDERedirectView, IPSAppRedirectView } from '@ibiz-template/model';
+import { IPSAppDataEntity, IPSAppDERedirectView, IPSAppRedirectView, IPSModelService } from '@ibiz-template/model';
 import { IModalData } from '../../interface';
 /**
  * 打开重定向视图
@@ -14,6 +14,18 @@ import { IModalData } from '../../interface';
  * @return {*}  {Promise<IModalData>}
  */
 export declare function openRedirectView(appView: IPSAppRedirectView, context?: IBizContext, params?: IParams, data?: IData[]): Promise<IModalData>;
+/**
+ * 本地打开工作流重定向视图
+ *
+ * @description 工作流 appredirectview 特殊处理，全局通过 appredirectview 跳转工作流重定向，均使用此方法
+ * @author chitanda
+ * @date 2023-01-12 11:01:40
+ * @export
+ * @param {IPSAppDERedirectView} appView
+ * @param {IBizContext} context
+ * @param {string} linkUrl
+ */
+export declare function toLocalOpenWFRedirectView(modelService: IPSModelService, context: IBizContext, linkUrl: string): Promise<void>;
 /**
  * 打开实体重定向视图
  *

package/out/utils/open-redirect-view/open-redirect-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"open-redirect-view.d.ts","sourceRoot":"","sources":["../../../src/utils/open-redirect-view/open-redirect-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAEL,gBAAgB,EAChB,oBAAoB,EACpB,kBAAkB,EAEnB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAG7C;;;;;;;;;;;GAWG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,kBAAkB,EAC3B,OAAO,GAAE,WAA+B,EACxC,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,KAAK,EAAO,GACjB,OAAO,CAAC,UAAU,CAAC,CAarB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,oBAAoB,EAC7B,OAAO,GAAE,WAA+B,EACxC,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,KAAK,EAAO,GACjB,OAAO,CAAC,UAAU,CAAC,CAiErB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,WAAW,CAC/B,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,oBAAoB,EAC5B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,MAAM,CAAC,CAkCjB"}
+{"version":3,"file":"open-redirect-view.d.ts","sourceRoot":"","sources":["../../../src/utils/open-redirect-view/open-redirect-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAgB,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAEL,gBAAgB,EAChB,oBAAoB,EACpB,kBAAkB,EAClB,eAAe,EAEhB,MAAM,sBAAsB,CAAC;AAI9B,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAG7C;;;;;;;;;;;GAWG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,kBAAkB,EAC3B,OAAO,GAAE,WAA+B,EACxC,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,KAAK,EAAO,GACjB,OAAO,CAAC,UAAU,CAAC,CAarB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,yBAAyB,CAC7C,YAAY,EAAE,eAAe,EAC7B,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,MAAM,iBAqEhB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,oBAAoB,EAC7B,OAAO,GAAE,WAA+B,EACxC,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,KAAK,EAAO,GACjB,OAAO,CAAC,UAAU,CAAC,CAkFrB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,WAAW,CAC/B,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,oBAAoB,EAC5B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,MAAM,CAAC,CAkCjB"}

package/out/utils/open-redirect-view/open-redirect-view.js

@@ -1,5 +1,6 @@
-import { IBizContext } from '@ibiz-template/core';
+import { IBizContext, RuntimeError } from '@ibiz-template/core';
 import { DefectModelError, UnsupportedModelError, } from '@ibiz-template/model';
+import qs from 'qs';
 import { isNilOrEmpty, notNilEmpty } from 'qx-util';
 import { OpenAppViewCommand } from '../../command';
 import { convertNavData } from '../nav-params/nav-params';
@@ -21,6 +22,64 @@ export async function openRedirectView(appView, context = new IBizContext(), par
     }
     throw new UnsupportedModelError(appView, `未支持的重定向视图类型: ${appView.viewType}`);
 }
+/**
+ * 本地打开工作流重定向视图
+ *
+ * @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, context, linkUrl) {
+    var _a;
+    const i = linkUrl.lastIndexOf('?');
+    const queryStr = decodeURIComponent(linkUrl.substring(i + 1, linkUrl.length));
+    const params = qs.parse(queryStr, { delimiter: ';' });
+    const deName = 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 = entity.codeName || entity.refM.codeName;
+    params[deCodeName.toLowerCase()] = params[deName.toLowerCase()];
+    const deRdView = (_a = app.getAllPSAppViews()) === null || _a === void 0 ? void 0 : _a.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];
+        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);
+}
 /**
  * 打开实体重定向视图
  *
@@ -59,12 +118,20 @@ export async function openDERedirectView(appView, context = new IBizContext(), p
     ibiz.loading.hideRedirect();
     if (res.ok) {
         curData = res.data;
-        const linkUrl = curData.linkurl;
+        let linkUrl = 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: [] };
         }
     }
@@ -88,6 +155,9 @@ export async function openDERedirectView(appView, context = new IBizContext(), p
             throw new DefectModelError(refView, `未配置实际引用视图`);
         }
     }
+    else {
+        throw new DefectModelError(appView, `未找到重定向标识[${rdTag}]或[${deRdTag}]对应视图`);
+    }
     return { ok: true, data: [] };
 }
 /**

package/out/utils/verify/de-rule-verify.d.ts

@@ -0,0 +1,15 @@
+import { IPSDEFVRCondition } from '@ibiz-template/model';
+/**
+ * 校验属性值规则
+ *
+ * @param {string} name 校验属性值所在字段的名称
+ * @param {*} data 数据对象
+ * @param {*} condition 规则条件
+ * @returns {{ isPast: boolean, infoMessage: string }}
+ * @memberof Verify
+ */
+export declare function verifyDeRules(name: string, data: IData, condition: IPSDEFVRCondition): {
+    isPast: boolean;
+    infoMessage: string;
+};
+//# sourceMappingURL=de-rule-verify.d.ts.map

package/out/utils/verify/de-rule-verify.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"de-rule-verify.d.ts","sourceRoot":"","sources":["../../../src/utils/verify/de-rule-verify.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EASlB,MAAM,sBAAsB,CAAC;AAyC9B;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,KAAK,EACX,SAAS,EAAE,iBAAiB,GAC3B;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CAuG1C"}