@ibiz-template/runtime 0.4.6-dev.0 → 0.4.8-dev.0

package/dist/index.esm.js

@@ -912,8 +912,7 @@ function findFieldById(entity, fieldId) {
 }
 
 // src/model/ui-action/ui-action.ts
-async function getUIActionById(id) {
-  const [, , appId] = id.split("@");
+async function getUIActionById(id, appId) {
   const app = ibiz.hub.getApp(appId);
   return app.getUIAction(id);
 }
@@ -10130,7 +10129,7 @@ var UIActionButtonState = class {
       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;
@@ -14448,12 +14447,16 @@ var DEUIActionNode = class extends UILogicNode {
         actionData = [param];
       }
     }
-    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
+    );
   }
 };
 
@@ -15319,8 +15322,8 @@ var UIActionUtil = class {
    * @param {IUILogicParams} params 界面行为参数
    * @return {*}  {Promise<IUIActionResult>}
    */
-  static async exec(actionId, params) {
-    const action = await getUIActionById(actionId);
+  static async exec(actionId, params, appId) {
+    const action = await getUIActionById(actionId, appId);
     if (!action) {
       throw new RuntimeError43("\u6CA1\u627E\u5230".concat(actionId, "\u7684\u754C\u9762\u884C\u4E3A\u6A21\u578B"));
     }
@@ -15341,9 +15344,9 @@ var UIActionUtil = class {
    * @param {string} actionId 界面行为id
    * @param {IUILogicParams} params 界面行为参数
    */
-  static async execAndResolved(actionId, params) {
+  static async execAndResolved(actionId, params, appId) {
     var _a, _b;
-    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 });
@@ -15404,9 +15407,13 @@ var UIActionProviderBase = class {
       params: result.nextParams || params
     };
     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) {
@@ -15464,10 +15471,10 @@ var UIActionProviderBase = class {
    * @param {(IData | undefined)} [opts]
    * @returns {*}  {Promise<void>}
    */
-  async doNextAction(action, params) {
+  async doNextAction(action, params, appId) {
     const nextActionId = action.nextId;
     if (nextActionId) {
-      return UIActionUtil.exec(nextActionId, params);
+      return UIActionUtil.exec(nextActionId, params, appId);
     }
   }
   /**
@@ -16034,7 +16041,7 @@ var ToolbarController = class extends ControlController {
   async doUIAction(item, event, param = {}) {
     if (item.itemType === "DEUIACTION") {
       const actionId = item.uiactionId;
-      const uiAction = await getUIActionById(actionId);
+      const uiAction = await getUIActionById(actionId, item.appId);
       if (!uiAction) {
         throw new RuntimeError45("\u6CA1\u6709\u627E\u5230\u754C\u9762\u884C\u4E3A\u6A21\u578B".concat(actionId));
       }
@@ -16047,11 +16054,15 @@ var ToolbarController = class extends ControlController {
         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("");
@@ -16522,13 +16533,17 @@ var PortletPartController = class {
    */
   async onActionClick(detail, event, data = []) {
     const actionId = detail.uiactionId;
-    await UIActionUtil.execAndResolved(actionId, {
-      context: this.dashboard.context,
-      params: this.dashboard.params,
-      data,
-      view: this.dashboard.view,
-      event
-    });
+    await UIActionUtil.execAndResolved(
+      actionId,
+      {
+        context: this.dashboard.context,
+        params: this.dashboard.params,
+        data,
+        view: this.dashboard.view,
+        event
+      },
+      detail.appId
+    );
   }
   /**
    * 表单数据变更通知(由表单控制器调用)
@@ -16849,13 +16864,17 @@ var DataViewControlController = class extends MDControlController {
    */
   async onActionClick(detail, item, event) {
     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
+    );
   }
   /**
    * 处理数据分组
@@ -16990,13 +17009,17 @@ var DataViewControlController = class extends MDControlController {
    */
   onClickNew(event, group) {
     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
+    );
   }
   /**
    * 分组工具栏点击处理回调
@@ -17009,13 +17032,17 @@ var DataViewControlController = class extends MDControlController {
   async onGroupToolbarClick(detail, event, group) {
     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
+    );
   }
   /**
    * 初始化排序项集合
@@ -18779,14 +18806,18 @@ var FormButtonController = class extends FormDetailController {
    */
   async doUIAction(event) {
     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
+    );
   }
   /**
    * 执行表单项更新
@@ -19060,13 +19091,17 @@ var FormGroupPanelController = class extends FormDetailController {
    */
   async onActionClick(detail, event) {
     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
+    );
   }
 };
 
@@ -22007,13 +22042,17 @@ var GridFieldColumnController = class extends GridColumnController {
    */
   async triggerAction(row, event) {
     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
+    );
   }
   /**
    * 加载代码表数据
@@ -22164,13 +22203,17 @@ var GridUAColumnController = class extends GridColumnController {
    */
   async onActionClick(detail, row, event) {
     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
+    );
   }
 };
 
@@ -24384,21 +24427,27 @@ var TreeController = class extends MDControlController {
   }
   /**
    * 执行界面行为
-   * @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, nodeData, event) {
+  async doUIAction(uiActionId, nodeData, event, appId) {
     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) {
@@ -25010,13 +25059,17 @@ var MDCtrlController = class extends MDControlController {
    */
   async onActionClick(detail, row, event) {
     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
+    );
   }
   /**
    * 初始化按钮状态
@@ -28495,7 +28548,11 @@ var AppDEUIActionExecutor = class extends LogicExecutor {
         "\u903B\u8F91\u4E2D\u7F3A\u5C11\u89E6\u53D1\u5E94\u7528\u5B9E\u4F53\u754C\u9762\u884C\u4E3Aid"
       );
     }
-    UIActionUtil.execAndResolved(this.logic.appDEUIActionId, executeParams);
+    UIActionUtil.execAndResolved(
+      this.logic.appDEUIActionId,
+      executeParams,
+      this.logic.appId
+    );
   }
 };