@ibiz-template/runtime 0.1.9 → 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/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:
+      }
     }
   }
 }