@flexem/fc-gui 3.0.0-alpha.12 → 3.0.0-alpha.120

package/model/air-quality/air-quality.model.d.ts

@@ -0,0 +1,7 @@
+import { Size } from '../shared';
+import { ConditionalDisplayModel } from '../base';
+export interface AirQualityModel extends ConditionalDisplayModel {
+    size: Size;
+    stroke: string;
+    fill: string;
+}

package/model/air-quality/air-quality.model.metadata.json

@@ -0,0 +1 @@
+[{"__symbolic":"module","version":4,"metadata":{"AirQualityModel":{"__symbolic":"interface"}}}]

package/model/alarm/alarm.model.d.ts

@@ -0,0 +1,13 @@
+import { ConditionalDisplayModel } from '../base/conditional-display-model';
+import { Point, Size } from '../shared';
+export interface AlarmModel extends ConditionalDisplayModel {
+    readonly version: number;
+    readonly size: Size;
+    readonly location: Point;
+    readonly generalSetting?: any;
+    readonly filterSetting?: any;
+    readonly widths: number[];
+    readonly heights: number[];
+    readonly columLabels: string[];
+    readonly levelText: string[];
+}

package/model/alarm/alarm.model.metadata.json

@@ -0,0 +1 @@
+[{"__symbolic":"module","version":4,"metadata":{"AlarmModel":{"__symbolic":"interface"}}}]

package/model/bar-graph/bar-graph.d.ts

@@ -19,4 +19,8 @@ export interface BarGraph extends ReadableModel {
     readonly upperLimitColor?: string;
     readonly lowerLimitColor?: string;
     readonly percentageFont?: FontStyleData;
+    readonly masterDivisionNumber: number;
+    readonly subDivisionNumber: number;
+    readonly integerDigits: number;
+    readonly fractionDigits: number;
 }

package/model/base/readable-model.d.ts

@@ -7,4 +7,8 @@ export interface ReadableModel extends ConditionalEnableModel {
     readonly version?: number;
     readonly variableName?: string;
     readonly readVariable?: VariableDefinition;
+    readonly minVariable?: any;
+    readonly maxVariable?: any;
+    readonly minValueType?: any;
+    readonly maxValueType?: any;
 }

package/model/datetime-display/datetime-display.d.ts

@@ -17,4 +17,5 @@ export interface DatetimeDisplay extends ConditionalDisplayModel {
     readonly version: number;
     readonly useGraph?: boolean;
     readonly graphSetting?: GraphSetting;
+    readonly timeZone?: string;
 }

package/model/historical-curve/historical-curve-axis-settings.d.ts

@@ -1,6 +1,17 @@
 import { Font } from '../shared/text/font';
 export interface HistoricalCurveAxisSettings {
+    readonly yAxisRangeType: AxisRangeType;
+    readonly yAxisMax?: number;
+    readonly yAxisMin?: number;
     readonly axisColor: string;
     readonly showAxisLabel: boolean;
     readonly axisLabelFont: Font;
+    readonly showTick?: boolean;
+    readonly xAxisTickColor?: string;
+    readonly yAxisTickColor?: string;
+    readonly filterBackgroudColor?: string;
+}
+export declare enum AxisRangeType {
+    Auto = 0,
+    Custom = 1
 }

package/model/historical-curve/historical-curve-axis-settings.js

@@ -0,0 +1,5 @@
+export var AxisRangeType;
+(function (AxisRangeType) {
+    AxisRangeType[AxisRangeType["Auto"] = 0] = "Auto";
+    AxisRangeType[AxisRangeType["Custom"] = 1] = "Custom"; // 自定义范围
+})(AxisRangeType || (AxisRangeType = {}));

package/model/historical-curve/historical-curve-axis-settings.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"HistoricalCurveAxisSettings":{"__symbolic":"interface"}}}]
+[{"__symbolic":"module","version":4,"metadata":{"HistoricalCurveAxisSettings":{"__symbolic":"interface"},"AxisRangeType":{"Auto":0,"Custom":1}}}]

package/model/historical-curve/historical-curve-chanel.model.d.ts

@@ -7,6 +7,14 @@ export interface HistroicalCurveChannelModel {
      * 连接线颜色
      */
     readonly connectorColor: string;
+    /**
+     * 启用标记点
+     */
+    readonly enablePoint: boolean;
+    /**
+     * 标记点颜色
+     */
+    readonly pointColor: string;
     /**
      * 是否投影颜色
      */

package/model/meter/meter.d.ts

@@ -10,4 +10,8 @@ export interface Meter extends ReadableModel {
     readonly radius: number;
     readonly min: number;
     readonly max: number;
+    readonly masterDivisionNumber: number;
+    readonly subDivisionNumber: number;
+    readonly integerDigits: number;
+    readonly fractionDigits: number;
 }

package/model/ring-graph/ring-graph.model.d.ts

@@ -22,4 +22,12 @@ export interface RingGraphModel extends ConditionalDisplayModel {
     readonly alarmRange?: AlarmRangeModel;
     readonly showPercentage: boolean;
     readonly percentageFont?: Font;
+    readonly minVariable?: any;
+    readonly maxVariable?: any;
+    readonly minValueType?: any;
+    readonly maxValueType?: any;
+    readonly masterDivisionNumber: number;
+    readonly subDivisionNumber: number;
+    readonly integerDigits: number;
+    readonly fractionDigits: number;
 }

package/model/switch-indicator-light/bit-switch-operation.d.ts

@@ -1,5 +1,6 @@
 export declare enum BitSwitchOperation {
     On = 0,
     Off = 1,
-    Inverse = 2
+    Inverse = 2,
+    Restoration = 3
 }

package/model/switch-indicator-light/bit-switch-operation.js

@@ -3,4 +3,5 @@ export var BitSwitchOperation;
     BitSwitchOperation[BitSwitchOperation["On"] = 0] = "On";
     BitSwitchOperation[BitSwitchOperation["Off"] = 1] = "Off";
     BitSwitchOperation[BitSwitchOperation["Inverse"] = 2] = "Inverse";
+    BitSwitchOperation[BitSwitchOperation["Restoration"] = 3] = "Restoration";
 })(BitSwitchOperation || (BitSwitchOperation = {}));

package/model/switch-indicator-light/bit-switch-operation.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"BitSwitchOperation":{"On":0,"Off":1,"Inverse":2}}}]
+[{"__symbolic":"module","version":4,"metadata":{"BitSwitchOperation":{"On":0,"Off":1,"Inverse":2,"Restoration":3}}}]

package/package.json

@@ -1,6 +1,6 @@
 {
 	"main": "bundles/fc-gui.umd.js",
-	"version": "3.0.0-alpha.12",
+	"version": "3.0.0-alpha.120",
 	"module": "public_api.js",
 	"typings": "public_api.d.ts",
 	"license": "UNLICENSED",

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

@@ -9,6 +9,7 @@ export declare class RemoteVariableCommunicator implements VariableCommunicator
     private appIdVariablesMap;
     private connectedSubscription;
     private variableValuesChangedSubscription;
+    private virtualDeviceStatesChangedSubscription;
     private variablesToBeOpened;
     private variablesToBeClosed;
     private variableValueCache;
@@ -17,14 +18,20 @@ export declare class RemoteVariableCommunicator implements VariableCommunicator
     private variableStateCache;
     private variableStatesToBeOpened;
     private variableStatesToBeClosed;
+    private alarmObservers;
+    private alarmChangedSubscription;
     constructor(remoteVariableProtocol: RemoteVariableProtocol, logger: LoggerService);
+    private doAlarmChanged;
     private doVariableValuesChanged;
+    private doVirtualDeviceStatesChanged;
     private doVariableStatesChanged;
     subscribeVariableStates(variableNames: string[]): Observable<VariableState[]>;
     subscribeVariableState(variableName: string): Observable<VariableState>;
+    requestVirtualDeviceState(): Observable<void>;
     openVariables(variableNames: string[], appId?: string): Observable<VariableValue[]>;
     openVariable(variableName: string, appId?: string): Observable<VariableValue>;
     write(variableName: string, value: any): Observable<VariableValue>;
     writeWordByBit(variableName: string, index: number, value: number): Observable<VariableValue>;
+    subscribeUserDeviceAlarms(appId?: string): Observable<any[]>;
     dispose(): void;
 }

package/remote/communication/variable/remote-variable-communicator.js

@@ -10,6 +10,7 @@ export class RemoteVariableCommunicator {
         this.appIdVariablesMap = new Map();
         this.variableStateObservers = new Map();
         this.variableStateCache = new Map();
+        this.alarmObservers = [];
         this.variableValueCache = new StringifyingMap(k => JSON.stringify(k));
         this.connectedSubscription = this.remoteVariableProtocol.connected.subscribe(() => {
             const variableNamesToStart = [];
@@ -23,6 +24,18 @@ export class RemoteVariableCommunicator {
         });
         this.doVariableStatesChanged();
         this.doVariableValuesChanged();
+        this.doVirtualDeviceStatesChanged();
+        this.doAlarmChanged();
+    }
+    doAlarmChanged() {
+        if (this.alarmChangedSubscription !== undefined) {
+            this.alarmChangedSubscription.unsubscribe();
+        }
+        this.alarmChangedSubscription = this.remoteVariableProtocol.virtualDeviceAlarmsChanged.subscribe((alarms) => {
+            each(this.alarmObservers, ob => {
+                ob.next(alarms);
+            });
+        });
     }
     doVariableValuesChanged() {
         if (this.variableValuesChangedSubscription !== undefined) {
@@ -42,6 +55,25 @@ export class RemoteVariableCommunicator {
                 });
             });
     }
+    doVirtualDeviceStatesChanged() {
+        if (this.virtualDeviceStatesChangedSubscription !== undefined) {
+            this.virtualDeviceStatesChangedSubscription.unsubscribe();
+        }
+        this.virtualDeviceStatesChangedSubscription =
+            this.remoteVariableProtocol.virtualDeviceStatesChanged.subscribe((deviceStates) => {
+                each(deviceStates, deviceState => {
+                    const variableName = '设备状态';
+                    this.variableValueCache.set(variableName, deviceState);
+                    const data = Object.assign(Object.assign({}, deviceState), { systemName: '设备状态' });
+                    if (this.observers.has(variableName)) {
+                        each(this.observers.get(variableName), ob => {
+                            // TODO 同一个ob监听多个变量的情况，组合成数组一次推送。
+                            ob.next([data]);
+                        });
+                    }
+                });
+            });
+    }
     doVariableStatesChanged() {
         if (this.variableStatesChangedSubscription !== undefined) {
             this.variableStatesChangedSubscription.unsubscribe();
@@ -115,6 +147,9 @@ export class RemoteVariableCommunicator {
     subscribeVariableState(variableName) {
         return this.subscribeVariableStates([variableName]).pipe(map(values => values[0]));
     }
+    requestVirtualDeviceState() {
+        return this.remoteVariableProtocol.requestVirtualDeviceState();
+    }
     openVariables(variableNames, appId = '') {
         return new Observable(observer => {
             let variablesToStart = [];
@@ -135,7 +170,7 @@ export class RemoteVariableCommunicator {
                     }
                     else {
                         if (this.appIdVariablesMap.get(appId).indexOf(variableName) === -1) {
-                            this.appIdVariablesMap.get(appId).push();
+                            this.appIdVariablesMap.get(appId).push(variableName);
                         }
                     }
                 }
@@ -203,11 +238,22 @@ export class RemoteVariableCommunicator {
               observer.next(new VariableValue(variable, VariableStateEnum.DataNormal, value))*/
         });
     }
+    subscribeUserDeviceAlarms(appId = '') {
+        return new Observable(observer => {
+            this.alarmObservers.push(observer);
+            this.remoteVariableProtocol.subscribeVirtualDeviceAlarms(appId);
+            return () => {
+                this.remoteVariableProtocol.unsubscribeVirtualDeviceAlarms(appId);
+            };
+        });
+    }
     dispose() {
         // TODO调用所有的ob.complete()。
         this.connectedSubscription.unsubscribe();
         this.variableStatesChangedSubscription.unsubscribe();
         this.variableValuesChangedSubscription.unsubscribe();
+        this.virtualDeviceStatesChangedSubscription.unsubscribe();
+        this.alarmChangedSubscription.unsubscribe();
         if (this.logger && this.logger.isDebugEnabled()) {
             this.logger.debug('[VariableCommunicator] RemoteVariableCommunicator disposed.');
         }

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":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"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"RemoteVariableCommunicator":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"./remote-variable-protocol","name":"RemoteVariableProtocol","line":28,"character":57},{"__symbolic":"reference","module":"../../../logger","name":"LoggerService","line":28,"character":106}]}],"doAlarmChanged":[{"__symbolic":"method"}],"doVariableValuesChanged":[{"__symbolic":"method"}],"doVirtualDeviceStatesChanged":[{"__symbolic":"method"}],"doVariableStatesChanged":[{"__symbolic":"method"}],"subscribeVariableStates":[{"__symbolic":"method"}],"subscribeVariableState":[{"__symbolic":"method"}],"requestVirtualDeviceState":[{"__symbolic":"method"}],"openVariables":[{"__symbolic":"method"}],"openVariable":[{"__symbolic":"method"}],"write":[{"__symbolic":"method"}],"writeWordByBit":[{"__symbolic":"method"}],"subscribeUserDeviceAlarms":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}]}}}}]

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

@@ -4,10 +4,15 @@ export interface RemoteVariableProtocol {
     connected: Observable<void>;
     variableStatesChanged: Observable<VariableValue[]>;
     variableValuesChanged: Observable<VariableValue[]>;
+    virtualDeviceAlarmsChanged: Observable<any>;
     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>;
+    requestVirtualDeviceState(): Observable<void>;
+    virtualDeviceStatesChanged: Observable<any>;
     subscribeVariableStates(variableNames: string[]): Observable<void>;
     unsubscribeVariableStates(variableNames: string[]): Observable<void>;
+    subscribeVirtualDeviceAlarms(appId: string): any;
+    unsubscribeVirtualDeviceAlarms(appId: string): any;
 }

package/service/index.d.ts

@@ -1,4 +1,5 @@
 export { WeatherService } from './weather.service';
 export { PermissionChecker } from './permission-checker';
+export { ReleasedVariableService } from './released-variable';
 export * from './operation-record';
 export * from './video';

package/service/index.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{},"exports":[{"from":"./weather.service","export":["WeatherService"]},{"from":"./permission-checker","export":["PermissionChecker"]},{"from":"./operation-record"},{"from":"./video"}]}]
+[{"__symbolic":"module","version":4,"metadata":{},"exports":[{"from":"./weather.service","export":["WeatherService"]},{"from":"./permission-checker","export":["PermissionChecker"]},{"from":"./released-variable","export":["ReleasedVariableService"]},{"from":"./operation-record"},{"from":"./video"}]}]

package/service/released-variable/index.d.ts

@@ -0,0 +1 @@
+export { ReleasedVariableService } from './released-variable.service';

package/service/released-variable/index.metadata.json

@@ -0,0 +1 @@
+[{"__symbolic":"module","version":4,"metadata":{},"exports":[{"from":"./released-variable.service","export":["ReleasedVariableService"]}]}]

package/service/released-variable/released-variable.service.d.ts

@@ -0,0 +1,4 @@
+import { Observable } from 'rxjs';
+export interface ReleasedVariableService {
+    getVariableWithValueTransform(variableName: any): Observable<any>;
+}

package/service/released-variable/released-variable.service.metadata.json

@@ -0,0 +1 @@
+[{"__symbolic":"module","version":4,"metadata":{"ReleasedVariableService":{"__symbolic":"interface"}}}]

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,7 @@ export declare class GuiConsts {
         videokey: string;
         tableKey: string;
         weatherKey: string;
+        airQualityKey: string;
+        alarmKey: string;
     };
 }

package/shared/gui-consts.js

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

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","alarmKey":"Alarm"}}}}}]

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

@@ -109,6 +109,16 @@ let FBoxDataTypeService = class FBoxDataTypeService {
                 return 8;
             case 15: // Binary32
                 return 32;
+            case 21: // UInt64
+                return 16;
+            case 22: // Int64
+                return 16;
+            case 23: // Bcd64
+                return 16;
+            case 24: // Hex64
+                return 8;
+            case 25: // Binary64
+                return 32;
             default:
                 return 0;
         }
@@ -165,6 +175,12 @@ let FBoxDataTypeService = class FBoxDataTypeService {
             case 13: // Bcd32
             case 14: // Hex32
             case 15: // Binary32
+            case 21: // UInt64
+            case 23: // Bcd64
+            case 14: // Hex32
+            case 15: // Binary32
+            case 24: // Hex64
+            case 25: // Binary64
                 minValue = 0;
                 break;
             case 2: // Int16
@@ -176,6 +192,13 @@ let FBoxDataTypeService = class FBoxDataTypeService {
             case 16: // Single
                 minValue = -1000000000;
                 break;
+            case 22: // Int64
+                // minValue = -9223372036854775808;
+                minValue = Number.MIN_SAFE_INTEGER;
+                break;
+            case 26: // Double
+                minValue = -Number.MAX_VALUE;
+                break;
         }
         if (integerDigits) {
             let digitsLength = integerDigits;
@@ -227,6 +250,23 @@ let FBoxDataTypeService = class FBoxDataTypeService {
             case 16: // Single
                 maxValue = 1000000000;
                 break;
+            case 21: // UInt64
+            case 24: // Hex64
+            case 25: // Binary64
+                // maxValue = 18446744073709551615;
+                maxValue = Number.MAX_SAFE_INTEGER;
+                break;
+            case 22: // Int64
+                // maxValue = 9223372036854775807;
+                maxValue = Number.MAX_SAFE_INTEGER;
+                break;
+            case 23: // Bcd64
+                // maxValue = 9999999999999999;
+                maxValue = Number.MAX_SAFE_INTEGER;
+                break;
+            case 26: // Double
+                maxValue = Number.MAX_VALUE;
+                break;
         }
         if (integerDigits) {
             let digitsLength = integerDigits;