@ibiz-template/runtime 0.1.8 → 0.1.9

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 {
@@ -48,6 +49,9 @@ export class ScriptFunction {
     if (options.singleRowReturn) {
       code = `return (${code})`;
     }
+    if (options.isAsync) {
+      code = `return (async function() { ${code}} )();`;
+    }
     return code;
   }
 
@@ -63,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));
   }
@@ -90,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;