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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.7.41-alpha.123",
+  "version": "0.7.41-alpha.125",
   "description": "运行时逻辑库",
   "type": "module",
   "main": "out/index.js",
@@ -70,5 +70,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "f1cf42a4ab139d6ca4eab2f2a51f566744b446b2"
+  "gitHead": "e240a35b3bcaabb0502fadb01723c85661f8ce23"
 }

package/src/application.ts

@@ -169,6 +169,7 @@ export class Application implements IAppService {
     await this.loadAppModelStyle();
     await this.loadAppLang();
     await this.loadGlobalAppUtil();
+    await this.loadExtensionPlugin();
     await this.loadReplaceDefaultPlugin();
   }
 
@@ -236,6 +237,28 @@ export class Application implements IAppService {
     await ibiz.plugin.loadPlugin(globalAppUtilPlugin as ISysPFPlugin);
   }
 
+  /**
+   * @description 加载扩展插件
+   * @protected
+   * @returns {*}  {Promise<void>}
+   * @memberof Application
+   */
+  protected async loadExtensionPlugin(): Promise<void> {
+    try {
+      await ibiz.plugin.loadPlugin({
+        runtimeObject: true,
+        rtobjectName: 'ExtensionPlugin',
+        rtobjectRepo: `${ibiz.env.baseUrl}/${this.appId}${ibiz.env.remoteModelUrl}/ext`,
+      } as IAppPFPluginRef);
+    } catch (error) {
+      ibiz.log.warn(
+        ibiz.i18n.t('runtime.application.noExtensionPlugin', {
+          appId: this.appId,
+        }),
+      );
+    }
+  }
+
   /**
    * @description 加载替换默认插件（仅主应用执行）
    * @protected

package/src/config/global-config.ts

@@ -136,6 +136,7 @@ export class GlobalConfig implements IGlobalConfig {
     importTemplNameMode: 'default',
     aiUploadMaxSize: 5242880,
     aiAutoQuestion: true,
+    asyncImport: false,
   };
 
   // 全局分页流布局配置

package/src/controller/control/form/form/form.controller.ts

@@ -338,9 +338,9 @@ export abstract class FormController<
     );
 
     // 监听表单成员事件，触发对应部件逻辑
-    this._evt.on('onFormDetailEvent', event => {
+    this._evt.on('onFormDetailEvent', async event => {
       if (this.state.formIsDestroyed) return;
-      this.scheduler?.triggerControlEvent(
+      await this.scheduler?.triggerControlItemEvent(
         event.formDetailName,
         event.formDetailEventName,
         event,

package/src/controller/control/form/form-detail/form-item/form-item.controller.ts

@@ -224,7 +224,6 @@ export class FormItemController
     if (this.model.editor && this.model.editor.editorType !== 'HIDDEN') {
       this.editorProvider = await getEditorProvider(
         this.model.editor,
-        this.model,
         this.form.model,
       );
       if (this.editorProvider) {

package/src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater.controller.ts

@@ -23,6 +23,8 @@ export class FormMDCtrlRepeaterController
   extends FormMDCtrlController
   implements IFormMDCtrlRepeaterController
 {
+  form!: EditFormController;
+
   /**
    * @description 多数据重复器对应的表单里的值
    * @readonly
@@ -192,7 +194,7 @@ export class FormMDCtrlRepeaterController
   setRepeaterController(id: string, controller: IEditFormController): void {
     this.repeaterMap.set(id, controller);
     if (this.value && this.repeaterMap.size === this.value.length) {
-      (this.form as EditFormController).evt.emit('onMDCtrlChange', {
+      this.form.evt.emit('onMDCtrlChange', {
         name: this.name,
         args: this,
       });
@@ -206,7 +208,9 @@ export class FormMDCtrlRepeaterController
    */
   async validate(): Promise<boolean> {
     const values = await Promise.all(
-      Array.from(this.repeaterMap.values()).map(form => form.validate()),
+      Array.from(this.repeaterMap.values()).map(
+        form => form.state.isLoaded && form.validate(),
+      ),
     );
 
     // 找不到value为false即全部是true
@@ -220,7 +224,9 @@ export class FormMDCtrlRepeaterController
    */
   async silentValidate(): Promise<boolean> {
     const values = await Promise.all(
-      Array.from(this.repeaterMap.values()).map(form => form.silentValidate()),
+      Array.from(this.repeaterMap.values()).map(
+        form => form.state.isLoaded && form.silentValidate(),
+      ),
     );
 
     // 找不到value为false即全部是true
@@ -243,15 +249,43 @@ export class FormMDCtrlRepeaterController
     });
   }
 
+  /**
+   * @description 自定义事件
+   * @private
+   * @param {{
+   *     eventName: string;
+   *     index?: number;
+   *     eventArg: IData;
+   *   }} args
+   * @returns {*}  {Promise<void>}
+   * @memberof FormMDCtrlRepeaterController
+   */
+  private async onCustomAction(args: {
+    eventName: string;
+    index?: number;
+    eventArg: IData;
+  }): Promise<void> {
+    await this.form.evt.emit('onFormDetailEvent', {
+      formDetailName: this.name || this.model.id!,
+      formDetailEventName: FormDetailEventName.CUSTOMACTION,
+      args: { ...args, data: this.value },
+    });
+  }
+
   /**
    * @description 添加或创建一条数据
    * @param {number} [index]
    * @memberof FormMDCtrlRepeaterController
    */
-  create(index?: number): void {
+  async create(index?: number): Promise<void> {
     const item = {};
     // 设置新建默认值
     this.setDefaultValue(item, 'create');
+    await this.onCustomAction({
+      index,
+      eventArg: item,
+      eventName: 'onBeforeNew',
+    });
     if (this.isSingleData) {
       this.setValue(item);
     } else {
@@ -265,7 +299,12 @@ export class FormMDCtrlRepeaterController
       }
       this.setValue(tempValue);
     }
-    (this.form as EditFormController).evt.emit('onMDCtrlNew', {
+    await this.onCustomAction({
+      index,
+      eventArg: item,
+      eventName: 'onNewSuccess',
+    });
+    this.form.evt.emit('onMDCtrlNew', {
       args: item,
     });
   }
@@ -276,7 +315,15 @@ export class FormMDCtrlRepeaterController
    * @returns {*}  {void}
    * @memberof FormMDCtrlRepeaterController
    */
-  remove(index?: number): void {
+  async remove(index?: number): Promise<void> {
+    const item = this.isSingleData
+      ? (this.value as IData)
+      : (this.value as IData[])[index!];
+    await this.onCustomAction({
+      index,
+      eventArg: item,
+      eventName: 'onBeforeRemove',
+    });
     if (this.isSingleData) {
       // 单项数据的时候删除就是清空
       this.setValue(null);
@@ -285,9 +332,13 @@ export class FormMDCtrlRepeaterController
     const newArr = (this.value! as IData[]).filter((_, i) => {
       return index !== i;
     });
-
     this.setValue(newArr);
-    (this.form as EditFormController).evt.emit('onMDCtrlRemove', {
+    await this.onCustomAction({
+      index,
+      eventArg: item,
+      eventName: 'onRemoveSuccess',
+    });
+    this.form.evt.emit('onMDCtrlRemove', {
       args: newArr,
     });
   }

package/src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts

@@ -151,7 +151,6 @@ export class GridFieldColumnController
     ) {
       this.filterEditorProvider = await getEditorProvider(
         filterEditor,
-        this.model,
         this.grid.model,
       );
       if (this.filterEditorProvider) {

package/src/controller/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.controller.ts

@@ -133,7 +133,6 @@ export class GridFieldEditColumnController
       ) {
         this.editorProvider = await getEditorProvider(
           this.editItem.editor,
-          this.model,
           this.grid.model,
         );
         if (this.editorProvider) {

package/src/controller/utils/data-file-util/data-file-util.ts

@@ -256,9 +256,9 @@ export async function importData2(opts: {
   params?: IParams;
 }): Promise<ImportDataResult> {
   const result: ImportDataResult = {
-    isAsync: ibiz.env.enableMqtt,
+    isAsync: ibiz.config.common.asyncImport,
   };
-  if (ibiz.env.enableMqtt) {
+  if (ibiz.config.common.asyncImport) {
     // 异步导入不需要等待
     asyncImportData(
       opts.selectedFile,

package/src/interface/api/common/global-config/i-api-global-common-config.ts

@@ -288,4 +288,14 @@ export interface IApiGlobalCommonConfig {
    * @memberof IApiGlobalCommonConfig
    */
   aiAutoQuestion: boolean;
+
+  /**
+   * @description 是否启用异步导入
+   * @type {boolean}
+   * @default false
+   * @platform web
+   * @platform mob
+   * @memberof IApiGlobalCommonConfig
+   */
+  asyncImport: boolean;
 }

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/logic-scheduler/scheduler/logic-scheduler.ts

@@ -296,4 +296,25 @@ export class LogicScheduler {
     } as const;
     this.triggerAndExecute(matchParams, executeParams);
   }
+
+  /**
+   * @description 触发部件项事件
+   * @param {string} ctrlItemName 部件项名称
+   * @param {string} eventName 事件名称
+   * @param {Partial<IUILogicParams>} [executeParams] 执行参数
+   * @memberof LogicScheduler
+   */
+  async triggerControlItemEvent(
+    ctrlItemName: string,
+    eventName: string,
+    executeParams?: Partial<IUILogicParams>,
+  ): Promise<void> {
+    const matchParams = {
+      eventName,
+      ctrlName: ctrlItemName,
+      triggerType: 'CTRLEVENT',
+    } as const;
+    const result = this.triggerAndExecute(matchParams, executeParams);
+    if (result) await Promise.all(result);
+  }
 }