@flexem/fc-gui 3.0.0-alpha.1 → 3.0.0-alpha.100

package/elements/historical-curve/historical-curve.element.metadata.json

@@ -0,0 +1 @@
+[{"__symbolic":"module","version":4,"metadata":{"HistoricalCurveElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-display-element","name":"ConditionalDisplayElement","line":21,"character":44},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":65,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":66,"character":18},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":67,"character":27},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":68,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":69,"character":23},{"__symbolic":"reference","module":"../../config","name":"HistoryDataStore","line":70,"character":43},{"__symbolic":"reference","name":"string"}]}],"dispose":[{"__symbolic":"method"}],"getValidTimePeriods":[{"__symbolic":"method"}],"updateTimeRange":[{"__symbolic":"method"}],"updateQueryTimeRange":[{"__symbolic":"method"}],"reRenderElement":[{"__symbolic":"method"}],"renderElement":[{"__symbolic":"method"}],"renderChart":[{"__symbolic":"method"}],"initPoint":[{"__symbolic":"method"}],"getLineChart":[{"__symbolic":"method"}],"getMultiBarWithFocusChart":[{"__symbolic":"method"}],"renderCommonProperty":[{"__symbolic":"method"}],"renderOperationArea":[{"__symbolic":"method"}],"timeFormat":[{"__symbolic":"method"}],"loadFirstPage":[{"__symbolic":"method"}],"loadNextPage":[{"__symbolic":"method"}],"loadPreviousPage":[{"__symbolic":"method"}],"loadLastPage":[{"__symbolic":"method"}],"initElementStatus":[{"__symbolic":"method"}],"updateElementStatus":[{"__symbolic":"method"}],"setStatusAsUnbound":[{"__symbolic":"method"}],"setStatusAsLoading":[{"__symbolic":"method"}],"setStatusAsLoadFailed":[{"__symbolic":"method"}],"renderStatus":[{"__symbolic":"method"}],"clearStatus":[{"__symbolic":"method"}]}}}}]

package/elements/historical-curve/historical-curve.element.option.metadata.json

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

package/elements/historical-curve/historical-curve.time-period.metadata.json

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

package/elements/main-element.d.ts

@@ -1,6 +1,6 @@
 import { Injector } from '@angular/core';
 import { VariableCommunicator, VariableValue, VariableState } from '../communication';
-import { BsModalService } from 'ngx-bootstrap';
+import { BsModalService } from 'ngx-bootstrap/modal';
 import { GuiContext } from '../gui/gui-context';
 import { Size } from '../model';
 import { PopupViewService } from '../view/popup-view.service';
@@ -11,6 +11,7 @@ export declare class MainElement {
     private readonly context;
     private readonly variableCommunicator;
     private readonly popupViewService;
+    private readonly signalRAppId;
     private readonly elements;
     private root;
     private isLoaded;
@@ -20,7 +21,7 @@ export declare class MainElement {
     oldSize: Size;
     private hostContainerId;
     get rootElement(): HTMLElement;
-    constructor(injector: Injector, bsModalService: BsModalService, context: GuiContext, variableCommunicator: VariableCommunicator, popupViewService: PopupViewService);
+    constructor(injector: Injector, bsModalService: BsModalService, context: GuiContext, variableCommunicator: VariableCommunicator, popupViewService: PopupViewService, signalRAppId: any);
     load(data: string, overflowVisible: boolean, guiOptions: GuiOptions): void;
     /**
      * 保证在显示区域内显示画面所有内容，等比缩放画面大小以铺满整个显示区域

package/elements/main-element.js

@@ -27,13 +27,16 @@ import { PolygonElement } from './vector-graphics/polygon-element';
 import { HyperlinkElement } from './static-elements/hyperlink-element';
 import { VideoElement } from './video/video-element';
 import { WeatherElement } from './weather/weater-element';
+import { AirQualityElement } from './air-quality/air-quality-element';
+import { AlarmElement } from './alarm/alarm-element';
 export class MainElement {
-    constructor(injector, bsModalService, context, variableCommunicator, popupViewService) {
+    constructor(injector, bsModalService, context, variableCommunicator, popupViewService, signalRAppId) {
         this.injector = injector;
         this.bsModalService = bsModalService;
         this.context = context;
         this.variableCommunicator = variableCommunicator;
         this.popupViewService = popupViewService;
+        this.signalRAppId = signalRAppId;
         this.elements = new Array();
         this.logger = injector.get(LOGGER_SERVICE_TOKEN);
     }
@@ -57,72 +60,78 @@ export class MainElement {
             const category = $(element).data('model').category;
             switch (category) {
                 case GuiConsts.components.numericalDisplayKey:
-                    const numericalDisplayElement = new NumericalDisplayElement(element, this.injector, this.bsModalService, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.graphStore, this.context.operationRecordService, this.context.securityChecker, this.context.configStore.variableStore, this.injector.get(LOCALIZATION));
+                    const numericalDisplayElement = new NumericalDisplayElement(element, this.injector, this.bsModalService, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.graphStore, this.context.operationRecordService, this.context.releasedVariableService, this.context.securityChecker, this.context.configStore.variableStore, this.injector.get(LOCALIZATION), this.signalRAppId);
                     this.elements.push(numericalDisplayElement);
                     break;
                 case GuiConsts.components.imageKey:
-                    this.elements.push(new ImageElement(element, this.injector, this.context.configStore.imageStore, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.context.configStore.graphStore));
+                    this.elements.push(new ImageElement(element, this.injector, this.context.configStore.imageStore, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.context.configStore.graphStore, this.signalRAppId));
                     break;
                 case GuiConsts.components.meterKey:
-                    this.elements.push(new MeterElement(element, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.injector.get(LOCALIZATION)));
+                    this.elements.push(new MeterElement(element, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.injector.get(LOCALIZATION), this.signalRAppId));
                     break;
                 case GuiConsts.components.pipeKey:
-                    this.elements.push(new PipeElement(element, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.injector.get(LOCALIZATION)));
+                    this.elements.push(new PipeElement(element, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.injector.get(LOCALIZATION), this.signalRAppId));
                     break;
                 case GuiConsts.components.switchIndicatorLightKey:
-                    this.elements.push(new SwitchIndicatorLightElement(element, this.injector, this.bsModalService, this.variableCommunicator, this.context.configStore.graphStore, this.context.permissionChecker, this.context.operationRecordService, this.context.securityChecker, this.context.configStore.variableStore, this.injector.get(LOCALIZATION)));
+                    this.elements.push(new SwitchIndicatorLightElement(element, this.injector, this.bsModalService, this.variableCommunicator, this.context.configStore.graphStore, this.context.permissionChecker, this.context.operationRecordService, this.context.securityChecker, this.context.configStore.variableStore, this.injector.get(LOCALIZATION), this.signalRAppId));
                     break;
                 case GuiConsts.components.barGraphKey:
-                    this.elements.push(new BarGraphElement(element, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.injector.get(LOCALIZATION)));
+                    this.elements.push(new BarGraphElement(element, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.injector.get(LOCALIZATION), this.signalRAppId));
                     break;
                 case GuiConsts.components.toggleViewKey:
                 case GuiConsts.components.viewOperationElement:
-                    this.elements.push(new ViewOperationElement(element, this.injector, this.bsModalService, this.variableCommunicator, this.context.configStore.variableStore, this.context.configStore.graphStore, this.context.permissionChecker, this.context.operationRecordService, this.context.securityChecker, this.injector.get(LOCALIZATION), this.popupViewService, guiOptions.hostContainerId, guiOptions.el));
+                    this.elements.push(new ViewOperationElement(element, this.injector, this.bsModalService, this.variableCommunicator, this.context.configStore.variableStore, this.context.configStore.graphStore, this.context.permissionChecker, this.context.operationRecordService, this.context.securityChecker, this.injector.get(LOCALIZATION), this.popupViewService, guiOptions.hostContainerId, guiOptions.el, this.signalRAppId));
                     break;
                 case GuiConsts.components.characterKey:
-                    this.elements.push(new CharacterDisplayElement(element, this.injector, this.bsModalService, this.variableCommunicator, this.context.configStore.graphStore, this.context.permissionChecker, this.context.operationRecordService, this.context.securityChecker, this.context.configStore.variableStore, this.injector.get(LOCALIZATION)));
+                    this.elements.push(new CharacterDisplayElement(element, this.injector, this.bsModalService, this.variableCommunicator, this.context.configStore.graphStore, this.context.permissionChecker, this.context.operationRecordService, this.context.securityChecker, this.context.configStore.variableStore, this.injector.get(LOCALIZATION), this.signalRAppId));
                     break;
                 case GuiConsts.components.textKey:
-                    this.elements.push(new TextElement(element, this.injector, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.context.configStore.graphStore));
+                    this.elements.push(new TextElement(element, this.injector, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.context.configStore.graphStore, this.signalRAppId));
                     break;
                 case GuiConsts.components.hyperlinkKey:
-                    this.elements.push(new HyperlinkElement(element, this.injector, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.context.configStore.graphStore));
+                    this.elements.push(new HyperlinkElement(element, this.injector, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.context.configStore.graphStore, this.signalRAppId));
                     break;
                 case GuiConsts.components.straightLineKey:
-                    this.elements.push(new StraightLineElement(element, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore));
+                    this.elements.push(new StraightLineElement(element, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.signalRAppId));
                     break;
                 case GuiConsts.components.polyLineKey:
-                    this.elements.push(new PolyLineElement(element, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore));
+                    this.elements.push(new PolyLineElement(element, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.signalRAppId));
                     break;
                 case GuiConsts.components.ellipseKey:
-                    this.elements.push(new EllipseElement(element, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore));
+                    this.elements.push(new EllipseElement(element, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.signalRAppId));
                     break;
                 case GuiConsts.components.rectangleKey:
-                    this.elements.push(new RectangleElement(element, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore));
+                    this.elements.push(new RectangleElement(element, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.signalRAppId));
                     break;
                 case GuiConsts.components.sectorkey:
-                    this.elements.push(new SectorElement(element, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore));
+                    this.elements.push(new SectorElement(element, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.signalRAppId));
                     break;
                 case GuiConsts.components.datetimeDisplayKey:
-                    this.elements.push(new DatetimeDisplayElement(element, this.injector, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.context.configStore.graphStore));
+                    this.elements.push(new DatetimeDisplayElement(element, this.injector, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.context.configStore.graphStore, this.signalRAppId));
                     break;
                 case GuiConsts.components.historicalCurveKey:
-                    this.elements.push(new HistoricalCurveElement(element, this.injector, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.context.configStore.historyDataStore));
+                    this.elements.push(new HistoricalCurveElement(element, this.injector, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.context.configStore.historyDataStore, this.signalRAppId));
                     break;
                 case GuiConsts.components.ringGraphKey:
-                    this.elements.push(new RingGraphElement(element, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.injector.get(LOCALIZATION)));
+                    this.elements.push(new RingGraphElement(element, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.injector.get(LOCALIZATION), this.signalRAppId));
                     break;
                 case GuiConsts.components.polygonKey:
-                    this.elements.push(new PolygonElement(element, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore));
+                    this.elements.push(new PolygonElement(element, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.signalRAppId));
                     break;
                 case GuiConsts.components.videokey:
-                    this.elements.push(new VideoElement(element, this.injector, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.context.videoService, new Size(this.rawWidth, this.rawHeight), guiOptions.svgRootClass));
+                    this.elements.push(new VideoElement(element, this.injector, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.context.videoService, new Size(this.rawWidth, this.rawHeight), guiOptions.svgRootClass, this.signalRAppId));
                     break;
                 case GuiConsts.components.tableKey:
-                    this.elements.push(new PolygonElement(element, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore));
+                    this.elements.push(new PolygonElement(element, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.signalRAppId));
                     break;
                 case GuiConsts.components.weatherKey:
-                    this.elements.push(new WeatherElement(element, this.injector, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.context.weatherService));
+                    this.elements.push(new WeatherElement(element, this.injector, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.context.weatherService, this.signalRAppId));
+                    break;
+                case GuiConsts.components.airQualityKey:
+                    this.elements.push(new AirQualityElement(element, this.injector, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.context.weatherService, this.signalRAppId));
+                    break;
+                case GuiConsts.components.alarmKey:
+                    this.elements.push(new AlarmElement(element, this.injector, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.variableStore, this.context.configStore.alarmsStore, this.signalRAppId));
                     break;
             }
         });
@@ -203,7 +212,7 @@ export class MainElement {
     initElementState() {
         forEach(this.elements, element => {
             if (element instanceof ReadableElement) {
-                element.init(element.readVariableName);
+                element.init(element.readVariableName || element.maxVariableName || element.minVariableName);
             }
             else if (element instanceof HistoricalCurveElement) {
                 element.initElementStatus();
@@ -214,8 +223,20 @@ export class MainElement {
     getVariableNames() {
         const variableNames = new Array();
         forEach(this.elements, element => {
+            var _a, _b;
             if (element instanceof ReadableElement) {
+                const maxVariableName = (_a = element) === null || _a === void 0 ? void 0 : _a.maxVariableName;
+                const maxValueType = element.maxValueType;
+                const minVariableName = (_b = element) === null || _b === void 0 ? void 0 : _b.minVariableName;
+                const minValueType = element.minValueType;
                 const variableName = element.readVariableName;
+                // 最大最小值选择变量类型时，其中一个未绑定变量不进行开点操作 - FLEXCLOUD-1817
+                if (maxValueType && maxVariableName && !variableNames.find(v => isEqual(maxVariableName, v))) {
+                    variableNames.push(maxVariableName);
+                }
+                if (minValueType && minVariableName && !variableNames.find(v => isEqual(minVariableName, v))) {
+                    variableNames.push(minVariableName);
+                }
                 if (variableName && !variableNames.find(v => isEqual(variableName, v))) {
                     variableNames.push(element.readVariableName);
                 }
@@ -241,7 +262,7 @@ export class MainElement {
         each(values, value => {
             each(this.elements, e => {
                 if (e instanceof ReadableElement) {
-                    if (e.readVariableName === value.variableName) {
+                    if (e.readVariableName === value.variableName || e.minVariableName === value.variableName || e.maxVariableName === value.variableName) {
                         e.reportValueChanged(value);
                     }
                 }
@@ -251,7 +272,8 @@ export class MainElement {
     dispose() {
         each(this.elements, e => {
             if (e instanceof HistoricalCurveElement || e instanceof VideoElement
-                || e instanceof WeatherElement || e instanceof NumericalDisplayElement || e instanceof TextElement) {
+                || e instanceof WeatherElement || e instanceof NumericalDisplayElement || e instanceof TextElement
+                || e instanceof AirQualityElement) {
                 e.dispose();
             }
         });

package/elements/main-element.metadata.json

@@ -0,0 +1 @@
+[{"__symbolic":"module","version":4,"metadata":{"MainElement":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":55,"character":43},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":56,"character":41},{"__symbolic":"reference","module":"../gui/gui-context","name":"GuiContext","line":57,"character":34},{"__symbolic":"reference","module":"../communication","name":"VariableCommunicator","line":58,"character":47},{"__symbolic":"reference","module":"../view/popup-view.service","name":"PopupViewService","line":59,"character":43},null]}],"load":[{"__symbolic":"method"}],"uniformStretch":[{"__symbolic":"method"}],"changeVideoStyle":[{"__symbolic":"method"}],"horizontalStretch":[{"__symbolic":"method"}],"initElementState":[{"__symbolic":"method"}],"getVariableNames":[{"__symbolic":"method"}],"reportVariableStates":[{"__symbolic":"method"}],"reportVariableValues":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}],"checkIsLoaded":[{"__symbolic":"method"}],"initBackground":[{"__symbolic":"method"}],"getImageEl":[{"__symbolic":"method"}]}}}}]

package/elements/meter-element.d.ts

@@ -5,16 +5,22 @@ import { ReadableElement } from './base';
 import { VariableStore } from '../config';
 import { PermissionChecker } from '../service';
 export declare class MeterElement extends ReadableElement {
+    private static DEFAULT_MIN_VALUE;
+    private static DEFAULT_MAX_VALUE;
     private readonly $handEl;
     private readonly arcPath$;
     private cx;
     private cy;
     private offsetY;
     private mainElementTransform;
+    private valueObj;
+    private isNeedUpdateScale;
     readonly model: Meter;
-    constructor(element: HTMLElement, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, localization: Localization);
-    updateVariableValue(value: number): void;
+    constructor(element: HTMLElement, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, localization: Localization, signalRAppId: string);
+    private updateValueObj;
+    updateVariableValue(value: number, variableName: any): void;
     private initFrameNode;
+    private updateScale;
     private getAngle;
     private directionPoint;
 }

package/elements/meter-element.js

@@ -1,10 +1,20 @@
 import { ReadableElement } from './base';
+import { isNumber } from 'lodash';
+import { VariableValueType } from '../model/shared/condition/variable-value-type';
 export class MeterElement extends ReadableElement {
-    constructor(element, permissionChecker, variableCommunicator, variableStore, localization) {
-        super(element, permissionChecker, variableCommunicator, variableStore, localization);
+    constructor(element, permissionChecker, variableCommunicator, variableStore, localization, signalRAppId) {
+        super(element, permissionChecker, variableCommunicator, variableStore, localization, signalRAppId);
         this.cx = 0;
         this.cy = 0;
         this.offsetY = 0;
+        this.valueObj = {};
+        this.isNeedUpdateScale = false;
+        if ((this.model.minValueType === VariableValueType.Constant && this.model.maxValueType === VariableValueType.Variable)
+            || this.model.maxValueType === VariableValueType.Constant && this.model.minValueType === VariableValueType.Variable) {
+            this.isNeedUpdateScale = true;
+            this.updateScale();
+            this.isNeedUpdateScale = false;
+        }
         let mainEl$;
         if (this.model.version && this.model.version > 3) {
             mainEl$ = this.$element.find('[data-id="main"]');
@@ -31,18 +41,75 @@ export class MeterElement extends ReadableElement {
             this.changeStates();
         });
     }
-    updateVariableValue(value) {
-        const angle = this.getAngle(value);
-        this.$handEl.attr('transform', this.mainElementTransform + ` translate(0,${this.offsetY}) rotate(${angle}, ${this.cx}, ${this.cy})`);
+    updateValueObj(value, variableName) {
+        var _a, _b, _c;
+        if (((_a = this.model.readVariable) === null || _a === void 0 ? void 0 : _a.name) === variableName) {
+            this.isNeedUpdateScale = false;
+            this.valueObj.value = value;
+        }
+        if (((_b = this.model.minVariable) === null || _b === void 0 ? void 0 : _b.name) === variableName) {
+            this.isNeedUpdateScale = true;
+            this.valueObj.min = value;
+        }
+        if (((_c = this.model.maxVariable) === null || _c === void 0 ? void 0 : _c.name) === variableName) {
+            this.isNeedUpdateScale = true;
+            this.valueObj.max = value;
+        }
+    }
+    updateVariableValue(value, variableName) {
+        this.updateValueObj(value, variableName);
+        this.updateScale();
+        const angle = this.getAngle();
+        if (isNumber(angle)) {
+            this.$handEl.attr('transform', this.mainElementTransform + ` translate(0,${this.offsetY}) rotate(${angle}, ${this.cx}, ${this.cy})`);
+        }
     }
     initFrameNode() {
         const b = Snap(this.$element[0]).getBBox();
         this.rootElement.append('rect').attr('id', 'StateFrame').attr('width', b.width).attr('height', b.height).attr('fill', 'transparent');
     }
-    getAngle(value) {
-        const min = this.model.min;
-        const max = this.model.max;
-        value = Math.min(Math.max(value, min), max);
+    updateScale() {
+        if (!this.isNeedUpdateScale) {
+            return;
+        }
+        let min = this.model.minValueType ? this.valueObj.min : this.model.min;
+        let max = this.model.maxValueType ? this.valueObj.max : this.model.max;
+        min = Number(min);
+        max = Number(max);
+        if (isNaN(min) || isNaN(max)) {
+            min = MeterElement.DEFAULT_MIN_VALUE;
+            max = MeterElement.DEFAULT_MAX_VALUE;
+        }
+        const avgSacle = ((max - min) / this.model.masterDivisionNumber).toFixed(5);
+        const textElements = this.$element.find('g:first > text');
+        for (let i = 0; i < textElements.length; i++) {
+            const text = textElements[i];
+            if (!text.innerHTML) {
+                continue;
+            }
+            let sacleValue = ((Number(avgSacle) * i) + min).toFixed(0);
+            // 整数位和小数位格式化；
+            if (this.model.fractionDigits > 0) {
+                sacleValue = (sacleValue / Math.pow(10, this.model.fractionDigits)).toFixed(this.model.fractionDigits);
+            }
+            if (!isNaN(sacleValue)) {
+                text.innerHTML = sacleValue;
+            }
+        }
+    }
+    getAngle() {
+        let min = this.model.minValueType ? this.valueObj.min : this.model.min;
+        let max = this.model.maxValueType ? this.valueObj.max : this.model.max;
+        min = Number(min);
+        max = Number(max);
+        if (isNaN(min) || isNaN(max)) {
+            min = MeterElement.DEFAULT_MIN_VALUE;
+            max = MeterElement.DEFAULT_MAX_VALUE;
+        }
+        if (!this.valueObj.value && isNaN(Number(this.valueObj.value))) {
+            return undefined;
+        }
+        const value = Math.min(Math.max(this.valueObj.value || 0, min), max);
         const len = (value - min) / (max - min);
         const arcPath = Snap(this.arcPath$[0]);
         const b = arcPath.getBBox(true);
@@ -68,3 +135,5 @@ export class MeterElement extends ReadableElement {
         return c;
     }
 }
+MeterElement.DEFAULT_MIN_VALUE = 0;
+MeterElement.DEFAULT_MAX_VALUE = 100;

package/elements/meter-element.metadata.json

@@ -0,0 +1 @@
+[{"__symbolic":"module","version":4,"metadata":{"MeterElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"./base","name":"ReadableElement","line":9,"character":34},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":25,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"../service","name":"PermissionChecker","line":25,"character":57},{"__symbolic":"reference","module":"../communication","name":"VariableCommunicator","line":26,"character":30},{"__symbolic":"reference","module":"../config","name":"VariableStore","line":26,"character":67},{"__symbolic":"reference","module":"../localization","name":"Localization","line":26,"character":96},{"__symbolic":"reference","name":"string"}]}],"updateValueObj":[{"__symbolic":"method"}],"updateVariableValue":[{"__symbolic":"method"}],"initFrameNode":[{"__symbolic":"method"}],"updateScale":[{"__symbolic":"method"}],"getAngle":[{"__symbolic":"method"}],"directionPoint":[{"__symbolic":"method"}]},"statics":{"DEFAULT_MIN_VALUE":0,"DEFAULT_MAX_VALUE":100}}}}]

package/elements/numerical-display/numerical-display-element.d.ts

@@ -1,9 +1,9 @@
 import { Injector } from '@angular/core';
-import { BsModalService } from 'ngx-bootstrap';
+import { BsModalService } from 'ngx-bootstrap/modal';
 import { GraphStore, VariableStore } from '../../config';
 import { Localization } from '../../localization';
 import { NumericalDisplay } from '../../model';
-import { PermissionChecker, OperationRecordService } from '../../service';
+import { PermissionChecker, OperationRecordService, ReleasedVariableService } from '../../service';
 import { VariableCommunicator } from '../../communication';
 import { ReadableElement } from '../base/readable-element';
 import { SecurityChecker } from '../../security';
@@ -11,6 +11,7 @@ export declare class NumericalDisplayElement extends ReadableElement {
     private readonly modalService;
     private readonly graphStore;
     private readonly operationRecordService;
+    private readonly releasedVariableService;
     private readonly securityChecker;
     private readonly dataTypeService;
     private readonly fractionDigitService;
@@ -20,8 +21,14 @@ export declare class NumericalDisplayElement extends ReadableElement {
     private displayText;
     private readonly logger;
     private displayForeignObject;
+    private enableDataParsed;
+    private writeValueMmodalRef;
+    private recordValue;
+    private showValue;
+    private numericalOperation;
+    private restorationTimer;
     get writeVariableName(): string;
-    constructor(element: HTMLElement, injector: Injector, modalService: BsModalService, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, graphStore: GraphStore, operationRecordService: OperationRecordService, securityChecker: SecurityChecker, variableStore: VariableStore, localization: Localization);
+    constructor(element: HTMLElement, injector: Injector, modalService: BsModalService, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, graphStore: GraphStore, operationRecordService: OperationRecordService, releasedVariableService: ReleasedVariableService, securityChecker: SecurityChecker, variableStore: VariableStore, localization: Localization, signalRAppId: string);
     dispose(): void;
     initElement(): any;
     private checkElementPassword;

package/elements/numerical-display/numerical-display-element.js

@@ -11,14 +11,22 @@ import { ConfirmOperationModalComponent } from '../../modal/confirm-operation/co
 import { VerifyPasswordModalComponent } from '../../modal/verify-password/verify-password-modal.component';
 import { isNil } from 'lodash';
 import { FCloudDataType } from '../../model/shared/data-type/fcloud-data-Type';
+var variableRwTypeEnum;
+(function (variableRwTypeEnum) {
+    variableRwTypeEnum[variableRwTypeEnum["read"] = 4] = "read";
+    variableRwTypeEnum[variableRwTypeEnum["witer"] = 2] = "witer";
+    variableRwTypeEnum[variableRwTypeEnum["readWiter"] = 6] = "readWiter";
+})(variableRwTypeEnum || (variableRwTypeEnum = {}));
 export class NumericalDisplayElement extends ReadableElement {
-    constructor(element, injector, modalService, permissionChecker, variableCommunicator, graphStore, operationRecordService, securityChecker, variableStore, localization) {
-        super(element, permissionChecker, variableCommunicator, variableStore, localization);
+    constructor(element, injector, modalService, permissionChecker, variableCommunicator, graphStore, operationRecordService, releasedVariableService, securityChecker, variableStore, localization, signalRAppId) {
+        super(element, permissionChecker, variableCommunicator, variableStore, localization, signalRAppId);
         this.modalService = modalService;
         this.graphStore = graphStore;
         this.operationRecordService = operationRecordService;
+        this.releasedVariableService = releasedVariableService;
         this.securityChecker = securityChecker;
         this.displayText = '';
+        this.enableDataParsed = false;
         this.logger = injector.get(LOGGER_SERVICE_TOKEN);
         this.dataTypeService = injector.get(DataTypeService);
         this.fractionDigitService = injector.get(FractionDigitService);
@@ -32,6 +40,10 @@ export class NumericalDisplayElement extends ReadableElement {
                 this.model.dataType = FCloudDataType.Hex;
             }
         }
+        // version小于6时是老版本，默认支持数据解析
+        if (this.model.version < 6 || this.model.enableDataParsed) {
+            this.enableDataParsed = true;
+        }
         this.initElement();
     }
     get writeVariableName() {
@@ -168,19 +180,42 @@ export class NumericalDisplayElement extends ReadableElement {
         if (null == this.writeVariableName) {
             return;
         }
-        const args = new WriteValueModalArgs(this.writeVariableName, this.model.dataType, this.model.integerDigits, this.model.fractionDigits, this.numericalOperationService.getNumericalOperations(this.model), this.model.version);
-        const modalRef = this.modalService.show(WriteValueModalComponent, {
+        const args = new WriteValueModalArgs(this.writeVariableName, this.model.dataType, this.model.fBoxDataType, this.model.integerDigits, this.model.fractionDigits, this.numericalOperationService.getNumericalOperations(this.model), this.model.version, this.enableDataParsed, this.releasedVariableService);
+        this.writeValueMmodalRef = this.modalService.show(WriteValueModalComponent, {
             initialState: { args: args }, backdrop: 'static', class: 'gui-modal-dialog-position', animated: false
         });
-        const onClosedSub = modalRef.content.onClosed.subscribe(result => {
-            modalRef.hide();
-            onClosedSub.unsubscribe();
+        this.writeValueMmodalRef.content.onClosed = (result) => {
             if (result) {
+                if (this.restorationTimer) {
+                    clearTimeout(this.restorationTimer);
+                    this.restorationTimer = undefined;
+                }
+                this.recordValue = result.value;
                 const writeValue = this.dataTypeService.formatToDecimal(this.model.version, result.value, this.model.dataType);
-                this.variableCommunicator.write(this.writeVariableName, writeValue).subscribe();
-                this.recordOperation(result.value);
+                this.showValue = result.showValue;
+                if (this.displayText !== this.showValue || result.variableRwType === variableRwTypeEnum.witer) {
+                    if (this.numericalOperation || result.enableNumericalOperation || result.isNumericalOperation || result.variableRwType === variableRwTypeEnum.witer) {
+                        this.recordOperation(result.value);
+                        this.writeValueMmodalRef.hide();
+                    }
+                    else {
+                        this.restorationTimer = setTimeout(() => {
+                            const isEquation = this.model.fractionDigits ?
+                                parseFloat(this.displayText) === parseFloat(this.showValue) :
+                                parseInt(this.displayText, 16) === parseInt(this.showValue, 16);
+                            if (!isEquation) {
+                                this.writeValueMmodalRef.content.isSubmitting = false;
+                                this.writeValueMmodalRef.content.showValidationErrorInfo(this.localization.writeValueTimeout);
+                            }
+                        }, 30000);
+                    }
+                    this.variableCommunicator.write(this.writeVariableName, writeValue).subscribe();
+                }
+                else {
+                    this.writeValueMmodalRef.hide();
+                }
             }
-        });
+        };
     }
     recordOperation(newValue) {
         if (this.model.isRecordOperation || this.model.isRecordOperation === undefined) {
@@ -206,7 +241,21 @@ export class NumericalDisplayElement extends ReadableElement {
         }
     }
     updateVariableValue(value) {
-        this.displayText = this.formatNumericalDisplayText(this.model.dataType, this.model.fractionDigits, value);
+        var _a;
+        const displayText = this.formatNumericalDisplayText(this.model.dataType, this.model.fractionDigits, value);
+        const isEquation = this.model.fractionDigits ?
+            parseFloat(displayText) === parseFloat(this.showValue) :
+            parseInt(displayText, 16) === parseInt(this.showValue, 16);
+        if (((_a = this.writeValueMmodalRef) === null || _a === void 0 ? void 0 : _a.content) && isEquation) {
+            if (this.restorationTimer) {
+                clearTimeout(this.restorationTimer);
+                this.restorationTimer = undefined;
+                this.recordOperation(this.recordValue);
+            }
+            this.writeValueMmodalRef.hide();
+            this.writeValueMmodalRef.content.hideValidationErrorInfo();
+        }
+        this.displayText = displayText;
         this.updateDisplayText(this.formatDisplayTextUnit(this.displayText));
     }
     updateDisplayText(text) {
@@ -294,6 +343,10 @@ export class NumericalDisplayElement extends ReadableElement {
         if (!this.isNumeric(value) || null == fractionDigits || fractionDigits < 0) {
             return value;
         }
+        // 数据解析
+        if (!this.enableDataParsed) {
+            return value;
+        }
         const supportFractionDigits = this.dataTypeService.isSupportFractionDigit(this.model.version, dataType);
         if (!supportFractionDigits) {
             return value;
@@ -312,7 +365,7 @@ export class NumericalDisplayElement extends ReadableElement {
         if (fractionDigits === 0) {
             return value;
         }
-        let displayText = Number(value).toString();
+        let displayText = Number(value).toFixed(0).toString();
         const isNegative = +displayText < 0;
         if (isNegative) {
             displayText = displayText.slice(1, displayText.length);
@@ -345,7 +398,7 @@ export class NumericalDisplayElement extends ReadableElement {
     }
     formatDisplayTextUnit(displayText) {
         if (this.model.showUnit !== false && this.model.unit) {
-            return `${displayText} ${this.model.unit}`;
+            return `${displayText || 0} ${this.model.unit}`;
         }
         return displayText;
     }

package/elements/numerical-display/numerical-display-element.metadata.json

@@ -0,0 +1 @@
+[{"__symbolic":"module","version":4,"metadata":{"NumericalDisplayElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/readable-element","name":"ReadableElement","line":28,"character":45},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":50,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":51,"character":18},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":52,"character":39},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":53,"character":27},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":54,"character":30},{"__symbolic":"reference","module":"../../config","name":"GraphStore","line":55,"character":37},{"__symbolic":"reference","module":"../../service","name":"OperationRecordService","line":56,"character":49},{"__symbolic":"reference","module":"../../service","name":"ReleasedVariableService","line":57,"character":50},{"__symbolic":"reference","module":"../../security","name":"SecurityChecker","line":58,"character":42},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":59,"character":23},{"__symbolic":"reference","module":"../../localization","name":"Localization","line":60,"character":22},{"__symbolic":"reference","name":"string"}]}],"dispose":[{"__symbolic":"method"}],"initElement":[{"__symbolic":"method"}],"checkElementPassword":[{"__symbolic":"method"}],"initVariableText":[{"__symbolic":"method"}],"initGraphAndText":[{"__symbolic":"method"}],"doWriteValue":[{"__symbolic":"method"}],"recordOperation":[{"__symbolic":"method"}],"changeStates":[{"__symbolic":"method"}],"updateVariableValue":[{"__symbolic":"method"}],"updateDisplayText":[{"__symbolic":"method"}],"rebuildTextElement":[{"__symbolic":"method"}],"formatNumericalDisplayText":[{"__symbolic":"method"}],"formatFloatDisplayText":[{"__symbolic":"method"}],"isNumeric":[{"__symbolic":"method"}],"formatDisplayTextUnit":[{"__symbolic":"method"}]}}}}]

package/elements/per-view-variable-communicator.d.ts

@@ -6,12 +6,14 @@ export declare class PerViewVariableCommunicator implements VariableCommunicator
     private observers;
     private variableValuesChangedSubscriptions;
     private variableStatesChangedSubscription;
+    private alarmSubscription;
     constructor(variableCommunicator: VariableCommunicator);
-    openVariable(variableName: string): Observable<VariableValue>;
-    openVariables(variableNames: Array<string>): Observable<Array<VariableValue>>;
+    openVariable(variableName: string, appId: string): Observable<VariableValue>;
+    openVariables(variableNames: Array<string>, appId?: string): Observable<Array<VariableValue>>;
     write(variableName: string, value: any): Observable<VariableValue>;
     writeWordByBit(variableName: string, index: number, value: number): Observable<VariableValue>;
     subscribeVariableState(variableName: string): Observable<VariableState>;
     subscribeVariableStates(variableNames: string[]): Observable<Array<VariableState>>;
+    subscribeUserDeviceAlarms(appId?: string): Observable<VariableState[]>;
     dispose(): void;
 }

package/elements/per-view-variable-communicator.js

@@ -6,12 +6,13 @@ export class PerViewVariableCommunicator {
         this.observers = new Map();
         this.variableValuesChangedSubscriptions = new Array();
         this.variableStatesChangedSubscription = new Array();
+        this.alarmSubscription = new Array();
         this._rawVariableCommunicator = variableCommunicator;
     }
-    openVariable(variableName) {
-        return this.openVariables([variableName]).pipe(map(values => values[0]));
+    openVariable(variableName, appId) {
+        return this.openVariables([variableName], appId).pipe(map(values => values[0]));
     }
-    openVariables(variableNames) {
+    openVariables(variableNames, appId = '') {
         return new Observable(subscriber => {
             each(variableNames, variableName => {
                 if (!this.observers.has(variableName)) {
@@ -19,7 +20,7 @@ export class PerViewVariableCommunicator {
                 }
                 this.observers.get(variableName).push(subscriber);
             });
-            const subscription = this._rawVariableCommunicator.openVariables(variableNames).subscribe(values => subscriber.next(values), error => subscriber.error(error), () => subscriber.complete());
+            const subscription = this._rawVariableCommunicator.openVariables(variableNames, appId).subscribe(values => subscriber.next(values), error => subscriber.error(error), () => subscriber.complete());
             this.variableValuesChangedSubscriptions.push(subscription);
         });
     }
@@ -38,8 +39,15 @@ export class PerViewVariableCommunicator {
             this.variableStatesChangedSubscription.push(subscription);
         });
     }
+    subscribeUserDeviceAlarms(appId = '') {
+        return new Observable(subscriber => {
+            const subscription = this._rawVariableCommunicator.subscribeUserDeviceAlarms(appId).subscribe(values => subscriber.next(values), error => subscriber.error(error), () => subscriber.complete());
+            this.alarmSubscription.push(subscription);
+        });
+    }
     dispose() {
         forEach(this.variableValuesChangedSubscriptions, s => s.unsubscribe());
         forEach(this.variableStatesChangedSubscription, s => s.unsubscribe());
+        forEach(this.alarmSubscription, s => s.unsubscribe());
     }
 }

package/elements/per-view-variable-communicator.metadata.json

@@ -0,0 +1 @@
+[{"__symbolic":"module","version":4,"metadata":{"PerViewVariableCommunicator":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"../communication","name":"VariableCommunicator","line":15,"character":38}]}],"openVariable":[{"__symbolic":"method"}],"openVariables":[{"__symbolic":"method"}],"write":[{"__symbolic":"method"}],"writeWordByBit":[{"__symbolic":"method"}],"subscribeVariableState":[{"__symbolic":"method"}],"subscribeVariableStates":[{"__symbolic":"method"}],"subscribeUserDeviceAlarms":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}]}}}}]

package/elements/pipe/pipe-element.d.ts

@@ -9,7 +9,7 @@ export declare class PipeElement extends ConditionalControlElement {
     private readonly elePipeInnerwall;
     private readonly elePipeFlowBlock;
     private pathLength;
-    constructor(element: HTMLElement, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, localization: Localization);
+    constructor(element: HTMLElement, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, localization: Localization, signalRAppId: string);
     initDefaultData(model: any): void;
     protected updateElement(result: ConditionControlResultValue): void;
     private initFrameNode;