@ibiz-template/runtime 0.2.9 → 0.2.10

package/out/controller/control/map/map.controller.js

@@ -57,10 +57,10 @@ export class MapController extends MDControlController {
         const tempareaData = [];
         const temppointData = [];
         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/out/controller/control/panel/panel/panel-item.controller.d.ts

@@ -65,6 +65,7 @@ export declare class PanelItemController<T extends IPanelItem = IPanelItem> impl
      */
     init(): Promise<void>;
     protected onInit(): Promise<void>;
+    destroy(): void;
     /**
      * 创建面板状态对象
      *

package/out/controller/control/panel/panel/panel-item.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"panel-item.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/panel/panel/panel-item.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EACL,oBAAoB,EACpB,gBAAgB,EAChB,6BAA6B,EAC9B,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,qBAAa,mBAAmB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,CAChE,YAAW,oBAAoB;aAgEb,KAAK,EAAE,CAAC;aACR,KAAK,EAAE,eAAe;aACtB,MAAM,CAAC;IAhEzB;;;;;;OAMG;IACH,KAAK,EAAE,cAAc,CAAC;IAEtB;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,gBAAgB,GAAG,6BAA6B,CAEjE;IAED;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED;;;;;;OAMG;IACH,IAAI,cAAc,IAAI,MAAM,EAAE,CAE7B;IAED;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,MAAM,EAAE,CAEzB;IAED;;;;;;;OAOG;gBAEe,KAAK,EAAE,CAAC,EACR,KAAK,EAAE,eAAe,EACtB,MAAM,CAAC,6CAAqB;IAK9C;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAoBvC;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,IAAI,cAAc;IAIvC;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAatD;;;;;OAKG;IACG,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAa/D;;;;;OAKG;IACH,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAsBnC;;;;;OAKG;IACH,eAAe,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAsBlC;;;;;OAKG;IACH,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAsBnC;;;;;OAKG;IACH,SAAS,CAAC,eAAe,EAAE;QACzB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,CAIC;IAEF;;;;;;;;;;OAUG;IACH,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,GAAE,OAAe,GAAG,IAAI;IAmC5E;;;;;;OAMG;IACH,cAAc,CACZ,KAAK,EAAE,oBAAoB,GAC1B,gBAAgB,GAAG,6BAA6B;IAWnD;;;;;OAKG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAe1C;;;;OAIG;IACH,OAAO,IAAI,IAAI;CAMhB"}
+{"version":3,"file":"panel-item.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/panel/panel/panel-item.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EACL,oBAAoB,EACpB,gBAAgB,EAChB,6BAA6B,EAC9B,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,qBAAa,mBAAmB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,CAChE,YAAW,oBAAoB;aAgEb,KAAK,EAAE,CAAC;aACR,KAAK,EAAE,eAAe;aACtB,MAAM,CAAC;IAhEzB;;;;;;OAMG;IACH,KAAK,EAAE,cAAc,CAAC;IAEtB;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,gBAAgB,GAAG,6BAA6B,CAEjE;IAED;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED;;;;;;OAMG;IACH,IAAI,cAAc,IAAI,MAAM,EAAE,CAE7B;IAED;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,MAAM,EAAE,CAEzB;IAED;;;;;;;OAOG;gBAEe,KAAK,EAAE,CAAC,EACR,KAAK,EAAE,eAAe,EACtB,MAAM,CAAC,6CAAqB;IAK9C;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAoBvC,OAAO,IAAI,IAAI;IAEf;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,IAAI,cAAc;IAIvC;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAatD;;;;;OAKG;IACG,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAa/D;;;;;OAKG;IACH,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAsBnC;;;;;OAKG;IACH,eAAe,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAsBlC;;;;;OAKG;IACH,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAsBnC;;;;;OAKG;IACH,SAAS,CAAC,eAAe,EAAE;QACzB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,CAIC;IAEF;;;;;;;;;;OAUG;IACH,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,GAAE,OAAe,GAAG,IAAI;IAmC5E;;;;;;OAMG;IACH,cAAc,CACZ,KAAK,EAAE,oBAAoB,GAC1B,gBAAgB,GAAG,6BAA6B;IAWnD;;;;;OAKG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAe1C;;;;OAIG;IACH,OAAO,IAAI,IAAI;CAMhB"}

package/out/controller/control/panel/panel/panel-item.controller.js

@@ -94,6 +94,7 @@ export class PanelItemController {
             this.state.class.label.push(labelSysCss.cssName);
         }
     }
+    destroy() { }
     /**
      * 创建面板状态对象
      *

package/out/controller/control/panel/panel/panel.controller.d.ts

@@ -1,5 +1,6 @@
 import { IControlLogic, IPanel, IPanelItem } from '@ibiz/model-core';
 import { IPanelState, IPanelEvent, IPanelController, IPanelItemController, IPanelItemProvider, IControlProvider, IPanelItemContainerController } from '../../../../interface';
+import { PanelData } from '../../../../service/vo';
 import { ControlController } from '../../../common';
 import { PanelNotifyState } from '../../../constant';
 import { ControllerEvent } from '../../../utils';
@@ -57,6 +58,7 @@ export declare class PanelController<T extends IPanel = IPanel, S extends IPanel
     getData(): IData[];
     protected onCreated(): Promise<void>;
     protected onMounted(): Promise<void>;
+    protected onDestroyed(): Promise<void>;
     /**
      * 初始化面板成员控制器
      *
@@ -91,7 +93,7 @@ export declare class PanelController<T extends IPanel = IPanel, S extends IPanel
      * @returns {*}  {IData}
      * @memberof PanelController
      */
-    convertData(data: IData): IData;
+    convertData(data: IData): PanelData;
     /**
      * 通知所有面板成员面板操作过程中的数据变更
      *

package/out/controller/control/panel/panel/panel.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"panel.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/panel/panel/panel.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,aAAa,EACb,MAAM,EAEN,UAAU,EAEX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,WAAW,EACX,WAAW,EACX,gBAAgB,EAChB,oBAAoB,EACpB,kBAAkB,EAClB,gBAAgB,EAChB,6BAA6B,EAC9B,MAAM,uBAAuB,CAAC;AAI/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD;;;;;;;;GAQG;AACH,qBAAa,eAAe,CACxB,CAAC,SAAS,MAAM,GAAG,MAAM,EACzB,CAAC,SAAS,WAAW,GAAG,WAAW,EACnC,CAAC,SAAS,WAAW,GAAG,WAAW,CAErC,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,gBAAgB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEpC,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,WAAW,CAAC,CAEjD;IAED;;;;;;OAMG;IACH,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,CAAA;KAAE,CAAM;IAEzD;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB,GAAG,gBAAgB,CAAA;KAAE,CAAM;IAEzE;;;;;;;OAOG;IACH,SAAS,EAAE,KAAK,GAAG,SAAS,CAAC;IAE7B;;;;;;;OAOG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAK3B,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,SAAS,GAAG,IAAI;IAI3C,OAAO,IAAI,KAAK,EAAE;cAIF,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAgB1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1C;;;;;;OAMG;cACa,wBAAwB,CACtC,UAAU,GAAE,UAAU,EAAE,GAAG,SAAqC,EAChE,KAAK,GAAE,eAAsB,EAC7B,MAAM,GAAE,6BAA6B,GAAG,SAAqB,GAC5D,OAAO,CAAC,IAAI,CAAC;IAyChB;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAa3B;;;;;;;OAOG;IACG,WAAW,IAAI,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC;IAiB/C;;;;;;;;OAQG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,KAAK;IAK/B;;;;;;OAMG;IACH,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI;IAMvC;;;;;OAKG;IACH,gBAAgB,CAAC,KAAK,EAAE,gBAAgB,GAAG,IAAI;IAM/C;;;;;OAKG;IACG,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAc/D,SAAS,CAAC,oBAAoB,CAAC,MAAM,GAAE,aAAa,EAAO,GAAG,IAAI;CAcnE"}
+{"version":3,"file":"panel.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/panel/panel/panel.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,aAAa,EACb,MAAM,EAEN,UAAU,EAEX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,WAAW,EACX,WAAW,EACX,gBAAgB,EAChB,oBAAoB,EACpB,kBAAkB,EAClB,gBAAgB,EAChB,6BAA6B,EAC9B,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD;;;;;;;;GAQG;AACH,qBAAa,eAAe,CACxB,CAAC,SAAS,MAAM,GAAG,MAAM,EACzB,CAAC,SAAS,WAAW,GAAG,WAAW,EACnC,CAAC,SAAS,WAAW,GAAG,WAAW,CAErC,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,gBAAgB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEpC,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,WAAW,CAAC,CAEjD;IAED;;;;;;OAMG;IACH,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,CAAA;KAAE,CAAM;IAEzD;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB,GAAG,gBAAgB,CAAA;KAAE,CAAM;IAEzE;;;;;;;OAOG;IACH,SAAS,EAAE,KAAK,GAAG,SAAS,CAAC;IAE7B;;;;;;;OAOG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAK3B,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,SAAS,GAAG,IAAI;IAI3C,OAAO,IAAI,KAAK,EAAE;cAIF,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAgB1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAI1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ5C;;;;;;OAMG;cACa,wBAAwB,CACtC,UAAU,GAAE,UAAU,EAAE,GAAG,SAAqC,EAChE,KAAK,GAAE,eAAsB,EAC7B,MAAM,GAAE,6BAA6B,GAAG,SAAqB,GAC5D,OAAO,CAAC,IAAI,CAAC;IAyChB;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAe3B;;;;;;;OAOG;IACG,WAAW,IAAI,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC;IAiB/C;;;;;;;;OAQG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,SAAS;IAcnC;;;;;;OAMG;IACH,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI;IAMvC;;;;;OAKG;IACH,gBAAgB,CAAC,KAAK,EAAE,gBAAgB,GAAG,IAAI;IAM/C;;;;;OAKG;IACG,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAa/D,SAAS,CAAC,oBAAoB,CAAC,MAAM,GAAE,aAAa,EAAO,GAAG,IAAI;CAcnE"}

package/out/controller/control/panel/panel/panel.controller.js

@@ -72,6 +72,14 @@ export class PanelController extends ControlController {
     async onMounted() {
         this.load();
     }
+    async onDestroyed() {
+        var _a, _b;
+        await super.onDestroyed();
+        (_b = (_a = this.data).destroy) === null || _b === void 0 ? void 0 : _b.call(_a);
+        Object.values(this.panelItems).forEach(item => {
+            item.destroy();
+        });
+    }
     /**
      * 初始化面板成员控制器
      *
@@ -112,6 +120,7 @@ export class PanelController extends ControlController {
      * @memberof PanelController
      */
     async load() {
+        var _a, _b;
         // 准备面板数据
         const data = await this.prepareData();
         if (!data) {
@@ -119,6 +128,8 @@ export class PanelController extends ControlController {
         }
         // 转换数据，处理原始数据和面板项的映射。
         const panelData = this.convertData(data);
+        // 清空上一个，如果存在的话。
+        (_b = (_a = this.data).destroy) === null || _b === void 0 ? void 0 : _b.call(_a);
         this.state.data = panelData;
         this.panelStateNotify(PanelNotifyState.LOAD);
     }
@@ -157,7 +168,15 @@ export class PanelController extends ControlController {
      */
     convertData(data) {
         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;
     }
     /**
      * 通知所有面板成员面板操作过程中的数据变更
@@ -196,7 +215,6 @@ export class PanelController extends ControlController {
         }
         // 改变值
         this.state.data[name] = value;
-        this.dataChangeNotify([name]);
     }
     initControlScheduler(logics = []) {
         const actualLogics = [...logics];

package/out/interface/controller/controller/control/panel-item/i-panel-item.controller.d.ts

@@ -47,5 +47,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;
 }
 //# sourceMappingURL=i-panel-item.controller.d.ts.map

package/out/interface/controller/controller/control/panel-item/i-panel-item.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-panel-item.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/interface/controller/controller/control/panel-item/i-panel-item.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,6BAA6B,EAAE,MAAM,qCAAqC,CAAC;AAEpF,MAAM,WAAW,oBAAoB;IACnC;;;;;OAKG;IACH,KAAK,EAAE,UAAU,CAAC;IAClB;;;;;OAKG;IACH,KAAK,EAAE,gBAAgB,CAAC;IAExB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,6BAA6B,CAAC;IAEvC;;;;;OAKG;IACH,KAAK,EAAE,eAAe,CAAC;IAEvB;;;;;;OAMG;IACH,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjD;;;;;OAKG;IACH,gBAAgB,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1D"}
+{"version":3,"file":"i-panel-item.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/interface/controller/controller/control/panel-item/i-panel-item.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,6BAA6B,EAAE,MAAM,qCAAqC,CAAC;AAEpF,MAAM,WAAW,oBAAoB;IACnC;;;;;OAKG;IACH,KAAK,EAAE,UAAU,CAAC;IAClB;;;;;OAKG;IACH,KAAK,EAAE,gBAAgB,CAAC;IAExB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,6BAA6B,CAAC;IAEvC;;;;;OAKG;IACH,KAAK,EAAE,eAAe,CAAC;IAEvB;;;;;;OAMG;IACH,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjD;;;;;OAKG;IACH,gBAAgB,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzD;;;;OAIG;IACH,OAAO,IAAI,IAAI,CAAC;CACjB"}

package/out/interface/controller/state/control/i-map.state.d.ts

@@ -67,12 +67,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
      * @author lxm

package/out/interface/controller/state/control/i-map.state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-map.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-map.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD;;;;;;;GAOG;AACH,MAAM,WAAW,SAAU,SAAQ,eAAe;IAChD,KAAK,EAAE,QAAQ,EAAE,CAAC;IAElB;;;;;OAKG;IACH,SAAS,EAAE,QAAQ,EAAE,CAAC;IAEtB;;;;;OAKG;IACH,QAAQ,EAAE,QAAQ,EAAE,CAAC;IAErB;;;;;OAKG;IACH,WAAW,EAAE,OAAO,CAAC;IAErB;;;;;OAKG;IACH,eAAe,EAAE,MAAM,GAAG,MAAM,CAAC;IAEjC;;;;;OAKG;IACH,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC;IAE1B;;;;;OAKG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;;;GAKG;AACH,MAAM,WAAW,QAAQ;IACvB;;;;;OAKG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;;;;OAKG;IACH,KAAK,EAAE,OAAO,GAAG,MAAM,CAAC;IAExB;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;;OAKG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB"}
+{"version":3,"file":"i-map.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-map.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD;;;;;;;GAOG;AACH,MAAM,WAAW,SAAU,SAAQ,eAAe;IAChD,KAAK,EAAE,QAAQ,EAAE,CAAC;IAElB;;;;;OAKG;IACH,SAAS,EAAE,QAAQ,EAAE,CAAC;IAEtB;;;;;OAKG;IACH,QAAQ,EAAE,QAAQ,EAAE,CAAC;IAErB;;;;;OAKG;IACH,WAAW,EAAE,OAAO,CAAC;IAErB;;;;;OAKG;IACH,eAAe,EAAE,MAAM,GAAG,MAAM,CAAC;IAEjC;;;;;OAKG;IACH,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC;IAE1B;;;;;OAKG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;;;GAKG;AACH,MAAM,WAAW,QAAQ;IACvB;;;;;OAKG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;;OAKG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB"}

package/out/logic-scheduler/executor/app-ui-logic-executor.d.ts

@@ -13,16 +13,13 @@ export declare class AppUILogicExecutor extends LogicExecutor {
     type: 'APPUILOGIC';
     execute(executeParams: IUILogicParams): any;
     /**
-     * 执行应用预置界面逻辑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>}
      */
     executeOpenDataAppUILogic(appUILogic: IAppUIOpenDataLogic, parameters: IUILogicParams): Promise<IModalData>;
     protected calcOpenViewRef(appUILogic: IAppUIOpenDataLogic, parameters: IUILogicParams): Promise<IAppUILogicRefViewBase>;

package/out/logic-scheduler/executor/app-ui-logic-executor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-ui-logic-executor.d.ts","sourceRoot":"","sources":["../../../src/logic-scheduler/executor/app-ui-logic-executor.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,mBAAmB,EAEnB,kBAAkB,EAClB,sBAAsB,EACvB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAG7D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD;;;;;;;GAOG;AACH,qBAAa,kBAAmB,SAAQ,aAAa;IAC3C,IAAI,EAAE,YAAY,CAAC;IAG3B,OAAO,CAAC,aAAa,EAAE,cAAc,GAAG,GAAG;IAiB3C;;;;;;;;;;;OAWG;IACG,yBAAyB,CAC7B,UAAU,EAAE,mBAAmB,EAC/B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,UAAU,CAAC;cAqDN,eAAe,CAC7B,UAAU,EAAE,mBAAmB,EAC/B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,sBAAsB,CAAC;IA2BlC;;;;;;;;;;;OAWG;IACG,wBAAwB,CAC5B,UAAU,EAAE,kBAAkB,EAC9B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,UAAU,CAAC;IAyFtB;;;;;;;;;;OAUG;cACa,mBAAmB,CACjC,UAAU,EAAE,kBAAkB,EAC9B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;IAmC9C;;;;;;;;;;OAUG;cACa,UAAU,CACxB,UAAU,EAAE,mBAAmB,EAC/B,UAAU,EAAE,KAAK,EAAE,EACnB,OAAO,EAAE,QAAQ,EACjB,UAAU,EAAE,sBAAsB,GACjC,OAAO,CAAC,IAAI,CAAC;CA+DjB"}
+{"version":3,"file":"app-ui-logic-executor.d.ts","sourceRoot":"","sources":["../../../src/logic-scheduler/executor/app-ui-logic-executor.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,mBAAmB,EAEnB,kBAAkB,EAClB,sBAAsB,EACvB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAG7D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD;;;;;;;GAOG;AACH,qBAAa,kBAAmB,SAAQ,aAAa;IAC3C,IAAI,EAAE,YAAY,CAAC;IAG3B,OAAO,CAAC,aAAa,EAAE,cAAc,GAAG,GAAG;IAiB3C;;;;;;;;OAQG;IACG,yBAAyB,CAC7B,UAAU,EAAE,mBAAmB,EAC/B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,UAAU,CAAC;cAsDN,eAAe,CAC7B,UAAU,EAAE,mBAAmB,EAC/B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,sBAAsB,CAAC;IA8BlC;;;;;;;;;;;OAWG;IACG,wBAAwB,CAC5B,UAAU,EAAE,kBAAkB,EAC9B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,UAAU,CAAC;IAyFtB;;;;;;;;;;OAUG;cACa,mBAAmB,CACjC,UAAU,EAAE,kBAAkB,EAC9B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;IAmC9C;;;;;;;;;;OAUG;cACa,UAAU,CACxB,UAAU,EAAE,mBAAmB,EAC/B,UAAU,EAAE,KAAK,EAAE,EACnB,OAAO,EAAE,QAAQ,EACjB,UAAU,EAAE,sBAAsB,GACjC,OAAO,CAAC,IAAI,CAAC;CA+DjB"}

package/out/logic-scheduler/executor/app-ui-logic-executor.js

@@ -12,7 +12,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 import { ModelError, RuntimeError, RuntimeModelError, } from '@ibiz-template/core';
 import { notNilEmpty } from 'qx-util';
 import { OpenAppViewCommand } from '../../command';
-import { calcDeCodeNameById, getFormTypeFieldName } from '../../model';
+import { calcDeCodeNameById } from '../../model';
 import { convertNavData } from '../../utils';
 import { LogicExecutor } from './logic-executor';
 import { Srfuf } from '../../service';
@@ -37,16 +37,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, parameters) {
         const { context, params } = parameters, rest = __rest(parameters, ["context", "params"]);
@@ -54,6 +51,7 @@ export class AppUILogicExecutor extends LogicExecutor {
         if (!(data === null || data === void 0 ? void 0 : data[0])) {
             throw new RuntimeError('opendata没有可操作数据！');
         }
+        // openDataAppViews 只有[索引实体]或[多表单实体]才会有值
         const openViewRefs = appUILogic.openDataAppViews;
         let openViewRef;
         if (openViewRefs) {
@@ -84,15 +82,15 @@ export class AppUILogicExecutor extends LogicExecutor {
         return ibiz.commands.execute(OpenAppViewCommand.TAG, openView, tempContext, tempParams, rest);
     }
     async calcOpenViewRef(appUILogic, parameters) {
-        const appDataEntityId = parameters.view.model.appDataEntityId;
-        // 表单类型属性
-        const formTypeName = await getFormTypeFieldName(appDataEntityId);
-        if (!formTypeName) {
-            throw new RuntimeModelError(appUILogic, `${appDataEntityId}实体缺少表单类型应用实体属性`);
+        const appDataEntity = await ibiz.hub.getAppDataEntity(parameters.view.model.appDataEntityId);
+        // [多表单实体] or [索引实体]类型属性
+        const typeFileName = appDataEntity.formTypeAppDEFieldId || appDataEntity.dataTypeAppDEFieldId;
+        if (!typeFileName) {
+            throw new RuntimeModelError(appUILogic, `${appDataEntity.codeName}[多表单实体] or [索引实体]缺少类型属性配置`);
         }
         const { data } = parameters;
         // 表单类型值
-        const formTypeValue = data[0][formTypeName];
+        const formTypeValue = data[0][typeFileName];
         if (!formTypeValue) {
             throw new RuntimeModelError(appUILogic, '数据源无表单类型应用实体属性值');
         }

package/out/model/data-entity/data-entity.d.ts

@@ -26,17 +26,6 @@ export declare function hasDeCodeName(params: IParams, entityId: string): boolea
  * @Date: 2023-05-31 10:26:24
  */
 export declare function getDeACMode(appDEACModeId: string, entityId: string, srfappid?: string): Promise<IAppDEACMode | undefined>;
-/**
- * 从实体里找到表单类型应用实体属性
- *
- * @author zk
- * @date 2023-09-07 05:09:41
- * @export
- * @param {string} entityId
- * @param {string} [srfappid]
- * @return {*}  {(Promise<string | undefined>)}
- */
-export declare function getFormTypeFieldName(entityId: string): Promise<string | undefined>;
 /**
  * 从实体里找到实体逻辑
  * @author lxm

package/out/model/data-entity/data-entity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data-entity.d.ts","sourceRoot":"","sources":["../../../src/model/data-entity/data-entity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,YAAY,EACZ,WAAW,EACX,QAAQ,EACT,MAAM,kBAAkB,CAAC;AAG1B;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAGrD;AAED;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAGxE;AAED;;;;;GAKG;AACH,wBAAsB,WAAW,CAC/B,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CAMnC;AAED;;;;;;;;;GASG;AACH,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAG7B;AAED;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CACzB,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,cAAc,GACrB,QAAQ,GAAG,SAAS,CAEtB;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,GACrC,QAAQ,EAAE,CAYZ;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,MAAM,GACd,WAAW,GAAG,SAAS,CAEzB"}
+{"version":3,"file":"data-entity.d.ts","sourceRoot":"","sources":["../../../src/model/data-entity/data-entity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,YAAY,EACZ,WAAW,EACX,QAAQ,EACT,MAAM,kBAAkB,CAAC;AAG1B;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAGrD;AAED;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAGxE;AAED;;;;;GAKG;AACH,wBAAsB,WAAW,CAC/B,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CAMnC;AAED;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CACzB,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,cAAc,GACrB,QAAQ,GAAG,SAAS,CAEtB;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,GACrC,QAAQ,EAAE,CAYZ;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,MAAM,GACd,WAAW,GAAG,SAAS,CAEzB"}

package/out/model/data-entity/data-entity.js

@@ -39,20 +39,6 @@ export async function getDeACMode(appDEACModeId, entityId, srfappid) {
     });
     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) {
-    const appDataEntity = await ibiz.hub.getAppDataEntity(entityId);
-    return appDataEntity.formTypeAppDEFieldId;
-}
 /**
  * 从实体里找到实体逻辑
  * @author lxm

package/out/service/vo/map-data/map-data.d.ts

@@ -3,7 +3,7 @@ import { IMapData } from '../../../interface';
 export declare class MapData implements IMapData {
     [key: string | symbol]: any;
     _id: string;
-    _type: 'point' | 'area';
+    _itemStyle: string;
     _mapItemId: string;
     _longitude?: string;
     _latitude?: string;

package/out/service/vo/map-data/map-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"map-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/map-data/map-data.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAgB9C,qBAAa,OAAQ,YAAW,QAAQ;IAEtC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B,GAAG,EAAE,MAAM,CAAC;IAEZ,KAAK,EAAE,OAAO,GAAG,MAAM,CAAC;IAExB,UAAU,EAAE,MAAM,CAAC;IAEnB,UAAU,CAAC,EAAE,MAAM,CAAa;IAEhC,SAAS,CAAC,EAAE,MAAM,CAAa;IAE/B,SAAS,CAAC,EAAE,MAAM,CAAa;IAE/B,QAAQ,CAAC,EAAE,MAAM,CAAa;IAE9B,MAAM,CAAC,EAAE,MAAM,CAAa;IAE5B,KAAK,CAAC,EAAE,MAAM,CAAa;IAE3B,OAAO,CAAC,EAAE,MAAM,CAAa;gBAEjB,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,WAAW;CAgFhD"}
+{"version":3,"file":"map-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/map-data/map-data.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAkB9C,qBAAa,OAAQ,YAAW,QAAQ;IAEtC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B,GAAG,EAAE,MAAM,CAAC;IAEZ,UAAU,EAAE,MAAM,CAAC;IAEnB,UAAU,EAAE,MAAM,CAAC;IAEnB,UAAU,CAAC,EAAE,MAAM,CAAa;IAEhC,SAAS,CAAC,EAAE,MAAM,CAAa;IAE/B,SAAS,CAAC,EAAE,MAAM,CAAa;IAE/B,QAAQ,CAAC,EAAE,MAAM,CAAa;IAE9B,MAAM,CAAC,EAAE,MAAM,CAAa;IAE5B,KAAK,CAAC,EAAE,MAAM,CAAa;IAE3B,OAAO,CAAC,EAAE,MAAM,CAAa;gBAEjB,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,WAAW;CAgFhD"}

package/out/service/vo/map-data/map-data.js

@@ -11,6 +11,7 @@ function updateKeyDefine(target, keys) {
         }
     });
 }
+const AreaItemStyles = ['REGION', 'REGION2', 'REGION3', 'REGION4'];
 export class MapData {
     constructor(deData, mapItem) {
         this._longitude = undefined;
@@ -20,12 +21,12 @@ export class MapData {
         this._value = undefined;
         this._text = undefined;
         this._symbol = undefined;
-        const { id, itemType, longitudeAppDEFieldId, latitudeAppDEFieldId, textAppDEFieldId, dataAppDEFieldId, tipsAppDEFieldId, sysImage, } = mapItem;
+        const { id, itemStyle, longitudeAppDEFieldId, latitudeAppDEFieldId, textAppDEFieldId, dataAppDEFieldId, tipsAppDEFieldId, sysImage, } = mapItem;
         const keyMap = new Map();
         this._id = id + deData.srfkey;
-        this._type = itemType;
+        this._itemStyle = itemStyle;
         this._mapItemId = id;
-        if (itemType === 'area') {
+        if (AreaItemStyles.includes(this._itemStyle)) {
             if (longitudeAppDEFieldId) {
                 keyMap.set('_areaCode', longitudeAppDEFieldId);
             }

package/out/service/vo/panel-data/panel-data.d.ts

@@ -1,4 +1,6 @@
 import { IPanelField } from '@ibiz/model-core';
+import { QXEvent } from 'qx-util';
+type ChangeCallBack = (field: string) => void;
 /**
  * 面板数据
  * @author lxm
@@ -9,13 +11,16 @@ import { IPanelField } from '@ibiz/model-core';
 export declare 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 _origin?: IParams;
+    _evt: QXEvent<{
+        change: ChangeCallBack;
+    }>;
     constructor(fields: IPanelField[], origin: IParams);
+    destroy(): void;
 }
+export {};
 //# sourceMappingURL=panel-data.d.ts.map

package/out/service/vo/panel-data/panel-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"panel-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/panel-data/panel-data.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAgB/C;;;;;;GAMG;AACH,qBAAa,SAAS;IAEpB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B;;;;;;OAMG;IACH,UAAkB,OAAO,CAAC,EAAE,OAAO,CAAC;gBAExB,MAAM,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,OAAO;CAsDnD"}
+{"version":3,"file":"panel-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/panel-data/panel-data.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAgBlC,KAAK,cAAc,GAAG,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;AAE9C;;;;;;GAMG;AACH,qBAAa,SAAS;IAEpB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B;;;;;OAKG;IACK,IAAI,EAAE,OAAO,CAAC;QAAE,MAAM,EAAE,cAAc,CAAA;KAAE,CAAC,CAAC;gBAEtC,MAAM,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,OAAO;IAoElD,OAAO,IAAI,IAAI;CAGhB"}

package/out/service/vo/panel-data/panel-data.js

@@ -1,4 +1,5 @@
 /* eslint-disable no-constructor-return */
+import { QXEvent } from 'qx-util';
 // 更新属性，缺的补充定义
 function updateKeyDefine(target, keys) {
     keys.forEach(key => {
@@ -21,6 +22,7 @@ function updateKeyDefine(target, keys) {
  */
 export class PanelData {
     constructor(fields, origin) {
+        const _evt = new QXEvent();
         // 面板属性映射绑定项
         const keyMap = {};
         // 绑定项映射面板属性
@@ -46,11 +48,23 @@ 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, p, _receiver) {
+                if (p === '_evt') {
+                    return _evt;
+                }
                 // 有映射拿原始对象
                 if (keyMap[p]) {
                     return origin[keyMap[p]];
@@ -70,4 +84,7 @@ export class PanelData {
             },
         });
     }
+    destroy() {
+        this._evt.reset();
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.2.9",
+  "version": "0.2.10",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -59,5 +59,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "1502d43393de4cc75f670d0ba22d901e158e0c00"
+  "gitHead": "0b78d7b2ba35e13ffa52c3214d21d01cc6c301cb"
 }

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, '数据源无表单类型应用实体属性值');
     }