@ibiz-template/runtime 0.0.4-beta.5 → 0.1.0

package/out/utils/value-rule/value-rule.js

@@ -0,0 +1,18 @@
+/**
+ * 过滤出指定属性列或表单项的值规则模型
+ * @author lxm
+ * @date 2023-05-31 10:11:30
+ * @export
+ * @template T
+ * @param {T[]} vrs 所有值规则模型集合
+ * @param {string} name 属性列或表单项名称
+ * @return {*}
+ */
+export function filterValueRules(vrs, name) {
+    return vrs.filter(vr => {
+        const { checkMode } = vr; // 排除后台校验为2
+        const belongName = vr.deformItemName ||
+            vr.degridEditItemName;
+        return checkMode !== 2 && belongName === name;
+    });
+}

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

@@ -1 +1 @@
-{"version":3,"file":"de-rule-verify.d.ts","sourceRoot":"","sources":["../../../src/utils/verify/de-rule-verify.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAShB,MAAM,kBAAkB,CAAC;AAyC1B;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,KAAK,EACX,SAAS,EAAE,eAAe,GACzB;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CAwG1C"}
+{"version":3,"file":"de-rule-verify.d.ts","sourceRoot":"","sources":["../../../src/utils/verify/de-rule-verify.ts"],"names":[],"mappings":"AACA,OAAO,EACL,eAAe,EAShB,MAAM,kBAAkB,CAAC;AA0C1B;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,KAAK,EACX,SAAS,EAAE,eAAe,GACzB;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CAuG1C"}

package/out/utils/verify/de-rule-verify.js

@@ -1,5 +1,7 @@
+import { RuntimeError } from '@ibiz-template/core';
 import { isNilOrEmpty } from 'qx-util';
 import { isEmpty, isNil } from 'ramda';
+import { ScriptFactory } from '../script';
 import { testCond } from './verify';
 function isGroupCondition(condition) {
     return condition.condType === 'GROUP';
@@ -31,8 +33,7 @@ function isSysValueRuleCondition(condition) {
 export function verifyDeRules(name, data, condition) {
     const flag = { isPast: true, infoMessage: condition.ruleInfo };
     if (isGroupCondition(condition)) {
-        // const childRules = condition.getPSDEFVRConditions();
-        const childRules = [];
+        const childRules = condition.conds;
         if (childRules && childRules.length > 0) {
             flag.isPast = logicForEach(childRules, (item) => {
                 const { isPast, infoMessage } = verifyDeRules(name, data, item);
@@ -151,7 +152,7 @@ function checkFieldSimpleRule(value, op, value2, errorInfo, paramType, form, pri
     const result = testCond(value, op, value2);
     if (!result) {
         if (primaryModel) {
-            throw new Error(errorInfo);
+            throw new RuntimeError(errorInfo);
         }
     }
     return !result;
@@ -177,7 +178,7 @@ function checkFieldStringLengthRule(viewValue, minLength, indexOfMin, maxLength,
     const judge = isNilOrEmpty(viewValue);
     if (judge) {
         if (primaryModel) {
-            throw new Error('值为空');
+            throw new RuntimeError('值为空');
         }
         errorInfo = '值为空';
         return true;
@@ -188,14 +189,14 @@ function checkFieldStringLengthRule(viewValue, minLength, indexOfMin, maxLength,
         if (indexOfMin) {
             if (viewValueLength < minLength) {
                 if (primaryModel) {
-                    throw new Error(errorInfo);
+                    throw new RuntimeError(errorInfo);
                 }
                 return true;
             }
         }
         else if (viewValueLength <= minLength) {
             if (primaryModel) {
-                throw new Error(errorInfo);
+                throw new RuntimeError(errorInfo);
             }
             return true;
         }
@@ -205,14 +206,14 @@ function checkFieldStringLengthRule(viewValue, minLength, indexOfMin, maxLength,
         if (indexOfMax) {
             if (viewValueLength > maxLength) {
                 if (primaryModel) {
-                    throw new Error(errorInfo);
+                    throw new RuntimeError(errorInfo);
                 }
                 return true;
             }
         }
         else if (viewValueLength >= maxLength) {
             if (primaryModel) {
-                throw new Error(errorInfo);
+                throw new RuntimeError(errorInfo);
             }
             return true;
         }
@@ -238,7 +239,7 @@ function checkFieldRegExRule(viewValue, strReg, errorInfo, primaryModel) {
     const judge = isNilOrEmpty(viewValue);
     if (judge) {
         if (primaryModel) {
-            throw new Error('值为空');
+            throw new RuntimeError('值为空');
         }
         errorInfo = '值为空';
         return true;
@@ -246,7 +247,7 @@ function checkFieldRegExRule(viewValue, strReg, errorInfo, primaryModel) {
     const regExp = new RegExp(strReg);
     if (!regExp.test(viewValue)) {
         if (primaryModel) {
-            throw new Error(errorInfo);
+            throw new RuntimeError(errorInfo);
         }
         return true;
     }
@@ -274,7 +275,7 @@ function checkFieldValueRangeRule(viewValue, minNumber, indexOfMin, maxNumber, i
     const isEmptyVal = isNilOrEmpty(viewValue);
     if (isEmptyVal) {
         if (primaryModel) {
-            throw new Error('值为空');
+            throw new RuntimeError('值为空');
         }
         errorInfo = '值为空';
         return true;
@@ -289,14 +290,14 @@ function checkFieldValueRangeRule(viewValue, minNumber, indexOfMin, maxNumber, i
         if (indexOfMin) {
             if (data < minNumber) {
                 if (primaryModel) {
-                    throw new Error(errorInfo);
+                    throw new RuntimeError(errorInfo);
                 }
                 return true;
             }
         }
         else if (data <= minNumber) {
             if (primaryModel) {
-                throw new Error(errorInfo);
+                throw new RuntimeError(errorInfo);
             }
             return true;
         }
@@ -306,14 +307,14 @@ function checkFieldValueRangeRule(viewValue, minNumber, indexOfMin, maxNumber, i
         if (indexOfMax) {
             if (data > maxNumber) {
                 if (primaryModel) {
-                    throw new Error(errorInfo);
+                    throw new RuntimeError(errorInfo);
                 }
                 return true;
             }
         }
         else if (data >= maxNumber) {
             if (primaryModel) {
-                throw new Error(errorInfo);
+                throw new RuntimeError(errorInfo);
             }
             return true;
         }
@@ -360,9 +361,7 @@ function checkFieldScriptRule(value, data, scriptCode, errorInfo, primaryModel)
     };
     try {
         // 避免脚本内变量冲突
-        // eslint-disable-next-line no-new-func
-        const runScript = new Function('value', 'data', scriptCode);
-        const result = runScript(value, source);
+        const result = ScriptFactory.execScriptFn({ value, data: source }, scriptCode);
         if (typeof result === 'boolean') {
             resultBoolean = result;
         }
@@ -373,7 +372,7 @@ function checkFieldScriptRule(value, data, scriptCode, errorInfo, primaryModel)
     }
     errorInfo = '';
     if (!resultBoolean && primaryModel) {
-        throw new Error(errorInfo);
+        throw new RuntimeError(errorInfo);
     }
     return { isPast: resultBoolean, infoMessage: selfError || errorInfo };
 }

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

@@ -1 +1 @@
-{"version":3,"file":"verify.d.ts","sourceRoot":"","sources":["../../../src/utils/verify/verify.ts"],"names":[],"mappings":"AAIA,KAAK,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC;AAErE;;;;;;;;;;GAUG;AACH,wBAAgB,QAAQ,CACtB,KAAK,EAAE,SAAS,EAChB,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,SAAS,GAChB,OAAO,CAkET;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,OAAO,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,GAAG,MAAM,CAgBnE;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAcnE;AAED;;;;;;;;GAQG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAUrE;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,UAAU,CACxB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,SAAS,EACjB,IAAI,CAAC,EAAE,OAAO,GAAG,KAAK,WAqBvB"}
+{"version":3,"file":"verify.d.ts","sourceRoot":"","sources":["../../../src/utils/verify/verify.ts"],"names":[],"mappings":"AAIA,KAAK,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC;AAErE;;;;;;;;;;GAUG;AACH,wBAAgB,QAAQ,CACtB,KAAK,EAAE,SAAS,EAChB,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,SAAS,GAChB,OAAO,CAkET;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,OAAO,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,GAAG,MAAM,CAgBnE;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAcnE;AAED;;;;;;;;GAQG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAUrE;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,UAAU,CACxB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,SAAS,EACjB,IAAI,CAAC,EAAE,OAAO,GAAG,KAAK,GACrB,OAAO,CAoBT"}

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

@@ -1,3 +1,5 @@
+import { IAppView } from '@ibiz/model-core';
+import { WFLink } from '../../interface';
 /**
  * 预置工作流相关数据处理并生成需要的上下文参数
  *
@@ -6,4 +8,14 @@
  * @returns {*}
  */
 export declare function getWFContext(data: IData): IData;
+/**
+ * 获取流程操作视图id
+ * @author lxm
+ * @date 2023-07-13 05:40:49
+ * @export
+ * @param {IAppView} view 当前视图模型
+ * @param {WFLink} link WFLink操作对象
+ * @return {*}
+ */
+export declare function getWFSubmitViewId(view: IAppView, link: WFLink): string | undefined;
 //# sourceMappingURL=wf-helper.d.ts.map

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

@@ -1 +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"}
+{"version":3,"file":"wf-helper.d.ts","sourceRoot":"","sources":["../../../src/utils/wf-helper/wf-helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,KAAK,CAM/C;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,QAAQ,EACd,IAAI,EAAE,MAAM,GACX,MAAM,GAAG,SAAS,CAUpB"}

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

@@ -12,3 +12,24 @@ export function getWFContext(data) {
     }
     return tempContext;
 }
+/**
+ * 获取流程操作视图id
+ * @author lxm
+ * @date 2023-07-13 05:40:49
+ * @export
+ * @param {IAppView} view 当前视图模型
+ * @param {WFLink} link WFLink操作对象
+ * @return {*}
+ */
+export function getWFSubmitViewId(view, link) {
+    var _a;
+    const { type, sequenceFlowView, sequenceFlowMobView } = link;
+    const appViewRefs = ((_a = view.viewLayoutPanel) === null || _a === void 0 ? void 0 : _a.appViewRefs) || view.appViewRefs;
+    const key = type
+        ? `WFUTILACTION@${type.toUpperCase()}`
+        : `WFACTION@${ibiz.env.isMob ? sequenceFlowMobView : sequenceFlowView}`;
+    const submitViewRef = appViewRefs.find(viewRef => {
+        return viewRef.name === key;
+    });
+    return submitViewRef === null || submitViewRef === void 0 ? void 0 : submitViewRef.refAppViewId;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.0.4-beta.5",
+  "version": "0.1.0",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -22,31 +22,37 @@
     "lint": "eslint 'src/**/*.ts'",
     "lint:fix": "eslint --fix 'src/**/*.ts'",
     "prepublish": "npm run build",
-    "publish:next": "npm publish --access public --tag next",
-    "publish:npm": "npm publish --access public"
+    "publish:next": "npm publish --access public --tag=next",
+    "publish:dev": "npm publish --access public --tag=dev",
+    "publish:beta": "npm publish --access public --tag=beta",
+    "publish:npm": "npm publish --access public --registry=https://registry.npmjs.org/"
   },
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.0.4-beta.5",
-    "@ibiz/model-core": "^0.0.6",
+    "@ibiz-template/core": "^0.1.0",
+    "@ibiz/model-core": "^0.0.14",
+    "@types/path-browserify": "^1.0.0",
     "@types/qs": "^6.9.7",
+    "@types/systemjs": "^6.13.1",
     "async-validator": "^4.2.5",
-    "dayjs": "^1.11.7",
+    "dayjs": "^1.11.9",
     "lodash-es": "^4.17.21",
-    "qs": "^6.11.1",
+    "path-browserify": "^1.0.1",
+    "qs": "^6.11.2",
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
   "peerDependencies": {
-    "@ibiz-template/core": "workspace:^0.0.4-beta.1",
-    "@ibiz/model-core": "^0.0.6",
+    "@ibiz-template/core": "^0.0.4-beta.35",
+    "@ibiz/model-core": "^0.0.14",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.7",
     "lodash-es": "^4.17.21",
+    "path-browserify": "^1.0.1",
     "qs": "^6.11.0",
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "899c34a41e55998a64d331fcf8ea28c94d1fdbce"
+  "gitHead": "764e1420d9056bd84442181ab3d68218c984515d"
 }

package/src/app-hub.ts

@@ -1,13 +1,8 @@
-import {
-  IAppDataEntity,
-  IAppView,
-  IApplication,
-  IAppDEUIAction,
-} from '@ibiz/model-core';
+import { IAppDataEntity, IAppView, IApplication } from '@ibiz/model-core';
 import { RuntimeError } from '@ibiz-template/core';
 import { Application } from './application';
 import { IAppHubService, ModelLoaderProvider } from './interface';
-import { Convert } from './hub';
+import { AppConfigService, Convert } from './hub';
 
 /**
  * 运行时总集
@@ -86,6 +81,13 @@ export class AppHub implements IAppHubService {
    */
   protected modelLoaderProvider?: ModelLoaderProvider;
 
+  /**
+   * hub配置信息服务
+   * @author lxm
+   * @date 2023-07-03 07:12:05
+   */
+  config = new AppConfigService();
+
   /**
    * 默认首页视图名称
    *
@@ -313,27 +315,4 @@ export class AppHub implements IAppHubService {
     }
     return this.appMap.get(key!)!;
   }
-
-  async getUIAction(id: string): Promise<IAppDEUIAction | undefined> {
-    const [actionId, entitiyId, appId] = id.split('@');
-    const app = this.getApp(appId);
-    let uiaction: IAppDEUIAction | undefined;
-    if (entitiyId) {
-      const entity = await this.getAppDataEntity(entitiyId, appId);
-      if (!entity) {
-        throw new RuntimeError(`没有找到名称为${entitiyId}的实体`);
-      }
-      uiaction = entity.appDEUIActions!.find(action => {
-        return action.id === id;
-      });
-    }
-    if (!uiaction) {
-      // 实体找不到，找应用全局的
-      uiaction = app.model.appDEUIActions!.find(action => {
-        return action.id === actionId;
-      });
-    }
-
-    return uiaction;
-  }
 }

package/src/application.ts

@@ -4,6 +4,7 @@ import {
   IAppFunc,
   IApplication,
   IDEOPPriv,
+  IDEUILogic,
 } from '@ibiz/model-core';
 import { AuthorityService, CodeListService, DEServiceUtil } from './service';
 import { IAppService } from './interface';
@@ -30,6 +31,15 @@ export class Application implements IAppService {
     return this.model.appId!;
   }
 
+  /**
+   * 应用实体名称到应用实体代码名称的映射
+   *
+   * @author chitanda
+   * @date 2023-06-14 17:06:02
+   * @type {Map<string, string>}
+   */
+  readonly deName2DeCodeName: Map<string, string> = new Map();
+
   /**
    * 应用请求服务
    *
@@ -90,6 +100,35 @@ export class Application implements IAppService {
    */
   async init(): Promise<void> {
     await this.authority.init();
+    await this.loadAppModelStyle();
+  }
+
+  /**
+   * 加载应用模型全局样式
+   *
+   * @author chitanda
+   * @date 2023-07-24 20:07:41
+   * @protected
+   * @return {*}  {Promise<void>}
+   */
+  protected async loadAppModelStyle(): Promise<void> {
+    await this.net
+      .get(`${ibiz.env.remoteModelUrl}/PSSYSAPP.json.css`)
+      .then(res => {
+        const dom = document.createElement('style');
+        dom.setAttribute('type', 'text/css');
+        if (res.request && res.request.responseURL) {
+          const url = new URL(res.request.responseURL);
+          dom.id = url.pathname;
+        }
+        dom.innerHTML = res.data as unknown as string;
+        document.head.appendChild(dom);
+      })
+      .catch(err => {
+        ibiz.log.error(
+          `应用[${this.appId}]模型全局样式加载失败：${err.message}`,
+        );
+      });
   }
 
   /**
@@ -115,20 +154,23 @@ export class Application implements IAppService {
    * @return {*}
    */
   async getUIAction(actionId: string): Promise<IAppDEUIAction | undefined> {
-    const [id, appDeId] = actionId.split('@');
+    const [, appDeId] = actionId.split('@');
     // 查找实体界面行为
     if (appDeId) {
       const appDataEntity = await ibiz.hub.getAppDataEntity(
         appDeId,
         this.model.appId,
       );
-      appDataEntity.appDEUIActions!.find(action => {
-        return action.id === id;
+      const find = appDataEntity.appDEUIActions!.find(action => {
+        return action.id === actionId;
       });
+      if (find) {
+        return find;
+      }
     }
     // 查找应用的界面行为
     return this.model.appDEUIActions!.find(action => {
-      return action.id === id;
+      return action.id === actionId;
     });
   }
 
@@ -155,4 +197,25 @@ export class Application implements IAppService {
     }
     return result;
   }
+
+  /**
+   * 查找实体的界面逻辑模型
+   * @author lxm
+   * @date 2023-06-14 07:20:30
+   * @param {string} deUILogicId
+   * @param {string} appDataEntityId
+   * @return {*}  {(Promise<IDEUILogic | undefined>)}
+   */
+  async getDEUILogic(
+    deUILogicId: string,
+    appDataEntityId: string,
+  ): Promise<IDEUILogic | undefined> {
+    const appDataEntity = await ibiz.hub.getAppDataEntity(
+      appDataEntityId,
+      this.model.appId,
+    );
+    return appDataEntity.appDEUILogics!.find(logic => {
+      return logic.id === deUILogicId;
+    });
+  }
 }

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

@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import { RuntimeError } from '@ibiz-template/core';
+import { ModelError, RuntimeError } from '@ibiz-template/core';
 import { IAppFunc } from '@ibiz/model-core';
+import { convertNavData } from '../../../utils';
 import { OpenAppViewCommand } from '../open-app-view/open-app-view';
 
 /**
@@ -48,27 +49,25 @@ export class AppFuncCommand {
       throw new RuntimeError(`找不到叫${appFuncId}的应用功能`);
     }
 
-    const navContext = appFunc.navigateContexts;
-    if (navContext) {
-      Object.assign(context, navContext);
-    }
-    const navParams = appFunc.navigateParams;
-    if (navParams) {
-      Object.assign(params, navParams);
-    }
-    switch (appFunc.appFuncType) {
+    // 导航参数转换
+    const { navigateContexts, navigateParams, appFuncType } = appFunc;
+    const _context = context.clone();
+    Object.assign(_context, convertNavData(navigateContexts, context, params));
+    const _params = convertNavData(navigateParams, context, params);
+
+    switch (appFuncType) {
       case 'APPVIEW':
-        return this.openAppView(appFunc, context, params, opts);
+        return this.openAppView(appFunc, _context, _params, opts);
       case 'OPENHTMLPAGE':
         return this.openHtmlPage(appFunc);
       case 'PDTAPPFUNC':
-        return this.openPdAppFunc(appFunc, context, params);
+        return this.openPdAppFunc(appFunc, _context, _params);
       case 'JAVASCRIPT':
-        return this.executeJavaScript(appFunc, context, params);
+        return this.executeJavaScript(appFunc, _context, _params);
       case 'CUSTOM':
-        return this.custom(appFunc, context, params);
+        return this.custom(appFunc, _context, _params);
       default:
-        throw new Error(`未知的应用功能类型: ${appFunc.appFuncType}`);
+        throw new ModelError(appFunc, `未支持的应用功能类型: ${appFuncType}`);
     }
   }
 
@@ -90,7 +89,7 @@ export class AppFuncCommand {
     opts?: IData,
   ): Promise<void> {
     if (!appFunc.appViewId) {
-      throw new Error('应用视图不存在');
+      throw new RuntimeError(`应用视图[${appFunc.appViewId}]不存在`);
     }
     return ibiz.commands.execute(
       OpenAppViewCommand.TAG,
@@ -130,7 +129,7 @@ export class AppFuncCommand {
     params?: IParams,
   ): void {
     ibiz.log.warn('openPdAppFunc', appFunc, context, params);
-    throw new Error('未实现');
+    throw new RuntimeError('未实现');
   }
 
   /**
@@ -149,7 +148,7 @@ export class AppFuncCommand {
     params?: IParams,
   ): void {
     ibiz.log.warn('executeJavaScript', appFunc, context, params);
-    throw new Error('未实现');
+    throw new RuntimeError('未实现');
   }
 
   /**
@@ -168,6 +167,6 @@ export class AppFuncCommand {
     params?: IParams,
   ): void {
     ibiz.log.warn('custom', appFunc, context, params);
-    throw new Error('未实现');
+    throw new RuntimeError('未实现');
   }
 }

package/src/command/app/open-app-view/open-app-view.ts

@@ -1,5 +1,7 @@
-import { IAppRedirectView, IAppView } from '@ibiz/model-core';
-import { IModalData } from '../../../interface';
+import { ModelError, RuntimeError } from '@ibiz-template/core';
+import { IAppRedirectView } from '@ibiz/model-core';
+import { IModalData, IViewConfig } from '../../../interface';
+import { calcDeCodeNameById } from '../../../model';
 import { openRedirectView } from '../../../utils';
 
 /**
@@ -34,13 +36,22 @@ export class OpenAppViewCommand {
     params: IParams = {},
     opts: IData = {},
   ): Promise<IModalData | void> {
-    const appView = await ibiz.hub.getAppView(appViewId!);
+    const appView = await ibiz.hub.config.view.get(appViewId!);
     if (!appView) {
-      throw new Error('应用视图不存在');
+      throw new RuntimeError(`应用视图[${appViewId}]不存在`);
     }
+
+    // 识别上下文的srfkey并转成对应视图实体名称，然后置空srfkey
+    if (context.srfkey && appView.appDataEntityId) {
+      const deName = calcDeCodeNameById(appView.appDataEntityId);
+      context[deName] = context.srfkey;
+      context.srfkey = undefined;
+    }
+
     if (appView.redirectView) {
+      const fullViewModel = await ibiz.hub.getAppView(appViewId);
       return openRedirectView(
-        appView as IAppRedirectView,
+        fullViewModel as IAppRedirectView,
         context,
         params,
         opts.data,
@@ -49,13 +60,17 @@ export class OpenAppViewCommand {
     const { openMode = 'INDEXVIEWTAB' } = appView;
     switch (openMode) {
       case 'INDEXVIEWTAB':
+        if (opts.noWaitRoute) {
+          this.openIndexViewTab(appView, context, params);
+          return;
+        }
         return this.openIndexViewTab(appView, context, params);
       case 'POPUP':
-        throw new Error('未支持的视图打开模式: POPUP');
+        throw new ModelError(appView, '未支持的视图打开模式: POPUP');
       case 'POPUPMODAL':
         return this.openModal(appView, context, params);
       case 'POPUPAPP':
-        throw new Error('未支持的视图打开模式: POPUPAPP');
+        throw new ModelError(appView, '未支持的视图打开模式: POPUPAPP');
       case 'POPOVER':
         return this.openPopover(appView, opts.event, context, params);
       case 'DRAWER_LEFT':
@@ -76,15 +91,15 @@ export class OpenAppViewCommand {
    * @author chitanda
    * @date 2022-07-25 20:07:43
    * @protected
-   * @param {IAppView} appView
+   * @param {IViewConfig} appView
    * @param {IContext} [context]
    * @param {IParams} [params={}]
    */
   protected openIndexViewTab(
-    appView: IAppView,
+    appView: IViewConfig,
     context: IContext,
     params: IParams = {},
-  ): void {
+  ): Promise<IModalData> {
     return ibiz.openView.root(appView, context, params);
   }
 
@@ -94,13 +109,13 @@ export class OpenAppViewCommand {
    * @author chitanda
    * @date 2022-07-25 20:07:55
    * @protected
-   * @param {IAppView} appView
+   * @param {IViewConfig} appView
    * @param {IContext} [context]
    * @param {IParams} [params={}]
    * @return {*}  {Promise<IModalData>}
    */
   protected async openModal(
-    appView: IAppView,
+    appView: IViewConfig,
     context: IContext,
     params: IParams = {},
   ): Promise<IModalData> {
@@ -113,13 +128,13 @@ export class OpenAppViewCommand {
    * @author chitanda
    * @date 2022-07-25 20:07:17
    * @protected
-   * @param {IAppView} appView
+   * @param {IViewConfig} appView
    * @param {IContext} [context]
    * @param {IParams} [params={}]
    * @return {*}  {Promise<IModalData>}
    */
   protected async openPopover(
-    appView: IAppView,
+    appView: IViewConfig,
     event: MouseEvent,
     context: IContext,
     params: IParams = {},
@@ -133,13 +148,13 @@ export class OpenAppViewCommand {
    * @author chitanda
    * @date 2022-07-25 20:07:08
    * @protected
-   * @param {IAppView} appView
+   * @param {IViewConfig} appView
    * @param {IContext} [context]
    * @param {IParams} [params={}]
    * @return {*}  {Promise<void>}
    */
   protected async openDrawer(
-    appView: IAppView,
+    appView: IViewConfig,
     context: IContext,
     params: IParams = {},
   ): Promise<IModalData> {
@@ -152,13 +167,13 @@ export class OpenAppViewCommand {
    * @author chitanda
    * @date 2022-07-25 20:07:41
    * @protected
-   * @param {IAppView} appView
+   * @param {IViewConfig} appView
    * @param {IContext} [context]
    * @param {IParams} [params={}]
    * @return {*}  {Promise<void>}
    */
   protected async openUserCustom(
-    appView: IAppView,
+    appView: IViewConfig,
     context: IContext,
     params: IParams = {},
   ): Promise<IModalData> {