@flexem/fc-gui 3.0.0-alpha.3 → 3.0.0-alpha.32

package/remote/communication/variable/remote-variable-communicator.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"RemoteVariableCommunicator":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"./remote-variable-protocol","name":"RemoteVariableProtocol","line":23,"character":57},{"__symbolic":"reference","module":"../../../logger","name":"LoggerService","line":23,"character":106}]}],"doVariableValuesChanged":[{"__symbolic":"method"}],"doVariableStatesChanged":[{"__symbolic":"method"}],"subscribeVariableStates":[{"__symbolic":"method"}],"subscribeVariableState":[{"__symbolic":"method"}],"openVariables":[{"__symbolic":"method"}],"openVariable":[{"__symbolic":"method"}],"write":[{"__symbolic":"method"}],"writeWordByBit":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"RemoteVariableCommunicator":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"./remote-variable-protocol","name":"RemoteVariableProtocol","line":24,"character":57},{"__symbolic":"reference","module":"../../../logger","name":"LoggerService","line":24,"character":106}]}],"doVariableValuesChanged":[{"__symbolic":"method"}],"doVariableStatesChanged":[{"__symbolic":"method"}],"subscribeVariableStates":[{"__symbolic":"method"}],"subscribeVariableState":[{"__symbolic":"method"}],"openVariables":[{"__symbolic":"method"}],"openVariable":[{"__symbolic":"method"}],"write":[{"__symbolic":"method"}],"writeWordByBit":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}]}}}}]

package/remote/communication/variable/remote-variable-protocol.d.ts

@@ -4,8 +4,8 @@ export interface RemoteVariableProtocol {
     connected: Observable<void>;
     variableStatesChanged: Observable<VariableValue[]>;
     variableValuesChanged: Observable<VariableValue[]>;
-    tryOpenVariables(variableNames: string[]): Observable<void>;
-    tryStopVariables(variableNames: string[]): Observable<void>;
+    tryOpenVariables(variableNames: string[], appId: string): Observable<void>;
+    tryStopVariables(variableNames: string[], appId: string): Observable<void>;
     writeVariable(variableName: string, value: any): Observable<void>;
     writeVariableWordByBit(variableName: string, index: number, value: number): Observable<void>;
     subscribeVariableStates(variableNames: string[]): Observable<void>;

package/service/weather.service.d.ts

@@ -1,3 +1,4 @@
 export interface WeatherService {
     getWeatherInfo(): Promise<any>;
+    getAirQualityInfo(): Promise<any>;
 }

package/shared/gui-consts.d.ts

@@ -26,5 +26,6 @@ export declare class GuiConsts {
         videokey: string;
         tableKey: string;
         weatherKey: string;
+        airQualityKey: string;
     };
 }

package/shared/gui-consts.js

@@ -27,4 +27,5 @@ GuiConsts.components = {
     videokey: 'Video',
     tableKey: 'Table',
     weatherKey: 'Weather',
+    airQualityKey: 'AirQualityIndex'
 };

package/shared/gui-consts.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"GuiConsts":{"__symbolic":"class","statics":{"components":{"imageKey":"Image","numericalDisplayKey":"NumericalDisplay","textKey":"Text","hyperlinkKey":"Hyperlink","meterKey":"Meter","pipeKey":"Pipe","switchIndicatorLightKey":"SwitchIndicatorLight","barGraphKey":"BarGraph","toggleViewKey":"ToggleView","characterKey":"Character","straightLineKey":"StraightLine","polyLineKey":"PolyLine","rectangleKey":"Rectangle","sectorkey":"Sector","ellipseKey":"Ellipse","datetimeDisplayKey":"DatetimeDisplay","historicalCurveKey":"HistoricalCurve","ringGraphKey":"RingGraph","viewOperationElement":"ViewOperation","polygonKey":"Polygon","videokey":"Video","tableKey":"Table","weatherKey":"Weather"}}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"GuiConsts":{"__symbolic":"class","statics":{"components":{"imageKey":"Image","numericalDisplayKey":"NumericalDisplay","textKey":"Text","hyperlinkKey":"Hyperlink","meterKey":"Meter","pipeKey":"Pipe","switchIndicatorLightKey":"SwitchIndicatorLight","barGraphKey":"BarGraph","toggleViewKey":"ToggleView","characterKey":"Character","straightLineKey":"StraightLine","polyLineKey":"PolyLine","rectangleKey":"Rectangle","sectorkey":"Sector","ellipseKey":"Ellipse","datetimeDisplayKey":"DatetimeDisplay","historicalCurveKey":"HistoricalCurve","ringGraphKey":"RingGraph","viewOperationElement":"ViewOperation","polygonKey":"Polygon","videokey":"Video","tableKey":"Table","weatherKey":"Weather","airQualityKey":"AirQualityIndex"}}}}}]

package/utils/data-type/data-type.service.d.ts

@@ -12,10 +12,9 @@ export declare class DataTypeService {
     isFloat(version: number, id: number): boolean;
     /**
      * 获取数据型号最大长度
-     * @param version
-     * @param id
+     * @param id fbox数据类型
      */
-    getValueMaxLength(version: number, id: number): number;
+    getValueMaxLength(version: number, dataType: number, fBoxDataType: number): number;
     /**
      * 是否支持小数位
      * @param version
@@ -43,18 +42,16 @@ export declare class DataTypeService {
     formatToDecimal(version: number, value: any, id: number): any;
     /**
        * 获取数据型号最小值
-       * @param version
        * @param id
        * @param? integerDigits
        * @param? fractionDigits
        */
-    getMinValue(version: number, id: number, integerDigits?: number, fractionDigits?: number): number;
+    getMinValue(version: number, dataType: number, fBoxDataType: number, integerDigits?: number, fractionDigits?: number): number;
     /**
        * 获取数据型号最大值
-       * @param version
        * @param id
        * @param? integerDigits
        * @param? fractionDigits
        */
-    getMaxValue(version: number, id: number, integerDigits?: number, fractionDigits?: number): number;
+    getMaxValue(version: number, dataType: number, fBoxDataType: number, integerDigits?: number, fractionDigits?: number): number;
 }

package/utils/data-type/data-type.service.js

@@ -8,7 +8,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 import { Injectable } from '@angular/core';
-import { isNil } from 'lodash';
+import { isNil, isNumber } from 'lodash';
 import { FCloudDataTypeService } from './fcloud-data-type.service';
 import { FBoxDataTypeService } from './fbox-data-type.service';
 let DataTypeService = class DataTypeService {
@@ -54,14 +54,18 @@ let DataTypeService = class DataTypeService {
     }
     /**
      * 获取数据型号最大长度
-     * @param version
-     * @param id
+     * @param id fbox数据类型
      */
-    getValueMaxLength(version, id) {
-        if (!isNil(version) && version > 4) {
-            return this.fcloudDataTypeService.getValueMaxLength(id);
+    getValueMaxLength(version, dataType, fBoxDataType) {
+        if (isNumber(fBoxDataType)) {
+            return this.fboxDataTypeService.getValueMaxLength(fBoxDataType);
+        }
+        else {
+            if (!isNil(version) && version > 4) {
+                return this.fcloudDataTypeService.getValueMaxLength(dataType);
+            }
+            return this.fboxDataTypeService.getValueMaxLength(dataType);
         }
-        return this.fboxDataTypeService.getValueMaxLength(id);
     }
     /**
      * 是否支持小数位
@@ -110,29 +114,37 @@ let DataTypeService = class DataTypeService {
     }
     /**
        * 获取数据型号最小值
-       * @param version
        * @param id
        * @param? integerDigits
        * @param? fractionDigits
        */
-    getMinValue(version, id, integerDigits, fractionDigits) {
-        if (!isNil(version) && version > 4) {
-            return this.fcloudDataTypeService.getMinValue(id, integerDigits, fractionDigits);
+    getMinValue(version, dataType, fBoxDataType, integerDigits, fractionDigits) {
+        if (isNumber(fBoxDataType)) {
+            return this.fboxDataTypeService.getMinValue(fBoxDataType, integerDigits, fractionDigits);
+        }
+        else {
+            if (!isNil(version) && version > 4) {
+                return this.fcloudDataTypeService.getMinValue(dataType);
+            }
+            return this.fboxDataTypeService.getMinValue(dataType);
         }
-        return this.fboxDataTypeService.getMinValue(id, integerDigits, fractionDigits);
     }
     /**
        * 获取数据型号最大值
-       * @param version
        * @param id
        * @param? integerDigits
        * @param? fractionDigits
        */
-    getMaxValue(version, id, integerDigits, fractionDigits) {
-        if (!isNil(version) && version > 4) {
-            return this.fcloudDataTypeService.getMaxValue(id, integerDigits, fractionDigits);
+    getMaxValue(version, dataType, fBoxDataType, integerDigits, fractionDigits) {
+        if (isNumber(fBoxDataType)) {
+            return this.fboxDataTypeService.getMaxValue(fBoxDataType, integerDigits, fractionDigits);
+        }
+        else {
+            if (!isNil(version) && version > 4) {
+                return this.fcloudDataTypeService.getMaxValue(dataType);
+            }
+            return this.fboxDataTypeService.getMaxValue(dataType);
         }
-        return this.fboxDataTypeService.getMaxValue(id, integerDigits, fractionDigits);
     }
 };
 DataTypeService = __decorate([

package/utils/numerical-operation.service.js

@@ -44,9 +44,9 @@ let NumericalOperationService = class NumericalOperationService {
     getNumericalOperations(model) {
         const numericalOperation = {};
         numericalOperation.numericalUpperLimit = (model.numericalUpperLimit || model.numericalUpperLimit === 0) ? +model.numericalUpperLimit
-            : this.dataTypeService.getMaxValue(model.version, model.dataType, model.integerDigits, model.fractionDigits);
+            : this.dataTypeService.getMaxValue(model.version, model.dataType, model.fBoxDataType, model.integerDigits, model.fractionDigits);
         numericalOperation.numericalLowerLimit = (model.numericalLowerLimit || model.numericalLowerLimit === 0) ? +model.numericalLowerLimit
-            : this.dataTypeService.getMinValue(model.version, model.dataType, model.integerDigits, model.fractionDigits);
+            : this.dataTypeService.getMinValue(model.version, model.dataType, model.fBoxDataType, model.integerDigits, model.fractionDigits);
         numericalOperation.enableNumericalOperation = model.enableNumericalOperation;
         if (model.enableNumericalOperation) {
             numericalOperation.type = model.numericalOperationSetting.type;

package/gui/scripts/config.js

@@ -1,6 +0,0 @@
-    // 路径配置
-    requirejs.config({
-      paths: {
-        echarts: 'http://echarts.baidu.com/build/dist'
-      }
-    });