@ibiz-template/runtime 0.2.7 → 0.2.8

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

@@ -172,10 +172,10 @@ export class PanelItemController<T extends IPanelItem = IPanelItem>
    * @param {IData} data
    */
   calcItemDisabled(data: IData): void {
-    let enable = !this.dynaLogicResult.disabled;
+    let { disabled } = this.dynaLogicResult;
 
     // 上层计算为启用时计算预定义项启用逻辑
-    if (enable && this.panel.scheduler) {
+    if (disabled !== true && this.panel.scheduler) {
       const itemEnable = this.panel.scheduler.triggerItemEnable(
         this.model.id!,
         {
@@ -183,12 +183,14 @@ export class PanelItemController<T extends IPanelItem = IPanelItem>
         },
       );
       if (itemEnable !== undefined) {
-        enable = itemEnable;
+        disabled = !itemEnable;
       }
     }
 
-    // 修改state
-    this.state.disabled = !enable;
+    // 有值的时候才会去修改state
+    if (disabled !== undefined) {
+      this.state.disabled = disabled;
+    }
   }
 
   /**
@@ -201,7 +203,7 @@ export class PanelItemController<T extends IPanelItem = IPanelItem>
     let { visible } = this.dynaLogicResult;
 
     // 上层计算为显示时计算预定义项显示逻辑
-    if (visible && this.panel.scheduler) {
+    if (visible !== false && this.panel.scheduler) {
       const itemVIsible = this.panel.scheduler.triggerItemVisible(
         this.model.id!,
         {
@@ -213,8 +215,10 @@ export class PanelItemController<T extends IPanelItem = IPanelItem>
       }
     }
 
-    // 修改state
-    this.state.visible = visible;
+    // 有值的时候才会去修改state
+    if (visible !== undefined) {
+      this.state.visible = visible;
+    }
   }
 
   /**
@@ -224,10 +228,10 @@ export class PanelItemController<T extends IPanelItem = IPanelItem>
    * @param {IData} data
    */
   calcItemRequired(data: IData): void {
-    let allowEmpty = !this.dynaLogicResult.required;
+    let { required } = this.dynaLogicResult;
 
     // 上层计算为启用时计算预定义项启用逻辑
-    if (allowEmpty && this.panel.scheduler) {
+    if (required !== true && this.panel.scheduler) {
       const itemAllowEmpty = this.panel.scheduler.triggerItemBlank(
         this.model.id!,
         {
@@ -235,12 +239,14 @@ export class PanelItemController<T extends IPanelItem = IPanelItem>
         },
       );
       if (itemAllowEmpty !== undefined) {
-        allowEmpty = itemAllowEmpty;
+        required = !itemAllowEmpty;
       }
     }
 
-    // 修改state
-    this.state.required = !allowEmpty;
+    // 有值的时候才会去修改state
+    if (required !== undefined) {
+      this.state.required = required;
+    }
   }
 
   /**
@@ -249,10 +255,14 @@ export class PanelItemController<T extends IPanelItem = IPanelItem>
    * @date 2023-09-21 03:36:37
    * @protected
    */
-  protected dynaLogicResult = {
-    visible: true,
-    disabled: false,
-    required: false,
+  protected dynaLogicResult: {
+    visible?: boolean;
+    disabled?: boolean;
+    required?: boolean;
+  } = {
+    visible: undefined,
+    disabled: undefined,
+    required: undefined,
   };
 
   /**

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

@@ -0,0 +1,15 @@
+import { ISysMap } from '@ibiz/model-core';
+import { IMapEvent } from '../../event';
+import { IMapState } from '../../state';
+import { IMDControlController } from './i-md-control.controller';
+
+/**
+ * 地图控制器
+ * @author lxm
+ * @date 2023-05-04 01:47:16
+ * @export
+ * @interface IChartController
+ * @extends {IMDControlController}
+ */
+export interface IMapController
+  extends IMDControlController<ISysMap, IMapState, IMapEvent> {}

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

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

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

@@ -0,0 +1,48 @@
+import { EventBase } from '../argument';
+import { IMDControlEvent } from './i-md-control.event';
+
+/**
+ * 地图部件事件
+ *
+ * @author lxm
+ * @date 2022-08-30 16:08:43
+ * @export
+ * @interface IMDControlEvent
+ */
+export interface IMapEvent extends IMDControlEvent {
+  /**
+   * 地图变更事件（下探，返回）
+   * @author lxm
+   * @date 2023-03-26 06:15:06
+   * @param {emitArgs} undefined
+   * @return {*}  {Promise<void>}
+   */
+  onMapChange: {
+    event: EventBase & { areaCode: string | number };
+    emitArgs: { areaCode: string | number };
+  };
+
+  /**
+   * 地图区域点击事件
+   * @author lxm
+   * @date 2023-03-26 06:15:06
+   * @param {emitArgs} undefined
+   * @return {*}  {Promise<void>}
+   */
+  onAreaClick: {
+    event: EventBase;
+    emitArgs: { data: IData[] };
+  };
+
+  /**
+   * 地图散点点击事件
+   * @author lxm
+   * @date 2023-03-26 06:15:06
+   * @param {emitArgs} undefined
+   * @return {*}  {Promise<void>}
+   */
+  onPointClick: {
+    event: EventBase;
+    emitArgs: { data: IData[] };
+  };
+}

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

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

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

@@ -0,0 +1,124 @@
+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;
+}

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

@@ -37,3 +37,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/src/service/mqtt/mqtt.service.ts

@@ -59,8 +59,8 @@ export class MqttService {
    * @param {string} appId
    */
   constructor(
-    mqttTopic: string,
-    token: string,
+    protected mqttTopic: string,
+    protected token: string,
     protected appId: string,
   ) {
     if (isNilOrEmpty(mqttTopic) || isNilOrEmpty(token)) {
@@ -88,6 +88,7 @@ export class MqttService {
       this.options,
     ) as MqttClient;
     this.client.on('connect', () => {
+      this.client!.subscribe(this.mqttTopic);
       ibiz.log.debug('mqtt connect');
     });
     this.client.on('error', error => {

package/src/service/vo/index.ts

@@ -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/src/service/vo/map-data/index.ts

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

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

@@ -0,0 +1,123 @@
+/* eslint-disable no-constructor-return */
+import { ISysMapItem } from '@ibiz/model-core';
+import { IMapData } from '../../../interface';
+
+// 更新属性，缺的补充定义
+function updateKeyDefine(target: IParams, keys: string[]): void {
+  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 implements IMapData {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  [key: string | symbol]: any;
+
+  _id: string;
+
+  _type: 'point' | 'area';
+
+  _mapItemId: string;
+
+  _longitude?: string = undefined;
+
+  _latitude?: string = undefined;
+
+  _areaCode?: string = undefined;
+
+  _tooltip?: string = undefined;
+
+  _value?: number = undefined;
+
+  _text?: string = undefined;
+
+  _symbol?: string = undefined;
+
+  constructor(deData: IData, mapItem: ISysMapItem) {
+    const {
+      id,
+      itemType,
+      longitudeAppDEFieldId,
+      latitudeAppDEFieldId,
+      textAppDEFieldId,
+      dataAppDEFieldId,
+      tipsAppDEFieldId,
+      sysImage,
+    } = mapItem;
+
+    const keyMap = new Map<string | symbol, string | symbol>();
+
+    this._id = id + deData.srfkey;
+
+    this._type = itemType! as 'point';
+
+    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<MapData>(this, {
+      set(target, p, value): boolean {
+        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): unknown {
+        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): ArrayLike<string | symbol> {
+        // 整合所有并排除重复
+        const allKeys = [
+          ...new Set([...Object.keys(target), ...Object.keys(deData)]),
+        ];
+        updateKeyDefine(target, allKeys);
+        return allKeys;
+      },
+    });
+  }
+}

package/src/utils/script/script-function.ts

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