@ibiz-template/runtime 0.1.9 → 0.1.10

package/out/ui-action/provider/sys-ui-action-provider.d.ts

@@ -11,6 +11,7 @@ import { UIActionProviderBase } from './ui-action-provider-base';
  * @implements {IUIActionProvider}
  */
 export declare class SysUIActionProvider extends UIActionProviderBase {
+    private predefinedActionMap;
     execAction(action: IAppDEUIAction, args: IUILogicParams): Promise<IUIActionResult>;
 }
 //# sourceMappingURL=sys-ui-action-provider.d.ts.map

package/out/ui-action/provider/sys-ui-action-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sys-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/sys-ui-action-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,mBAAoB,SAAQ,oBAAoB;IACrD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;CAY5B"}
+{"version":3,"file":"sys-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/sys-ui-action-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,mBAAoB,SAAQ,oBAAoB;IAC3D,OAAO,CAAC,mBAAmB,CAoCxB;IAEG,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;CAc5B"}

package/out/ui-action/provider/sys-ui-action-provider.js

@@ -10,9 +10,50 @@ import { UIActionProviderBase } from './ui-action-provider-base';
  * @implements {IUIActionProvider}
  */
 export class SysUIActionProvider extends UIActionProviderBase {
+    constructor() {
+        super(...arguments);
+        this.predefinedActionMap = 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, args) {
         const { view } = args;
-        const uIActionTag = action.uiactionTag;
+        const uIActionTag = this.predefinedActionMap.get(action.predefinedType) ||
+            action.uiactionTag;
         if (uIActionTag === SysUIActionTag.EXIT) {
             return { closeView: true };
         }

package/out/ui-action/provider/ui-action-provider-base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-action-provider-base.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/ui-action-provider-base.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAkB,MAAM,kBAAkB,CAAC;AAClE,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,cAAc,EACf,MAAM,iBAAiB,CAAC;AAMzB;;;;;;;GAOG;AACH,8BAAsB,oBAAqB,YAAW,iBAAiB;IACrE;;;;;;;OAOG;IACG,IAAI,CACR,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IAuD3B;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,eAAe,GAAG,eAAe;IAO/D;;;;;;;OAOG;IACG,SAAS,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;IAOzD;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,UAAU,CACjB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,eAAe,CAAC;IAE3B;;;;;;;;;;;OAWG;IACG,YAAY,CAChB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IAOvC;;;;;;;;;;;;;;;;OAgBG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,EAAE,EACb,MAAM,EAAE,OAAO,GACd,OAAO,CAAC;QACT,aAAa,EAAE,QAAQ,CAAC;QACxB,UAAU,EAAE,KAAK,EAAE,CAAC;QACpB,YAAY,EAAE,OAAO,CAAC;KACvB,CAAC;CAkFH"}
+{"version":3,"file":"ui-action-provider-base.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/ui-action-provider-base.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAkB,MAAM,kBAAkB,CAAC;AAClE,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,cAAc,EACf,MAAM,iBAAiB,CAAC;AAMzB;;;;;;;GAOG;AACH,8BAAsB,oBAAqB,YAAW,iBAAiB;IACrE;;;;;;;OAOG;IACG,IAAI,CACR,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IAwD3B;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,eAAe,GAAG,eAAe;IAO/D;;;;;;;OAOG;IACG,SAAS,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;IAOzD;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,UAAU,CACjB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,eAAe,CAAC;IAE3B;;;;;;;;;;;OAWG;IACG,YAAY,CAChB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IAOvC;;;;;;;;;;;;;;;;OAgBG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,EAAE,EACb,MAAM,EAAE,OAAO,GACd,OAAO,CAAC;QACT,aAAa,EAAE,QAAQ,CAAC;QACxB,UAAU,EAAE,KAAK,EAAE,CAAC;QACpB,YAAY,EAAE,OAAO,CAAC;KACvB,CAAC;CAkFH"}

package/out/ui-action/provider/ui-action-provider-base.js

@@ -24,6 +24,7 @@ export class UIActionProviderBase {
         const { context, params, data } = args;
         const result = {
             refresh: action.reloadData,
+            refreshMode: action.refreshMode,
             closeView: action.closeEditView,
         };
         // ** 界面逻辑替换执行界面行为

package/out/ui-action/uiaction-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uiaction-util.d.ts","sourceRoot":"","sources":["../../src/ui-action/uiaction-util.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAI/D;;;;;;;GAOG;AACH,qBAAa,YAAY;IACvB;;;;;;;;;OASG;WACU,IAAI,CACf,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,eAAe,CAAC;IAS3B;;;;;;;OAOG;WACU,eAAe,CAC1B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,IAAI,CAAC;CAQjB"}
+{"version":3,"file":"uiaction-util.d.ts","sourceRoot":"","sources":["../../src/ui-action/uiaction-util.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAI/D;;;;;;;GAOG;AACH,qBAAa,YAAY;IACvB;;;;;;;;;OASG;WACU,IAAI,CACf,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,eAAe,CAAC;IAS3B;;;;;;;OAOG;WACU,eAAe,CAC1B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,IAAI,CAAC;CAmBjB"}

package/out/ui-action/uiaction-util.js

@@ -38,12 +38,24 @@ export class UIActionUtil {
      * @param {IUILogicParams} params 界面行为参数
      */
     static async execAndResolved(actionId, params) {
+        var _a, _b;
         const result = await this.exec(actionId, params);
         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 ((_a = params.view.parentView) === null || _a === void 0 ? void 0 : _a.callUIAction(SysUIActionTag.REFRESH));
+                    break;
+                case 3:
+                    await ((_b = params.view.getTopView()) === null || _b === void 0 ? void 0 : _b.callUIAction(SysUIActionTag.REFRESH));
+                    break;
+                default:
+            }
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -30,7 +30,7 @@
   "license": "MIT",
   "devDependencies": {
     "@ibiz-template/core": "^0.1.8",
-    "@ibiz/model-core": "^0.0.14",
+    "@ibiz/model-core": "^0.0.15",
     "@types/path-browserify": "^1.0.0",
     "@types/qs": "^6.9.7",
     "@types/systemjs": "^6.13.1",
@@ -44,7 +44,7 @@
   },
   "peerDependencies": {
     "@ibiz-template/core": "^0.1.0",
-    "@ibiz/model-core": "^0.0.14",
+    "@ibiz/model-core": "^0.0.15",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.7",
     "lodash-es": "^4.17.21",
@@ -53,5 +53,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "996ad2a8bc9cd856f5a672ebdc97748124c07da1"
+  "gitHead": "24e2a2f4b050fbb3a3b9f5deeee97f98985913e4"
 }

package/src/config/global-config.ts

@@ -23,7 +23,7 @@ export class GlobalConfig implements IGlobalConfig {
 
   // 全局表格配置
   grid: IGlobalGridConfig = {
-    editShowMode: 'cell',
+    editShowMode: 'row',
     editSaveMode: 'cell-blur',
   };
 

package/src/interface/common/i-ui-action-result/i-ui-action-result.ts

@@ -16,6 +16,14 @@ export interface IUIActionResult {
    */
   refresh?: boolean;
 
+  /**
+   * 刷新引用视图模式
+   * @description 值模式 [界面行为重新加载数据模式] {0：无、 1：引用视图或树节点、 2：引用树节点父节点、 3：引用树节点根节点 }
+   * @type {( number | 0 | 1 | 2 | 3)}
+   * @default 0
+   */
+  refreshMode?: number | 0 | 1 | 2 | 3;
+
   /**
    * 是否关闭界面
    *

package/src/interface/controller/controller/control/i-form.controller.ts

@@ -23,4 +23,12 @@ export interface IFormController<
    * @return {*}  {IData[]}
    */
   getData(): IData[];
+
+  /**
+   * 表单值规则校验
+   * @author zzq
+   * @date 2023-08-23 16:38:33
+   * @return {*}  {Promise<boolean>}
+   */
+  validate(): Promise<boolean>;
 }

package/src/interface/controller/controller/control/i-grid.controller.ts

@@ -1,7 +1,7 @@
 import { IDEGrid } from '@ibiz/model-core';
 import { ControlVO } from '../../../../service';
 import { IGridEvent } from '../../event';
-import { IGridState } from '../../state';
+import { IGridRowState, IGridState } from '../../state';
 import { IMDControlController } from './i-md-control.controller';
 
 /**
@@ -57,4 +57,13 @@ export interface IGridController
    * @memberof IGridController
    */
   exportData(_args: { event: MouseEvent; params: IData }): Promise<void>;
+
+  /**
+   * 值规则校验
+   *
+   * @author zzq
+   * @date 2023-08-23 18:23:26
+   * @memberof IGridController
+   */
+  validate(row: IGridRowState): Promise<boolean>;
 }

package/src/interface/controller/controller/control/i-tree.controller.ts

@@ -46,10 +46,15 @@ export interface ITreeController
   ): Promise<void>;
 
   /**
-   * 刷新父节点数据
+   * 刷新指定树节点的子节点数据
    * @author lxm
-   * @date 2023-08-18 01:49:59
-   * @param {ITreeNodeData} parentNode
+   * @date 2023-08-23 08:23:59
+   * @param {(ITreeNodeData | IData)} nodeData 指定树节点数据，可以是节点数据，也可以是对应的实体数据
+   * @param {boolean} [refreshParent=false] 是否是刷新给定节点数据的父节点的子节点数据
+   * @return {*}  {Promise<void>}
    */
-  refreshParent(parentData: ITreeNodeData | IData): void;
+  refreshNodeChildren(
+    nodeData: ITreeNodeData | IData,
+    refreshParent?: boolean,
+  ): Promise<void>;
 }

package/src/interface/controller/event/control/i-pickup-view-panel.event.ts

@@ -38,20 +38,4 @@ export interface IPickupViewPanelEvent extends IControlEvent {
     event: EventBase;
     emitArgs: { data: IData[] };
   };
-
-  /**
-   * 选择视图初始化
-   *
-   * @author zk
-   * @date 2023-08-04 05:08:37
-   * @type {{
-   *     event: EventBase;
-   *     emitArgs: { data: IViewController };
-   *   }}
-   * @memberof IPickupViewPanelEvent
-   */
-  onPickUpViewMounted: {
-    event: EventBase;
-    emitArgs: undefined;
-  };
 }

package/src/interface/controller/state/control/i-tree-exp-bar.state.ts

@@ -7,4 +7,13 @@ import { IExpBarControlState } from './i-exp-bar-control.state';
  * @interface ITreeExpBarState
  * @extends {IExpBarControlState}
  */
-export interface ITreeExpBarState extends IExpBarControlState {}
+export interface ITreeExpBarState extends IExpBarControlState {
+  /**
+   * 不需要配置导航视图
+   * 没有配置导航视图的情况下也正常抛出导航事件，由外部决定导航参数用在哪个导航视图里。
+   * @author lxm
+   * @date 2023-08-22 03:39:14
+   * @type {boolean}
+   */
+  noNeedNavView: boolean;
+}

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

@@ -0,0 +1,28 @@
+/**
+ * 获取插件的注册唯一标识
+ * @author lxm
+ * @date 2023-08-23 11:04:04
+ * @export
+ * @param {string} pluginId
+ * @param {string} [appId]
+ * @return {*}  {string}
+ */
+export async function getPluginRegisterKey(
+  pluginId: string,
+  appId?: string,
+): Promise<string | undefined> {
+  const app = ibiz.hub.getApp(appId);
+
+  const plugin = app.model.appPFPluginRefs?.find(
+    item => item.pluginCode!.toLowerCase() === pluginId,
+  );
+
+  if (!plugin) {
+    ibiz.log.error(`找不到${pluginId}的插件模型`);
+    return;
+  }
+
+  await ibiz.plugin.loadPlugin(plugin);
+
+  return `${plugin.pluginType}_${plugin.pluginCode}`;
+}

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

@@ -1,5 +1,6 @@
 import { IControl } from '@ibiz/model-core';
 import { IControlProvider } from '../../interface';
+import { getPluginRegisterKey } from './common-register';
 
 /** 部件适配器前缀 */
 export const CONTROL_PROVIDER_PREFIX = 'CONTROL';
@@ -37,7 +38,21 @@ export async function getControlProvider(
   model: IControl,
 ): Promise<IControlProvider | undefined> {
   let provider: IControlProvider | undefined;
-  const { controlType, controlStyle } = model as Required<IControl>;
+  const { controlType, controlStyle, sysPFPluginId, appId } =
+    model as Required<IControl>;
+
+  // 找插件适配器
+  if (sysPFPluginId) {
+    const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
+    if (pluginKey) {
+      provider = getProvider(pluginKey);
+    }
+    if (!provider) {
+      ibiz.log.error(`找不到部件插件${pluginKey}对应的适配器`);
+    } else {
+      return provider;
+    }
+  }
 
   // 再找部件类型和部件样式
   if (controlStyle && controlStyle !== 'DEFAULT') {
@@ -48,17 +63,17 @@ export async function getControlProvider(
         `找不到部件类型：[${controlType}]的部件样式：[${controlStyle}]对应的适配器`,
         model,
       );
+    } else {
+      return provider;
     }
   }
 
   // 找部件类型
-  if (!provider) {
-    provider = getProvider(controlType);
-  }
+  provider = getProvider(controlType);
 
   if (!provider) {
     ibiz.log.error(`找不到部件类型${controlType}对应的适配器`);
+  } else {
+    return provider;
   }
-
-  return provider;
 }

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

@@ -1,5 +1,6 @@
 import { IEditor } from '@ibiz/model-core';
 import { IEditorProvider } from '../../interface';
+import { getPluginRegisterKey } from './common-register';
 
 /** 编辑器适配器前缀 */
 export const EDITOR_PROVIDER_PREFIX = 'EDITOR';
@@ -37,9 +38,22 @@ export async function getEditorProvider(
   model: IEditor,
 ): Promise<IEditorProvider | undefined> {
   let provider: IEditorProvider | undefined;
-  const { editorType, editorStyle, predefinedType } =
+  const { editorType, editorStyle, predefinedType, sysPFPluginId, appId } =
     model as Required<IEditor>;
 
+  // 找插件适配器
+  if (sysPFPluginId) {
+    const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
+    if (pluginKey) {
+      provider = getProvider(pluginKey);
+    }
+    if (!provider) {
+      ibiz.log.error(`找不到编辑器插件${pluginKey}对应的适配器`);
+    } else {
+      return provider;
+    }
+  }
+
   // 再找编辑器类型和编辑器样式
   if (editorStyle && editorStyle !== 'DEFAULT') {
     const key = `${editorType}_${editorStyle}`;
@@ -49,6 +63,8 @@ export async function getEditorProvider(
         `找不到编辑器类型：[${editorType}]的编辑器样式：[${editorStyle}]对应的适配器`,
         model,
       );
+    } else {
+      return provider;
     }
   }
 
@@ -64,17 +80,16 @@ export async function getEditorProvider(
         `找不到编辑器类型：[${editorType}]的预置类型：[${predefinedType}]对应的适配器`,
         model,
       );
+    } else {
+      return provider;
     }
   }
 
   // 找编辑器类型
-  if (!provider) {
-    provider = getProvider(editorType);
-  }
-
+  provider = getProvider(editorType);
   if (!provider) {
     ibiz.log.error(`找不到编辑器类型${editorType}对应的适配器`);
+  } else {
+    return provider;
   }
-
-  return provider;
 }

package/src/register/helper/form-detail-register.ts

@@ -1,5 +1,6 @@
 import { IDEFormDetail } from '@ibiz/model-core';
 import { IFormDetailProvider } from '../../interface';
+import { getPluginRegisterKey } from './common-register';
 
 /** 表单成员适配器前缀 */
 export const FORMDETAIL_PROVIDER_PREFIX = 'FORMDETAIL';
@@ -37,15 +38,26 @@ export async function getFormDetailProvider(
   model: IDEFormDetail,
 ): Promise<IFormDetailProvider | undefined> {
   let provider: IFormDetailProvider | undefined;
-  const { detailType } = model as Required<IDEFormDetail>;
+  const { detailType, sysPFPluginId, appId } = model as Required<IDEFormDetail>;
 
-  // 找表单成员类型
-  if (!provider) {
-    provider = getProvider(detailType);
+  // 找插件适配器
+  if (sysPFPluginId) {
+    const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
+    if (pluginKey) {
+      provider = getProvider(pluginKey);
+    }
+    if (!provider) {
+      ibiz.log.error(`找不到表单成员插件${pluginKey}对应的适配器`);
+    } else {
+      return provider;
+    }
   }
+
+  // 找表单成员类型
+  provider = getProvider(detailType);
   if (!provider) {
     ibiz.log.error(`找不到表单成员类型${detailType}对应的适配器`);
+  } else {
+    return provider;
   }
-
-  return provider;
 }

package/src/register/helper/grid-column-register.ts

@@ -1,5 +1,6 @@
 import { IDEGridColumn } from '@ibiz/model-core';
 import { IGridColumnProvider } from '../../interface';
+import { getPluginRegisterKey } from './common-register';
 
 /** 表格列适配器前缀 */
 export const GRIDCOLUMN_PROVIDER_PREFIX = 'GRIDCOLUMN';
@@ -37,16 +38,28 @@ export async function getGridColumnProvider(
   model: IDEGridColumn,
 ): Promise<IGridColumnProvider | undefined> {
   let provider: IGridColumnProvider | undefined;
-  const { columnType, enableRowEdit } = model as Required<IDEGridColumn>;
+  const { columnType, enableRowEdit, sysPFPluginId, appId } =
+    model as Required<IDEGridColumn>;
+
+  // 找插件适配器
+  if (sysPFPluginId) {
+    const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
+    if (pluginKey) {
+      provider = getProvider(pluginKey);
+    }
+    if (!provider) {
+      ibiz.log.error(`找不到表格列插件${pluginKey}对应的适配器`);
+    } else {
+      return provider;
+    }
+  }
 
   const key = enableRowEdit ? `${columnType!}_EDIT` : columnType!;
   // 找表格列类型
-  if (!provider) {
-    provider = getProvider(key);
-  }
+  provider = getProvider(key);
   if (!provider) {
     ibiz.log.error(`找不到表格列类型${key}对应的适配器`);
+  } else {
+    return provider;
   }
-
-  return provider;
 }

package/src/register/helper/panel-item-register.ts

@@ -1,5 +1,6 @@
 import { IPanelContainer, IPanelItem, IPanelRawItem } from '@ibiz/model-core';
 import { IPanelItemProvider } from '../../interface';
+import { getPluginRegisterKey } from './common-register';
 
 /** 面板成员适配器前缀 */
 export const PANELITEM_PROVIDER_PREFIX = 'PANELITEM';
@@ -40,7 +41,20 @@ export async function getPanelItemProvider(
   model: IPanelItem,
 ): Promise<IPanelItemProvider | undefined> {
   let provider: IPanelItemProvider | undefined;
-  const { itemType } = model as Required<IPanelItem>;
+  const { itemType, sysPFPluginId, appId } = model as Required<IPanelItem>;
+
+  // 找插件适配器
+  if (sysPFPluginId) {
+    const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
+    if (pluginKey) {
+      provider = getProvider(pluginKey);
+    }
+    if (!provider) {
+      ibiz.log.error(`找不到面板成员插件${pluginKey}对应的适配器`);
+    } else {
+      return provider;
+    }
+  }
 
   // 特殊容器类型
   if (itemType === 'CONTAINER') {
@@ -50,6 +64,8 @@ export async function getPanelItemProvider(
     provider = getProvider(key);
     if (!provider) {
       ibiz.log.error(`找不到面板容器预置类型为${predefinedType}的适配器`);
+    } else {
+      return provider;
     }
   }
 
@@ -63,16 +79,16 @@ export async function getPanelItemProvider(
       ibiz.log.error(
         `找不到面板成员直接内容预置类型为${predefinedType}的适配器`,
       );
+    } else {
+      return provider;
     }
   }
 
   // 找面板成员类型
-  if (!provider) {
-    provider = getProvider(itemType);
-  }
+  provider = getProvider(itemType);
   if (!provider) {
     ibiz.log.error(`找不到面板成员类型${itemType}对应的适配器`);
+  } else {
+    return provider;
   }
-
-  return provider;
 }

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

@@ -1,5 +1,6 @@
 import { IDBPortletPart } from '@ibiz/model-core';
 import { IPortletProvider } from '../../interface';
+import { getPluginRegisterKey } from './common-register';
 
 /** 门户部件成员适配器前缀 */
 export const PORTLET_PROVIDER_PREFIX = 'PORTLET';
@@ -37,15 +38,27 @@ export async function getPortletProvider(
   model: IDBPortletPart,
 ): Promise<IPortletProvider | undefined> {
   let provider: IPortletProvider | undefined;
-  const { portletType } = model as Required<IDBPortletPart>;
+  const { portletType, sysPFPluginId, appId } =
+    model as Required<IDBPortletPart>;
 
-  // 找门户部件成员类型
-  if (!provider) {
-    provider = getProvider(portletType);
+  // 找插件适配器
+  if (sysPFPluginId) {
+    const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
+    if (pluginKey) {
+      provider = getProvider(pluginKey);
+    }
+    if (!provider) {
+      ibiz.log.error(`找不到门户部件插件${pluginKey}对应的适配器`);
+    } else {
+      return provider;
+    }
   }
+
+  // 找门户部件成员类型
+  provider = getProvider(portletType);
   if (!provider) {
     ibiz.log.error(`找不到门户部件成员类型${portletType}对应的适配器`);
+  } else {
+    return provider;
   }
-
-  return provider;
 }

package/src/register/helper/ui-action-register.ts

@@ -1,6 +1,7 @@
 import { RuntimeError } from '@ibiz-template/core';
 import { IAppUIAction } from '@ibiz/model-core';
 import { IUIActionProvider } from '../../interface';
+import { getPluginRegisterKey } from './common-register';
 
 /** 界面行为适配器前缀 */
 export const UIACTION_PROVIDER_PREFIX = 'UIACTION';
@@ -38,15 +39,27 @@ export async function getUIActionProvider(
   model: IAppUIAction,
 ): Promise<IUIActionProvider> {
   let provider: IUIActionProvider | undefined;
-  const { uiactionMode } = model as Required<IAppUIAction>;
+  const { uiactionMode, sysPFPluginId, appId } =
+    model as Required<IAppUIAction>;
 
-  // 找界面行为类型
-  if (!provider) {
-    provider = getProvider(uiactionMode);
+  // 找插件适配器
+  if (sysPFPluginId) {
+    const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
+    if (pluginKey) {
+      provider = getProvider(pluginKey);
+    }
+    if (!provider) {
+      ibiz.log.error(`找不到界面行为插件${pluginKey}对应的适配器`);
+    } else {
+      return provider;
+    }
   }
+
+  // 找界面行为类型
+  provider = getProvider(uiactionMode);
   if (!provider) {
     throw new RuntimeError(`找不界面行为模式${uiactionMode}对应的适配器`);
+  } else {
+    return provider;
   }
-
-  return provider;
 }