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

package/out/service/service/control/control.service.js

@@ -26,8 +26,8 @@ export class ControlService {
      * @date 2022-08-18 22:08:30
      * @returns {*}  {Promise<void>}
      */
-    async init(context) {
-        this.app = ibiz.hub.getApp(context === null || context === void 0 ? void 0 : context.srfappid);
+    async init(_context) {
+        this.app = ibiz.hub.getApp(this.model.appId);
         this.initUIDataMap();
     }
     /**

package/out/service/utils/dynamic-code-list/dynamic-code-list.js

@@ -74,7 +74,7 @@ export class DynamicCodeListCache {
             iconClsXAppDEFieldId ||
             iconPathAppDEFieldId ||
             iconPathXAppDEFieldId) {
-            result.sysImage = {};
+            result.sysImage = { appId: this.codeList.appId };
             // 图标样式属性
             if (iconClsAppDEFieldId) {
                 result.sysImage.cssClass = data[iconClsAppDEFieldId];

package/out/ui-action/provider/front-ui-action-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"front-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/front-ui-action-provider.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAa,MAAM,kBAAkB,CAAC;AAE7D,OAAO,EAAE,cAAc,EAAE,eAAe,EAAc,MAAM,iBAAiB,CAAC;AAE9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,qBAAsB,SAAQ,oBAAoB;IACvD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IA+D3B;;;;;;;;OAQG;IAEH,SAAS,CAAC,OAAO,CACf,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,eAAe;IAalB;;;;;;OAMG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;IAgEhB;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,cAAc,GACpB,OAAO,CAAC,eAAe,CAAC;IAkC3B;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;CAoDjB"}
+{"version":3,"file":"front-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/front-ui-action-provider.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAa,MAAM,kBAAkB,CAAC;AAE7D,OAAO,EAAE,cAAc,EAAE,eAAe,EAAc,MAAM,iBAAiB,CAAC;AAE9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,qBAAsB,SAAQ,oBAAoB;IACvD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IA+D3B;;;;;;;;OAQG;IAEH,SAAS,CAAC,OAAO,CACf,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,eAAe;IAalB;;;;;;OAMG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;IAiEhB;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,cAAc,GACpB,OAAO,CAAC,eAAe,CAAC;IAmC3B;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;CAqDjB"}

package/out/ui-action/provider/front-ui-action-provider.js

@@ -88,7 +88,7 @@ export class FrontUIActionProvider extends UIActionProviderBase {
         var _a, _b, _c;
         // 处理参数
         const { resultContext, resultParams } = await this.handleParams(action, args.context, args.data, args.params);
-        const appDataEntity = await ibiz.hub.getAppDataEntity(action.appDataEntityId);
+        const appDataEntity = await ibiz.hub.getAppDataEntity(action.appDataEntityId, action.appId);
         const appDEPrint = (_a = appDataEntity.appDEPrints) === null || _a === void 0 ? void 0 : _a.find(print => {
             return print.id === action.appDEPrintId;
         });
@@ -146,7 +146,7 @@ export class FrontUIActionProvider extends UIActionProviderBase {
      */
     async executeDataImport(action, _args) {
         var _a;
-        const appDataEntity = await ibiz.hub.getAppDataEntity(action.appDataEntityId);
+        const appDataEntity = await ibiz.hub.getAppDataEntity(action.appDataEntityId, action.appId);
         const appDEDataImport = (_a = appDataEntity.appDEDataImports) === null || _a === void 0 ? void 0 : _a.find(dataImport => dataImport.id === action.appDEDataImportId);
         let importName = 'DataImport';
         if (appDEDataImport && appDEDataImport.enableCustomized) {
@@ -181,7 +181,7 @@ export class FrontUIActionProvider extends UIActionProviderBase {
         var _a, _b;
         // 处理参数
         const { resultParams } = await this.handleParams(action, args.context, args.data, args.params);
-        const appDataEntity = await ibiz.hub.getAppDataEntity(action.appDataEntityId);
+        const appDataEntity = await ibiz.hub.getAppDataEntity(action.appDataEntityId, action.appId);
         const appDEDataExport = (_a = appDataEntity.appDEDataExports) === null || _a === void 0 ? void 0 : _a.find(dataExport => {
             return dataExport.id === action.appDEDataExportId;
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.4.5",
+  "version": "0.4.6-dev.0",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,8 +29,8 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.4.5",
-    "@ibiz/model-core": "^0.0.24",
+    "@ibiz-template/core": "^0.4.6-dev.0",
+    "@ibiz/model-core": "^0.0.26",
     "@types/path-browserify": "^1.0.2",
     "@types/qs": "^6.9.10",
     "@types/systemjs": "^6.13.5",
@@ -47,7 +47,7 @@
   },
   "peerDependencies": {
     "@ibiz-template/core": "^0.4.0",
-    "@ibiz/model-core": "^0.0.24",
+    "@ibiz/model-core": "^0.0.26",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.7",
     "echarts": "^5.4.3",
@@ -59,5 +59,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "28b2af793771fa7be9fac2e1c8396081f4002230"
+  "gitHead": "b7cde546c542456de87377e49677bdd21b04449d"
 }

package/src/app-hub.ts

@@ -51,16 +51,6 @@ export class AppHub implements IAppHubService {
    */
   protected appMap: Map<string, Application> = new Map();
 
-  /**
-   * 实例化的应用模型
-   *
-   * @author chitanda
-   * @date 2023-04-17 23:04:45
-   * @protected
-   * @type {Map<string, IApplication>}
-   */
-  protected apps: Map<string, IApplication> = new Map();
-
   /**
    * 当前基座下所有的应用视图
    *
@@ -147,17 +137,6 @@ export class AppHub implements IAppHubService {
     this.modelLoaderProvider = provider;
   }
 
-  /**
-   * 注册应用实例模型
-   *
-   * @author chitanda
-   * @date 2023-04-17 23:04:29
-   * @param {IApplication} model
-   */
-  registerApp(model: IApplication): void {
-    this.apps.set(model.codeName!, model);
-  }
-
   /**
    * 注册应用视图实例模型
    *
@@ -301,17 +280,13 @@ export class AppHub implements IAppHubService {
     if (this.appMap.has(id)) {
       return this.appMap.get(id)!;
     }
-    let appModel: IApplication;
-    if (this.apps.has(id)) {
-      appModel = this.apps.get(id)!;
-    } else if (this.modelLoaderProvider) {
-      appModel = await this.modelLoaderProvider.getApp(id);
-      this.registerApp(appModel);
-    } else {
-      throw new RuntimeError(`未找到应用[${id}]模型`);
+    if (!this.modelLoaderProvider) {
+      throw new RuntimeError('请先注册模型加载适配器');
     }
+    const appModel: IApplication = await this.modelLoaderProvider.getApp(id);
     const app = new Application(appModel);
     this.appMap.set(id, app);
+    await this.modelLoaderProvider.initApp(id);
     await app.init();
     if (!this.configCache) {
       this.configCache = new ConfigService(

package/src/command/app/app-func/app-func.ts

@@ -44,7 +44,8 @@ export class AppFuncCommand {
     params: IParams = {},
     opts: IData = {},
   ): Promise<void> {
-    const appFunc = ibiz.hub.getApp(context.srfappid).getAppFunc(appFuncId);
+    const app = await ibiz.hub.getAppAsync(context.srfappid);
+    const appFunc = app.getAppFunc(appFuncId);
     if (!appFunc) {
       throw new RuntimeError(`找不到叫${appFuncId}的应用功能`);
     }

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

@@ -86,6 +86,7 @@ export class MDControlController<
     // 初始化实体属性id和name的映射
     this.dataEntity = await ibiz.hub.getAppDataEntity(
       this.model.appDataEntityId!,
+      this.model.appId,
     );
     this.dataEntity.appDEFields?.forEach(field => {
       this.fieldIdNameMap.set(field.id!, field.name!);
@@ -429,7 +430,10 @@ export class MDControlController<
    */
   async importData(): Promise<void> {
     const { appDataEntityId, dedataImportId } = this.model;
-    const appDataEntity = await ibiz.hub.getAppDataEntity(appDataEntityId!);
+    const appDataEntity = await ibiz.hub.getAppDataEntity(
+      appDataEntityId!,
+      this.model.appId,
+    );
     const dataImport = appDataEntity.appDEDataImports?.find(
       (importItem: IAppDEDataImport) => importItem.id === dedataImportId,
     );

package/src/controller/common/view/view.controller.ts

@@ -183,7 +183,11 @@ export class ViewController<
       });
     } else {
       const ins = ibiz.engine.getEngine(
-        { engineCat: 'VIEW', engineType: this.model.viewType },
+        {
+          engineCat: 'VIEW',
+          engineType: this.model.viewType,
+          appId: this.model.appId,
+        },
         this,
       );
       if (ins) {

package/src/controller/control/app-menu/app-menu.controller.ts

@@ -87,6 +87,7 @@ export class AppMenuController
     }
 
     const tempContext = this.context.clone();
+    tempContext.srfappid = menuItem.appId;
     if (this.routeDepth && useDepth) {
       Object.assign(tempContext, {
         toRouteDepth: this.routeDepth + 1,

package/src/controller/control/chart/generator/chart-options-generator.ts

@@ -282,7 +282,10 @@ export class ChartOptionsGenerator {
    */
   async init(context: IContext, params: IParams): Promise<void> {
     await this.loadCodeList(context, params);
-    this.entity = await ibiz.hub.getAppDataEntity(this.model.appDataEntityId!);
+    this.entity = await ibiz.hub.getAppDataEntity(
+      this.model.appDataEntityId!,
+      this.model.appId,
+    );
     this.initSeriesGenerators();
   }
 

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

@@ -136,6 +136,7 @@ export class EditFormController
 
     const appDataEntity = await ibiz.hub.getAppDataEntity(
       this.model.appDataEntityId!,
+      this.model.appId,
     );
     const key = appDataEntity.keyAppDEFieldId;
     if (key && this.params[key]) {

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

@@ -109,7 +109,7 @@ export class FormMDCtrlFormController extends FormMDCtrlController {
     const { appDataEntityId } = this.model.contentControl!;
     const fetchAction = 'fetchdefault';
     const res = await ibiz.hub
-      .getApp()
+      .getApp(this.model.appId)
       .deService.exec(appDataEntityId!, fetchAction, this.context, this.params);
     if (res.ok) {
       this.state.items = (res.data as IData[]).map(item => {

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

@@ -99,11 +99,13 @@ export class FormMDCtrlRepeaterController extends FormMDCtrlController {
   prepareRepeatedForm(): void {
     const id = `${this.model.id}repeatedform`;
     const tempForm: IDEForm = {
+      appId: this.model.appId,
       id,
       codeName: id,
       name: id,
       deformPages: [
         {
+          appId: this.model.appId,
           id: 'formpage1',
           deformDetails: this.model.deformDetails,
           detailType: 'FORMPAGE',

package/src/controller/control/medit-view-panel/medit-view-panel.controller.ts

@@ -64,6 +64,7 @@ export class MEditViewPanelController
       if (embedView.appDataEntityId) {
         const embedViewEntity = await ibiz.hub.getAppDataEntity(
           embedView.appDataEntityId,
+          embedView.appId,
         );
         if (embedView && embedViewEntity) {
           this.parameters = [

package/src/controller/control/report-panel/generator/user-generator.ts

@@ -42,6 +42,13 @@ export class UserReportPanelGenerator extends ReportPanelBaseGenerator {
         miniMapConfig: {},
       },
       HOOKS: {
+        g6Hooks: [
+          {
+            name: 'afterrender',
+            callBack:
+              '{{ const nodes = data.controller.graph.getNodes(); if (nodes.length < 25) { data.controller.graph.zoomTo(1); data.controller.graph.fitCenter() } }}',
+          },
+        ],
         nodeDataHook:
           "{{ data.forEach(node => { const type = node.data.source_lables || node.data.target_lables; Object.assign(node, { label: node.data.name, size: 66, style: { fill: node.color },donutAttrs: { prop1: 10000, prop2: 10 },donutColorMap: { prop1: node.color, prop2: node.color },icon: {show: true,img: type === 'NEO4J_ZT' ? './assets/images/user-avatar.png' : './assets/images/phone.png',width: 40,height: 40}})})}}",
         edgeDataHook:

package/src/controller/control/report-panel/report-panel.controller.ts

@@ -80,6 +80,7 @@ export class ReportPanelController
     this.generator = ReportPanelGeneratorFactory.getInstance(this.model);
     this.dataEntity = await ibiz.hub.getAppDataEntity(
       this.model.appDataEntityId!,
+      this.model.appId,
     );
     this.service = new ReportPanelService(this.model);
     await this.service.init(this.context);

package/src/controller/control/report-panel/report-panel.service.ts

@@ -26,6 +26,7 @@ export class ReportPanelService<
   ): Promise<IHttpResponse<ControlVO>> {
     this.dataEntity = await ibiz.hub.getAppDataEntity(
       this.model.appDataEntityId!,
+      this.model.appId,
     );
     const url = `${this.dataEntity.codeName2?.toLowerCase()}/report?srfreporttag=${
       this.model.codeName

package/src/controller/control/tab-exp-panel/tab-exp-panel.controller.ts

@@ -254,7 +254,7 @@ export class TabExpPanelController
     const context = Object.assign(this.context.clone(), resultContext, {
       currentSrfNav: this.state.activeName,
     });
-    const params = { ...this.params, ...resultParams };
+    const params = { ...resultParams };
     return { context, params };
   }
 

package/src/de-logic/index.ts

@@ -22,7 +22,7 @@ const deLogicMap: WeakMap<IAppDELogic, DELogic> = new Map();
 async function findDeLogic(
   deDELogicId: string,
   dataEntityId: string,
-  appId?: string,
+  appId: string,
 ): Promise<IAppDELogic | undefined> {
   const appDataEntity = await ibiz.hub.getAppDataEntity(dataEntityId, appId);
   return findDELogic(deDELogicId, appDataEntity);

package/src/interface/common/i-app-hub-service/i-app-hub-service.ts

@@ -67,15 +67,6 @@ export interface IAppHubService {
    */
   registerModelLoaderProvider(provider: ModelLoaderProvider): void;
 
-  /**
-   * 注册应用模型
-   *
-   * @author chitanda
-   * @date 2023-04-23 15:04:28
-   * @param {IApplication} model
-   */
-  registerApp(model: IApplication): void;
-
   /**
    * 注册应用视图模型
    *
@@ -93,7 +84,7 @@ export interface IAppHubService {
    * @param {IAppDataEntity} model
    * @param {string} [appId=ibiz.env.appId]
    */
-  registerAppDataEntity(model: IAppDataEntity, appId?: string): void;
+  registerAppDataEntity(model: IAppDataEntity, appId: string): void;
 
   /**
    * 设置应用视图所属应用，兼容识别视图 codeName 或 id
@@ -144,7 +135,7 @@ export interface IAppHubService {
    * @param {string} [appId=ibiz.env.appId]
    * @return {*}  {Promise<IAppDataEntity>}
    */
-  getAppDataEntity(id: string, appId?: string): Promise<IAppDataEntity>;
+  getAppDataEntity(id: string, appId: string): Promise<IAppDataEntity>;
 
   /**
    * 异步获取应用对象，用于不确定应用是否已经加载的情况
@@ -154,7 +145,7 @@ export interface IAppHubService {
    * @param {string} [appId=ibiz.env.appId]
    * @return {*}  {Promise<IAppService>}
    */
-  getAppAsync(appId?: string): Promise<IAppService>;
+  getAppAsync(appId: string): Promise<IAppService>;
 
   /**
    * 获取应用实例
@@ -164,5 +155,5 @@ export interface IAppHubService {
    * @param {(string | IApplication)} [app]
    * @return {*}  {IAppService}
    */
-  getApp(app?: string | IApplication): IAppService;
+  getApp(app: string | IApplication): IAppService;
 }

package/src/interface/controller/state/control/i-toolbar.state.ts

@@ -44,6 +44,15 @@ export interface IExtraButton {
    */
   id: string;
 
+  /**
+   * 应用标识
+   *
+   * @author chitanda
+   * @date 2023-12-06 18:12:03
+   * @type {string}
+   */
+  appId: string;
+
   /**
    * 按钮类型
    * @author lxm

package/src/interface/provider/model-loader.provider.ts

@@ -9,6 +9,16 @@ import { IAppDataEntity, IAppView, IApplication } from '@ibiz/model-core';
  * @interface ModelLoaderProvider
  */
 export interface ModelLoaderProvider {
+  /**
+   * 初始化应用
+   *
+   * @author chitanda
+   * @date 2023-12-06 17:12:31
+   * @param {string} [id]
+   * @return {*}  {Promise<boolean>}
+   */
+  initApp(id?: string): Promise<boolean>;
+
   /**
    * 获取应用模型
    *

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

@@ -118,6 +118,7 @@ export class AppUILogicExecutor extends LogicExecutor {
   ): Promise<IAppUILogicRefViewBase> {
     const appDataEntity = await ibiz.hub.getAppDataEntity(
       parameters.view.model.appDataEntityId!,
+      parameters.view.model.appId,
     )!;
     // [多表单实体] or [索引实体]类型属性
     const typeFileName =
@@ -221,6 +222,7 @@ export class AppUILogicExecutor extends LogicExecutor {
     if (params.srfcopymode) {
       const entity = await ibiz.hub.getAppDataEntity(
         view.model.appDataEntityId!,
+        view.model.appId,
       );
       const key = entity.keyAppDEFieldId;
       if (key && _data) {

package/src/logic-scheduler/scheduler/view-logic-scheduler.ts

@@ -16,7 +16,7 @@ export class ViewLogicScheduler extends LogicScheduler {
       // 视图逻辑的触发类型logicTrigger统一成triggerType
       (logic as IData).triggerType = logic.logicTrigger!;
     });
-    super(logics as ISchedulerLogic[]);
+    super(logics as IData[] as ISchedulerLogic[]);
   }
 
   /**

package/src/model/data-entity/data-entity.ts

@@ -43,7 +43,7 @@ export function hasDeCodeName(params: IParams, entityId: string): boolean {
 export async function getDeACMode(
   appDEACModeId: string,
   entityId: string,
-  srfappid?: string,
+  srfappid: string,
 ): Promise<IAppDEACMode | undefined> {
   const appDataEntity = await ibiz.hub.getAppDataEntity(entityId, srfappid)!;
   const deACMode = appDataEntity.appDEACModes?.find((mode: IAppDEACMode) => {

package/src/model/main-state/main-state.ts

@@ -48,7 +48,7 @@ export function calcMainStateOPPrivsStrs(
   mainState: IDEMainState,
   appDataEntity: IAppDataEntity,
 ): string[] {
-  const app = ibiz.hub.getApp().model;
+  const app = ibiz.hub.getApp(appDataEntity.appId).model;
   const { demainStateOPPrivs, opprivAllowMode } = mainState;
   const mainStateOPPrivIds = demainStateOPPrivs?.map(item => item.name!) || [];
   let opprivs: string[] = [];

package/src/model/utils/util.ts

@@ -126,7 +126,7 @@ export function parseUserParams(userParams: Record<string, string>): {
  * @param {string} [appId] 当前所在应用标识
  * @return {*}  {ISysPFPlugin}
  */
-export function getPFPlugin(id: string, appId?: string): ISysPFPlugin {
+export function getPFPlugin(id: string, appId: string): ISysPFPlugin {
   const app = ibiz.hub.getApp(appId);
   if (!app) {
     throw new RuntimeModelError(app, '未找到应用');

package/src/plugin/plugin-static-resource/plugin-static-resource.ts

@@ -48,8 +48,7 @@ export class PluginStaticResource {
    */
   constructor(mateUrl: string) {
     this.url = new URL(mateUrl);
-    const dir = path.dirname(this.url.pathname);
-    this.baseDir = dir;
+    this.baseDir = path.dirname(this.url.pathname);
   }
 
   /**
@@ -61,7 +60,7 @@ export class PluginStaticResource {
    * @return {*}  {string}
    */
   dir(pathStr: string): string {
-    return path.resolve(this.baseDir, pathStr);
+    return this.url.origin + path.resolve(this.baseDir, pathStr);
   }
 
   /**

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

@@ -9,7 +9,7 @@
  */
 export async function getPluginRegisterKey(
   pluginId: string,
-  appId?: string,
+  appId: string,
 ): Promise<string | undefined> {
   const app = ibiz.hub.getApp(appId);
 

package/src/service/service/control/control.service.ts

@@ -43,8 +43,8 @@ export class ControlService<T extends IControl = IControl> {
    * @date 2022-08-18 22:08:30
    * @returns {*}  {Promise<void>}
    */
-  async init(context?: IContext): Promise<void> {
-    this.app = ibiz.hub.getApp(context?.srfappid);
+  async init(_context?: IContext): Promise<void> {
+    this.app = ibiz.hub.getApp(this.model.appId);
     this.initUIDataMap();
   }
 

package/src/service/utils/dynamic-code-list/dynamic-code-list.ts

@@ -154,7 +154,7 @@ export class DynamicCodeListCache {
       iconPathAppDEFieldId ||
       iconPathXAppDEFieldId
     ) {
-      result.sysImage = {};
+      result.sysImage = { appId: this.codeList.appId };
       // 图标样式属性
       if (iconClsAppDEFieldId) {
         result.sysImage.cssClass = data[iconClsAppDEFieldId];

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

@@ -132,6 +132,7 @@ export class FrontUIActionProvider extends UIActionProviderBase {
     );
     const appDataEntity = await ibiz.hub.getAppDataEntity(
       action.appDataEntityId!,
+      action.appId,
     );
     const appDEPrint = appDataEntity.appDEPrints?.find(print => {
       return print.id === action.appDEPrintId;
@@ -199,6 +200,7 @@ export class FrontUIActionProvider extends UIActionProviderBase {
   ): Promise<IUIActionResult> {
     const appDataEntity = await ibiz.hub.getAppDataEntity(
       action.appDataEntityId!,
+      action.appId,
     );
     const appDEDataImport = appDataEntity.appDEDataImports?.find(
       dataImport => dataImport.id === action.appDEDataImportId,
@@ -251,6 +253,7 @@ export class FrontUIActionProvider extends UIActionProviderBase {
 
     const appDataEntity = await ibiz.hub.getAppDataEntity(
       action.appDataEntityId!,
+      action.appId,
     );
     const appDEDataExport = appDataEntity.appDEDataExports?.find(dataExport => {
       return dataExport.id === action.appDEDataExportId;