@ibiz-template/runtime 0.4.4 → 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 = [];
@@ -2580,6 +2580,7 @@ var TextUtil = class {
 };
 
 // src/utils/theme-util/theme-util.ts
+import { clone as clone2 } from "ramda";
 var ThemeUtil = class {
   constructor() {
     /**
@@ -2601,14 +2602,47 @@ var ThemeUtil = class {
    * @return {*}  {Promise<void>}
    */
   async loadTheme(theme) {
-    const data = theme.themeParams || {};
+    const data = clone2(theme.themeParams || {});
+    const path2 = data["theme-package-path"];
+    delete data.appId;
+    delete data["theme-package-path"];
     await ibiz.plugin.loadPlugin({
       runtimeObject: true,
       rtobjectName: theme.name,
-      rtobjectRepo: data["theme-package-path"]
+      rtobjectRepo: path2
     });
+    this.setThemeParams(theme, data);
     this.setTheme(theme.themeTag);
   }
+  /**
+   * 设置额外修改的主题参数
+   *
+   * @author chitanda
+   * @date 2023-12-05 11:12:00
+   * @protected
+   * @param {IAppUITheme} theme
+   * @param {Record<string, string>} params
+   * @return {*}  {void}
+   */
+  setThemeParams(theme, params) {
+    const themeStyle = document.getElementById(theme.themeTag);
+    if (themeStyle) {
+      return;
+    }
+    let content = ":root.".concat(theme.themeTag, "{");
+    for (const key in params) {
+      if (Object.prototype.hasOwnProperty.call(params, key)) {
+        const val = params[key];
+        content += "".concat(key, ": ").concat(val).concat(val.endsWith(";") ? "" : ";");
+      }
+    }
+    content += "}";
+    const script = document.createElement("style");
+    script.id = theme.themeTag;
+    script.type = "text/css";
+    script.innerHTML = content;
+    document.head.appendChild(script);
+  }
   /**
    * 设置主题
    *
@@ -2689,7 +2723,7 @@ async function handleAllSettled(values, isThrow = true) {
 
 // src/command/app/open-app-view/open-app-view.ts
 import { ModelError as ModelError14, RuntimeError as RuntimeError21 } from "@ibiz-template/core";
-import { clone as clone13 } from "ramda";
+import { clone as clone14 } from "ramda";
 
 // src/service/utils/de-dq-cond/ps-de-dq-cond-engine.ts
 import { isEmpty as isEmpty3 } from "ramda";
@@ -3650,7 +3684,7 @@ async function getDEMethodProvider(model) {
 // src/service/utils/app-counter/app-counter.ts
 import { IBizContext, RuntimeError as RuntimeError11 } from "@ibiz-template/core";
 import { notNilEmpty as notNilEmpty5, QXEvent } from "qx-util";
-import { clone as clone2 } from "ramda";
+import { clone as clone3 } from "ramda";
 var AppCounter = class {
   /**
    * Creates an instance of AppCounter.
@@ -3710,10 +3744,10 @@ var AppCounter = class {
    */
   setParams(context, params) {
     if (context) {
-      this.context = clone2(context);
+      this.context = clone3(context);
     }
     if (params) {
-      this.params = clone2(params);
+      this.params = clone3(params);
     }
   }
   /**
@@ -4023,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];
       }
@@ -4041,9 +4075,15 @@ var DynamicCodeListCache = class {
       result.disableSelect = data[disableAppDEFieldId];
     }
     if (dataAppDEFieldId && data[dataAppDEFieldId]) {
-      result.data = ScriptFactory.execSingleLine(
-        data[dataAppDEFieldId]
-      );
+      try {
+        result.data = ScriptFactory.execSingleLine(
+          data[dataAppDEFieldId]
+        );
+      } catch (error) {
+        ibiz.log.error(
+          "\u52A8\u6001\u4EE3\u7801\u8868\u6570\u636E\u5C5E\u6027\u8FD4\u56DE\u503C\u4E0D\u4E3A\u5BF9\u8C61\u683C\u5F0F\u7684\u5B57\u7B26\u4E32\uFF0C\u65E0\u6CD5\u8F6C\u6362\uFF01"
+        );
+      }
     }
     return result;
   }
@@ -4182,7 +4222,7 @@ var DynamicCodeListCache = class {
 };
 
 // src/service/utils/de-cache/de-cache.ts
-import { where, equals, clone as clone3, isNil as isNil5, isEmpty as isEmpty5 } from "ramda";
+import { where, equals, clone as clone4, isNil as isNil5, isEmpty as isEmpty5 } from "ramda";
 import { createUUID } from "qx-util";
 
 // src/service/utils/service-exist-util/service-exist-util.ts
@@ -4243,7 +4283,7 @@ var DECache = class {
    */
   forceUpdate(context, entity) {
     const map = this.getCacheByTag(context);
-    map.set(entity.srfkey, clone3(entity));
+    map.set(entity.srfkey, clone4(entity));
     ibiz.log.warn("forceUpdate", entity.srfkey, entity);
   }
   /**
@@ -4275,7 +4315,7 @@ var DECache = class {
       }
       entity.srftempdate = (/* @__PURE__ */ new Date()).getTime();
       const map = this.getCacheByTag(context);
-      map.set(entity.srfkey, clone3(entity));
+      map.set(entity.srfkey, clone4(entity));
       ibiz.log.warn("add", entity.srfkey, entity);
       return entity;
     } catch (err) {
@@ -4297,7 +4337,7 @@ var DECache = class {
       const map = this.getCacheByTag(context);
       const data = map.get(srfKey);
       ibiz.log.warn("get", srfKey, data);
-      return clone3(data);
+      return clone4(data);
     } catch (err) {
       ibiz.log.error(err);
       return null;
@@ -4322,7 +4362,7 @@ var DECache = class {
         data.assign(entity);
         map.set(entity.srfkey, data);
         ibiz.log.warn("update", entity.srfkey, entity);
-        return clone3(data);
+        return clone4(data);
       }
       throw new Error("\u6570\u636E\u4E0D\u5B58\u5728\uFF0C\u65E0\u6CD5\u66F4\u65B0!");
     } catch (err) {
@@ -4375,7 +4415,7 @@ var DECache = class {
           entity.srfkey = createUUID();
         }
         entity.srftempdate = (/* @__PURE__ */ new Date()).getTime();
-        const data = clone3(entity);
+        const data = clone4(entity);
         map.set(entity.srfkey, data);
         entities[i] = data;
         ibiz.log.warn("add", entity.srfkey, entity);
@@ -4408,7 +4448,7 @@ var DECache = class {
           data.assign(entity);
           map.set(entity.srfkey, data);
           ibiz.log.warn("update", entity.srfkey, entity);
-          entities[i] = clone3(data);
+          entities[i] = clone4(data);
         } else {
           throw new Error(
             "\u6570\u636E[".concat(entity.srfdename, "-").concat(entity.srfmajortext, "(").concat(entity.srfkey, ")]\u4E0D\u5B58\u5728\uFF0C\u65E0\u6CD5\u66F4\u65B0!")
@@ -5512,11 +5552,11 @@ var DEService = class {
 };
 
 // src/service/service/control/control.service.ts
-import { clone as clone5 } from "@ibiz-template/core";
+import { clone as clone6 } from "@ibiz-template/core";
 
 // src/service/vo/control.vo.ts
 import { createUUID as createUUID2 } from "qx-util";
-import { clone as clone4, isNil as isNil7 } from "ramda";
+import { clone as clone5, isNil as isNil7 } from "ramda";
 
 // src/service/constant/srfuf.ts
 var Srfuf = /* @__PURE__ */ ((Srfuf2) => {
@@ -5713,7 +5753,7 @@ var ControlVO = class _ControlVO {
    * @return {*}  {ControlVO}
    */
   clone() {
-    const cloneOrigin = clone4(this.$origin);
+    const cloneOrigin = clone5(this.$origin);
     const newVal = new _ControlVO(cloneOrigin, this.$dataUIMap);
     Object.keys(this).forEach((key) => {
       newVal[key] = this[key];
@@ -5749,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();
   }
   /**
@@ -5790,7 +5830,7 @@ var ControlService = class {
    * @returns {*}  {IHttpResponse}
    */
   handleResponse(res) {
-    return clone5(res);
+    return clone6(res);
   }
   /**
    * 实体数据转ui数据
@@ -6238,7 +6278,7 @@ import { RuntimeModelError as RuntimeModelError8 } from "@ibiz-template/core";
 import { isArray as isArray4 } from "lodash-es";
 
 // src/service/app-data-entity/app-data-entity.ts
-import { clone as clone6, isNil as isNil9 } from "ramda";
+import { clone as clone7, isNil as isNil9 } from "ramda";
 import { DataTypes } from "@ibiz-template/core";
 import { createUUID as createUUID3 } from "qx-util";
 var AppDataEntity = class _AppDataEntity {
@@ -6262,7 +6302,7 @@ var AppDataEntity = class _AppDataEntity {
     Object.defineProperty(this, "_data", {
       enumerable: false,
       configurable: true,
-      value: data instanceof _AppDataEntity ? clone6(data._data) : clone6(data)
+      value: data instanceof _AppDataEntity ? clone7(data._data) : clone7(data)
     });
     Object.defineProperty(this, "srfdeid", {
       get() {
@@ -6824,7 +6864,7 @@ var Method = class {
 // src/de-logic/index.ts
 import { HttpError as HttpError3, HttpResponse as HttpResponse2, RuntimeError as RuntimeError18 } from "@ibiz-template/core";
 import { isArray as isArray6 } from "lodash-es";
-import { clone as clone11 } from "ramda";
+import { clone as clone12 } from "ramda";
 
 // src/de-logic/de-logic.ts
 import { ModelError as ModelError12, RuntimeModelError as RuntimeModelError18 } from "@ibiz-template/core";
@@ -7253,11 +7293,11 @@ var EndNode = class extends DELogicNode {
 
 // src/de-logic/de-logic-node/prepare-param-node/prepare-param-node.ts
 import { ModelError as ModelError10 } from "@ibiz-template/core";
-import { clone as clone8 } from "ramda";
+import { clone as clone9 } from "ramda";
 
 // src/de-logic/utils/handle-src-val.ts
 import { ModelError as ModelError9 } from "@ibiz-template/core";
-import { clone as clone7 } from "ramda";
+import { clone as clone8 } from "ramda";
 function handleSrcVal(ctx, srcValParams) {
   const { srcDELogicParamId, srcFieldName, srcValue } = srcValParams;
   const srcValueType = srcValParams.srcValueType || "SRCDLPARAM";
@@ -7287,7 +7327,7 @@ function handleSrcVal(ctx, srcValParams) {
       value = ctx.parameters.context;
       break;
     case "ENVPARAM":
-      value = clone7(ibiz.env);
+      value = clone8(ibiz.env);
       break;
     default:
       throw new ModelError9(srcValParams, "\u6682\u672A\u652F\u6301\u6E90\u503C\u7C7B\u578B".concat(srcValueType));
@@ -7358,7 +7398,7 @@ var PrepareParamNode = class extends DELogicNode {
   copyParam(nodeParam, ctx) {
     const { dstDELogicParamId } = nodeParam;
     const srcVal = handleSrcVal(ctx, nodeParam);
-    ctx.params[dstDELogicParamId] = clone8(srcVal);
+    ctx.params[dstDELogicParamId] = clone9(srcVal);
   }
   /**
    * 绑定参数
@@ -7520,7 +7560,7 @@ var RenewParamNode = class extends DELogicNode {
 
 // src/de-logic/de-logic-node/copy-param-node/copy-param-node.ts
 import { RuntimeModelError as RuntimeModelError15 } from "@ibiz-template/core";
-import { clone as clone9 } from "ramda";
+import { clone as clone10 } from "ramda";
 var CopyParamNode = class extends DELogicNode {
   async exec(ctx) {
     const { dstDELogicParamId, srcDELogicParamId } = this.model;
@@ -7531,7 +7571,7 @@ var CopyParamNode = class extends DELogicNode {
       );
     }
     const srcVal = handleSrcVal(ctx, this.model);
-    ctx.params[dstDELogicParamId] = clone9(srcVal);
+    ctx.params[dstDELogicParamId] = clone10(srcVal);
   }
 };
 
@@ -7597,7 +7637,7 @@ var ThrowExceptionNode = class extends DELogicNode {
 
 // src/de-logic/de-logic-param/de-logic-param.ts
 import { ModelError as ModelError11 } from "@ibiz-template/core";
-import { clone as clone10 } from "ramda";
+import { clone as clone11 } from "ramda";
 var DELogicParam = class {
   /**
    * Creates an instance of DELogicParam.
@@ -7629,7 +7669,7 @@ var DELogicParam = class {
         ctx.params[tag] = ctx.data[0] || {};
       }
     } else if (m.appGlobalParam) {
-      ctx.params[tag] = clone10(ibiz.env);
+      ctx.params[tag] = clone11(ibiz.env);
     } else if (m.entityListParam) {
       ctx.params[tag] = [];
     } else if (m.entityPageParam) {
@@ -7645,7 +7685,7 @@ var DELogicParam = class {
     } else if (m.simpleParam) {
       ctx.params[tag] = {};
     } else if (m.cloneParam) {
-      ctx.params[tag] = clone10(ctx.data || {});
+      ctx.params[tag] = clone11(ctx.data || {});
     } else if (m.envParam) {
       throw new ModelError11(m, "\u672A\u652F\u6301\u7684\u903B\u8F91\u53C2\u6570\u7C7B\u578B: \u7CFB\u7EDF\u73AF\u5883\u53D8\u91CF");
     } else if (m.fileListParam) {
@@ -7880,9 +7920,9 @@ async function execDELogicById(deDELogicId, dataEntityId, context, data, params)
   return execDELogic(deLogic, context, data, params);
 }
 async function execDELogicAction(deDELogic, context, data, params) {
-  const _context = clone11(context);
-  const _data = data ? clone11(data) : data;
-  const _params = params ? clone11(params) : params;
+  const _context = clone12(context);
+  const _data = data ? clone12(data) : data;
+  const _params = params ? clone12(params) : params;
   try {
     const result = await execDELogic(deDELogic, _context, _data, _params);
     return new HttpResponse2(result);
@@ -8284,7 +8324,7 @@ import {
   RuntimeModelError as RuntimeModelError20
 } from "@ibiz-template/core";
 import { ascSort, descSort } from "qx-util";
-import { clone as clone12, equals as equals2, isEmpty as isEmpty7, isNil as isNil11, where as where2 } from "ramda";
+import { clone as clone13, equals as equals2, isEmpty as isEmpty7, isNil as isNil11, where as where2 } from "ramda";
 import { isArray as isArray8 } from "lodash-es";
 var FetchMethod = class extends Method {
   get isLocalMode() {
@@ -8428,7 +8468,7 @@ var FetchMethod = class extends Method {
     const { page, size } = filter;
     const start = page * size;
     const end = (page + 1) * size - 1;
-    const items = list.slice(start, end).map((item) => clone12(item));
+    const items = list.slice(start, end).map((item) => clone13(item));
     return items;
   }
   /**
@@ -9187,7 +9227,7 @@ var _OpenAppViewCommand = class _OpenAppViewCommand {
    * @return {*}  {(Promise<IModalData | void>)}
    */
   async exec(appViewId, _context, params = {}, opts = {}) {
-    const context = clone13(_context);
+    const context = clone14(_context);
     const appView = await ibiz.hub.config.view.get(appViewId);
     if (!appView) {
       throw new RuntimeError21("\u5E94\u7528\u89C6\u56FE[".concat(appViewId, "]\u4E0D\u5B58\u5728"));
@@ -9332,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"));
     }
@@ -11178,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) {
@@ -11612,7 +11657,7 @@ var CodeListEditorController = class extends EditorController {
 
 // src/controller/common/control/control.controller.ts
 import { IBizContext as IBizContext3, IBizParams, NoticeError } from "@ibiz-template/core";
-import { clone as clone14, isNil as isNil19 } from "ramda";
+import { clone as clone15, isNil as isNil19 } from "ramda";
 import { notNilEmpty as notNilEmpty7 } from "qx-util";
 var ControlController = class extends BaseController {
   /**
@@ -11654,7 +11699,7 @@ var ControlController = class extends BaseController {
         "".concat(model.controlType, "_DEFAULT")
       );
       if (panelModel) {
-        this.controlPanel = clone14(panelModel);
+        this.controlPanel = clone15(panelModel);
       }
     }
     this.updateContextParams({});
@@ -11953,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);
@@ -12241,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
     );
@@ -12330,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
@@ -12733,7 +12783,7 @@ import isSameOrBefore from "dayjs/plugin/isSameOrBefore";
 import quarterOfYear from "dayjs/plugin/quarterOfYear";
 import weekOfYear from "dayjs/plugin/weekOfYear";
 import isoWeek from "dayjs/plugin/isoWeek";
-import { clone as clone15, isNil as isNil20, mergeDeepRight } from "ramda";
+import { clone as clone16, isNil as isNil20, mergeDeepRight } from "ramda";
 dayjs3.extend(minMax);
 dayjs3.extend(isSameOrBefore);
 dayjs3.extend(quarterOfYear);
@@ -13008,7 +13058,7 @@ var BaseSeriesGenerator = class {
   dataPreprocess(data) {
     const tempData = [];
     data.forEach((singleData) => {
-      tempData.push(clone15(singleData));
+      tempData.push(clone16(singleData));
     });
     const { groupMode } = this.model;
     if (groupMode) {
@@ -13617,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();
   }
   /**
@@ -14063,7 +14116,7 @@ import { ModelError as ModelError18, RuntimeModelError as RuntimeModelError29 }
 
 // src/ui-logic/utils/handle-src-val.ts
 import { ModelError as ModelError17 } from "@ibiz-template/core";
-import { clone as clone16 } from "ramda";
+import { clone as clone17 } from "ramda";
 function handleSrcVal2(ctx, srcValParams) {
   const { srcDEUILogicParamId, srcFieldName, srcValue } = srcValParams;
   const srcValueType = srcValParams.srcValueType || "SRCDLPARAM";
@@ -14090,7 +14143,7 @@ function handleSrcVal2(ctx, srcValParams) {
       value = ctx.parameters.context;
       break;
     case "ENVPARAM":
-      value = clone16(ibiz.env);
+      value = clone17(ibiz.env);
       break;
     default:
       throw new ModelError17(srcValParams, "\u6682\u672A\u652F\u6301\u6E90\u503C\u7C7B\u578B".concat(srcValueType));
@@ -14445,7 +14498,7 @@ var EndNode2 = class extends UILogicNode {
 
 // src/ui-logic/ui-logic-node/prepare-js-param-node/prepare-js-param-node.ts
 import { ModelError as ModelError21, RuntimeError as RuntimeError37 } from "@ibiz-template/core";
-import { clone as clone17 } from "ramda";
+import { clone as clone18 } from "ramda";
 var PrepareJSParamNode = class extends UILogicNode {
   async exec(ctx) {
     const nodeParams = this.model.deuilogicNodeParams;
@@ -14534,7 +14587,7 @@ var PrepareJSParamNode = class extends UILogicNode {
   copyParam(nodeParam, ctx) {
     const { dstDEUILogicParamId } = nodeParam;
     const srcVal = handleSrcVal2(ctx, nodeParam);
-    ctx.params[dstDEUILogicParamId] = clone17(srcVal);
+    ctx.params[dstDEUILogicParamId] = clone18(srcVal);
   }
   /**
    * 绑定参数
@@ -14761,7 +14814,7 @@ var ResetParamNode2 = class extends UILogicNode {
 
 // src/ui-logic/ui-logic-node/copy-param-node/copy-param-node.ts
 import { RuntimeModelError as RuntimeModelError38 } from "@ibiz-template/core";
-import { clone as clone18 } from "ramda";
+import { clone as clone19 } from "ramda";
 var CopyParamNode2 = class extends UILogicNode {
   async exec(ctx) {
     const { dstDEUILogicParamId, srcDEUILogicParamId } = this.model;
@@ -14772,7 +14825,7 @@ var CopyParamNode2 = class extends UILogicNode {
       );
     }
     const srcVal = handleSrcVal2(ctx, this.model);
-    ctx.params[dstDEUILogicParamId] = clone18(srcVal);
+    ctx.params[dstDEUILogicParamId] = clone19(srcVal);
   }
 };
 
@@ -15777,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;
@@ -15830,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
@@ -15877,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;
@@ -16060,6 +16116,9 @@ var ToolbarController = class extends ControlController {
         this.model,
         (item) => {
           const itemState = this.state.buttonsState[item.id];
+          if (!itemState) {
+            return;
+          }
           if (itemState.visible) {
             const dynaVisible = this.scheduler.triggerItemVisible(
               item.id,
@@ -19592,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();
@@ -19692,7 +19751,7 @@ var FormMDCtrlFormController = class extends FormMDCtrlController {
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-repeater.controller.ts
 import { ModelError as ModelError27 } from "@ibiz-template/core";
-import { clone as clone19 } from "ramda";
+import { clone as clone20 } from "ramda";
 var FormMDCtrlRepeaterController = class extends FormMDCtrlController {
   constructor() {
     super(...arguments);
@@ -19763,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",
@@ -19784,7 +19845,7 @@ var FormMDCtrlRepeaterController = class extends FormMDCtrlController {
     copyFields.forEach((key) => {
       tempForm[key] = this.form.model[key];
     });
-    this.repeatedForm = clone19(tempForm);
+    this.repeatedForm = clone20(tempForm);
   }
   /**
    * 设置重复器数据（修改主表单里重复器对应属性）
@@ -19915,7 +19976,7 @@ import {
 } from "@ibiz-template/core";
 import { debounce as debounce2 } from "lodash-es";
 import { createUUID as createUUID10 } from "qx-util";
-import { clone as clone20 } from "ramda";
+import { clone as clone21 } from "ramda";
 
 // src/controller/control/form/edit-form/edit-form.service.ts
 import {
@@ -20262,10 +20323,11 @@ var EditFormController = class extends FormController {
    * @return {*}  {Promise<IData>}
    */
   async copy() {
-    const context = clone20(this.context);
-    const queryParams = clone20(this.params);
+    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]) {
@@ -20319,7 +20381,7 @@ var EditFormController = class extends FormController {
       return this.loadDraft();
     }
     const { context, params } = this.handlerAbilityParams(args);
-    const queryParams = clone20(params);
+    const queryParams = clone21(params);
     let res;
     try {
       await this.startLoading();
@@ -20839,7 +20901,7 @@ import {
   RuntimeError as RuntimeError51,
   RuntimeModelError as RuntimeModelError56
 } from "@ibiz-template/core";
-import { clone as clone21 } from "ramda";
+import { clone as clone22 } from "ramda";
 
 // src/controller/control/grid/grid/grid.service.ts
 var GridService = class extends MDControlService {
@@ -21506,7 +21568,7 @@ var GridController = class extends MDControlController {
         throw new RuntimeError51("\u540C\u65F6\u53EA\u80FD\u6709\u4E00\u884C\u5F00\u542F\u884C\u7F16\u8F91");
       }
       if (row.data.srfuf === 1 /* UPDATE */) {
-        row.cacheData = clone21(row.data);
+        row.cacheData = clone22(row.data);
         const defaultVal = this.calcDefaultValue(row.data, false);
         Object.assign(row.data, defaultVal);
       }
@@ -21669,7 +21731,7 @@ var GridController = class extends MDControlController {
           }
         });
       }
-      const cloneData = clone21(
+      const cloneData = clone22(
         data2.map((item) => {
           return item.getOrigin();
         })
@@ -21813,7 +21875,7 @@ var GridController = class extends MDControlController {
 import { DataTypes as DataTypes3, ModelError as ModelError28, plus as plus2 } from "@ibiz-template/core";
 import dayjs4 from "dayjs";
 import { debounce as debounce3 } from "lodash-es";
-import { clone as clone22, isNil as isNil22 } from "ramda";
+import { clone as clone23, isNil as isNil22 } from "ramda";
 var GridFieldColumnController = class extends GridColumnController {
   constructor() {
     super(...arguments);
@@ -21917,7 +21979,7 @@ var GridFieldColumnController = class extends GridColumnController {
       srfkey: value,
       ...wfContext
     });
-    const tempParams = clone22(this.params);
+    const tempParams = clone23(this.params);
     const { context: newContext, params: newParams } = this.handlePublicParams(
       row.data,
       tempContext,
@@ -22243,8 +22305,16 @@ var GridFieldEditColumnController = class extends GridFieldColumnController {
    * @param {string[]} names 变更属性名称
    */
   async dataChangeNotify(row, names) {
-    const { resetItemName } = this.editItem;
-    if (resetItemName && names.includes(resetItemName)) {
+    const { resetItemNames } = this.editItem;
+    let isReset = false;
+    if (resetItemNames && resetItemNames.length > 0) {
+      resetItemNames.forEach((resetItemName) => {
+        if (names.includes(resetItemName)) {
+          isReset = true;
+        }
+      });
+    }
+    if (isReset) {
       this.setRowValue(row, null);
     }
     this.calcColumnDisabled(row);
@@ -23786,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 };
   }
   /**
@@ -25732,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 = [
@@ -26117,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, {
@@ -26211,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 })}) }}"
       }
@@ -26297,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);
@@ -26443,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();
     /**
      * 当前基座下所有的应用视图
      *
@@ -26523,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);
-  }
   /**
    * 注册应用视图实例模型
    *
@@ -26663,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(
@@ -26978,7 +27034,7 @@ var ViewEngineBase = class {
 
 // src/engine/md-view.engine.ts
 import { RuntimeModelError as RuntimeModelError61 } from "@ibiz-template/core";
-import { clone as clone23 } from "ramda";
+import { clone as clone24 } from "ramda";
 var MDViewEngine = class extends ViewEngineBase {
   /**
    * 多数据部件名称
@@ -27186,7 +27242,7 @@ var MDViewEngine = class extends ViewEngineBase {
     if (!openAppViewLogic) {
       throw new RuntimeModelError61(this.view.model, "\u7F3A\u5C11newdata\u7684\u89C6\u56FE\u903B\u8F91");
     }
-    const params = clone23(this.view.params);
+    const params = clone24(this.view.params);
     if (copyMode) {
       params.srfcopymode = copyMode;
     }
@@ -28161,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) {
@@ -28245,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) {
@@ -28534,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);
   }
   /**
    * 合并输出静态资源目录
@@ -28546,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);
   }
   /**
    * 加载样式静态资源
@@ -28781,6 +28838,7 @@ export {
   TreeStaticNodeData,
   UIACTION_PROVIDER_PREFIX,
   UIActionButtonState,
+  UIActionProviderBase,
   UIActionUtil,
   UILOGINNODE_PROVIDER_PREFIX,
   UIMapField,