@ibiz-template/runtime 0.0.1-alpha.13 → 0.0.1-alpha.15

package/out/interface/util/i-loading-util/i-loading-util.d.ts

@@ -22,5 +22,19 @@ export interface ILoadingUtil {
      * @date 2022-08-17 17:08:48
      */
     hide(): void;
+    /**
+     * 显示顶部全局加载动画
+     *
+     * @author chitanda
+     * @date 2022-10-08 16:10:18
+     */
+    showRedirect(): void;
+    /**
+     * 隐藏顶部全局加载动画
+     *
+     * @author chitanda
+     * @date 2022-10-08 16:10:29
+     */
+    hideRedirect(): void;
 }
 //# sourceMappingURL=i-loading-util.d.ts.map

package/out/interface/util/i-loading-util/i-loading-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-loading-util.d.ts","sourceRoot":"","sources":["../../../../src/interface/util/i-loading-util/i-loading-util.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;;;OAMG;IACH,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B;;;;;OAKG;IACH,IAAI,IAAI,IAAI,CAAC;CACd"}
+{"version":3,"file":"i-loading-util.d.ts","sourceRoot":"","sources":["../../../../src/interface/util/i-loading-util/i-loading-util.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;;;OAMG;IACH,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B;;;;;OAKG;IACH,IAAI,IAAI,IAAI,CAAC;IACb;;;;;OAKG;IACH,YAAY,IAAI,IAAI,CAAC;IACrB;;;;;OAKG;IACH,YAAY,IAAI,IAAI,CAAC;CACtB"}

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

@@ -1 +1 @@
-{"version":3,"file":"app-de-ui-action-util.d.ts","sourceRoot":"","sources":["../../../src/utils/app-de-ui-action-util/app-de-ui-action-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EACL,gBAAgB,EAGjB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAGlD;;;;;;;GAOG;AACH,qBAAa,iBAAiB;IAC5B;;;;;;;;;;;;OAYG;WACU,IAAI,CACf,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,EACpB,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,KAAK,GACX,OAAO,CAAC,eAAe,CAAC;IAqE3B;;;;;;;;;;;;;;;;OAgBG;qBACoB,YAAY,CACjC,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;IA0DF;;;;;;;;OAQG;WACU,kBAAkB,CAC7B,MAAM,EAAE,gBAAgB,EACxB,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,EACpB,IAAI,CAAC,EAAE,KAAK,GACX,OAAO,CAAC,eAAe,CAAC;IA6G3B;;;;;;;;;;;;OAYG;WACU,oBAAoB,CAC/B,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,WAAW,EACpB,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI,EACrB,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,KAAK,GACX,OAAO,CAAC,eAAe,CAAC;IAiB3B;;;;;;;;;;;OAWG;WACU,sBAAsB,CACjC,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,WAAW,EACpB,KAAK,EAAE,KAAK,EAAE,EACd,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,eAAe,CAAC;CAY5B"}
+{"version":3,"file":"app-de-ui-action-util.d.ts","sourceRoot":"","sources":["../../../src/utils/app-de-ui-action-util/app-de-ui-action-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EACL,gBAAgB,EAGjB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAGlD;;;;;;;GAOG;AACH,qBAAa,iBAAiB;IAC5B;;;;;;;;;;;;OAYG;WACU,IAAI,CACf,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,EACpB,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,KAAK,GACX,OAAO,CAAC,eAAe,CAAC;IAqE3B;;;;;;;;;;;;;;;;OAgBG;qBACoB,YAAY,CACjC,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;IA0DF;;;;;;;;OAQG;WACU,kBAAkB,CAC7B,MAAM,EAAE,gBAAgB,EACxB,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,EACpB,IAAI,CAAC,EAAE,KAAK,GACX,OAAO,CAAC,eAAe,CAAC;IAqG3B;;;;;;;;;;;;OAYG;WACU,oBAAoB,CAC/B,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,WAAW,EACpB,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI,EACrB,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,KAAK,GACX,OAAO,CAAC,eAAe,CAAC;IAiB3B;;;;;;;;;;;OAWG;WACU,sBAAsB,CACjC,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,WAAW,EACpB,KAAK,EAAE,KAAK,EAAE,EACd,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,eAAe,CAAC;CAY5B"}

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

@@ -219,13 +219,7 @@ export class AppDEUIActionUtil {
             await neuron.call.wfSubmit();
         }
         // 需要关闭视图的
-        if ([
-            'SaveAndExit',
-            'Exit',
-            'SaveAndStart',
-            'ViewWFStep',
-            'RemoveAndExit',
-        ].indexOf(uIActionTag) !== -1) {
+        if (['SaveAndExit', 'Exit', 'RemoveAndExit'].indexOf(uIActionTag) !== -1) {
             result.closeView = true;
         }
         // 需要刷新界面的

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;AAE9B,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C;;;;;;;;;;;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,CAyDrB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,WAAW,CAC/B,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,oBAAoB,EAC5B,IAAI,EAAE,OAAO,EACb,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,MAAM,CAAC,CAgCjB"}
+{"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;AAE9B,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,CA2ErB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,WAAW,CAC/B,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,oBAAoB,EAC5B,IAAI,EAAE,OAAO,EACb,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,MAAM,CAAC,CAgCjB"}

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

@@ -1,6 +1,7 @@
 import { IBizContext } from '@ibiz-template/core';
 import { DefectModelError, UnsupportedModelError, } from '@ibiz-template/model';
 import { OpenAppViewCommand } from '../../command';
+import { convertNavData } from '../nav-params/nav-params';
 /**
  * 打开重定向视图
  *
@@ -32,6 +33,14 @@ export async function openRedirectView(appView, context = new IBizContext(), par
  * @return {*}  {Promise<IModalData>}
  */
 export async function openDERedirectView(appView, context = new IBizContext(), params = {}, data = []) {
+    // 计算重定向视图上下文参数转换
+    const navContext = appView.getPSAppViewNavContexts() || [];
+    const navContextData = convertNavData(navContext, context, params);
+    context = new IBizContext(navContextData, context);
+    // 计算重定向视图视图参数转换
+    const navParams = appView.getPSAppViewNavParams() || [];
+    const navParamsData = convertNavData(navParams, context, params);
+    Object.assign(params, navParamsData);
     // 重定向视图对应应用实体
     const entity = appView.getPSAppDataEntity();
     await entity.fill(true);
@@ -42,10 +51,20 @@ export async function openDERedirectView(appView, context = new IBizContext(), p
     // 实体重定向视图获取数据行为
     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.getContext(), params);
+    ibiz.loading.hideRedirect();
     if (res.ok) {
         curData = res.data;
+        const linkUrl = curData.linkurl;
+        if (linkUrl) {
+            if (linkUrl.startsWith('http://') || linkUrl.startsWith('https://')) {
+                window.open(linkUrl, '_blank');
+                return { ok: true, data: [] };
+            }
+            return { ok: false, data: [] };
+        }
     }
     // 根据参数中是否给了 srfwf 来判断是否为工作流
     const isWf = !!params.srfwf;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.0.1-alpha.13",
+  "version": "0.0.1-alpha.15",
   "description": "控制器包",
   "main": "out/index.js",
   "types": "out/index.d.ts",
@@ -28,8 +28,8 @@
   },
   "devDependencies": {
     "@ibiz-template/core": "^0.0.1-alpha.13",
-    "@ibiz-template/model": "^0.0.1-alpha.13",
-    "@ibiz-template/service": "^0.0.1-alpha.13",
+    "@ibiz-template/model": "^0.0.1-alpha.15",
+    "@ibiz-template/service": "^0.0.1-alpha.15",
     "qx-util": "^0.4.1"
   },
   "peerDependencies": {
@@ -38,5 +38,5 @@
     "@ibiz-template/service": "^0.0.1-alpha.2",
     "qx-util": "^0.4.1"
   },
-  "gitHead": "e72517e4226353804443c9a0cd7b40aaf0edf846"
+  "gitHead": "9c4cb087ceb4cd9703ee6c4becd961215922dd13"
 }

package/src/interface/util/i-loading-util/i-loading-util.ts

@@ -22,4 +22,18 @@ export interface ILoadingUtil {
    * @date 2022-08-17 17:08:48
    */
   hide(): void;
+  /**
+   * 显示顶部全局加载动画
+   *
+   * @author chitanda
+   * @date 2022-10-08 16:10:18
+   */
+  showRedirect(): void;
+  /**
+   * 隐藏顶部全局加载动画
+   *
+   * @author chitanda
+   * @date 2022-10-08 16:10:29
+   */
+  hideRedirect(): void;
 }

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

@@ -293,15 +293,7 @@ export class AppDEUIActionUtil {
     }
 
     // 需要关闭视图的
-    if (
-      [
-        'SaveAndExit',
-        'Exit',
-        'SaveAndStart',
-        'ViewWFStep',
-        'RemoveAndExit',
-      ].indexOf(uIActionTag) !== -1
-    ) {
+    if (['SaveAndExit', 'Exit', 'RemoveAndExit'].indexOf(uIActionTag) !== -1) {
       result.closeView = true;
     }
 

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

@@ -8,6 +8,7 @@ import {
 } from '@ibiz-template/model';
 import { OpenAppViewCommand } from '../../command';
 import { IModalData } from '../../interface';
+import { convertNavData } from '../nav-params/nav-params';
 
 /**
  * 打开重定向视图
@@ -59,6 +60,14 @@ export async function openDERedirectView(
   params: IParams = {},
   data: IData[] = [],
 ): Promise<IModalData> {
+  // 计算重定向视图上下文参数转换
+  const navContext = appView.getPSAppViewNavContexts() || [];
+  const navContextData = convertNavData(navContext, context, params);
+  context = new IBizContext(navContextData, context);
+  // 计算重定向视图视图参数转换
+  const navParams = appView.getPSAppViewNavParams() || [];
+  const navParamsData = convertNavData(navParams, context, params);
+  Object.assign(params, navParamsData);
   // 重定向视图对应应用实体
   const entity = appView.getPSAppDataEntity()!;
   await entity.fill(true);
@@ -69,14 +78,24 @@ export async function openDERedirectView(
   // 实体重定向视图获取数据行为
   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.getContext(),
     params,
   );
+  ibiz.loading.hideRedirect();
   if (res.ok) {
     curData = res.data;
+    const linkUrl: string = curData.linkurl;
+    if (linkUrl) {
+      if (linkUrl.startsWith('http://') || linkUrl.startsWith('https://')) {
+        window.open(linkUrl, '_blank');
+        return { ok: true, data: [] };
+      }
+      return { ok: false, data: [] };
+    }
   }
   // 根据参数中是否给了 srfwf 来判断是否为工作流
   const isWf = !!params.srfwf;