@ibiz-template/runtime 0.7.41-alpha.124 → 0.7.41-alpha.125

package/src/interface/register/i-register-params.ts

@@ -13,57 +13,47 @@ import {
  */
 export interface IRegisterParams {
   /**
-   * 部件项模型
-   *
-   * @author ljx
-   * @date 2024-04-15 16:10:54
-   * @type {IModel}
-   */
-  controlItemModel?: IControlItem;
-
-  /**
-   * 部件模型
-   *
-   * @author ljx
-   * @date 2024-04-15 16:10:54
-   * @type {IPanel}
-   */
-  controlModel?: IControl;
-
-  /**
-   * 视图模型
-   *
-   * @author ljx
-   * @date 2024-04-15 16:10:54
+   * @description 部件模型
    * @type {IControl}
-   */
-  viewModel?: IAppView;
-
-  /**
-   * @description 界面行为模型
-   * @type {IAppUIAction}
    * @memberof IRegisterParams
    */
-  uiActionModel?: IAppUIAction;
+  control?: IControl;
 
   /**
-   * @description 实体方法模型
-   * @type {IDEMethodProvider}
+   * @description 视图模型
+   * @type {IAppView}
    * @memberof IRegisterParams
    */
-  deMethodModel?: IAppDEMethod;
+  view?: IAppView;
 
   /**
-   * @description 实体模型
-   * @type {string}
+   * @description 应用实体模型
+   * @type {IAppDataEntity}
    * @memberof IRegisterParams
    */
-  entityModel?: IAppDataEntity;
+  entity?: IAppDataEntity;
 
   /**
-   * @description 编辑器模型
-   * @type {IEditor}
+   * @description 主模型
+   * @type {
+   *     | IAppView
+   *     | IAppDataEntity
+   *     | IAppDEMethod
+   *     | IAppUIAction
+   *     | IControl
+   *     | IControlItem
+   *     | IEditor
+   *     | IAppDEMethod
+   *   }
    * @memberof IRegisterParams
    */
-  editorModel?: IEditor;
+  mainModel:
+    | IAppView
+    | IAppDataEntity
+    | IAppDEMethod
+    | IAppUIAction
+    | IControl
+    | IControlItem
+    | IAppDEMethod
+    | IEditor;
 }

package/src/locale/en/index.ts

@@ -444,6 +444,10 @@ export const en = {
       noImplementedRouting:
         'Getting view routing parameter variables is not implemented',
     },
+    application: {
+      noExtensionPlugin:
+        'Attempted to load application [{appId}] extension plugin, but no extension plugin was found',
+    },
     hub: {
       failedParse: 'View parameter {paramsName} failed to parse: {error}',
       noExist: 'View [{id}] does not exist',
@@ -578,6 +582,22 @@ export const en = {
           'Cannot find the adapter corresponding to the toolbar item plugin {pluginKey}.',
         acItem:
           'Cannot find the adapter corresponding to the ac item plugin {pluginKey}.',
+        viewCustomRegistration:
+          '[Custom Extended View] Cannot find an adapter with a custom registration ID of [{registerKey}].',
+        ctrlCustomRegistration:
+          '[Custom Extended Control] Cannot find an adapter with a custom registration ID of [{registerKey}].',
+        panelItemCustomRegistration:
+          '[Custom Extended Panel Item] Cannot find an adapter with a custom registration ID of [{registerKey}].',
+        formDetailCustomRegistration:
+          '[Custom Extended Form Detail] Cannot find an adapter with a custom registration ID of [{registerKey}].',
+        gridColumnCustomRegistration:
+          '[Custom Extended Grid Column] Cannot find an adapter with a custom registration ID of [{registerKey}].',
+        editorCustomRegistration:
+          '[Custom Extended Editor] Cannot find an adapter with a custom registration ID of [{registerKey}].',
+        uiactionCustomRegistration:
+          '[Custom Extended UIAction] Cannot find an adapter with a custom registration ID of [{registerKey}].',
+        deMethodCustomRegistration:
+          '[Custom Extended DEMethod] Cannot find an adapter with a custom registration ID of [{registerKey}].',
       },
     },
     service: {

package/src/locale/zh-CN/index.ts

@@ -371,6 +371,9 @@ export const zhCn = {
     global: {
       noImplemented: '获取应用全局变量没有实现',
     },
+    application: {
+      noExtensionPlugin: '尝试加载应用[{appId}]扩展插件，暂未找到扩展插件',
+    },
     hub: {
       failedParse: '视图参数 {paramsName} 解析失败：{error}',
       noExist: '视图[{id}]不存在',
@@ -468,6 +471,22 @@ export const zhCn = {
           '找不到视图类型：[{viewType}]的视图样式：[{viewStyle}]对应的适配器',
         toolbarItem: '找不到工具栏项插件{pluginKey}对应的适配器',
         acItem: '找不到自填列表项插件{pluginKey}对应的适配器',
+        viewCustomRegistration:
+          '[自定义扩展视图] 找不到自定义注册标识为[{registerKey}]对应的适配器',
+        ctrlCustomRegistration:
+          '[自定义扩展部件] 找不到自定义注册标识为[{registerKey}]对应的适配器',
+        panelItemCustomRegistration:
+          '[自定义扩展面板项] 找不到自定义注册标识为[{registerKey}]对应的适配器',
+        formDetailCustomRegistration:
+          '[自定义扩展表单成员] 找不到自定义注册标识为[{registerKey}]对应的适配器',
+        gridColumnCustomRegistration:
+          '[自定义扩展表格列] 找不到自定义注册标识为[{registerKey}]对应的适配器',
+        editorCustomRegistration:
+          '[自定义扩展编辑器] 找不到自定义注册标识为[{registerKey}]对应的适配器',
+        uiactionCustomRegistration:
+          '[自定义扩展界面行为] 找不到自定义注册标识为[{registerKey}]对应的适配器',
+        deMethodCustomRegistration:
+          '[自定义扩展实体方法] 找不到自定义注册标识为[{registerKey}]对应的适配器',
       },
     },
     service: {

package/src/register/custom-register.ts

@@ -1,4 +1,4 @@
-import { calcDeCodeNameById } from '../model';
+import { IAppDEMethod, IControl } from '@ibiz/model-core';
 import { IRegisterParams } from '../interface';
 import {
   CONTROL_PROVIDER_PREFIX,
@@ -8,81 +8,82 @@ import {
   GRIDCOLUMN_PROVIDER_PREFIX,
   PANELITEM_PROVIDER_PREFIX,
   UIACTION_PROVIDER_PREFIX,
+  VIEW_PROVIDER_PREFIX,
 } from './helper';
+import { calcDeCodeNameById } from '../model';
 
 /**
  * 自定义注册
  */
 export class CustomRegister {
   /**
-   * 获取适配器注册key
-   *
-   * @author ljx
-   * @date 2024-04-16 23:08:08
+   * @description 获取适配器注册key
+   * @static
    * @param {string} registerType
    * @param {IRegisterParams} opts
-   * @return {string}
+   * @returns {*}  {string}
+   * @memberof CustomRegister
    */
   static getRegisterKey(registerType: string, opts: IRegisterParams): string {
     switch (registerType) {
+      case VIEW_PROVIDER_PREFIX:
+        return this.calcExtensionViewKey(opts);
+      case CONTROL_PROVIDER_PREFIX:
+        return this.calcExtensionControlKey(opts);
       case PANELITEM_PROVIDER_PREFIX:
-        return this.calcKeyByView(opts);
+        return this.calcExtensionPanelItemKey(opts);
       case FORMDETAIL_PROVIDER_PREFIX:
       case GRIDCOLUMN_PROVIDER_PREFIX:
-      case CONTROL_PROVIDER_PREFIX:
-        return this.calcKeyByCtrl(opts);
+        return this.calcExtensionControlItemKey(opts);
+      case EDITOR_PROVIDER_PREFIX:
+        return this.calcExtensionEditorKey(opts);
       case UIACTION_PROVIDER_PREFIX:
-        return this.calcKeyByAction(opts);
+        return this.calcExtensionUIActionKey(opts);
       case DEMETHOD_PROVIDER_PREFIX:
-        return this.calcKeyByMethod(opts);
-      case EDITOR_PROVIDER_PREFIX:
-        return this.calcKeyByEditor(opts);
+        return this.calcExtensionMethodKey(opts);
+
       default:
         return '';
     }
   }
 
   /**
-   * 通过视图计算key
-   * 目前适用于计算面板项的key
-   * @author ljx
-   * @date 2024-04-16 23:08:08
+   * @description 计算扩展视图key，（appId@codeName）全大写
+   * @static
    * @param {IRegisterParams} opts
-   * @return {string}
+   * @returns {*}  {string}
+   * @memberof CustomRegister
    */
-  static calcKeyByView(opts: IRegisterParams): string {
-    const { controlItemModel, controlModel, viewModel } = opts;
+  static calcExtensionViewKey(opts: IRegisterParams): string {
+    const { mainModel } = opts;
     let key = '';
-
-    if (viewModel?.codeName) {
-      key += `${viewModel.codeName.toUpperCase()}`;
+    if (mainModel.appId) {
+      key += `${mainModel.appId.toUpperCase()}`;
     }
 
-    if (controlModel?.codeName) {
-      key += `@${controlModel.codeName.toUpperCase()}`;
-    }
-    // TODO 面板项模型中没有codeName暂用id
-    if (controlItemModel?.id) {
-      key += `@${controlItemModel.id.toUpperCase()}`;
+    if (mainModel.codeName) {
+      key += `@${mainModel.codeName.toUpperCase()}`;
     }
     return key;
   }
 
   /**
-   * 通过部件计算key
-   * 没有实体的部件默认为APP
-   * @date 2024-04-16 23:08:08
+   * @description 计算扩展部件key，（appId/DEFAULT@实体codeName/APP@部件类型@部件codeName）全大写
+   * @static
    * @param {IRegisterParams} opts
-   * @return {string}
+   * @returns {*}  {string}
+   * @memberof CustomRegister
    */
-  static calcKeyByCtrl(opts: IRegisterParams): string {
-    const { controlModel, controlItemModel } = opts;
+  static calcExtensionControlKey(opts: IRegisterParams): string {
     let key = '';
-    let prefix: string = 'APP';
-    if (controlModel) {
-      const { appDataEntityId, controlType, codeName } = controlModel;
+    const { mainModel } = opts;
+    if (mainModel) {
+      key = (mainModel.appId || 'DEFAULT').toUpperCase();
+      const { appDataEntityId, controlType, codeName } = mainModel as IControl;
       if (appDataEntityId) {
-        prefix = calcDeCodeNameById(appDataEntityId).toUpperCase();
+        key += `@${calcDeCodeNameById(appDataEntityId).toUpperCase()}`;
+      } else {
+        key += '@APP';
       }
       if (controlType) {
         key += `@${controlType.toUpperCase()}`;
@@ -91,91 +92,135 @@ export class CustomRegister {
         key += `@${codeName.toUpperCase()}`;
       }
     }
+    return key;
+  }
 
-    if (controlItemModel?.codeName) {
-      key += `@${controlItemModel.codeName.toUpperCase()}`;
+  /**
+   * @description 计算扩展面板key，（appId/DEFAULT@视图codeName@部件codeName@面板项标识）全大写
+   * @static
+   * @param {IRegisterParams} opts
+   * @returns {*}  {string}
+   * @memberof CustomRegister
+   */
+  static calcExtensionPanelItemKey(opts: IRegisterParams): string {
+    const { mainModel, view, control } = opts;
+    let key = `${(mainModel.appId || 'DEFAULT').toUpperCase()}`;
+
+    if (view?.codeName) {
+      key += `@${view.codeName.toUpperCase()}`;
+    }
+
+    if (control?.codeName) {
+      key += `@${control.codeName.toUpperCase()}`;
+    }
+    if (mainModel?.id) {
+      key += `@${mainModel.id.toUpperCase()}`;
     }
-    key = prefix + key;
     return key;
   }
 
   /**
-   * @description 通过界面行为模型计算key，其中实体部分无实体的话默认为APP
+   * @description 计算扩展部件项key，（appId/DEFAULT@实体codeName/APP@部件类型@部件codeName@部件项codeName）全大写
    * @static
    * @param {IRegisterParams} opts
    * @returns {*}  {string}
    * @memberof CustomRegister
    */
-  static calcKeyByAction(opts: IRegisterParams): string {
-    const { uiActionModel } = opts;
-    let prefix: string = 'APP';
+  static calcExtensionControlItemKey(opts: IRegisterParams): string {
+    const { mainModel, control } = opts;
     let key = '';
-    if (uiActionModel) {
-      const { appDataEntityId, uiactionTag } = uiActionModel as IData;
+    if (mainModel) {
+      key = (mainModel.appId || 'DEFAULT').toUpperCase();
+      const { appDataEntityId, controlType, codeName } = control as IControl;
       if (appDataEntityId) {
-        prefix = calcDeCodeNameById(appDataEntityId).toUpperCase();
+        key += `@${calcDeCodeNameById(appDataEntityId).toUpperCase()}`;
+      } else {
+        key += '@APP';
       }
-      key += `${prefix}`;
-      if (uiactionTag) {
-        key += `@${uiactionTag.toUpperCase()}`;
+      if (controlType) {
+        key += `@${controlType.toUpperCase()}`;
+      }
+      if (codeName) {
+        key += `@${codeName.toUpperCase()}`;
+      }
+      if (mainModel.codeName) {
+        key += `@${mainModel.codeName.toUpperCase()}`;
       }
     }
     return key;
   }
 
   /**
-   * @description 通过实体方法模型计算key
+   * @description 计算扩展编辑器key，（appId/DEFAULT@实体codeName/APP@部件类型@部件codeName@项标识_EDITOR）全大写
    * @static
    * @param {IRegisterParams} opts
    * @returns {*}  {string}
    * @memberof CustomRegister
    */
-  static calcKeyByMethod(opts: IRegisterParams): string {
-    const { deMethodModel, entityModel } = opts;
-    let key: string = '';
-    if (deMethodModel) {
-      const { methodType, codeName } = deMethodModel;
-      if (entityModel?.id) {
-        key += calcDeCodeNameById(entityModel.id).toUpperCase();
-      }
-      if (methodType && codeName) {
-        key += `@${methodType.toUpperCase()}@${codeName.toUpperCase()}`;
+  static calcExtensionEditorKey(opts: IRegisterParams): string {
+    const { mainModel, control } = opts;
+    let key = (mainModel.appId || 'DEFAULT').toUpperCase();
+    if (control) {
+      const { appDataEntityId, controlType, codeName } = control as IControl;
+      if (appDataEntityId) {
+        key += `@${calcDeCodeNameById(appDataEntityId).toUpperCase()}`;
+      } else {
+        key += '@APP';
       }
+      key += `@${(controlType || 'DEFAULT').toUpperCase()}`;
+      key += `@${(codeName || 'DEFAULT').toUpperCase()}`;
+    }
+    if (mainModel.id) {
+      key += `@${mainModel.id.toUpperCase()}_EDITOR`;
     }
     return key;
   }
 
   /**
-   * @description 通过编辑器模型计算key
+   * @description 计算扩展界面行为key,（appId/DEFAULT@实体codeName/APP@界面行为标记）全大写
+   * @author tony001
+   * @date 2026-08-11 17:08:45
    * @static
    * @param {IRegisterParams} opts
    * @returns {*}  {string}
    * @memberof CustomRegister
    */
-  static calcKeyByEditor(opts: IRegisterParams): string {
-    const { editorModel, controlItemModel, controlModel } = opts;
-    let key = '';
-    let prefix: string = 'APP';
-    if (controlModel) {
-      const { appDataEntityId, controlType, codeName } = controlModel;
+  static calcExtensionUIActionKey(opts: IRegisterParams): string {
+    const { mainModel } = opts;
+    let key: string = (mainModel.appId || 'DEFAULT').toUpperCase();
+    if (mainModel) {
+      const { appDataEntityId, uiactionTag } = mainModel as IData;
       if (appDataEntityId) {
-        prefix = calcDeCodeNameById(appDataEntityId).toUpperCase();
-      }
-      if (controlType) {
-        key += `@${controlType.toUpperCase()}`;
+        key += `@${calcDeCodeNameById(appDataEntityId).toUpperCase()}`;
+      } else {
+        key += '@APP';
       }
-      if (codeName) {
-        key += `@${codeName.toUpperCase()}`;
+      if (uiactionTag) {
+        key += `@${uiactionTag.toUpperCase()}`;
       }
     }
+    return key;
+  }
 
-    if (controlItemModel?.codeName) {
-      key += `@${controlItemModel.codeName.toUpperCase()}`;
+  /**
+   * @description 计算扩展实体方法key,（appId/DEFAULT@实体codeName/方法类型/方法codeName）全大写
+   * @static
+   * @param {IRegisterParams} opts
+   * @returns {*}  {string}
+   * @memberof CustomRegister
+   */
+  static calcExtensionMethodKey(opts: IRegisterParams): string {
+    const { mainModel, entity } = opts;
+    let key: string = (mainModel.appId || 'DEFAULT').toUpperCase();
+    if (entity?.id) {
+      key += `@${calcDeCodeNameById(entity.id).toUpperCase()}`;
     }
-    if (editorModel) {
-      key += `_EDITOR`;
+    if (mainModel) {
+      const { methodType, codeName } = mainModel as IAppDEMethod;
+      if (methodType && codeName) {
+        key += `@${methodType.toUpperCase()}@${codeName.toUpperCase()}`;
+      }
     }
-    key = prefix + key;
     return key;
   }
 }

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

@@ -44,13 +44,13 @@ export async function getControlProvider(
 
   // 找自定义注册的适配器
   const registerKey = CustomRegister.getRegisterKey(CONTROL_PROVIDER_PREFIX, {
-    controlModel: model,
+    mainModel: model,
   });
   provider = getProvider(registerKey);
 
   if (!provider) {
     ibiz.log.debug(
-      ibiz.i18n.t('runtime.register.helper.customRegistration', {
+      ibiz.i18n.t('runtime.register.helper.ctrlCustomRegistration', {
         registerKey,
       }),
     );

package/src/register/helper/de-method-register.ts

@@ -38,18 +38,18 @@ function getProvider(key: string): IDEMethodProvider | undefined {
  */
 export async function getDEMethodProvider(
   model: IAppDEMethod,
-  entityModel?: IAppDataEntity,
+  entity?: IAppDataEntity,
 ): Promise<IDEMethodProvider> {
   let provider: IDEMethodProvider | undefined;
   const { methodType, sysPFPluginId, appId } = model as Required<IAppDEMethod>;
   const registerKey = CustomRegister.getRegisterKey(DEMETHOD_PROVIDER_PREFIX, {
-    deMethodModel: model,
-    entityModel,
+    mainModel: model,
+    entity,
   });
   provider = getProvider(registerKey);
   if (!provider) {
     ibiz.log.debug(
-      ibiz.i18n.t('runtime.register.helper.customRegistration', {
+      ibiz.i18n.t('runtime.register.helper.deMethodCustomRegistration', {
         registerKey,
       }),
     );

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

@@ -1,4 +1,4 @@
-import { IControl, IControlItem, IEditor } from '@ibiz/model-core';
+import { IControl, IEditor } from '@ibiz/model-core';
 import { IEditorProvider } from '../../interface';
 import { getPluginRegisterKey } from './common-register';
 import { CustomRegister } from '../custom-register';
@@ -31,13 +31,11 @@ function getProvider(key: string): IEditorProvider | undefined {
  * @description 获取编辑器适配器
  * @export
  * @param {IEditor} model 编辑器模型
- * @param {IControlItem} [ctrlItem] 控件项模型
  * @param {IControl} [ctrl] 部件模型
  * @returns {*}  {(Promise<IEditorProvider | undefined>)}
  */
 export async function getEditorProvider(
   model: IEditor,
-  ctrlItem?: IControlItem,
   ctrl?: IControl,
 ): Promise<IEditorProvider | undefined> {
   let provider: IEditorProvider | undefined;
@@ -46,14 +44,13 @@ export async function getEditorProvider(
 
   // 找自定义的编辑器适配器
   const registerKey = CustomRegister.getRegisterKey(EDITOR_PROVIDER_PREFIX, {
-    controlItemModel: ctrlItem,
-    controlModel: ctrl,
-    editorModel: model,
+    mainModel: model,
+    control: ctrl,
   });
   provider = getProvider(registerKey);
   if (!provider) {
     ibiz.log.debug(
-      ibiz.i18n.t('runtime.register.helper.customRegistration', {
+      ibiz.i18n.t('runtime.register.helper.editorCustomRegistration', {
         registerKey,
       }),
     );

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

@@ -46,14 +46,14 @@ export async function getFormDetailProvider(
   const registerKey = CustomRegister.getRegisterKey(
     FORMDETAIL_PROVIDER_PREFIX,
     {
-      controlItemModel: model,
-      controlModel: formModel,
+      mainModel: model,
+      control: formModel,
     },
   );
   provider = getProvider(registerKey);
   if (!provider) {
     ibiz.log.debug(
-      ibiz.i18n.t('runtime.register.helper.customRegistration', {
+      ibiz.i18n.t('runtime.register.helper.formDetailCustomRegistration', {
         registerKey,
       }),
     );

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

@@ -37,7 +37,7 @@ function getProvider(key: string): IGridColumnProvider | undefined {
  */
 export async function getGridColumnProvider(
   model: IDEGridColumn,
-  gridModel: IDEGrid,
+  grid: IDEGrid,
 ): Promise<IGridColumnProvider | undefined> {
   let provider: IGridColumnProvider | undefined;
   const { columnType, enableRowEdit, sysPFPluginId, appId } =
@@ -47,14 +47,14 @@ export async function getGridColumnProvider(
   const registerKey = CustomRegister.getRegisterKey(
     GRIDCOLUMN_PROVIDER_PREFIX,
     {
-      controlItemModel: model,
-      controlModel: gridModel,
+      mainModel: model,
+      control: grid,
     },
   );
   provider = getProvider(registerKey);
   if (!provider) {
     ibiz.log.debug(
-      ibiz.i18n.t('runtime.register.helper.customRegistration', {
+      ibiz.i18n.t('runtime.register.helper.gridColumnCustomRegistration', {
         registerKey,
       }),
     );
@@ -98,12 +98,12 @@ export async function getGridColumnProvider(
  *
  * @export
  * @param {IDEGridColumn} model
- * @param {IDEGrid} gridModel
+ * @param {IDEGrid} grid
  * @return {*}  {(Promise<IGridColumnProvider | undefined>)}
  */
 export async function getAutoGridColumnProvider(
   model: IDEGridColumn,
-  gridModel: IDEGrid,
+  grid: IDEGrid,
 ): Promise<IGridColumnProvider | undefined> {
   let provider: IGridColumnProvider | undefined;
   const { columnType, enableRowEdit, sysPFPluginId, appId } =
@@ -113,14 +113,14 @@ export async function getAutoGridColumnProvider(
   const registerKey = CustomRegister.getRegisterKey(
     GRIDCOLUMN_PROVIDER_PREFIX,
     {
-      controlItemModel: model,
-      controlModel: gridModel,
+      mainModel: model,
+      control: grid,
     },
   );
   provider = getProvider(registerKey);
   if (!provider) {
     ibiz.log.debug(
-      ibiz.i18n.t('runtime.register.helper.customRegistration', {
+      ibiz.i18n.t('runtime.register.helper.gridColumnCustomRegistration', {
         registerKey,
       }),
     );

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

@@ -56,14 +56,14 @@ export async function getPanelItemProvider(
 
   // 找自定义注册的适配器
   const registerKey = CustomRegister.getRegisterKey(PANELITEM_PROVIDER_PREFIX, {
-    controlItemModel: model,
-    controlModel: panelModel,
-    viewModel,
+    mainModel: model,
+    view: viewModel,
+    control: panelModel,
   });
   provider = getProvider(registerKey);
   if (!provider) {
     ibiz.log.debug(
-      ibiz.i18n.t('runtime.register.helper.customRegistration', {
+      ibiz.i18n.t('runtime.register.helper.panelItemCustomRegistration', {
         registerKey,
       }),
     );

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

@@ -44,12 +44,12 @@ export async function getUIActionProvider(
     model as Required<IAppUIAction>;
   // 找自定义注册的适配器
   const registerKey = CustomRegister.getRegisterKey(UIACTION_PROVIDER_PREFIX, {
-    uiActionModel: model,
+    mainModel: model,
   });
   provider = getProvider(registerKey);
   if (!provider) {
     ibiz.log.debug(
-      ibiz.i18n.t('runtime.register.helper.customRegistration', {
+      ibiz.i18n.t('runtime.register.helper.uiactionCustomRegistration', {
         registerKey,
       }),
     );