@ibiz-template/runtime 0.4.6 → 0.4.8

package/src/controller/control/data-view/data-view.controller.ts

@@ -272,13 +272,17 @@ export class DataViewControlController<
     event: MouseEvent,
   ): Promise<void> {
     const actionId = detail.uiactionId;
-    await UIActionUtil.execAndResolved(actionId!, {
-      context: this.context,
-      params: this.params,
-      data: [item],
-      view: this.view,
-      event,
-    });
+    await UIActionUtil.execAndResolved(
+      actionId!,
+      {
+        context: this.context,
+        params: this.params,
+        data: [item],
+        view: this.view,
+        event,
+      },
+      detail.appId,
+    );
   }
 
   /**
@@ -425,13 +429,17 @@ export class DataViewControlController<
    */
   onClickNew(event: MouseEvent, group: string | number): void {
     const params = { ...this.params, srfgroup: group };
-    UIActionUtil.execAndResolved('new', {
-      context: this.context,
-      params,
-      data: [],
-      view: this.view,
-      event,
-    });
+    UIActionUtil.execAndResolved(
+      'new',
+      {
+        context: this.context,
+        params,
+        data: [],
+        view: this.view,
+        event,
+      },
+      this.view.model.appId,
+    );
   }
 
   /**
@@ -449,13 +457,17 @@ export class DataViewControlController<
   ): Promise<void> {
     const actionId = detail.uiactionId;
     const params = { ...this.params, srfgroup: group.key };
-    await UIActionUtil.execAndResolved(actionId!, {
-      context: this.context,
-      params,
-      data: group.selectedData || [],
-      view: this.view,
-      event,
-    });
+    await UIActionUtil.execAndResolved(
+      actionId!,
+      {
+        context: this.context,
+        params,
+        data: group.selectedData || [],
+        view: this.view,
+        event,
+      },
+      detail.appId,
+    );
   }
 
   /**

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

@@ -50,14 +50,18 @@ export class FormButtonController extends FormDetailController<IDEFormButton> {
    */
   async doUIAction(event: MouseEvent): Promise<void> {
     const actionId = this.model.uiactionId;
-    await UIActionUtil.execAndResolved(actionId!, {
-      context: this.form.context,
-      params: this.form.params,
-      data: [this.data],
-      view: this.form.view,
-      event,
-      noWaitRoute: true,
-    });
+    await UIActionUtil.execAndResolved(
+      actionId!,
+      {
+        context: this.form.context,
+        params: this.form.params,
+        data: [this.data],
+        view: this.form.view,
+        event,
+        noWaitRoute: true,
+      },
+      this.model.appId,
+    );
   }
 
   /**

package/src/controller/control/form/form-detail/form-group-panel/form-group-panel.controller.ts

@@ -108,12 +108,16 @@ export class FormGroupPanelController<
   ): Promise<void> {
     const actionId = detail.uiactionId;
 
-    await UIActionUtil.execAndResolved(actionId!, {
-      context: this.form.context,
-      params: this.form.params,
-      data: [this.data],
-      view: this.form.view,
-      event,
-    });
+    await UIActionUtil.execAndResolved(
+      actionId!,
+      {
+        context: this.form.context,
+        params: this.form.params,
+        data: [this.data],
+        view: this.form.view,
+        event,
+      },
+      detail.appId,
+    );
   }
 }

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

@@ -174,13 +174,17 @@ export class GridFieldColumnController extends GridColumnController<IDEGridField
    */
   async triggerAction(row: GridRowState, event: MouseEvent): Promise<void> {
     const actionId = this.model.deuiactionId;
-    await UIActionUtil.execAndResolved(actionId!, {
-      context: this.context,
-      params: this.params,
-      data: [row.data],
-      view: this.grid.view,
-      event,
-    });
+    await UIActionUtil.execAndResolved(
+      actionId!,
+      {
+        context: this.context,
+        params: this.params,
+        data: [row.data],
+        view: this.grid.view,
+        event,
+      },
+      this.model.appId,
+    );
   }
 
   /**

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

@@ -59,12 +59,16 @@ export class GridUAColumnController extends GridColumnController<IDEGridUAColumn
     event: MouseEvent,
   ): Promise<void> {
     const actionId = detail.uiactionId;
-    await UIActionUtil.execAndResolved(actionId!, {
-      context: this.context,
-      params: this.params,
-      data: [row.data],
-      view: this.grid.view,
-      event,
-    });
+    await UIActionUtil.execAndResolved(
+      actionId!,
+      {
+        context: this.context,
+        params: this.params,
+        data: [row.data],
+        view: this.grid.view,
+        event,
+      },
+      detail.appId,
+    );
   }
 }

package/src/controller/control/md-ctrl/md-ctrl.controller.ts

@@ -165,13 +165,17 @@ export class MDCtrlController
     event: MouseEvent,
   ): Promise<void> {
     const actionId = detail.uiactionId;
-    await UIActionUtil.execAndResolved(actionId!, {
-      context: this.context,
-      params: this.params,
-      data: [row.data],
-      view: this.view,
-      event,
-    });
+    await UIActionUtil.execAndResolved(
+      actionId!,
+      {
+        context: this.context,
+        params: this.params,
+        data: [row.data],
+        view: this.view,
+        event,
+      },
+      detail.appId,
+    );
   }
 
   /**

package/src/controller/control/toolbar/toolbar.controllerr.ts

@@ -70,7 +70,7 @@ export class ToolbarController<
     // 执行界面行为
     if (item.itemType === 'DEUIACTION') {
       const actionId = (item as IDETBUIActionItem).uiactionId;
-      const uiAction = await getUIActionById(actionId!);
+      const uiAction = await getUIActionById(actionId!, item.appId);
       if (!uiAction) {
         throw new RuntimeError(`没有找到界面行为模型${actionId}`);
       }
@@ -89,11 +89,15 @@ export class ToolbarController<
         const data = res || [];
         const args = this.getEventArgs();
         args.params = Object.assign(param, args.params);
-        await UIActionUtil.execAndResolved(actionId!, {
-          ...args,
-          data,
-          event,
-        });
+        await UIActionUtil.execAndResolved(
+          actionId!,
+          {
+            ...args,
+            data,
+            event,
+          },
+          item.appId,
+        );
       } finally {
         if (enableLoading) {
           this.state.buttonsState.setLoading('');

package/src/controller/control/tree/tree.controller.ts

@@ -292,25 +292,32 @@ export class TreeController
 
   /**
    * 执行界面行为
-   * @author lxm
-   * @date 2023-07-27 05:31:36
+   *
+   * @author chitanda
+   * @date 2023-12-07 15:12:26
    * @param {string} uiActionId
    * @param {ITreeNodeData} nodeData
    * @param {MouseEvent} event
+   * @param {string} appId
    * @return {*}  {Promise<void>}
    */
   async doUIAction(
     uiActionId: string,
     nodeData: ITreeNodeData,
     event: MouseEvent,
+    appId: string,
   ): Promise<void> {
     const eventArgs = this.getEventArgs();
     const nodeParams = this.parseTreeNodeData(nodeData);
-    const result = await UIActionUtil.exec(uiActionId!, {
-      ...eventArgs,
-      ...nodeParams,
-      event,
-    });
+    const result = await UIActionUtil.exec(
+      uiActionId!,
+      {
+        ...eventArgs,
+        ...nodeParams,
+        event,
+      },
+      appId,
+    );
     if (result.closeView) {
       this.view.closeView();
     } else if (result.refresh) {

package/src/controller/utils/button-state/ui-action-button.state.ts

@@ -93,7 +93,7 @@ export class UIActionButtonState implements IButtonState {
       this.isInit = true;
       return;
     }
-    const uiAction = await getUIActionById(this.uiActionId);
+    const uiAction = await getUIActionById(this.uiActionId, this.appId);
     [, this.appDeName] = this.uiActionId.split('@');
     if (!uiAction) {
       return;

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

@@ -32,17 +32,20 @@ export interface ITreeController
 
   /**
    * 执行界面行为
-   * @author lxm
-   * @date 2023-07-27 05:31:36
+   *
+   * @author chitanda
+   * @date 2023-12-07 15:12:51
    * @param {string} uiActionId
    * @param {ITreeNodeData} nodeData
    * @param {MouseEvent} event
+   * @param {string} appId
    * @return {*}  {Promise<void>}
    */
   doUIAction(
     uiActionId: string,
     nodeData: ITreeNodeData,
     event: MouseEvent,
+    appId: string,
   ): Promise<void>;
 
   /**

package/src/interface/logic-scheduler/i-scheduler-logic.ts

@@ -24,6 +24,15 @@ export type LogicType =
   | 'SYSVIEWLOGIC';
 
 export interface ISchedulerLogic {
+  /**
+   * 应用标识
+   *
+   * @author chitanda
+   * @date 2023-12-07 14:12:23
+   * @type {string}
+   */
+  appId: string;
+
   /**
    * 触发器类型
    * @author lxm

package/src/logic-scheduler/executor/app-ui-action-executor.ts

@@ -22,6 +22,10 @@ export class AppDEUIActionExecutor extends LogicExecutor {
         `逻辑中缺少触发应用实体界面行为id`,
       );
     }
-    UIActionUtil.execAndResolved(this.logic.appDEUIActionId, executeParams);
+    UIActionUtil.execAndResolved(
+      this.logic.appDEUIActionId,
+      executeParams,
+      this.logic.appId,
+    );
   }
 }

package/src/logic-scheduler/executor/app-ui-logic-executor.ts

@@ -29,21 +29,26 @@ export class AppUILogicExecutor extends LogicExecutor {
   declare type: 'APPUILOGIC';
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  execute(executeParams: IUILogicParams): any {
-    if (this.logic.id === 'opendata' && this.logic.builtinAppUILogic) {
-      // 执行打开数据界面逻辑
-      return this.executeOpenDataAppUILogic(
-        this.logic.builtinAppUILogic as IAppUIOpenDataLogic,
-        executeParams,
-      );
-    }
-    if (this.logic.id === 'newdata' && this.logic.builtinAppUILogic) {
-      // 执行新建数据逻辑
-      return this.executeNewDataAppUILogic(
-        this.logic.builtinAppUILogic as IAppUINewDataLogic,
-        executeParams,
-      );
+  async execute(executeParams: IUILogicParams): Promise<any> {
+    let result;
+    try {
+      if (this.logic.id === 'opendata' && this.logic.builtinAppUILogic) {
+        // 执行打开数据界面逻辑
+        result = await this.executeOpenDataAppUILogic(
+          this.logic.builtinAppUILogic as IAppUIOpenDataLogic,
+          executeParams,
+        );
+      } else if (this.logic.id === 'newdata' && this.logic.builtinAppUILogic) {
+        // 执行新建数据逻辑
+        result = await this.executeNewDataAppUILogic(
+          this.logic.builtinAppUILogic as IAppUINewDataLogic,
+          executeParams,
+        );
+      }
+    } catch (error) {
+      ibiz.log.error(error);
     }
+    return result;
   }
 
   /**
@@ -291,7 +296,9 @@ export class AppUILogicExecutor extends LogicExecutor {
       throw new RuntimeError('请选中一条数据');
     }
     const indexType = selectData.srfkey;
-    const findView = newDataAppViews?.find(item => item.refMode === indexType);
+    const findView = newDataAppViews?.find(
+      item => item.refMode?.toUpperCase() === indexType.toUpperCase(),
+    );
     if (!findView) {
       throw new RuntimeError(
         `没有找到与索引类型${indexType}相关的实体的编辑视图`,

package/src/model/ui-action/ui-action.ts

@@ -2,16 +2,18 @@ import { IAppDEUIAction } from '@ibiz/model-core';
 
 /**
  * 通过id获取界面行为模型方法
- * @author lxm
- * @date 2023-05-18 09:24:40
+ *
+ * @author chitanda
+ * @date 2023-12-07 17:12:16
  * @export
  * @param {string} id
+ * @param {string} appId
  * @return {*}  {(Promise<IAppDEUIAction | undefined>)}
  */
 export async function getUIActionById(
   id: string,
+  appId: string,
 ): Promise<IAppDEUIAction | undefined> {
-  const [, , appId] = id.split('@');
   const app = ibiz.hub.getApp(appId);
   return app.getUIAction(id);
 }

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

@@ -70,9 +70,13 @@ export abstract class UIActionProviderBase implements IUIActionProvider {
     };
     if (action.closeEditView) {
       // 关闭视图的情况下，不等待后续界面行为
-      this.doNextAction(action, nextActionParams);
+      this.doNextAction(action, nextActionParams, action.appId);
     } else {
-      const nextResult = await this.doNextAction(action, nextActionParams);
+      const nextResult = await this.doNextAction(
+        action,
+        nextActionParams,
+        action.appId,
+      );
       if (nextResult) {
         Object.assign(result, nextResult);
         if (nextResult.cancel === true) {
@@ -160,10 +164,11 @@ export abstract class UIActionProviderBase implements IUIActionProvider {
   async doNextAction(
     action: IAppDEUIAction,
     params: IUILogicParams,
+    appId: string,
   ): Promise<IUIActionResult | undefined> {
     const nextActionId = action.nextId;
     if (nextActionId) {
-      return UIActionUtil.exec(nextActionId, params);
+      return UIActionUtil.exec(nextActionId, params, appId);
     }
   }
 

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

@@ -26,8 +26,9 @@ export class UIActionUtil {
   static async exec(
     actionId: string,
     params: IUILogicParams,
+    appId: string,
   ): Promise<IUIActionResult> {
-    const action = await getUIActionById(actionId);
+    const action = await getUIActionById(actionId, appId);
     if (!action) {
       throw new RuntimeError(`没找到${actionId}的界面行为模型`);
     }
@@ -53,8 +54,9 @@ export class UIActionUtil {
   static async execAndResolved(
     actionId: string,
     params: IUILogicParams,
+    appId: string,
   ): Promise<void> {
-    const result = await this.exec(actionId, params);
+    const result = await this.exec(actionId, params, appId);
     if (result.closeView) {
       params.view.modal.ignoreDismissCheck = true;
       params.view.closeView({ ok: true });

package/src/ui-logic/ui-logic-node/de-ui-action-node/de-ui-action-node.ts

@@ -32,11 +32,15 @@ export class DEUIActionNode extends UILogicNode {
       }
     }
 
-    await UIActionUtil.execAndResolved(dstAppDEUIActionId!, {
-      ...parameters,
-      context: ctx.context,
-      params: ctx.viewParam,
-      data: actionData,
-    });
+    await UIActionUtil.execAndResolved(
+      dstAppDEUIActionId!,
+      {
+        ...parameters,
+        context: ctx.context,
+        params: ctx.viewParam,
+        data: actionData,
+      },
+      this.model.appId,
+    );
   }
 }