@ibiz-template/runtime 0.2.7 → 0.2.8

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

@@ -0,0 +1,111 @@
+import { IMDControlState } from './i-md-control.state';
+/**
+ * 地图部件状态
+ * @author lxm
+ * @date 2023-05-22 02:18:43
+ * @export
+ * @interface IMapState
+ * @extends {IMDControlState}
+ */
+export interface IMapState extends IMDControlState {
+    items: IMapData[];
+    /**
+     * 点的数据
+     * @author lxm
+     * @date 2023-10-31 09:48:54
+     * @type {IMapData[]}
+     */
+    pointData: IMapData[];
+    /**
+     * 区域的数据
+     * @author lxm
+     * @date 2023-10-31 09:49:02
+     * @type {IMapData[]}
+     */
+    areaData: IMapData[];
+    /**
+     * 当前区域代码
+     * @author lxm
+     * @date 2023-10-31 09:03:23
+     * @type {string}
+     */
+    areaCode: string | number;
+}
+/**
+ * 地图数据格式
+ *
+ * @export
+ * @class ITreeNodeData
+ */
+export interface IMapData {
+    /**
+     * 唯一标识
+     * @author lxm
+     * @date 2023-10-30 06:20:08
+     * @type {string}
+     */
+    _id: string;
+    /**
+     * 类型
+     * @author lxm
+     * @date 2023-10-30 06:20:14
+     * @type {('point' | 'area')}
+     */
+    _type: 'point' | 'area';
+    /**
+     * 地图项id
+     * @author lxm
+     * @date 2023-10-30 06:20:40
+     * @type {string}
+     */
+    _mapItemId: string;
+    /**
+     * 经度
+     * @author lxm
+     * @date 2023-10-30 09:25:34
+     * @type {string}
+     */
+    _longitude?: string;
+    /**
+     * 纬度
+     * @author lxm
+     * @date 2023-10-30 09:25:34
+     * @type {string}
+     */
+    _latitude?: string;
+    /**
+     * 区域标识
+     * @author lxm
+     * @date 2023-10-30 09:26:18
+     */
+    _areaCode?: string;
+    /**
+     * 提示信息
+     * @author lxm
+     * @date 2023-10-30 09:34:47
+     * @type {string}
+     */
+    _tooltip?: string;
+    /**
+     * 统计数据值
+     * @author lxm
+     * @date 2023-10-31 10:47:50
+     * @type {number}
+     */
+    _value?: number;
+    /**
+     * 文本值
+     * @author lxm
+     * @date 2023-10-31 10:47:50
+     * @type {number}
+     */
+    _text?: string;
+    /**
+     * 图标
+     * @author lxm
+     * @date 2023-10-31 10:47:50
+     * @type {number}
+     */
+    _symbol?: string;
+}
+//# sourceMappingURL=i-map.state.d.ts.map

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

@@ -0,0 +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,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC;CAC3B;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"}

package/out/interface/controller/state/control/i-map.state.js

@@ -0,0 +1 @@
+export {};

package/out/interface/controller/state/control/index.d.ts

@@ -34,4 +34,5 @@ export * from './i-tree-grid.state';
 export * from './i-tree-grid-ex.state';
 export * from './i-medit-view-panel.state';
 export * from './i-chart-exp-bar.state';
+export * from './i-map.state';
 //# sourceMappingURL=index.d.ts.map

package/out/interface/controller/state/control/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,YAAY,EACV,eAAe,EACf,kBAAkB,GACnB,MAAM,uBAAuB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAClC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,uBAAuB,CAAC;AACtC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,yBAAyB,CAAC;AACxC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,sBAAsB,CAAC;AACrC,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,yBAAyB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,YAAY,EACV,eAAe,EACf,kBAAkB,GACnB,MAAM,uBAAuB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAClC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,uBAAuB,CAAC;AACtC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,yBAAyB,CAAC;AACxC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,sBAAsB,CAAC;AACrC,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,yBAAyB,CAAC;AACxC,cAAc,eAAe,CAAC"}

package/out/interface/controller/state/control/index.js

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

package/out/service/mqtt/mqtt.service.d.ts

@@ -10,6 +10,8 @@ import { QXEvent } from 'qx-util';
  * @class MqttService
  */
 export declare class MqttService {
+    protected mqttTopic: string;
+    protected token: string;
     protected appId: string;
     /**
      * 接受消息通知

package/out/service/mqtt/mqtt.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mqtt.service.d.ts","sourceRoot":"","sources":["../../../src/service/mqtt/mqtt.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AAClD,OAAO,EAAE,OAAO,EAA4B,MAAM,SAAS,CAAC;AAE5D;;;;;;;GAOG;AACH,qBAAa,WAAW;IAmDpB,SAAS,CAAC,KAAK,EAAE,MAAM;IAlDzB;;;;;OAKG;IACH,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC;QAAE,OAAO,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,IAAI,CAAA;KAAE,CAAC,CACjD;IAEhB;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,UAAU,CAAC;IAEpB;;;;;;;OAOG;IACH,SAAS,CAAC,OAAO,EAAE,cAAc,CAU/B;IAEF;;;;;;;;OAQG;gBAED,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACH,KAAK,EAAE,MAAM;IASzB;;;;;;OAMG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA4B9B;;;;;OAKG;IACH,KAAK,IAAI,IAAI;CAGd"}
+{"version":3,"file":"mqtt.service.d.ts","sourceRoot":"","sources":["../../../src/service/mqtt/mqtt.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AAClD,OAAO,EAAE,OAAO,EAA4B,MAAM,SAAS,CAAC;AAE5D;;;;;;;GAOG;AACH,qBAAa,WAAW;IAiDpB,SAAS,CAAC,SAAS,EAAE,MAAM;IAC3B,SAAS,CAAC,KAAK,EAAE,MAAM;IACvB,SAAS,CAAC,KAAK,EAAE,MAAM;IAlDzB;;;;;OAKG;IACH,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC;QAAE,OAAO,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,IAAI,CAAA;KAAE,CAAC,CACjD;IAEhB;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,UAAU,CAAC;IAEpB;;;;;;;OAOG;IACH,SAAS,CAAC,OAAO,EAAE,cAAc,CAU/B;IAEF;;;;;;;;OAQG;gBAES,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM;IASzB;;;;;;OAMG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA6B9B;;;;;OAKG;IACH,KAAK,IAAI,IAAI;CAGd"}

package/out/service/mqtt/mqtt.service.js

@@ -18,6 +18,8 @@ export class MqttService {
      * @param {string} appId
      */
     constructor(mqttTopic, token, appId) {
+        this.mqttTopic = mqttTopic;
+        this.token = token;
         this.appId = appId;
         /**
          * 接受消息通知
@@ -66,6 +68,7 @@ export class MqttService {
         const { location } = window;
         this.client = mqtt.connect(`ws://${location.host}${ibiz.env.baseUrl}/${this.appId}${ibiz.env.mqttUrl}`, this.options);
         this.client.on('connect', () => {
+            this.client.subscribe(this.mqttTopic);
             ibiz.log.debug('mqtt connect');
         });
         this.client.on('error', error => {

package/out/service/vo/index.d.ts

@@ -2,4 +2,5 @@ export * from './control.vo';
 export * from './tree-node-data';
 export * from './ui-map-field';
 export * from './calendar-item-data';
+export * from './map-data';
 //# sourceMappingURL=index.d.ts.map

package/out/service/vo/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/service/vo/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/service/vo/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,YAAY,CAAC"}

package/out/service/vo/index.js

@@ -2,3 +2,4 @@ export * from './control.vo';
 export * from './tree-node-data';
 export * from './ui-map-field';
 export * from './calendar-item-data';
+export * from './map-data';

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

@@ -0,0 +1,2 @@
+export { MapData } from './map-data';
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/map-data/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC"}

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

@@ -0,0 +1 @@
+export { MapData } from './map-data';

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

@@ -0,0 +1,17 @@
+import { ISysMapItem } from '@ibiz/model-core';
+import { IMapData } from '../../../interface';
+export declare class MapData implements IMapData {
+    [key: string | symbol]: any;
+    _id: string;
+    _type: 'point' | 'area';
+    _mapItemId: string;
+    _longitude?: string;
+    _latitude?: string;
+    _areaCode?: string;
+    _tooltip?: string;
+    _value?: number;
+    _text?: string;
+    _symbol?: string;
+    constructor(deData: IData, mapItem: ISysMapItem);
+}
+//# sourceMappingURL=map-data.d.ts.map

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

@@ -0,0 +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"}

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

@@ -0,0 +1,87 @@
+// 更新属性，缺的补充定义
+function updateKeyDefine(target, keys) {
+    keys.forEach(key => {
+        if (!Object.prototype.hasOwnProperty.call(target, key)) {
+            Object.defineProperty(target, key, {
+                enumerable: true,
+                configurable: true,
+                writable: true,
+                value: undefined,
+            });
+        }
+    });
+}
+export class MapData {
+    constructor(deData, mapItem) {
+        this._longitude = undefined;
+        this._latitude = undefined;
+        this._areaCode = undefined;
+        this._tooltip = undefined;
+        this._value = undefined;
+        this._text = undefined;
+        this._symbol = undefined;
+        const { id, itemType, longitudeAppDEFieldId, latitudeAppDEFieldId, textAppDEFieldId, dataAppDEFieldId, tipsAppDEFieldId, sysImage, } = mapItem;
+        const keyMap = new Map();
+        this._id = id + deData.srfkey;
+        this._type = itemType;
+        this._mapItemId = id;
+        if (itemType === 'area') {
+            if (longitudeAppDEFieldId) {
+                keyMap.set('_areaCode', longitudeAppDEFieldId);
+            }
+        }
+        else {
+            if (longitudeAppDEFieldId) {
+                keyMap.set('_longitude', longitudeAppDEFieldId);
+            }
+            if (latitudeAppDEFieldId) {
+                keyMap.set('_latitude', latitudeAppDEFieldId);
+            }
+        }
+        if (tipsAppDEFieldId) {
+            keyMap.set('_tooltip', tipsAppDEFieldId);
+        }
+        if (textAppDEFieldId) {
+            keyMap.set('_text', textAppDEFieldId);
+        }
+        if (dataAppDEFieldId) {
+            keyMap.set('_value', dataAppDEFieldId);
+        }
+        if (sysImage) {
+            this._symbol = sysImage.rawContent || sysImage.imagePath;
+        }
+        return new Proxy(this, {
+            set(target, p, value) {
+                if (Object.prototype.hasOwnProperty.call(deData, p)) {
+                    deData[p] = value;
+                }
+                else if (keyMap.has(p)) {
+                    deData[keyMap.get(p)] = value;
+                }
+                else {
+                    target[p] = value;
+                }
+                return true;
+            },
+            get(target, p, _receiver) {
+                if (target[p] !== undefined) {
+                    return target[p];
+                }
+                if (keyMap.has(p)) {
+                    return deData[keyMap.get(p)];
+                }
+                if (deData[p] !== undefined) {
+                    return deData[p];
+                }
+            },
+            ownKeys(target) {
+                // 整合所有并排除重复
+                const allKeys = [
+                    ...new Set([...Object.keys(target), ...Object.keys(deData)]),
+                ];
+                updateKeyDefine(target, allKeys);
+                return allKeys;
+            },
+        });
+    }
+}

package/out/utils/script/script-function.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"script-function.d.ts","sourceRoot":"","sources":["../../../src/utils/script/script-function.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAmB,MAAM,iBAAiB,CAAC;AASvE,qBAAa,cAAc;IACzB,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAE7B,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,CAAM;IAEjC,SAAS,CAAC,OAAO,EAAE,mBAAmB,CAAC;gBAGrC,OAAO,EAAE,MAAM,EAAE,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,mBAAoC;IAW/C;;;;;;;;OAQG;IACH,SAAS,CAAC,UAAU,CAClB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,mBAAmB,GAC3B,MAAM;IAWT;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,mBAAmB,GAAG,IAAI;IA4B5E;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,GAAG,GAAG,EAAE;IAuB7C;;;;;;;OAOG;IACH,SAAS,CAAC,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI;IA4C9D;;;;;;OAMG;IACH,IAAI,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO;CAI/B"}
+{"version":3,"file":"script-function.d.ts","sourceRoot":"","sources":["../../../src/utils/script/script-function.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAmB,MAAM,iBAAiB,CAAC;AASvE,qBAAa,cAAc;IACzB,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAE7B,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,CAAM;IAEjC,SAAS,CAAC,OAAO,EAAE,mBAAmB,CAAC;gBAGrC,OAAO,EAAE,MAAM,EAAE,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,mBAAoC;IAgB/C;;;;;;;;OAQG;IACH,SAAS,CAAC,UAAU,CAClB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,mBAAmB,GAC3B,MAAM;IAWT;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,mBAAmB,GAAG,IAAI;IA4B5E;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,GAAG,GAAG,EAAE;IAuB7C;;;;;;;OAOG;IACH,SAAS,CAAC,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI;IA4C9D;;;;;;OAMG;IACH,IAAI,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO;CAI/B"}

package/out/utils/script/script-function.js

@@ -16,7 +16,13 @@ export class ScriptFunction {
         this.calcArgKeys(argKeys, options);
         const fn = new Function(...this.argKeys, code);
         this.scriptFn = function callBack(...args) {
-            return fn.apply({}, args);
+            try {
+                return fn.apply({}, args);
+            }
+            catch (error) {
+                console.log('报错脚本', code);
+                throw error;
+            }
         };
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -30,7 +30,7 @@
   "license": "MIT",
   "devDependencies": {
     "@ibiz-template/core": "^0.2.6",
-    "@ibiz/model-core": "^0.0.19",
+    "@ibiz/model-core": "^0.0.20",
     "@types/path-browserify": "^1.0.0",
     "@types/qs": "^6.9.8",
     "@types/systemjs": "^6.13.3",
@@ -47,7 +47,7 @@
   },
   "peerDependencies": {
     "@ibiz-template/core": "^0.1.0",
-    "@ibiz/model-core": "^0.0.19",
+    "@ibiz/model-core": "^0.0.20",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.7",
     "echarts": "^5.4.3",
@@ -59,5 +59,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "2533d04e6de6b0d5b20759a0bb3951491c520ca3"
+  "gitHead": "98917f0e99351acbe3ca6241011ff1da2794e55a"
 }

package/src/controller/common/control/md-control.controller.ts

@@ -1,6 +1,7 @@
 /* eslint-disable max-classes-per-file */
 import { isElementSame, RuntimeError } from '@ibiz-template/core';
 import { IAppDataEntity, IMDControl } from '@ibiz/model-core';
+import { debounce } from 'lodash-es';
 import {
   IMDControlController,
   IMDControlEvent,
@@ -89,7 +90,12 @@ export class MDControlController<
     this.dataEntity.appDEFields?.forEach(field => {
       this.fieldIdNameMap.set(field.id!, field.name!);
     });
-    this.onDataChange = this.onDataChange.bind(this);
+
+    const fn = this.onDataChange.bind(this);
+    this.onDataChange = debounce(msg => {
+      fn(msg);
+    }, 300);
+
     ibiz.mc.command.change.on(this.onDataChange);
 
     // 设置默认排序

package/src/controller/control/form/edit-form/edit-form.controller.ts

@@ -428,6 +428,9 @@ export class EditFormController
     const { context, params } = this.handlerAbilityParams(args);
     try {
       await this.service.wfStart(context, params, this.data);
+      if (this.view.modal.mode === 'ROUTE') {
+        ibiz.mc.command.send(this.data.$origin, 'OBJECTUPDATED');
+      }
     } catch (error) {
       this.actionNotification('WFSTARTERROR', {
         error: error as Error,
@@ -457,6 +460,9 @@ export class EditFormController
     const { context, params } = this.handlerAbilityParams(args);
     try {
       await this.service.wfSubmit(context, params, this.data);
+      if (this.view.modal.mode === 'ROUTE') {
+        ibiz.mc.command.send(this.data.$origin, 'OBJECTUPDATED');
+      }
     } catch (error) {
       this.actionNotification('WFSUBMITERROR', {
         error: error as Error,

package/src/controller/control/grid/grid/grid.controller.ts

@@ -525,10 +525,6 @@ export class GridController
     rowState.data = res.data;
     rowState.modified = false;
 
-    this.actionNotification(`${isCreate ? 'CREATE' : 'UPDATE'}SUCCESS`, {
-      default: `${res.data.srfmajortext || ''}保存成功`,
-      data: res.data,
-    });
     this.gridStateNotify(rowState, GridNotifyState.SAVE);
     await this.evt.emit('onSaveSuccess', undefined);
   }

package/src/controller/control/index.ts

@@ -22,3 +22,4 @@ export * from './kanban/index';
 export * from './tree-grid-ex/index';
 export * from './tree-grid/index';
 export * from './medit-view-panel/index';
+export * from './map/index';

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

@@ -0,0 +1,2 @@
+export * from './map.controller';
+export * from './map.service';

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

@@ -0,0 +1,126 @@
+import { ISysMap } from '@ibiz/model-core';
+import { MapService } from './map.service';
+import {
+  IMapController,
+  IMapData,
+  IMapEvent,
+  IMapState,
+  MDCtrlLoadParams,
+} from '../../../interface';
+import { MDControlController } from '../../common';
+
+export class MapController
+  extends MDControlController<ISysMap, IMapState, IMapEvent>
+  implements IMapController
+{
+  declare service: MapService;
+
+  protected initState(): void {
+    super.initState();
+    this.state.size = 1000;
+    this.state.pointData = [];
+    this.state.areaData = [];
+    this.state.areaCode = 320000;
+  }
+
+  protected async onCreated(): Promise<void> {
+    await super.onCreated();
+    this.service = new MapService(this.model);
+    await this.service.init(this.context);
+  }
+
+  /**
+   * 部件加载数据行为
+   *
+   * @author lxm
+   * @date 2022-08-19 14:08:50
+   */
+  async load(args: MDCtrlLoadParams = {}): Promise<IData[]> {
+    if (this.state.isSimple) {
+      return [];
+    }
+    await this.startLoading();
+    try {
+      // *初始加载需要重置分页
+      const isInitialLoad = args.isInitialLoad === true;
+
+      // *查询参数处理
+      const { context } = this.handlerAbilityParams(args);
+      const params = await this.getFetchParams(args?.viewParam);
+      context.srfareacode = this.state.areaCode;
+
+      const res = await this.service.fetchAll(context, params);
+
+      this.state.items = res.data;
+
+      await this.afterLoad(args, res.data);
+
+      this.state.isLoaded = true;
+      await this._evt.emit('onLoadSuccess', {
+        isInitialLoad,
+      });
+    } catch (error) {
+      await this._evt.emit('onLoadError', undefined);
+      this.actionNotification('FETCHERROR', {
+        error: error as Error,
+      });
+      throw error;
+    } finally {
+      await this.endLoading();
+    }
+
+    this.actionNotification('FETCHSUCCESS');
+    return this.state.items;
+  }
+
+  async afterLoad(args: MDCtrlLoadParams, items: IData[]): Promise<IData[]> {
+    const result = (await super.afterLoad(args, items)) as IMapData[];
+
+    const tempareaData: IMapData[] = [];
+    const temppointData: IMapData[] = [];
+    result.forEach(item => {
+      if (item._type === 'area') {
+        tempareaData.push(item);
+      } else if (item._type === 'point') {
+        temppointData.push(item);
+      }
+    });
+    this.state.pointData = temppointData;
+    this.state.areaData = tempareaData;
+
+    return result;
+  }
+
+  /**
+   * 地图变更事件处理
+   * @author lxm
+   * @date 2023-10-31 05:28:36
+   * @param {(string | number)} areaCode
+   */
+  onMapChange(areaCode: string | number): void {
+    // 修改预置视图参数，然后加载
+    this.state.areaCode = areaCode;
+    this.load({});
+    this.evt.emit('onMapChange', { areaCode });
+  }
+
+  /**
+   * 地图区域点击事件处理
+   * @author lxm
+   * @date 2023-10-31 05:30:54
+   * @param {IMapData} mapData
+   */
+  onAreaClick(mapData: IMapData): void {
+    this.evt.emit('onAreaClick', { data: [mapData] });
+  }
+
+  /**
+   * 地图散点点击事件处理
+   * @author lxm
+   * @date 2023-10-31 05:30:58
+   * @param {IMapData} mapData
+   */
+  onPointClick(mapData: IMapData): void {
+    this.evt.emit('onPointClick', { data: [mapData] });
+  }
+}

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

@@ -0,0 +1,79 @@
+import { HttpResponse, IHttpResponse } from '@ibiz-template/core';
+import { ISysMap } from '@ibiz/model-core';
+import { IMapData } from '../../../interface';
+import { parseUserParams } from '../../../model';
+import { MapData, MDControlService } from '../../../service';
+import { convertNavData, ScriptFactory } from '../../../utils';
+
+/**
+ * 地图部件服务
+ * @author lxm
+ * @date 2023-05-15 09:53:35
+ * @export
+ * @class GridService
+ * @extends {MDControlService<ISysMap>}
+ */
+export class MapService extends MDControlService<ISysMap> {
+  async init(context?: IContext | undefined): Promise<void> {
+    await super.init(context);
+  }
+
+  /**
+   * 加载所有地图项的数据
+   * @author lxm
+   * @date 2023-10-30 06:27:32
+   * @param {IParams} context
+   * @param {IParams} [params={}]
+   * @return {*}  {Promise<IHttpResponse<IMapData[]>>}
+   */
+  async fetchAll(
+    context: IContext,
+    params: IParams = {},
+  ): Promise<IHttpResponse<IMapData[]>> {
+    const allData: IMapData[] = [];
+    // 没有面板项返回空数组
+    if (this.model.sysMapItems?.length) {
+      const app = ibiz.hub.getApp(context.srfappid);
+      await Promise.all(
+        this.model.sysMapItems.map(async mapItem => {
+          const { appDataEntityId, appDEDataSetId, customCond } = mapItem;
+          const _context = context.clone();
+          const _params = { ...params };
+
+          if (customCond) {
+            const customParams = ScriptFactory.execSingleLine(
+              customCond,
+            ) as IData;
+            if (customParams) {
+              const { navigateContexts, navigateParams } =
+                parseUserParams(customParams);
+              if (navigateContexts) {
+                Object.assign(
+                  _context,
+                  convertNavData(navigateContexts, params, context),
+                );
+              }
+              if (navigateParams) {
+                Object.assign(
+                  _params,
+                  convertNavData(navigateContexts, params, context),
+                );
+              }
+            }
+          }
+
+          const res = (await app.deService.exec(
+            appDataEntityId!,
+            appDEDataSetId!,
+            _context,
+            _params,
+          )) as IHttpResponse<IData[]>;
+          if (res.data) {
+            allData.push(...res.data.map(item => new MapData(item, mapItem)));
+          }
+        }),
+      );
+    }
+    return new HttpResponse<IMapData[]>(allData, 200);
+  }
+}