@ibiz-template/runtime 0.7.41-alpha.133 → 0.7.41-alpha.135

package/dist/index.esm.js

@@ -22638,7 +22638,7 @@ var ScriptFunction = class {
    */
   formatCode(scriptCode, options) {
     let code = scriptCode;
-    if (options.singleRowReturn && !code.includes("return")) {
+    if (options.singleRowReturn) {
       code = "return (".concat(code, ")");
     }
     if (options.isAsync) {
@@ -26973,7 +26973,7 @@ var ViewMsgController = class _ViewMsgController {
         testScriptCode,
         {
           isAsync: false,
-          singleRowReturn: true
+          singleRowReturn: !testScriptCode.includes("return")
         }
       );
       return !!result;
@@ -47728,6 +47728,7 @@ var EditFormController = class extends FormController {
     this.initAnchorData();
     this.service = new EditFormService(this.model);
     await this.service.init(this.context);
+    this.state.data = this.service.toUIData({});
     this.autoSave = debounce(this.autoSave.bind(this), 500, {
       trailing: true
     });
@@ -49231,6 +49232,13 @@ async function newRowDynamic(c) {
 var GridController = class extends MDControlController {
   constructor() {
     super(...arguments);
+    /**
+     * @description 行状态索引缓存
+     * @protected
+     * @type {Map<string, number>}
+     * @memberof GridController
+     */
+    this.rowStateIndexMap = /* @__PURE__ */ new Map();
     /**
      * 是否有配置宽度自适应列
      *
@@ -49805,6 +49813,7 @@ var GridController = class extends MDControlController {
    * @param rows
    */
   async updateRows(rows) {
+    this.rowStateIndexMap.clear();
     for (const row of rows) {
       await Promise.all([
         ...Object.values(row.uaColStates).map(
@@ -50813,8 +50822,11 @@ var GridController = class extends MDControlController {
   findRowStateIndex(data) {
     const isCreate = data.srfuf === 0 /* CREATE */;
     const compareKey = isCreate ? "tempsrfkey" : "srfkey";
+    if (data[compareKey] && this.rowStateIndexMap.has(data[compareKey])) {
+      return this.rowStateIndexMap.get(data[compareKey]);
+    }
     const unionKeys = this.controlParams.unionkeys ? this.controlParams.unionkeys.split("|") : void 0;
-    return this.state.rows.findIndex((item) => {
+    const index = this.state.rows.findIndex((item) => {
       if (unionKeys) {
         let result = item.data[compareKey] === data[compareKey];
         if (!result)
@@ -50830,6 +50842,10 @@ var GridController = class extends MDControlController {
       }
       return item.data[compareKey] === data[compareKey];
     });
+    if (data[compareKey]) {
+      this.rowStateIndexMap.set(data[compareKey], index);
+    }
+    return index;
   }
   /**
    * 查找rowState
@@ -85701,23 +85717,53 @@ var AppHub = class {
     return targetCodeListMap == null ? void 0 : targetCodeListMap.get(id);
   }
   /**
-   * @description 加载扩展插件
+   * @description 加载主应用扩展插件
    * @public
-   * @param {string} appId
    * @returns {*}  {Promise<void>}
    * @memberof AppHub
    */
-  async loadExtensionPlugin(appId2) {
+  async loadMainExtensionPlugin() {
+    let index = 1;
+    let success = true;
+    do {
+      const suffix = index === 1 ? "" : "".concat(index);
+      const targetUrl = "".concat(ibiz.env.baseUrl, "/").concat(ibiz.env.appId).concat(ibiz.env.remoteModelUrl, "/ext").concat(suffix);
+      try {
+        await ibiz.plugin.loadPlugin({
+          runtimeObject: true,
+          rtobjectName: "ExtensionPlugin".concat(suffix),
+          rtobjectRepo: targetUrl
+        });
+        index += 1;
+        success = true;
+      } catch (error) {
+        ibiz.log.warn(
+          ibiz.i18n.t("runtime.hub.noExtensionPlugin", {
+            targetUrl
+          })
+        );
+        success = false;
+      }
+    } while (success);
+  }
+  /**
+   * @description 加载指定子应用扩展插件
+   * @param {string} appId 应用标识
+   * @returns {*}  {Promise<void>}
+   * @memberof AppHub
+   */
+  async loadSubExtensionPlugin(appId2) {
+    const targetUrl = "".concat(ibiz.env.baseUrl, "/").concat(ibiz.env.appId).concat(ibiz.env.remoteModelUrl, "/subapps/").concat(appId2, "/ext");
     try {
       await ibiz.plugin.loadPlugin({
         runtimeObject: true,
-        rtobjectName: "ExtensionPlugin",
-        rtobjectRepo: "".concat(ibiz.env.baseUrl, "/").concat(appId2).concat(ibiz.env.remoteModelUrl, "/ext")
+        rtobjectName: "".concat(appId2, "_ExtensionPlugin"),
+        rtobjectRepo: targetUrl
       });
     } catch (error) {
       ibiz.log.warn(
-        ibiz.i18n.t("runtime.application.noExtensionPlugin", {
-          appId: ibiz.env.appId
+        ibiz.i18n.t("runtime.hub.noExtensionPlugin", {
+          targetUrl
         })
       );
     }
@@ -85738,7 +85784,7 @@ var AppHub = class {
       throw new RuntimeError73(ibiz.i18n.t("runtime.utils.firstregister"));
     }
     if (id !== ibiz.env.appId) {
-      await this.loadExtensionPlugin(id);
+      await this.loadSubExtensionPlugin(id);
     }
     const appModel = await this.modelLoaderProvider.getApp(id);
     const subAppRef = await this.modelLoaderProvider.getSubAppRef(id);
@@ -92510,7 +92556,7 @@ var en = {
     hub: {
       failedParse: "View parameter {paramsName} failed to parse: {error}",
       noExist: "View [{id}] does not exist",
-      noExtensionPlugin: "Attempted to load application [{appId}] extension plugin, but no extension plugin was found"
+      noExtensionPlugin: "Attempted to load the extension plugin from path [{targetUrl}], but no extension plugin was found"
     },
     logicScheduler: {
       executor: {
@@ -93224,7 +93270,7 @@ var zhCn = {
     hub: {
       failedParse: "\u89C6\u56FE\u53C2\u6570 {paramsName} \u89E3\u6790\u5931\u8D25\uFF1A{error}",
       noExist: "\u89C6\u56FE[{id}]\u4E0D\u5B58\u5728",
-      noExtensionPlugin: "\u5C1D\u8BD5\u52A0\u8F7D\u5E94\u7528[{appId}]\u6269\u5C55\u63D2\u4EF6\uFF0C\u6682\u672A\u627E\u5230\u6269\u5C55\u63D2\u4EF6"
+      noExtensionPlugin: "\u5C1D\u8BD5\u52A0\u8F7D\u8DEF\u5F84[{targetUrl}]\u6269\u5C55\u63D2\u4EF6\uFF0C\u6682\u672A\u627E\u5230\u6269\u5C55\u63D2\u4EF6"
     },
     logicScheduler: {
       executor: {