@ibiz-template/runtime 0.1.8 → 0.1.10

package/src/register/helper/view-register.ts

@@ -1,5 +1,6 @@
 import { IAppView } from '@ibiz/model-core';
 import { IViewProvider } from '../../interface';
+import { getPluginRegisterKey } from './common-register';
 
 /** 视图适配器前缀 */
 export const VIEW_PROVIDER_PREFIX = 'VIEW';
@@ -35,7 +36,21 @@ export async function getViewProvider(
   model: IAppView,
 ): Promise<IViewProvider | undefined> {
   let provider: IViewProvider | undefined;
-  const { viewType, viewStyle } = model as Required<IAppView>;
+  const { viewType, viewStyle, sysPFPluginId, appId } =
+    model as Required<IAppView>;
+
+  // 找插件适配器
+  if (sysPFPluginId) {
+    const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
+    if (pluginKey) {
+      provider = getProvider(pluginKey);
+    }
+    if (!provider) {
+      ibiz.log.error(`找不到视图插件${pluginKey}对应的适配器`);
+    } else {
+      return provider;
+    }
+  }
 
   // 再找视图类型和视图样式
   if (viewStyle && viewStyle !== 'DEFAULT') {
@@ -46,6 +61,8 @@ export async function getViewProvider(
         `找不到视图类型：[${viewType}]的视图样式：[${viewStyle}]对应的适配器`,
         model,
       );
+    } else {
+      return provider;
     }
   }
 

package/src/service/app-data-entity/app-data-entity.ts

@@ -82,7 +82,6 @@ export class AppDataEntity implements IDataEntity {
       Object.defineProperty(this, 'srfkey', {
         set(val: unknown) {
           _srfkey = val;
-          this._data[key] = val;
         },
         get() {
           return this._data[key] || _srfkey;

package/src/service/service/counter/counter.service.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import { RuntimeModelError } from '@ibiz-template/core';
+import { ModelError, RuntimeModelError } from '@ibiz-template/core';
 import { IAppCounter, IAppCounterRef } from '@ibiz/model-core';
 import { AppCounter } from '../../utils';
 
@@ -70,6 +70,9 @@ export class CounterService {
     if (!appCounter) {
       throw new RuntimeModelError(model, `未配置应用计数器!`);
     }
+    if (appCounter.counterType === 'CUSTOM') {
+      throw new ModelError(appCounter, `未支持自定义计数器`);
+    }
     return this.getCounter(appCounter, context, params);
   }
 }

package/src/service/vo/tree-node-data/tree-data-set-node-data.ts

@@ -89,6 +89,9 @@ export class TreeDataSetNodeData extends TreeNodeData implements ITreeNodeData {
       return ScriptFactory.execScriptFn(
         { data: this.deData },
         dataItem.scriptCode,
+        {
+          isAsync: false,
+        },
       ) as string;
     }
   }

package/src/ui-action/provider/sys-ui-action-provider.ts

@@ -13,12 +13,52 @@ import { UIActionProviderBase } from './ui-action-provider-base';
  * @implements {IUIActionProvider}
  */
 export class SysUIActionProvider extends UIActionProviderBase {
+  private predefinedActionMap: Map<string, string> = new Map([
+    ['EDITVIEW_EXITACTION', 'Exit'],
+    ['EDITVIEW_SAVEANDEXITACTION', 'SaveAndExit'],
+    ['TREEVIEW_REFRESHPARENTACTION', 'RefreshParent'],
+    ['GRIDVIEW_EXPORTXMLACTION', 'ExportModel'],
+    ['GRIDVIEW_EXPORTACTION', 'ExportExcel'],
+    ['EDITVIEW_REMOVEANDEXITACTION', 'RemoveAndExit'],
+    ['GRIDVIEW_PRINTACTION', 'Print'],
+    ['EDITVIEW_NEXTRECORDACTION', 'NextRecord'],
+    ['GRIDVIEW_NEWROWACTION', 'NewRow'],
+    ['EDITVIEW_LASTRECORDACTION', 'LastRecord'],
+    ['EDITVIEW_PREVRECORDACTION', 'PrevRecord'],
+    ['GRIDVIEW_SEARCHBAR', 'ToggleFilter'],
+    ['EDITVIEW_SAVEANDSTARTWFACTION', 'SaveAndStart'],
+    ['EDITVIEW_NEWACTION', 'New'],
+    ['EDITVIEW_PRINTACTION', 'Print'],
+    ['EDITVIEW_COPYACTION', 'Copy'],
+    ['EDITVIEW_HELPACTION', 'Help'],
+    ['EDITVIEW_FIRSTRECORDACTION', 'FirstRecord'],
+    ['GRIDVIEW_REFRESHACTION', 'Refresh'],
+    ['EDITVIEW_SAVEANDNEWACTION', 'SaveAndNew'],
+    ['EDITVIEW_VIEWWFSTEPACTORACTION', 'ViewWFStep'],
+    ['EDITVIEW_SAVEACTION', 'Save'],
+    ['TREEVIEW_REFRESHALLACTION', 'RefreshAll'],
+    ['GRIDVIEW_IMPORTBAR', 'Import'],
+    ['GRIDVIEW_ROWEDITACTION', 'ToggleRowEdit'],
+    ['GRIDVIEW_NEWACTION', 'New'],
+    ['GRIDVIEW_EDITACTION', 'Edit'],
+    ['GRIDVIEW_HELPACTION', 'Help'],
+    ['EDITVIEW_REFRESHACTION', 'Refresh'],
+    ['GRIDVIEW_REMOVEACTION', 'Remove'],
+    ['GRIDVIEW_COPYACTION', 'Copy'],
+    ['GRIDVIEW_VIEWACTION', 'View'],
+    ['GRIDVIEW_SAVEROWACTION', 'SaveRow'],
+    ['APP_LOGIN', 'login'],
+    ['APP_LOGOUT', 'logout'],
+  ]);
+
   async execAction(
     action: IAppDEUIAction,
     args: IUILogicParams,
   ): Promise<IUIActionResult> {
     const { view } = args!;
-    const uIActionTag = action.uiactionTag!;
+    const uIActionTag =
+      this.predefinedActionMap.get(action.predefinedType!) ||
+      action.uiactionTag!;
 
     if (uIActionTag === SysUIActionTag.EXIT) {
       return { closeView: true };

package/src/ui-action/provider/ui-action-provider-base.ts

@@ -34,6 +34,7 @@ export abstract class UIActionProviderBase implements IUIActionProvider {
     const { context, params, data } = args;
     const result: IUIActionResult = {
       refresh: action.reloadData,
+      refreshMode: action.refreshMode,
       closeView: action.closeEditView,
     };
 

package/src/ui-action/uiaction-util.ts

@@ -51,7 +51,18 @@ export class UIActionUtil {
     if (result.closeView) {
       params.view.closeView();
     } else if (result.refresh) {
-      await params.view.callUIAction(SysUIActionTag.REFRESH);
+      switch (result.refreshMode) {
+        case 1:
+          await params.view.callUIAction(SysUIActionTag.REFRESH);
+          break;
+        case 2:
+          await params.view.parentView?.callUIAction(SysUIActionTag.REFRESH);
+          break;
+        case 3:
+          await params.view.getTopView()?.callUIAction(SysUIActionTag.REFRESH);
+          break;
+        default:
+      }
     }
   }
 }

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;