@ibiz-template/runtime 0.0.1-alpha.9 → 0.0.1-beta.130

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

@@ -0,0 +1,232 @@
+import { RuntimeError } from '@ibiz-template/core';
+import { DefectModelError, UnsupportedModelError, } from '@ibiz-template/model';
+import { isNilOrEmpty, notNilEmpty } from 'qx-util';
+import qs from 'qs';
+import { OpenAppViewCommand } from '../../command';
+import { convertNavData } from '../nav-params/nav-params';
+/**
+ * 打开重定向视图
+ *
+ * @author chitanda
+ * @date 2022-09-28 16:09:13
+ * @export
+ * @param {IPSAppRedirectView} appView 应用重定向视图
+ * @param {IContext}
+ * @param {IParams} [params={}]
+ * @param {IData} [data={}]
+ * @return {*}  {Promise<IModalData>}
+ */
+export async function openRedirectView(appView, context, params = {}, data = []) {
+    if (appView.instanceof('app.view.IPSAppDERedirectView')) {
+        return openDERedirectView(appView, context, params, data);
+    }
+    throw new UnsupportedModelError(appView, `未支持的重定向视图类型: ${appView.viewType}`);
+}
+/**
+ * 本地打开工作流重定向视图
+ *
+ * @description 工作流 appredirectview 特殊处理，全局通过 appredirectview 跳转工作流重定向，均使用此方法
+ * @author chitanda
+ * @date 2023-01-12 11:01:40
+ * @export
+ * @param {IPSAppDERedirectView} appView
+ * @param {IContext} 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);
+}
+/**
+ * 打开实体重定向视图
+ *
+ * @author chitanda
+ * @date 2022-09-28 16:09:15
+ * @export
+ * @param {IPSAppDERedirectView} appView
+ * @param {IContext}
+ * @param {IParams} [params={}]
+ * @param {IData[]} [data=[]]
+ * @return {*}  {Promise<IModalData>}
+ */
+export async function openDERedirectView(appView, context, params = {}, data = []) {
+    // 计算重定向视图上下文参数转换
+    const navContext = appView.getPSAppViewNavContexts() || [];
+    const navContextData = convertNavData(navContext, context, params);
+    context = Object.assign(context.clone(), navContextData);
+    // 计算重定向视图视图参数转换
+    const navParams = appView.getPSAppViewNavParams() || [];
+    const navParamsData = convertNavData(navParams, context, params);
+    Object.assign(params, navParamsData);
+    // 重定向视图对应应用实体
+    const entity = appView.getPSAppDataEntity();
+    await entity.fill(true);
+    const key = entity.codeName.toLowerCase();
+    let curData = data[0] || {};
+    // 将数据主键转换到上下文当中
+    context[key] = curData[key] || context[key] || params[key];
+    // 实体重定向视图获取数据行为
+    const action = appView.getGetDataPSAppDEAction();
+    const service = await ibiz.entityService.getService(entity.codeName);
+    ibiz.loading.showRedirect();
+    // 获取数据，未配置行为时，默认走 Get 行为
+    const res = await service.exec(action ? action.codeName : 'Get', context, params);
+    ibiz.loading.hideRedirect();
+    if (res.ok) {
+        curData = res.data;
+        let linkUrl = curData.linkurl;
+        if (linkUrl) {
+            // 工作流param09转的srfprocessinstanceid传递
+            if (context.srfprocessinstanceid) {
+                linkUrl += `;srfprocessinstanceid=${context.srfprocessinstanceid}`;
+            }
+            if (linkUrl.startsWith('http://') || linkUrl.startsWith('https://')) {
+                return new Promise(resolve => {
+                    const newWindow = window.open(linkUrl, '_blank');
+                    if (newWindow) {
+                        newWindow.callback = () => {
+                            resolve({ ok: true, data: [] });
+                        };
+                    }
+                });
+            }
+            if (linkUrl.startsWith('appredirectview?')) {
+                await toLocalOpenWFRedirectView(appView.getPSModelService(), context, linkUrl);
+                return { ok: true, data: [] };
+            }
+            return { ok: false, data: [] };
+        }
+    }
+    const rdTag = await calcDERdTag(entity, appView, params, 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();
+    let refView = allRefViews === null || allRefViews === void 0 ? void 0 : allRefViews.find(view => {
+        return view.name === deRdTag || view.name === rdTag;
+    });
+    if (!refView) {
+        // 特殊补充匹配，子流程应用特殊模式在没有配置具体流程的视图时，匹配不包含流程标识的
+        refView = allRefViews === null || allRefViews === void 0 ? void 0 : allRefViews.find(view => {
+            return view.name === wfRdTag;
+        });
+    }
+    if (refView) {
+        const view = refView.getRefPSAppView();
+        if (view) {
+            // 工作流param09转的srfprocessinstanceid传递
+            if (context.srfprocessinstanceid) {
+                params.srfprocessinstanceid = context.srfprocessinstanceid;
+            }
+            const result = await ibiz.commands.execute(OpenAppViewCommand.TAG, view, context, params, { data: [curData] });
+            if (result) {
+                return result;
+            }
+        }
+        else {
+            throw new DefectModelError(refView, `未配置实际引用视图`);
+        }
+    }
+    else {
+        throw new DefectModelError(appView, `未找到重定向标识[${rdTag}]或[${deRdTag}]对应视图`);
+    }
+    return { ok: true, data: [] };
+}
+/**
+ * 计算重定向标识
+ *
+ * @author chitanda
+ * @date 2022-10-25 16:10:48
+ * @export
+ * @param {IPSAppDataEntity} entity 重定向视图所在应用实体
+ * @param {IPSAppDERedirectView} rdView 重定向视图
+ * @param {string} srfWf
+ * @param {IData} data 当前数据
+ * @return {*}  {Promise<string>}
+ */
+export async function calcDERdTag(entity, rdView, params, data) {
+    let rdTag = '';
+    // 重定向视图自定义类别属性
+    const typeField = rdView.getTypePSAppDEField();
+    // 自定义重定向
+    if (typeField) {
+        const value = data[typeField.codeName.toLowerCase()];
+        if (notNilEmpty(value)) {
+            return value;
+        }
+    }
+    // 如果流程步骤存在，按照工作流优先
+    const srfWf = params.srfwf;
+    if (notNilEmpty(srfWf)) {
+        if (notNilEmpty(params.wf)) {
+            return `EDITVIEW:${srfWf.toUpperCase()}:${params.wf.toUpperCase()}`;
+        }
+        return `EDITVIEW:${srfWf.toUpperCase()}`;
+    }
+    let typeValue = '';
+    // 从索引属性获取重定向视图类型
+    const indexTypeField = entity.getIndexTypePSAppDEField();
+    if (indexTypeField) {
+        typeValue = data[indexTypeField.codeName.toLowerCase()];
+    }
+    if (isNilOrEmpty(typeValue)) {
+        // 从多表单属性判断重定向视图类型
+        const multiFormField = entity.getFormTypePSAppDEField();
+        if (multiFormField) {
+            typeValue = data[multiFormField.codeName.toLowerCase()];
+        }
+    }
+    if (notNilEmpty(typeValue)) {
+        rdTag = `EDITVIEW:${typeValue}`;
+    }
+    else {
+        rdTag = `EDITVIEW`;
+    }
+    return rdTag;
+}

package/out/utils/wf-helper/wf-helper.d.ts

@@ -0,0 +1,9 @@
+/**
+ * 预置工作流相关数据处理并生成需要的上下文参数
+ *
+ * @export
+ * @param {IData} data
+ * @returns {*}
+ */
+export declare function getWFContext(data: IData): IData;
+//# sourceMappingURL=wf-helper.d.ts.map

package/out/utils/wf-helper/wf-helper.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"wf-helper.d.ts","sourceRoot":"","sources":["../../../src/utils/wf-helper/wf-helper.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,KAAK,SAMvC"}

package/out/utils/wf-helper/wf-helper.js

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

package/out/view-logic/view-logic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"view-logic.d.ts","sourceRoot":"","sources":["../../src/view-logic/view-logic.ts"],"names":[],"mappings":"AAEA,OAAO,EAIL,oBAAoB,EACpB,qBAAqB,EACrB,eAAe,EAEhB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAG/C;;;;;;;;;;;GAWG;AACH,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,eAAe,EAC1B,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,EACpB,MAAM,EAAE,OAAO,EACf,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,eAAe,CAAC,CA8B1B;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,yBAAyB,CAC7C,UAAU,EAAE,qBAAqB,EACjC,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,EACpB,MAAM,EAAE,OAAO,EACf,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,eAAe,CAAC,CA6C1B;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,wBAAwB,CAC5C,UAAU,EAAE,oBAAoB,EAChC,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,EACpB,MAAM,EAAE,OAAO,EACf,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,eAAe,CAAC,CA6C1B"}
+{"version":3,"file":"view-logic.d.ts","sourceRoot":"","sources":["../../src/view-logic/view-logic.ts"],"names":[],"mappings":"AACA,OAAO,EAML,oBAAoB,EACpB,qBAAqB,EACrB,eAAe,EAEhB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAc,eAAe,EAAE,MAAM,cAAc,CAAC;AAG3D;;;;;;;;;;;GAWG;AACH,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,eAAe,EAC1B,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,EACpB,MAAM,EAAE,OAAO,EACf,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,eAAe,CAAC,CA8B1B;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,yBAAyB,CAC7C,UAAU,EAAE,qBAAqB,EACjC,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,EACpB,MAAM,EAAE,OAAO,EACf,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,eAAe,CAAC,CAqD1B;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,wBAAwB,CAC5C,UAAU,EAAE,oBAAoB,EAChC,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,EACpB,MAAM,EAAE,OAAO,EACf,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,eAAe,CAAC,CAgI1B"}

package/out/view-logic/view-logic.js

@@ -1,6 +1,6 @@
-import { IBizContext } from '@ibiz-template/core';
 import { notNilEmpty } from 'qx-util';
-import { AppEntityModel, getPSUIActionByModelObject, } from '@ibiz-template/model';
+import { AppEntityModel, DefectModelError, getPSUIActionByModelObject, } from '@ibiz-template/model';
+import { RuntimeError } from '@ibiz-template/core';
 import { OpenAppViewCommand } from '../command';
 import { AppDEUIActionUtil, convertNavData } from '../utils';
 /**
@@ -20,7 +20,7 @@ export async function executeViewLogic(viewLogic, context, data, params, opts =
         // 执行打开数据界面逻辑
         return executeOpenDataAppUILogic(viewLogic.getPSAppUILogic(), context, data, params, opts);
     }
-    if (viewLogic.name === 'newdata') {
+    if (viewLogic.name === 'newdata' && viewLogic.getPSAppUILogic()) {
         // 执行新建数据逻辑
         return executeNewDataAppUILogic(viewLogic.getPSAppUILogic(), context, data, params, opts);
     }
@@ -58,7 +58,6 @@ export async function executeOpenDataAppUILogic(appUILogic, context, data, param
     const appDataEntity = new AppEntityModel(openView.getPSAppDataEntity());
     await appDataEntity.init();
     // 处理导航参数
-    let tempContext = {};
     // 处理上下文导航参数
     const navContexts = openViewRef.getPSNavigateContexts() || [];
     // 默认添加主键的上下文导航参数
@@ -70,8 +69,8 @@ export async function executeOpenDataAppUILogic(appUILogic, context, data, param
             rawValue: false,
         });
     }
-    tempContext = convertNavData(navContexts, context, params, data[0]);
-    tempContext = new IBizContext(tempContext, context);
+    const newContext = context.clone();
+    const tempContext = Object.assign(newContext, convertNavData(navContexts, context, params, data[0]));
     // 处理导航视图参数
     let tempParams = {};
     const navParams = openViewRef.getPSNavigateParams();
@@ -79,7 +78,11 @@ export async function executeOpenDataAppUILogic(appUILogic, context, data, param
         tempParams = convertNavData(navParams, params, context, data[0]);
     }
     // 打开视图
-    return ibiz.commands.execute(OpenAppViewCommand.TAG, openView, tempContext, tempParams, opts);
+    await ibiz.commands.execute(OpenAppViewCommand.TAG, openView, tempContext, tempParams, opts);
+    // 刷新上一个视图
+    const { neuron } = opts;
+    neuron.call.refresh();
+    return {};
 }
 /**
  * 执行应用预置界面逻辑newdata
@@ -94,42 +97,118 @@ export async function executeOpenDataAppUILogic(appUILogic, context, data, param
  * @param {IData} [opts] 额外参数，event是js原生事件
  */
 export async function executeNewDataAppUILogic(appUILogic, context, data, params, opts = {}) {
+    var _a, _b;
+    const { enableWizardAdd, enableBatchAdd, batchAddOnly } = appUILogic;
+    let openViewRef = null;
+    let doBatchAdd = false;
     // 准备需要的模型
-    const newViewRef = appUILogic.getNewDataPSAppView();
-    if (!newViewRef)
-        throw new Error('getNewDataPSAppView为空');
-    const newView = newViewRef.getRefPSAppView();
-    if (!newView)
-        throw new Error('newView为空');
-    await newView.fill(true);
-    const appDataEntity = new AppEntityModel(newView.getPSAppDataEntity());
+    // todo 拷贝
+    if (enableWizardAdd) {
+        // todo 向导添加
+    }
+    else if (enableBatchAdd) {
+        // 批添加
+        const batchViews = appUILogic.getBatchAddPSAppViews();
+        openViewRef = batchViews === null || batchViews === void 0 ? void 0 : batchViews.find(view => {
+            const openDeName = view.refMode.toLowerCase();
+            return openDeName !== context.srfparentdename;
+        });
+        doBatchAdd = true;
+    }
+    else if (batchAddOnly) {
+        // todo 只支持批添加
+    }
+    else {
+        // 普通新建视图打开
+        openViewRef = appUILogic.getNewDataPSAppView();
+    }
+    const openView = openViewRef === null || openViewRef === void 0 ? void 0 : openViewRef.getRefPSAppView();
+    if (!openViewRef || !openView)
+        throw new RuntimeError('找不到新建视图');
+    await openView.fill(true);
+    const appDataEntity = new AppEntityModel(openView.getPSAppDataEntity());
     await appDataEntity.init();
     // 处理导航参数
     let tempContext = {};
     let tempParams = {};
     const _data = (data === null || data === void 0 ? void 0 : data[0]) || {};
-    const navContexts = newViewRef.getPSNavigateContexts();
+    const navContexts = openViewRef.getPSNavigateContexts();
     if (notNilEmpty(navContexts)) {
         tempContext = convertNavData(navContexts, context, params, _data);
     }
-    const navParams = newViewRef.getPSNavigateParams();
-    if (notNilEmpty(navParams)) {
-        tempParams = convertNavData(navParams, params, context, _data);
-    }
-    tempContext = new IBizContext(tempContext, context);
+    tempContext = Object.assign(context.clone(), tempContext);
     // 删除上下文内的主键
-    delete tempContext[appDataEntity.deName.toLowerCase()];
     tempContext[appDataEntity.deName.toLowerCase()] = undefined;
-    // todo 拷贝
-    if (appUILogic.enableWizardAdd) {
-        // todo 向导添加
-    }
-    else if (appUILogic.enableBatchAdd) {
-        // todo 批添加
-    }
-    else if (appUILogic.batchAddOnly) {
-        // todo 只支持批添加
+    const navParams = openViewRef.getPSNavigateParams();
+    if (notNilEmpty(navParams)) {
+        tempParams = convertNavData(navParams, params, context, _data);
     }
     // 打开视图
-    return ibiz.commands.execute(OpenAppViewCommand.TAG, newView, tempContext, tempParams, opts);
+    const result = await ibiz.commands.execute(OpenAppViewCommand.TAG, openView, tempContext, tempParams, opts);
+    // 批添加新建选中数据后
+    if (doBatchAdd && ((_a = result === null || result === void 0 ? void 0 : result.data) === null || _a === void 0 ? void 0 : _a.length)) {
+        const newView = appUILogic.getNewDataPSAppView().getRefPSAppView();
+        await newView.fill(true);
+        const selfDe = newView.getPSAppDataEntity();
+        const minorDERs = selfDe.getMinorPSAppDERSs();
+        const pickParentDeName = openViewRef.refMode.toLowerCase();
+        if (!minorDERs) {
+            throw new DefectModelError(selfDe, '实体没有从关系集合！');
+        }
+        let pickParentFieldName;
+        minorDERs === null || minorDERs === void 0 ? void 0 : minorDERs.forEach(item => {
+            const majorDeName = item
+                .getMajorPSAppDataEntity()
+                .codeName.toLowerCase();
+            if (pickParentDeName === majorDeName) {
+                pickParentFieldName = item
+                    .getParentPSAppDEField()
+                    .codeName.toLowerCase();
+            }
+        });
+        // 获取key为keymapping的特殊视图参数
+        const openViewKeyParam = (_b = openView
+            .getPSAppViewNavParams()) === null || _b === void 0 ? void 0 : _b.find(navParam => {
+            return navParam.key === 'keymapping';
+        });
+        let addData = [];
+        if (openViewKeyParam) {
+            const keyValuePairs = openViewKeyParam.value.split(';');
+            const keyMapping = {};
+            // 遍历键值对数组并添加到 keyMapping 映射对象中
+            for (const pair of keyValuePairs) {
+                const [sourceKey, targetKey] = pair.split(':');
+                if (sourceKey && targetKey) {
+                    keyMapping[sourceKey] = targetKey;
+                }
+            }
+            addData = result.data.map(item => {
+                const tempData = {
+                    [pickParentFieldName]: item.srfkey,
+                };
+                // 遍历映射对象，将属性从 item 复制到 tempData
+                for (const key in keyMapping) {
+                    if (Object.prototype.hasOwnProperty.call(keyMapping, key)) {
+                        const targetKey = keyMapping[key];
+                        if (Object.prototype.hasOwnProperty.call(item, key)) {
+                            tempData[targetKey] = item[key];
+                        }
+                    }
+                }
+                return tempData;
+            });
+        }
+        else {
+            addData = result.data.map(item => ({
+                [pickParentFieldName]: item.srfkey,
+            }));
+        }
+        // 获取实体服务并调用创建接口
+        const service = await ibiz.entityService.getService(selfDe.codeName, context);
+        await service.exec('Create', context, addData);
+    }
+    // 刷新上一个视图
+    const { neuron } = opts;
+    neuron.call.refresh();
+    return {};
 }

package/package.json

@@ -1,38 +1,49 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.0.1-alpha.9",
+  "version": "0.0.1-beta.130",
   "description": "控制器包",
+  "type": "module",
   "main": "out/index.js",
   "types": "out/index.d.ts",
+  "system": "./dist/system/index.system.js",
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/iBizModeling/ibiz-template.git"
+  },
   "files": [
+    "dist",
     "out",
     "src"
   ],
   "scripts": {
     "dev": "tsc --watch",
-    "build": "npm run lint && npm run clean && tsc --build",
+    "build": "npm run lint && npm run clean && npm run build:rollup && tsc --build",
+    "build:rollup": "rollup -c",
     "lint": "eslint 'src/**/*.ts'",
     "lint:fix": "eslint --fix 'src/**/*.ts'",
-    "clean": "rimraf out",
-    "publish:next": "npm run build && npm publish --access public --tag next",
-    "publish:npm": "npm run build && npm publish --access public"
+    "clean": "rimraf out dist",
+    "prepublish": "npm run build",
+    "publish:next": "npm publish --access public --tag next",
+    "publish:npm": "npm publish --access public"
   },
   "author": "chitanda",
   "license": "MIT",
   "dependencies": {
-    "@ibiz-template/command": "^0.0.1-alpha.2"
+    "@ibiz-template/command": "^0.0.1-beta.50",
+    "qs": "^6.11.0"
   },
   "devDependencies": {
-    "@ibiz-template/core": "^0.0.1-alpha.6",
-    "@ibiz-template/model": "^0.0.1-alpha.9",
-    "@ibiz-template/service": "^0.0.1-alpha.9",
-    "qx-util": "^0.4.1"
+    "@ibiz-template/core": "^0.0.1-beta.130",
+    "@ibiz-template/model": "^0.0.1-beta.130",
+    "@ibiz-template/service": "^0.0.1-beta.130",
+    "@types/qs": "^6.9.7",
+    "@types/systemjs": "^6.13.0",
+    "qx-util": "^0.4.8"
   },
   "peerDependencies": {
-    "@ibiz-template/core": "^0.0.1-alpha.2",
-    "@ibiz-template/model": "^0.0.1-alpha.2",
-    "@ibiz-template/service": "^0.0.1-alpha.2",
-    "qx-util": "^0.4.1"
-  },
-  "gitHead": "36f86effeb183c0fad87a82feec576dab4a61eff"
+    "@ibiz-template/core": "^0.0.1-beta.30",
+    "@ibiz-template/model": "^0.0.1-beta.30",
+    "@ibiz-template/service": "^0.0.1-beta.30",
+    "qx-util": "^0.4.8"
+  }
 }

package/src/command/app/app-func/app-func.ts

@@ -1,5 +1,6 @@
-import { IBizContext } from '@ibiz-template/core';
 import { IPSAppFunc } from '@ibiz-template/model';
+import { notNilEmpty } from 'qx-util';
+import { convertNavData } from '../../../utils';
 import { OpenAppViewCommand } from '../open-app-view/open-app-view';
 
 /**
@@ -31,40 +32,39 @@ export class AppFuncCommand {
    * @author chitanda
    * @date 2022-07-25 17:07:35
    * @param {IPSAppFunc} appFunc 应用功能模型
-   * @param {IBizContext} [context] 执行上下文
+   * @param {IContext} [context] 执行上下文
    * @param {IParams} [params={}] 参数
    * @param {IData} [opts={}] 额外参数，与具体执行对象规划好的额外参数。如需要给飘窗使用的 event 事件对象.
    * @return {*}  {Promise<void>}
    */
   async exec(
     appFunc: IPSAppFunc,
-    context?: IBizContext,
+    context: IContext,
     params: IParams = {},
     opts: IData = {},
   ): Promise<void> {
-    const navContext = appFunc.getPSNavigateContexts();
-    if (navContext) {
-      if (context) {
-        Object.assign(context, navContext);
-      } else {
-        context = new IBizContext(navContext);
-      }
+    // 处理导航参数
+    let tempContext: IContext = context.clone();
+    let tempParams: IData = {};
+    const navContexts = appFunc.getPSNavigateContexts();
+    if (notNilEmpty(navContexts)) {
+      tempContext = convertNavData(navContexts!, context, params) as IContext;
     }
     const navParams = appFunc.getPSNavigateParams();
-    if (navParams) {
-      Object.assign(params, navParams);
+    if (notNilEmpty(navParams)) {
+      tempParams = convertNavData(navParams!, params, context);
     }
     switch (appFunc.appFuncType) {
       case 'APPVIEW':
-        return this.openAppView(appFunc, context, params, opts);
+        return this.openAppView(appFunc, tempContext, tempParams, opts);
       case 'OPENHTMLPAGE':
         return this.openHtmlPage(appFunc);
       case 'PDTAPPFUNC':
-        return this.openPdAppFunc(appFunc, context, params);
+        return this.openPdAppFunc(appFunc, tempContext, tempParams);
       case 'JAVASCRIPT':
-        return this.executeJavaScript(appFunc, context, params);
+        return this.executeJavaScript(appFunc, tempContext, tempParams);
       case 'CUSTOM':
-        return this.custom(appFunc, context, params);
+        return this.custom(appFunc, tempContext, tempParams);
       default:
         throw new Error(`未知的应用功能类型: ${appFunc.appFuncType}`);
     }
@@ -77,13 +77,13 @@ export class AppFuncCommand {
    * @date 2022-07-25 18:07:49
    * @protected
    * @param {IPSAppFunc} appFunc
-   * @param {IBizContext} [context]
+   * @param {IContext} [context]
    * @param {IParams} [params]
    * @return {*}  {Promise<void>}
    */
   protected openAppView(
     appFunc: IPSAppFunc,
-    context?: IBizContext,
+    context?: IContext,
     params?: IParams,
     opts?: IData,
   ): Promise<void> {
@@ -120,15 +120,15 @@ export class AppFuncCommand {
    * @date 2022-07-25 18:07:22
    * @protected
    * @param {IPSAppFunc} appFunc
-   * @param {IBizContext} [context]
+   * @param {IContext} [context]
    * @param {IParams} [params]
    */
   protected openPdAppFunc(
     appFunc: IPSAppFunc,
-    context?: IBizContext,
+    context?: IContext,
     params?: IParams,
   ): void {
-    console.log('openPdAppFunc', appFunc, context, params);
+    ibiz.log.warn('openPdAppFunc', appFunc, context, params);
     throw new Error('未实现');
   }
 
@@ -139,15 +139,15 @@ export class AppFuncCommand {
    * @date 2022-07-25 18:07:09
    * @protected
    * @param {IPSAppFunc} appFunc
-   * @param {IBizContext} [context]
+   * @param {IContext} [context]
    * @param {IParams} [params]
    */
   protected executeJavaScript(
     appFunc: IPSAppFunc,
-    context?: IBizContext,
+    context?: IContext,
     params?: IParams,
   ): void {
-    console.log('executeJavaScript', appFunc, context, params);
+    ibiz.log.warn('executeJavaScript', appFunc, context, params);
     throw new Error('未实现');
   }
 
@@ -158,15 +158,15 @@ export class AppFuncCommand {
    * @date 2022-07-25 18:07:51
    * @protected
    * @param {IPSAppFunc} appFunc
-   * @param {IBizContext} [context]
+   * @param {IContext} [context]
    * @param {IParams} [params]
    */
   protected custom(
     appFunc: IPSAppFunc,
-    context?: IBizContext,
+    context?: IContext,
     params?: IParams,
   ): void {
-    console.log('custom', appFunc, context, params);
+    ibiz.log.warn('custom', appFunc, context, params);
     throw new Error('未实现');
   }
 }