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

package/dist/index.esm.js

@@ -857,7 +857,7 @@ function matchMainState(appDataEntity, data) {
   }
 }
 function calcMainStateOPPrivsStrs(mainState, appDataEntity) {
-  const app = ibiz.hub.getApp().model;
+  const app = ibiz.hub.getApp(appDataEntity.appId).model;
   const { demainStateOPPrivs, opprivAllowMode } = mainState;
   const mainStateOPPrivIds = (demainStateOPPrivs == null ? void 0 : demainStateOPPrivs.map((item) => item.name)) || [];
   let opprivs = [];
@@ -4057,7 +4057,7 @@ var DynamicCodeListCache = class {
     result.value = value;
     result.text = textAppDEFieldId ? data[textAppDEFieldId] : data.srfmajortext;
     if (iconClsAppDEFieldId || iconClsXAppDEFieldId || iconPathAppDEFieldId || iconPathXAppDEFieldId) {
-      result.sysImage = {};
+      result.sysImage = { appId: this.codeList.appId };
       if (iconClsAppDEFieldId) {
         result.sysImage.cssClass = data[iconClsAppDEFieldId];
       }
@@ -5789,8 +5789,8 @@ var ControlService = class {
    * @date 2022-08-18 22:08:30
    * @returns {*}  {Promise<void>}
    */
-  async init(context) {
-    this.app = ibiz.hub.getApp(context == null ? void 0 : context.srfappid);
+  async init(_context) {
+    this.app = ibiz.hub.getApp(this.model.appId);
     this.initUIDataMap();
   }
   /**
@@ -9372,7 +9372,8 @@ var _AppFuncCommand = class _AppFuncCommand {
    * @return {*}  {Promise<void>}
    */
   async exec(appFuncId, context, params = {}, opts = {}) {
-    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 RuntimeError22("\u627E\u4E0D\u5230\u53EB".concat(appFuncId, "\u7684\u5E94\u7528\u529F\u80FD"));
     }
@@ -11218,7 +11219,11 @@ var ViewController = class extends BaseController {
       });
     } 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) {
@@ -11993,7 +11998,8 @@ var MDControlController = class extends ControlController {
     var _a;
     await super.onCreated();
     this.dataEntity = await ibiz.hub.getAppDataEntity(
-      this.model.appDataEntityId
+      this.model.appDataEntityId,
+      this.model.appId
     );
     (_a = this.dataEntity.appDEFields) == null ? void 0 : _a.forEach((field) => {
       this.fieldIdNameMap.set(field.id, field.name);
@@ -12281,7 +12287,10 @@ var MDControlController = class extends ControlController {
   async importData() {
     var _a;
     const { appDataEntityId, dedataImportId } = this.model;
-    const appDataEntity = await ibiz.hub.getAppDataEntity(appDataEntityId);
+    const appDataEntity = await ibiz.hub.getAppDataEntity(
+      appDataEntityId,
+      this.model.appId
+    );
     const dataImport = (_a = appDataEntity.appDEDataImports) == null ? void 0 : _a.find(
       (importItem) => importItem.id === dedataImportId
     );
@@ -12370,6 +12379,7 @@ var AppMenuController = class extends ControlController {
       throw new RuntimeModelError23(menuItem, "\u6CA1\u6709\u914D\u7F6E\u5E94\u7528\u529F\u80FD");
     }
     const tempContext = this.context.clone();
+    tempContext.srfappid = menuItem.appId;
     if (this.routeDepth && useDepth) {
       Object.assign(tempContext, {
         toRouteDepth: this.routeDepth + 1
@@ -13657,7 +13667,10 @@ var ChartOptionsGenerator2 = class {
    */
   async init(context, params) {
     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();
   }
   /**
@@ -15817,7 +15830,8 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
       args.params
     );
     const appDataEntity = await ibiz.hub.getAppDataEntity(
-      action.appDataEntityId
+      action.appDataEntityId,
+      action.appId
     );
     const appDEPrint = (_a = appDataEntity.appDEPrints) == null ? void 0 : _a.find((print) => {
       return print.id === action.appDEPrintId;
@@ -15870,7 +15884,8 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
   async executeDataImport(action, _args) {
     var _a;
     const appDataEntity = await ibiz.hub.getAppDataEntity(
-      action.appDataEntityId
+      action.appDataEntityId,
+      action.appId
     );
     const appDEDataImport = (_a = appDataEntity.appDEDataImports) == null ? void 0 : _a.find(
       (dataImport) => dataImport.id === action.appDEDataImportId
@@ -15917,7 +15932,8 @@ var FrontUIActionProvider = class extends UIActionProviderBase {
       args.params
     );
     const appDataEntity = await ibiz.hub.getAppDataEntity(
-      action.appDataEntityId
+      action.appDataEntityId,
+      action.appId
     );
     const appDEDataExport = (_a = appDataEntity.appDEDataExports) == null ? void 0 : _a.find((dataExport) => {
       return dataExport.id === action.appDEDataExportId;
@@ -19635,7 +19651,7 @@ var FormMDCtrlFormController = class extends FormMDCtrlController {
   async fetchData() {
     const { appDataEntityId } = this.model.contentControl;
     const fetchAction = "fetchdefault";
-    const res = await ibiz.hub.getApp().deService.exec(appDataEntityId, fetchAction, this.context, this.params);
+    const res = await ibiz.hub.getApp(this.model.appId).deService.exec(appDataEntityId, fetchAction, this.context, this.params);
     if (res.ok) {
       this.state.items = res.data.map((item) => {
         const context = this.context.clone();
@@ -19806,11 +19822,13 @@ var FormMDCtrlRepeaterController = class extends FormMDCtrlController {
   prepareRepeatedForm() {
     const id = "".concat(this.model.id, "repeatedform");
     const tempForm = {
+      appId: this.model.appId,
       id,
       codeName: id,
       name: id,
       deformPages: [
         {
+          appId: this.model.appId,
           id: "formpage1",
           deformDetails: this.model.deformDetails,
           detailType: "FORMPAGE",
@@ -20308,7 +20326,8 @@ var EditFormController = class extends FormController {
     const context = clone21(this.context);
     const queryParams = clone21(this.params);
     const appDataEntity = await ibiz.hub.getAppDataEntity(
-      this.model.appDataEntityId
+      this.model.appDataEntityId,
+      this.model.appId
     );
     const key = appDataEntity.keyAppDEFieldId;
     if (key && this.params[key]) {
@@ -23837,7 +23856,7 @@ var TabExpPanelController = class extends ControlController {
     const context = Object.assign(this.context.clone(), resultContext, {
       currentSrfNav: this.state.activeName
     });
-    const params = { ...this.params, ...resultParams };
+    const params = { ...resultParams };
     return { context, params };
   }
   /**
@@ -25783,7 +25802,8 @@ var MEditViewPanelController = class extends MDControlController {
       const embedView = await ibiz.hub.getAppView(this.model.embeddedAppViewId);
       if (embedView.appDataEntityId) {
         const embedViewEntity = await ibiz.hub.getAppDataEntity(
-          embedView.appDataEntityId
+          embedView.appDataEntityId,
+          embedView.appId
         );
         if (embedView && embedViewEntity) {
           this.parameters = [
@@ -26168,7 +26188,8 @@ var ReportPanelService = class extends ControlService {
   async fetch(context, params = {}) {
     var _a;
     this.dataEntity = await ibiz.hub.getAppDataEntity(
-      this.model.appDataEntityId
+      this.model.appDataEntityId,
+      this.model.appId
     );
     const url = "".concat((_a = this.dataEntity.codeName2) == null ? void 0 : _a.toLowerCase(), "/report?srfreporttag=").concat(this.model.codeName);
     let res = await ibiz.net.request(url, {
@@ -26262,6 +26283,12 @@ var UserReportPanelGenerator = class 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: "{{ data.forEach(edge => {Object.assign(edge, { label: edge.name })}) }}"
       }
@@ -26348,7 +26375,8 @@ var ReportPanelController = class extends ControlController {
     await super.onCreated();
     this.generator = ReportPanelGeneratorFactory.getInstance(this.model);
     this.dataEntity = await ibiz.hub.getAppDataEntity(
-      this.model.appDataEntityId
+      this.model.appDataEntityId,
+      this.model.appId
     );
     this.service = new ReportPanelService(this.model);
     await this.service.init(this.context);
@@ -26494,15 +26522,6 @@ var AppHub = class {
      * @type {Map<string, Application>}
      */
     this.appMap = /* @__PURE__ */ new Map();
-    /**
-     * 实例化的应用模型
-     *
-     * @author chitanda
-     * @date 2023-04-17 23:04:45
-     * @protected
-     * @type {Map<string, IApplication>}
-     */
-    this.apps = /* @__PURE__ */ new Map();
     /**
      * 当前基座下所有的应用视图
      *
@@ -26574,16 +26593,6 @@ var AppHub = class {
   registerModelLoaderProvider(provider) {
     this.modelLoaderProvider = provider;
   }
-  /**
-   * 注册应用实例模型
-   *
-   * @author chitanda
-   * @date 2023-04-17 23:04:29
-   * @param {IApplication} model
-   */
-  registerApp(model) {
-    this.apps.set(model.codeName, model);
-  }
   /**
    * 注册应用视图实例模型
    *
@@ -26714,17 +26723,13 @@ var AppHub = class {
     if (this.appMap.has(id)) {
       return this.appMap.get(id);
     }
-    let appModel;
-    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 RuntimeError57("\u672A\u627E\u5230\u5E94\u7528[".concat(id, "]\u6A21\u578B"));
+    if (!this.modelLoaderProvider) {
+      throw new RuntimeError57("\u8BF7\u5148\u6CE8\u518C\u6A21\u578B\u52A0\u8F7D\u9002\u914D\u5668");
     }
+    const appModel = 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(
@@ -28212,7 +28217,8 @@ var AppUILogicExecutor = class extends LogicExecutor {
   }
   async calcOpenViewRef(appUILogic, parameters) {
     const appDataEntity = await ibiz.hub.getAppDataEntity(
-      parameters.view.model.appDataEntityId
+      parameters.view.model.appDataEntityId,
+      parameters.view.model.appId
     );
     const typeFileName = appDataEntity.formTypeAppDEFieldId || appDataEntity.dataTypeAppDEFieldId;
     if (!typeFileName) {
@@ -28296,7 +28302,8 @@ var AppUILogicExecutor = class extends LogicExecutor {
     }
     if (params.srfcopymode) {
       const entity = await ibiz.hub.getAppDataEntity(
-        view.model.appDataEntityId
+        view.model.appDataEntityId,
+        view.model.appId
       );
       const key = entity.keyAppDEFieldId;
       if (key && _data) {
@@ -28585,8 +28592,7 @@ var PluginStaticResource = class {
      */
     this.styleElementMap = /* @__PURE__ */ new Map();
     this.url = new URL(mateUrl);
-    const dir = path.dirname(this.url.pathname);
-    this.baseDir = dir;
+    this.baseDir = path.dirname(this.url.pathname);
   }
   /**
    * 合并输出静态资源目录
@@ -28597,7 +28603,7 @@ var PluginStaticResource = class {
    * @return {*}  {string}
    */
   dir(pathStr) {
-    return path.resolve(this.baseDir, pathStr);
+    return this.url.origin + path.resolve(this.baseDir, pathStr);
   }
   /**
    * 加载样式静态资源