@ibiz-template/runtime 0.2.9 → 0.2.10

package/src/model/data-entity/data-entity.ts

@@ -52,23 +52,6 @@ export async function getDeACMode(
   return deACMode;
 }
 
-/**
- * 从实体里找到表单类型应用实体属性
- *
- * @author zk
- * @date 2023-09-07 05:09:41
- * @export
- * @param {string} entityId
- * @param {string} [srfappid]
- * @return {*}  {(Promise<string | undefined>)}
- */
-export async function getFormTypeFieldName(
-  entityId: string,
-): Promise<string | undefined> {
-  const appDataEntity = await ibiz.hub.getAppDataEntity(entityId)!;
-  return appDataEntity.formTypeAppDEFieldId;
-}
-
 /**
  * 从实体里找到实体逻辑
  * @author lxm

package/src/service/vo/map-data/map-data.ts

@@ -16,13 +16,15 @@ function updateKeyDefine(target: IParams, keys: string[]): void {
   });
 }
 
+const AreaItemStyles: string[] = ['REGION', 'REGION2', 'REGION3', 'REGION4'];
+
 export class MapData implements IMapData {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   [key: string | symbol]: any;
 
   _id: string;
 
-  _type: 'point' | 'area';
+  _itemStyle: string;
 
   _mapItemId: string;
 
@@ -43,7 +45,7 @@ export class MapData implements IMapData {
   constructor(deData: IData, mapItem: ISysMapItem) {
     const {
       id,
-      itemType,
+      itemStyle,
       longitudeAppDEFieldId,
       latitudeAppDEFieldId,
       textAppDEFieldId,
@@ -56,11 +58,11 @@ export class MapData implements IMapData {
 
     this._id = id + deData.srfkey;
 
-    this._type = itemType! as 'point';
+    this._itemStyle = itemStyle!;
 
     this._mapItemId = id!;
 
-    if (itemType === 'area') {
+    if (AreaItemStyles.includes(this._itemStyle)) {
       if (longitudeAppDEFieldId) {
         keyMap.set('_areaCode', longitudeAppDEFieldId);
       }

package/src/service/vo/panel-data/panel-data.ts

@@ -1,6 +1,7 @@
 /* eslint-disable no-constructor-return */
 
 import { IPanelField } from '@ibiz/model-core';
+import { QXEvent } from 'qx-util';
 
 // 更新属性，缺的补充定义
 function updateKeyDefine(target: IParams, keys: string[]): void {
@@ -16,6 +17,8 @@ function updateKeyDefine(target: IParams, keys: string[]): void {
   });
 }
 
+type ChangeCallBack = (field: string) => void;
+
 /**
  * 面板数据
  * @author lxm
@@ -28,15 +31,16 @@ export class PanelData {
   [key: string | symbol]: any;
 
   /**
-   * 父视图参数
+   * 事件
    * @author lxm
-   * @date 2023-10-27 04:08:59
+   * @date 2023-11-02 02:35:33
    * @protected
-   * @type {IParams}
    */
-  protected declare _origin?: IParams;
+  declare _evt: QXEvent<{ change: ChangeCallBack }>;
 
   constructor(fields: IPanelField[], origin: IParams) {
+    const _evt = new QXEvent<{ change: ChangeCallBack }>();
+
     // 面板属性映射绑定项
     const keyMap: Record<string, string | undefined> = {};
     // 绑定项映射面板属性
@@ -61,13 +65,24 @@ export class PanelData {
           }
         } else {
           // 没有面板属性的直接修改原始对象，视图面板对象一开始就是空的，没有任何属性
-          origin[keyMap[p]!] = value;
+          origin[p] = value;
+        }
+        _evt.emit('change', p);
+        // 修改面板属性，同步抛原值变更
+        if (keyMap[p] && keyMap[p] !== p) {
+          _evt.emit('change', keyMap[p]!);
+        }
+        // 修改原值变更，同时抛面板属性变更
+        if (reverseKeyMap[p] && reverseKeyMap[p] !== p) {
+          _evt.emit('change', reverseKeyMap[p]!);
         }
-
         return true;
       },
 
       get(target: PanelData, p: string, _receiver: unknown): unknown {
+        if (p === '_evt') {
+          return _evt;
+        }
         // 有映射拿原始对象
         if (keyMap[p]) {
           return origin[keyMap[p]!];
@@ -90,4 +105,8 @@ export class PanelData {
       },
     });
   }
+
+  destroy(): void {
+    this._evt.reset();
+  }
 }