@ibiz-template/runtime 0.2.9 → 0.2.11

package/src/controller/control/map/map.controller.ts

@@ -79,9 +79,9 @@ export class MapController
     const tempareaData: IMapData[] = [];
     const temppointData: IMapData[] = [];
     result.forEach(item => {
-      if (item._type === 'area') {
+      if (item._itemStyle === 'REGION') {
         tempareaData.push(item);
-      } else if (item._type === 'point') {
+      } else if (item._itemStyle === 'POINT') {
         temppointData.push(item);
       }
     });

package/src/controller/control/panel/panel/panel-item.controller.ts

@@ -114,6 +114,8 @@ export class PanelItemController<T extends IPanelItem = IPanelItem>
     }
   }
 
+  destroy(): void {}
+
   /**
    * 创建面板状态对象
    *

package/src/controller/control/panel/panel/panel.controller.ts

@@ -117,6 +117,14 @@ export class PanelController<
     this.load();
   }
 
+  protected async onDestroyed(): Promise<void> {
+    await super.onDestroyed();
+    this.data.destroy?.();
+    Object.values(this.panelItems).forEach(item => {
+      item.destroy();
+    });
+  }
+
   /**
    * 初始化面板成员控制器
    *
@@ -185,6 +193,8 @@ export class PanelController<
     // 转换数据，处理原始数据和面板项的映射。
     const panelData = this.convertData(data);
 
+    // 清空上一个，如果存在的话。
+    this.data.destroy?.();
     this.state.data = panelData;
     this.panelStateNotify(PanelNotifyState.LOAD);
   }
@@ -223,9 +233,18 @@ export class PanelController<
    * @returns {*}  {IData}
    * @memberof PanelController
    */
-  convertData(data: IData): IData {
+  convertData(data: IData): PanelData {
     const fields = getAllPanelField(this.model);
-    return new PanelData(fields, data);
+    const fieldKeys = fields.map(item => item.id!);
+    const panelData = new PanelData(fields, data);
+
+    // 面板属性变更的触发变更通知
+    panelData._evt.on('change', key => {
+      if (fieldKeys.includes(key)) {
+        this.dataChangeNotify([key]);
+      }
+    });
+    return panelData;
   }
 
   /**
@@ -270,7 +289,6 @@ export class PanelController<
 
     // 改变值
     this.state.data[name] = value;
-    this.dataChangeNotify([name]);
   }
 
   protected initControlScheduler(logics: IControlLogic[] = []): void {

package/src/interface/controller/controller/control/panel-item/i-panel-item.controller.ts

@@ -52,4 +52,11 @@ export interface IPanelItemController {
    * @date 2022-09-20 18:09:07
    */
   panelStateNotify(state: PanelNotifyState): Promise<void>;
+
+  /**
+   * 销毁方法
+   * @author lxm
+   * @date 2023-11-02 03:31:29
+   */
+  destroy(): void;
 }

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

@@ -76,12 +76,12 @@ export interface IMapData {
   _id: string;
 
   /**
-   * 类型
+   * 呈现样式
    * @author lxm
-   * @date 2023-10-30 06:20:14
-   * @type {('point' | 'area')}
+   * @date 2023-11-02 04:59:12
+   * @type {string}
    */
-  _type: 'point' | 'area';
+  _itemStyle: string;
 
   /**
    * 地图项id

package/src/logic-scheduler/executor/app-ui-logic-executor.ts

@@ -12,7 +12,7 @@ import {
 import { notNilEmpty } from 'qx-util';
 import { OpenAppViewCommand } from '../../command';
 import { IModalData, IUILogicParams } from '../../interface';
-import { calcDeCodeNameById, getFormTypeFieldName } from '../../model';
+import { calcDeCodeNameById } from '../../model';
 import { convertNavData } from '../../utils';
 import { LogicExecutor } from './logic-executor';
 import { Srfuf } from '../../service';
@@ -47,16 +47,13 @@ export class AppUILogicExecutor extends LogicExecutor {
   }
 
   /**
-   * 执行应用预置界面逻辑opendata
+   * 执行应用预置界面逻辑 opendata
    *
-   * @author lxm
-   * @date 2022-08-22 14:08:03
-   * @export
-   * @param {IPSAppUIOpenDataLogic} appUILogic 应用预置界面逻辑opendata模型对象
-   * @param {IContext} context 上下文参数
-   * @param {(IData | null)} data 数据集合
-   * @param {IParams} params 视图参数
-   * @param {IData} [opts] 额外参数，event是js原生事件
+   * @author chitanda
+   * @date 2023-11-02 11:11:36
+   * @param {IAppUIOpenDataLogic} appUILogic 应用预置界面逻辑 opendata 模型对象
+   * @param {IUILogicParams} parameters
+   * @return {*}  {Promise<IModalData>}
    */
   async executeOpenDataAppUILogic(
     appUILogic: IAppUIOpenDataLogic,
@@ -67,6 +64,7 @@ export class AppUILogicExecutor extends LogicExecutor {
     if (!data?.[0]) {
       throw new RuntimeError('opendata没有可操作数据！');
     }
+    // openDataAppViews 只有[索引实体]或[多表单实体]才会有值
     const openViewRefs = appUILogic.openDataAppViews;
     let openViewRef: IAppUILogicRefViewBase | undefined;
     if (openViewRefs) {
@@ -118,18 +116,21 @@ export class AppUILogicExecutor extends LogicExecutor {
     appUILogic: IAppUIOpenDataLogic,
     parameters: IUILogicParams,
   ): Promise<IAppUILogicRefViewBase> {
-    const appDataEntityId = parameters.view.model.appDataEntityId!;
-    // 表单类型属性
-    const formTypeName = await getFormTypeFieldName(appDataEntityId);
-    if (!formTypeName) {
+    const appDataEntity = await ibiz.hub.getAppDataEntity(
+      parameters.view.model.appDataEntityId!,
+    )!;
+    // [多表单实体] or [索引实体]类型属性
+    const typeFileName =
+      appDataEntity.formTypeAppDEFieldId || appDataEntity.dataTypeAppDEFieldId;
+    if (!typeFileName) {
       throw new RuntimeModelError(
         appUILogic,
-        `${appDataEntityId}实体缺少表单类型应用实体属性`,
+        `${appDataEntity.codeName}[多表单实体] or [索引实体]缺少类型属性配置`,
       );
     }
     const { data } = parameters;
     // 表单类型值
-    const formTypeValue = data[0][formTypeName];
+    const formTypeValue = data[0][typeFileName];
     if (!formTypeValue) {
       throw new RuntimeModelError(appUILogic, '数据源无表单类型应用实体属性值');
     }

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();
+  }
 }