@ibiz-template/runtime 0.7.41-alpha.84 → 0.7.41-alpha.86

package/dist/index.esm.js

@@ -34044,7 +34044,7 @@ var UIActionProviderBase = class {
     if (action.closeEditView) {
       view.state.isClosing = true;
     }
-    const { appDEUILogicId, appDataEntityId, uilogicAttachMode } = action;
+    const { appDEUILogicId, appDataEntityId, uilogicAttachMode, appId: appId2 } = action;
     if (uilogicAttachMode === "REPLACE") {
       if (!appDEUILogicId) {
         throw new RuntimeModelError37(
@@ -34058,6 +34058,9 @@ var UIActionProviderBase = class {
         data,
         params
       );
+      Object.assign(resultContext, {
+        srfappid: appId2
+      });
       const res = await execUILogic(appDEUILogicId, appDataEntityId, {
         ...args,
         context: resultContext,
@@ -34092,11 +34095,11 @@ var UIActionProviderBase = class {
           ibiz.i18n.t("runtime.logicScheduler.executor.noConfiguredLogic")
         );
       }
-      await execUILogic(
-        appDEUILogicId,
-        appDataEntityId,
-        this.mergeArgsByResult(args, result)
-      );
+      const tempParams = this.mergeArgsByResult(args, result);
+      Object.assign(tempParams.context, {
+        srfappid: appId2
+      });
+      await execUILogic(appDEUILogicId, appDataEntityId, tempParams);
     }
     const nextActionParams = this.mergeArgsByResult(args, result);
     if (action.closeEditView) {
@@ -34499,7 +34502,7 @@ var SysUIActionProvider = class extends UIActionProviderBase {
       return { closeView: true };
     }
     const result = await view.callUIAction(uIActionTag, args);
-    return result || {};
+    return result ? { data: Array.isArray(result) ? [...result] : [result] } : {};
   }
 };
 
@@ -35258,6 +35261,21 @@ var ToolbarController = class extends ControlController {
   async onCreated() {
     await super.onCreated();
     this.state.viewMode = this.ctx.view.modal.mode;
+    await this.initButtonState();
+    await this.initToolbarItemProviders();
+    if (!this.state.manualCalcButtonState) {
+      await this.calcButtonState(void 0, this.model.appDataEntityId, {
+        view: this.view,
+        ctrl: this
+      });
+    } else {
+      await this.state.buttonsState.init();
+    }
+  }
+  /**
+   * 初始化工具栏按钮状态对象
+   */
+  async initButtonState() {
     const asyncTasks = [];
     recursiveIterate2(
       this.model,
@@ -35310,15 +35328,6 @@ var ToolbarController = class extends ControlController {
         );
       }
     });
-    await this.initToolbarItemProviders();
-    if (!this.state.manualCalcButtonState) {
-      await this.calcButtonState(void 0, this.model.appDataEntityId, {
-        view: this.view,
-        ctrl: this
-      });
-    } else {
-      await this.state.buttonsState.init();
-    }
   }
   /**
    * 生命周期-加载完成，实际执行逻辑，子类重写用这个