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

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

@@ -344,6 +344,10 @@ export class FormItemController
   async setDataValue(value: unknown, name?: string): Promise<void> {
     name = name || this.name;
     await this.form.setDataValue(name, value);
+    this.form.evt.emit('onFormDetailEvent', {
+      formDetailName: this.model.id!,
+      formDetailEventName: 'onChange',
+    });
   }
 
   /**
@@ -371,4 +375,30 @@ export class FormItemController
       data[this.name] = defaultVal;
     }
   }
+
+  /**
+   * 聚焦事件
+   * @author lxm
+   * @date 2023-10-11 05:03:26
+   */
+  onFocus(event: MouseEvent): void {
+    this.form.evt.emit('onFormDetailEvent', {
+      formDetailName: this.model.id!,
+      formDetailEventName: 'onFocus',
+      event,
+    });
+  }
+
+  /**
+   * 失焦事件
+   * @author lxm
+   * @date 2023-10-11 05:03:26
+   */
+  onBlur(event: MouseEvent): void {
+    this.form.evt.emit('onFormDetailEvent', {
+      formDetailName: this.model.id!,
+      formDetailEventName: 'onBlur',
+      event,
+    });
+  }
 }

package/src/interface/controller/event/argument/form-detail.event.ts

@@ -0,0 +1,27 @@
+import { EventBase } from './base.event';
+
+/**
+ * 表单成员事件
+ * @author lxm
+ * @date 2023-08-09 10:52:48
+ * @export
+ * @interface FormDetailEvent
+ * @extends {EventBase}
+ */
+export interface FormDetailEvent extends EventBase {
+  /**
+   * 触发的表单成员名称
+   * @author lxm
+   * @date 2023-03-26 02:02:16
+   * @type {string}
+   */
+  formDetailName: string;
+
+  /**
+   * 触发的表单成员事件的名称
+   * @author lxm
+   * @date 2023-07-26 11:00:37
+   * @type {string}
+   */
+  formDetailEventName: string;
+}

package/src/interface/controller/event/argument/index.ts

@@ -8,3 +8,4 @@ export type { ControlTriggerEvent } from './control-trigger.event';
 export type { NavViewChangeEvent } from './nav-view-change.event';
 export type { RowEditChangeEvent } from './row-edit-change.event';
 export type { PanelItemEvent } from './panel-item.event';
+export type { FormDetailEvent } from './form-detail.event';

package/src/interface/controller/event/control/i-form.event.ts

@@ -1,4 +1,5 @@
-import { EventBase } from '../argument';
+import { PartialWithObject } from '@ibiz-template/core';
+import { EventBase, FormDetailEvent } from '../argument';
 import { IControlEvent } from './i-control.event';
 
 /**
@@ -51,4 +52,16 @@ export interface IFormEvent extends IControlEvent {
     event: EventBase;
     emitArgs: undefined;
   };
+
+  /**
+   * 表单里的成员事件监听
+   * @author lxm
+   * @date 2023-03-26 06:15:06
+   * @param {EventBase} event
+   * @return {*}  {Promise<void>}
+   */
+  onFormDetailEvent: {
+    event: FormDetailEvent;
+    emitArgs: PartialWithObject<FormDetailEvent, EventBase>;
+  };
 }

package/src/interface/controller/event/view/i-map-view.event.ts

@@ -0,0 +1,12 @@
+import { IMDViewEvent } from './i-md-view.event';
+
+/**
+ * 地图视图事件
+ *
+ * @author lxm
+ * @date 2022-09-13 10:09:00
+ * @export
+ * @interface IMapViewEvent
+ * @extends {IMDViewEvent}
+ */
+export type IMapViewEvent = IMDViewEvent;

package/src/interface/controller/event/view/index.ts

@@ -41,3 +41,4 @@ export * from './i-tree-grid-view.event';
 export * from './i-tree-grid-ex-view.event';
 export * from './i-medit-view9.event';
 export * from './i-chart-exp-view.event';
+export * from './i-map-view.event';

package/src/interface/controller/state/view/i-map-view.state.ts

@@ -0,0 +1,10 @@
+import { IMDViewState } from './i-md-view.state';
+
+/**
+ * 地图视图UI状态
+ *
+ * @export
+ * @class IMapViewState
+ * @extends {IMDViewState}
+ */
+export interface IMapViewState extends IMDViewState {}

package/src/interface/controller/state/view/i-pickup-md-view.state.ts

@@ -19,4 +19,14 @@ export interface IPickupMDViewState extends IMDViewState {
    * @memberof IPickupMDViewState
    */
   singleSelect: boolean;
+
+  /**
+   * 选择数据
+   *
+   * @author zk
+   * @date 2023-11-13 05:11:46
+   * @type {IData[]}
+   * @memberof IPickupMDViewState
+   */
+  selectedData: IData[];
 }

package/src/interface/controller/state/view/index.ts

@@ -42,3 +42,4 @@ export * from './i-tree-grid-view.state';
 export * from './i-tree-grid-ex-view.state';
 export * from './i-medit-view9.state';
 export * from './i-chart-exp-view.state';
+export * from './i-map-view.state';

package/src/model/utils/util.ts

@@ -21,8 +21,13 @@ export function findModelChild(
   models: IModelObject[],
   id: string,
 ): IModelObject | null {
-  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;
     }

package/src/service/dto/method.dto.ts

@@ -9,6 +9,10 @@ import { Application } from '../../application';
 import { AppDataEntity } from '../app-data-entity/app-data-entity';
 import { findModelChild } from '../../model';
 
+interface listMap {
+  [key: number]: IData;
+}
+
 /**
  * 应用实体服务方法转换 DTO
  *
@@ -37,6 +41,35 @@ export class MethodDto {
     }
   }
 
+  /**
+   * 转换数组成ListMap
+   *
+   * @param {IData[]} arr
+   * @return {*} listMap
+   */
+  private convertArrayToListMap(arr: IData[]): listMap {
+    const result: listMap = {};
+    arr.forEach((obj, index) => {
+      result[index + 1] = obj;
+    });
+    return result;
+  }
+
+  /**
+   * 转换ListMap成数组
+   *
+   * @param {listMap} obj
+   * @return {*} IData[]
+   */
+  private convertListMapToArray(obj: listMap): IData[] {
+    const result: IData[] = [];
+    Object.keys(obj).forEach(key => {
+      const index = parseInt(key, 10);
+      result[index - 1] = obj[index];
+    });
+    return result;
+  }
+
   /**
    * 请求参数组合 DTO
    *
@@ -57,24 +90,31 @@ export class MethodDto {
           break;
         }
         case 'DTOS': {
-          if (data[key] !== undefined) {
-            break;
-          }
-          // 没有实体id的不处理
-          if (!field.refAppDataEntityId) {
-            break;
-          }
-          const dto = await this.getFieldDto(field);
-          const service = await this.app!.deService.getService(
-            field.refAppDataEntityId!,
-          );
-          const items: IData[] = 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] !== undefined) {
+              break;
+            }
+            // 没有实体id的不处理
+            if (!field.refAppDataEntityId) {
+              break;
+            }
+            const dto = await this.getFieldDto(field);
+            const service = await this.app!.deService.getService(
+              field.refAppDataEntityId!,
+            );
+            const items: IData[] = 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;
         }
@@ -108,17 +148,21 @@ export class MethodDto {
         const all = this.fields
           .filter(field => field.type === 'DTOS')
           .map(async field => {
-            // 没有实体id的不处理
-            if (!field.refAppDataEntityId) {
-              return;
-            }
             const key = field.codeName!.toLowerCase();
-            const dto = await this.getFieldDto(field);
-            const items: IData[] = 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, []);
+              // 没有实体id的不处理
+              if (!field.refAppDataEntityId) {
+                return;
+              }
+              const dto = await this.getFieldDto(field);
+              const items: IData[] = datum[key];
+              if (items) {
+                await dto.sets(context, items);
+              } else {
+                await dto.sets(context, []);
+              }
             }
           });
         for (let i = 0; i < all.length; i++) {

package/src/utils/handlebars/handlebars.ts

@@ -49,7 +49,9 @@ export class HandlebarsUtil {
       return this.p;
     }
     this.p = import('handlebars');
-    this.hsb = await this.p;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const module = (await this.p) as any;
+    this.hsb = module.default || module;
     this.p = null;
     installHelpers(this.hsb);
     return this.hsb;