@ibiz-template/runtime 0.1.7 → 0.1.9

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

@@ -193,10 +193,9 @@ export async function openDERedirectView(
   // 所有重定向引用视图
   const allRefViews = appView.redirectAppViewRefs;
   const refView = allRefViews?.find(view => {
+    const matchKey = view.name || view.id;
     // 特殊补充 wfRdTag 匹配，子流程应用特殊模式
-    return (
-      view.name === deRdTag || view.name === rdTag || view.name === wfRdTag
-    );
+    return matchKey === deRdTag || matchKey === rdTag || matchKey === wfRdTag;
   });
   if (refView) {
     const viewId = refView.refAppViewId;
@@ -250,16 +249,6 @@ export async function calcDERdTag(
   data: IData,
 ): Promise<string> {
   let rdTag = '';
-  const defView = `${ibiz.env.isMob ? 'MOB' : ''}EDITVIEW`;
-  // 如果流程步骤存在，按照工作流优先
-  const srfWf = params.srfwf;
-  if (notNilEmpty(srfWf)) {
-    if (notNilEmpty(params.wf)) {
-      return `${defView}:${srfWf.toUpperCase()}:${params.wf.toUpperCase()}`;
-    }
-    return `${defView}:${srfWf.toUpperCase()}`;
-  }
-  let typeValue = '';
   // 重定向视图自定义类别属性
   const typeFieldId = rdView.typeAppDEFieldId;
   // 自定义重定向
@@ -267,15 +256,27 @@ export async function calcDERdTag(
     const { codeName } = findFieldById(entity, typeFieldId)!;
     const value = data[codeName!.toLowerCase()];
     if (notNilEmpty(value)) {
-      typeValue = value;
+      return `${value}`;
     }
+    ibiz.log.warn(
+      `重定向视图[${rdView.name}]自定义类别属性[${typeFieldId}]值为空`,
+      data,
+    );
   }
-  if (isNilOrEmpty(typeValue)) {
-    // 从索引属性获取重定向视图类型
-    if (entity.indexTypeAppDEFieldId) {
-      const { codeName } = findFieldById(entity, entity.indexTypeAppDEFieldId)!;
-      typeValue = data[codeName!.toLowerCase()];
+  const defView = `${ibiz.env.isMob ? 'MOB' : ''}EDITVIEW`;
+  // 如果流程步骤存在，按照工作流优先
+  const srfWf = params.srfwf;
+  if (notNilEmpty(srfWf)) {
+    if (notNilEmpty(params.wf)) {
+      return `${defView}:${srfWf.toUpperCase()}:${params.wf.toUpperCase()}`;
     }
+    return `${defView}:${srfWf.toUpperCase()}`;
+  }
+  let typeValue = '';
+  // 从索引属性获取重定向视图类型
+  if (entity.indexTypeAppDEFieldId) {
+    const { codeName } = findFieldById(entity, entity.indexTypeAppDEFieldId)!;
+    typeValue = data[codeName!.toLowerCase()];
   }
   if (isNilOrEmpty(typeValue)) {
     // 从多表单属性判断重定向视图类型

package/src/utils/script/script-function.ts

@@ -2,12 +2,13 @@
 /* eslint-disable no-new-func */
 /* eslint-disable @typescript-eslint/ban-types */
 import { mergeRight } from 'ramda';
-import { IScriptFunctionOpts } from '../../interface';
+import { IScriptFunctionOpts, IViewController } from '../../interface';
 
 /** 默认选项 */
 const DefaultOptions: IScriptFunctionOpts = {
   /** 是否是单行脚本，并把表达式结果return */
   singleRowReturn: false,
+  isAsync: true,
 };
 
 export class ScriptFunction {
@@ -25,7 +26,10 @@ export class ScriptFunction {
     this.options = options;
     const code = this.formatCode(scriptCode, options);
     this.calcArgKeys(argKeys, options);
-    this.scriptFn = new Function(...this.argKeys, code);
+    const fn = new Function(...this.argKeys, code);
+    this.scriptFn = function callBack(...args: unknown[]): unknown {
+      return fn.apply({}, args);
+    };
   }
 
   /**
@@ -45,6 +49,9 @@ export class ScriptFunction {
     if (options.singleRowReturn) {
       code = `return (${code})`;
     }
+    if (options.isAsync) {
+      code = `return (async function() { ${code}} )();`;
+    }
     return code;
   }
 
@@ -60,7 +67,26 @@ export class ScriptFunction {
     const keys = options.presetParams ? Object.keys(options.presetParams) : [];
     keys.push(...argKeys);
     // 预置提供的参数
-    keys.push('document', 'el', 'selector');
+    const presetArgsKeys = [
+      'document',
+      'el',
+      'selector',
+      'env',
+      'appSession',
+      'topViewSession',
+      'viewSession',
+      'context',
+      'viewParam',
+      'activeData',
+      'data',
+      'app',
+      'topView',
+      'parentView',
+      'view',
+      'parent',
+      'util',
+    ];
+    keys.push(...presetArgsKeys);
     // 除重
     this.argKeys = Array.from(new Set(keys));
   }
@@ -87,12 +113,64 @@ export class ScriptFunction {
     // 对象参数转数组
     const result: any[] = [];
     this.argKeys.forEach(key => {
+      if (_params[key] === undefined) {
+        this.fillDefaultParams(key, _params);
+      }
       result.push(_params[key]);
     });
 
     return result;
   }
 
+  /**
+   * 填充预置参数
+   * @author lxm
+   * @date 2023-08-21 04:07:50
+   * @protected
+   * @param {string} key
+   * @param {IParams} param
+   */
+  protected fillDefaultParams(key: string, param: IParams): void {
+    const view = param.view as IViewController | undefined;
+    switch (key) {
+      case 'util': // 工具类
+        param.util = {
+          message: ibiz.message,
+          notification: ibiz.notification,
+          modal: ibiz.modal,
+          confirm: ibiz.confirm,
+          openView: ibiz.openView,
+        };
+        break;
+      case 'env': // 全局环境变量
+        param.env = ibiz.env;
+        break;
+      case 'app': // 应用级的控制器
+        param.app = ibiz.hub.controller;
+        break;
+      case 'parent': // 父容器控制器
+        param.parent = view?.parentView;
+        break;
+      case 'topView': // 顶级视图控制器
+        param.topView = view?.getTopView();
+        break;
+      case 'parentView': // 父级视图控制器
+        param.parentView = view?.parentView;
+        break;
+      case 'topViewSession': // 顶级视图共享数据对象
+        param.topViewSession = view?.getTopView().session;
+        break;
+      case 'viewSession': // 当前视图共享数据对象
+        param.viewSession = view?.session;
+        break;
+      case 'appSession': // 全局共享数据对象
+        param.appSession = ibiz.hub.controller.session;
+        break;
+      default:
+        break;
+    }
+  }
+
   /**
    * 执行脚本代码
    * @author lxm

package/src/utils/verify/de-rule-verify.ts

@@ -498,6 +498,7 @@ function checkFieldScriptRule(
     const result = ScriptFactory.execScriptFn(
       { value, data: source },
       scriptCode,
+      { isAsync: false },
     );
     if (typeof result === 'boolean') {
       resultBoolean = result;

package/out/service/service/auth/auth.service.d.ts

@@ -1,30 +0,0 @@
-import { IHttpResponse } from '@ibiz-template/core';
-/**
- * 认证服务
- *
- * @author chitanda
- * @date 2022-07-19 18:07:51
- * @export
- * @class AuthService
- */
-export declare class AuthService {
-    /**
-     * v7 uaa 登录
-     *
-     * @author chitanda
-     * @date 2022-07-19 18:07:54
-     * @param {string} loginname
-     * @param {string} password
-     * @return {*}  {Promise<IHttpResponse>}
-     */
-    v7login(loginname: string, password: string): Promise<IHttpResponse>;
-    /**
-     * v7 uaa 登出
-     *
-     * @author chitanda
-     * @date 2022-09-14 18:07:54
-     * @return {*}  {Promise<IHttpResponse>}
-     */
-    v7logout(): Promise<IHttpResponse>;
-}
-//# sourceMappingURL=auth.service.d.ts.map

package/out/service/service/auth/auth.service.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"auth.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/auth/auth.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD;;;;;;;GAOG;AACH,qBAAa,WAAW;IACtB;;;;;;;;OAQG;IACG,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAa1E;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,aAAa,CAAC;CAIzC"}

package/out/service/service/auth/auth.service.js

@@ -1,37 +0,0 @@
-/**
- * 认证服务
- *
- * @author chitanda
- * @date 2022-07-19 18:07:51
- * @export
- * @class AuthService
- */
-export class AuthService {
-    /**
-     * v7 uaa 登录
-     *
-     * @author chitanda
-     * @date 2022-07-19 18:07:54
-     * @param {string} loginname
-     * @param {string} password
-     * @return {*}  {Promise<IHttpResponse>}
-     */
-    async v7login(loginname, password) {
-        const res = await ibiz.net.post('/v7/login', { loginname, password }, {}, {
-        // sass 模式下，注册在 sassMgr 管理平台的应用中心系统标识
-        // srfdcsystem: ibiz.env.dcSystem,
-        });
-        return res;
-    }
-    /**
-     * v7 uaa 登出
-     *
-     * @author chitanda
-     * @date 2022-09-14 18:07:54
-     * @return {*}  {Promise<IHttpResponse>}
-     */
-    async v7logout() {
-        const res = await ibiz.net.get('/v7/logout', {});
-        return res;
-    }
-}

package/src/service/service/auth/auth.service.ts

@@ -1,44 +0,0 @@
-import { IHttpResponse } from '@ibiz-template/core';
-/**
- * 认证服务
- *
- * @author chitanda
- * @date 2022-07-19 18:07:51
- * @export
- * @class AuthService
- */
-export class AuthService {
-  /**
-   * v7 uaa 登录
-   *
-   * @author chitanda
-   * @date 2022-07-19 18:07:54
-   * @param {string} loginname
-   * @param {string} password
-   * @return {*}  {Promise<IHttpResponse>}
-   */
-  async v7login(loginname: string, password: string): Promise<IHttpResponse> {
-    const res = await ibiz.net.post(
-      '/v7/login',
-      { loginname, password },
-      {},
-      {
-        // sass 模式下，注册在 sassMgr 管理平台的应用中心系统标识
-        // srfdcsystem: ibiz.env.dcSystem,
-      },
-    );
-    return res;
-  }
-
-  /**
-   * v7 uaa 登出
-   *
-   * @author chitanda
-   * @date 2022-09-14 18:07:54
-   * @return {*}  {Promise<IHttpResponse>}
-   */
-  async v7logout(): Promise<IHttpResponse> {
-    const res = await ibiz.net.get('/v7/logout', {});
-    return res;
-  }
-}