@ibiz-template/runtime 0.1.7 → 0.1.8

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

@@ -25,7 +25,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);
+    };
   }
 
   /**

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;
-  }
-}