@ibiz-template/runtime 0.2.18-dev.0 → 0.2.18-dev.2

package/dist/index.esm.js

@@ -463,7 +463,8 @@ var HandlebarsUtil = class {
       return this.p;
     }
     this.p = import("handlebars");
-    this.hsb = await this.p;
+    const module = await this.p;
+    this.hsb = module.default || module;
     this.p = null;
     installHelpers(this.hsb);
     return this.hsb;
@@ -622,8 +623,13 @@ import qs from "qs";
 
 // src/model/utils/util.ts
 function findModelChild(models, id) {
-  if (models) {
-    const model = models.find((item) => item.id === id);
+  if (models && id) {
+    const model = models.find((item) => {
+      if (item.id) {
+        return item.id.toLowerCase() === id.toLowerCase();
+      }
+      return false;
+    });
     if (model) {
       return model;
     }
@@ -5281,6 +5287,33 @@ var MethodDto = class _MethodDto {
       this.fields = [];
     }
   }
+  /**
+   * 转换数组成ListMap
+   *
+   * @param {IData[]} arr
+   * @return {*} listMap
+   */
+  convertArrayToListMap(arr) {
+    const result = {};
+    arr.forEach((obj, index) => {
+      result[index + 1] = obj;
+    });
+    return result;
+  }
+  /**
+   * 转换ListMap成数组
+   *
+   * @param {listMap} obj
+   * @return {*} IData[]
+   */
+  convertListMapToArray(obj) {
+    const result = [];
+    Object.keys(obj).forEach((key) => {
+      const index = parseInt(key, 10);
+      result[index - 1] = obj[index];
+    });
+    return result;
+  }
   /**
    * 请求参数组合 DTO
    *
@@ -5300,23 +5333,27 @@ var MethodDto = class _MethodDto {
           break;
         }
         case "DTOS": {
-          if (data[key] !== void 0) {
-            break;
-          }
-          if (!field.refAppDataEntityId) {
-            break;
-          }
-          const dto = await this.getFieldDto(field);
-          const service = await this.app.deService.getService(
-            field.refAppDataEntityId
-          );
-          const items = service.local.getList(context);
-          if (items) {
-            const arr = [];
-            for (let j = 0; j < items.length; j++) {
-              arr.push(await dto.get(context, items[j]));
+          if (field.listMap) {
+            params[key] = data[key] && data[key].length > 0 ? this.convertArrayToListMap(data[key]) : null;
+          } else {
+            if (data[key] !== void 0) {
+              break;
+            }
+            if (!field.refAppDataEntityId) {
+              break;
+            }
+            const dto = await this.getFieldDto(field);
+            const service = await this.app.deService.getService(
+              field.refAppDataEntityId
+            );
+            const items = service.local.getList(context);
+            if (items) {
+              const arr = [];
+              for (let j = 0; j < items.length; j++) {
+                arr.push(await dto.get(context, items[j]));
+              }
+              params[key] = arr;
             }
-            params[key] = arr;
           }
           break;
         }
@@ -5346,16 +5383,20 @@ var MethodDto = class _MethodDto {
     return Promise.all(
       data.map(async (datum) => {
         const all = this.fields.filter((field) => field.type === "DTOS").map(async (field) => {
-          if (!field.refAppDataEntityId) {
-            return;
-          }
           const key = field.codeName.toLowerCase();
-          const dto = await this.getFieldDto(field);
-          const items = datum[key];
-          if (items) {
-            await dto.sets(context, items);
+          if (field.listMap && typeof datum[key] === "object") {
+            datum[key] = this.convertListMapToArray(datum[key]);
           } else {
-            await dto.sets(context, []);
+            if (!field.refAppDataEntityId) {
+              return;
+            }
+            const dto = await this.getFieldDto(field);
+            const items = datum[key];
+            if (items) {
+              await dto.sets(context, items);
+            } else {
+              await dto.sets(context, []);
+            }
           }
         });
         for (let i = 0; i < all.length; i++) {
@@ -17002,6 +17043,14 @@ var FormController = class extends ControlController {
       },
       200
     );
+    this._evt.on("onFormDetailEvent", (event) => {
+      var _a;
+      (_a = this.scheduler) == null ? void 0 : _a.triggerControlEvent(
+        event.formDetailName,
+        event.formDetailEventName,
+        event
+      );
+    });
   }
   /**
    * 获取加载草稿额外参数，新建默认值
@@ -17633,6 +17682,18 @@ var FormDetailController = class {
       this.state.required = required;
     }
   }
+  /**
+   * 点击事件
+   * @author lxm
+   * @date 2023-10-11 05:03:26
+   */
+  async onClick(event) {
+    this.form.evt.emit("onFormDetailEvent", {
+      formDetailName: this.model.id,
+      formDetailEventName: "onClick",
+      event
+    });
+  }
 };
 
 // src/controller/control/form/form-detail/form-button/form-button.state.ts
@@ -17682,6 +17743,7 @@ var FormButtonController = class extends FormDetailController {
     } finally {
       this.state.loading = false;
     }
+    super.onClick(event);
   }
   /**
    * 执行界面行为
@@ -18258,6 +18320,10 @@ var FormItemController = class extends FormDetailController {
   async setDataValue(value, name) {
     name = name || this.name;
     await this.form.setDataValue(name, value);
+    this.form.evt.emit("onFormDetailEvent", {
+      formDetailName: this.model.id,
+      formDetailEventName: "onChange"
+    });
   }
   /**
    * 设置默认值
@@ -18283,6 +18349,30 @@ var FormItemController = class extends FormDetailController {
       data[this.name] = defaultVal;
     }
   }
+  /**
+   * 聚焦事件
+   * @author lxm
+   * @date 2023-10-11 05:03:26
+   */
+  onFocus(event) {
+    this.form.evt.emit("onFormDetailEvent", {
+      formDetailName: this.model.id,
+      formDetailEventName: "onFocus",
+      event
+    });
+  }
+  /**
+   * 失焦事件
+   * @author lxm
+   * @date 2023-10-11 05:03:26
+   */
+  onBlur(event) {
+    this.form.evt.emit("onFormDetailEvent", {
+      formDetailName: this.model.id,
+      formDetailEventName: "onBlur",
+      event
+    });
+  }
 };
 
 // src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-content-type.controller.ts