@flexem/fc-gui 3.0.0-alpha.4 → 3.0.0-alpha.40

package/modal/write-value/write-value-modal.component.d.ts

@@ -1,21 +1,21 @@
 import { OnInit } from '@angular/core';
-import { Observable } from 'rxjs';
 import { Localization } from '../../localization';
 import { NumericalOperation } from '../../model/numerical-display/numerical-operation';
 import { DataTypeService } from '../../utils/data-type/data-type.service';
 import { FractionDigitService } from '../../utils/fraction-digit.service';
 import { NumericalOperationService } from '../../utils/numerical-operation.service';
 import { WriteValueModalArgs } from './write-value-modal-args';
-import { WriteValueModelResult } from './write-value-model-result';
+import { BsModalRef } from 'ngx-bootstrap/modal';
 export declare class WriteValueModalComponent implements OnInit {
     localization: Localization;
     private readonly dataTypeService;
     private readonly fractionDigitService;
     private readonly numericalOperationService;
-    private _onClosed;
-    get onClosed(): Observable<WriteValueModelResult>;
+    private readonly bsModalRef;
+    onClosed: any;
     args: WriteValueModalArgs;
     private dataType;
+    private fBoxDataType;
     private pattern;
     private fractionDigits;
     private integerDigits;
@@ -33,13 +33,15 @@ export declare class WriteValueModalComponent implements OnInit {
     writeMinValue: number;
     writeMaxValue: number;
     writeValueRangeText: string;
+    isSubmitting: boolean;
     get invalidErrorText(): string;
-    constructor(localization: Localization, dataTypeService: DataTypeService, fractionDigitService: FractionDigitService, numericalOperationService: NumericalOperationService);
+    constructor(localization: Localization, dataTypeService: DataTypeService, fractionDigitService: FractionDigitService, numericalOperationService: NumericalOperationService, bsModalRef: BsModalRef);
     ngOnInit(): void;
     initData(option: WriteValueModalArgs): void;
+    private setValueRangeAccordToDataParsed;
     getWriteValueRangeText(): string;
     save(): void;
-    close(modalResult?: WriteValueModelResult): void;
+    close(): void;
     validate(): void;
     private showValidationErrorInfo;
     private hideValidationErrorInfo;

package/modal/write-value/write-value-modal.component.html

@@ -16,6 +16,9 @@
     <span class="help-block text-danger" [hidden]="!validationError">{{validationErrorText}}</span>
   </div>
   <div class="modal-footer">
-    <button type="submit" class="btn md-skip btn-primary btn-block" [disabled]="validationError">{{localization.submit}}</button>
+    <button type="submit" class="btn md-skip btn-primary btn-block" [disabled]="validationError || isSubmitting">
+      <ng-container *ngIf="!isSubmitting">{{localization.submit}}</ng-container>
+      <ng-container *ngIf="isSubmitting">{{localization.submitting}}</ng-container>
+    </button>
   </div>
 </form>

package/modal/write-value/write-value-modal.component.js

@@ -11,23 +11,21 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
 import { Component, Inject, Output } from '@angular/core';
-import { Subject } from 'rxjs';
 import { LOCALIZATION } from '../../localization';
 import { DataTypeService } from '../../utils/data-type/data-type.service';
 import { FractionDigitService } from '../../utils/fraction-digit.service';
 import { NumericalOperationService } from '../../utils/numerical-operation.service';
 import { isNil } from 'lodash';
+import { BsModalRef } from 'ngx-bootstrap/modal';
 let WriteValueModalComponent = class WriteValueModalComponent {
-    constructor(localization, dataTypeService, fractionDigitService, numericalOperationService) {
+    constructor(localization, dataTypeService, fractionDigitService, numericalOperationService, bsModalRef) {
         this.localization = localization;
         this.dataTypeService = dataTypeService;
         this.fractionDigitService = fractionDigitService;
         this.numericalOperationService = numericalOperationService;
-        this._onClosed = new Subject();
+        this.bsModalRef = bsModalRef;
         this.writeValueRangeText = '';
-    }
-    get onClosed() {
-        return this._onClosed;
+        this.isSubmitting = false;
     }
     get invalidErrorText() {
         return this.localization.loadFailed;
@@ -39,6 +37,7 @@ let WriteValueModalComponent = class WriteValueModalComponent {
     initData(option) {
         this.variableName = option.variableName;
         this.dataType = option.dataType;
+        this.fBoxDataType = option.fBoxDataType;
         this.integerDigits = option.integerDigits ? option.integerDigits : 0;
         this.fractionDigits = option.fractionDigits ? option.fractionDigits : 0;
         this.valueType = this.dataTypeService.getValueType(option.version, option.dataType);
@@ -47,15 +46,25 @@ let WriteValueModalComponent = class WriteValueModalComponent {
         this.enableNumericalOperation = this.numericalOperation.enableNumericalOperation ?
             this.numericalOperation.enableNumericalOperation : false;
         this.value = '';
+        if (this.args.enableDataParsed) {
+            this.setValueRangeAccordToDataParsed(option);
+        }
+        else {
+            this.writeMaxValue = this.dataTypeService.getMaxValue(option.version, this.dataType, this.fBoxDataType);
+            this.writeMinValue = this.dataTypeService.getMinValue(option.version, this.dataType, this.fBoxDataType);
+        }
+        this.writeValueRangeText = this.getWriteValueRangeText();
+    }
+    setValueRangeAccordToDataParsed(option) {
         if (this.dataTypeService.isFloat(option.version, this.dataType) || this.enableNumericalOperation) {
-            this.maxValueLimit = this.dataTypeService.getMaxValue(option.version, this.dataType);
-            this.minValueLimit = this.dataTypeService.getMinValue(option.version, this.dataType);
+            this.maxValueLimit = this.dataTypeService.getMaxValue(option.version, this.dataType, this.fBoxDataType);
+            this.minValueLimit = this.dataTypeService.getMinValue(option.version, this.dataType, this.fBoxDataType);
             this.numericalLowerLimit = this.numericalOperation.numericalLowerLimit;
             this.numericalUpperLimit = this.numericalOperation.numericalUpperLimit;
         }
         else {
-            this.maxValueLimit = +this.fractionDigitService.movePoint(this.dataTypeService.getMaxValue(option.version, this.dataType), -this.fractionDigits);
-            this.minValueLimit = +this.fractionDigitService.movePoint(this.dataTypeService.getMinValue(option.version, this.dataType), -this.fractionDigits);
+            this.maxValueLimit = +this.fractionDigitService.movePoint(this.dataTypeService.getMaxValue(option.version, this.dataType, this.fBoxDataType), -this.fractionDigits);
+            this.minValueLimit = +this.fractionDigitService.movePoint(this.dataTypeService.getMinValue(option.version, this.dataType, this.fBoxDataType), -this.fractionDigits);
             this.numericalLowerLimit = +this.fractionDigitService.movePoint(this.numericalOperation.numericalLowerLimit, -this.fractionDigits);
             this.numericalUpperLimit = +this.fractionDigitService.movePoint(this.numericalOperation.numericalUpperLimit, -this.fractionDigits);
         }
@@ -69,7 +78,6 @@ let WriteValueModalComponent = class WriteValueModalComponent {
         const realUpperLimitValue = lowerLimitValue < upperLimitValue ? upperLimitValue : lowerLimitValue;
         this.writeMinValue = realMinValue > realLowerLimitValue ? realMinValue : realLowerLimitValue;
         this.writeMaxValue = realMaxValue < realUpperLimitValue ? realMaxValue : realUpperLimitValue;
-        this.writeValueRangeText = this.getWriteValueRangeText();
     }
     getWriteValueRangeText() {
         let minValue = '';
@@ -79,7 +87,7 @@ let WriteValueModalComponent = class WriteValueModalComponent {
             maxValue = this.writeMaxValue.toString(16);
         }
         else {
-            if (this.fractionDigits > 0) {
+            if (this.args.enableDataParsed && this.fractionDigits > 0) {
                 minValue = this.writeMinValue.toFixed(this.fractionDigits).toString();
                 maxValue = this.writeMaxValue.toFixed(this.fractionDigits).toString();
             }
@@ -91,17 +99,19 @@ let WriteValueModalComponent = class WriteValueModalComponent {
         return minValue + '~' + maxValue;
     }
     save() {
-        if (this.enableNumericalOperation) {
-            this.value = this.numericalOperationService.getWriteValue(this.args.version, this.value, this.numericalOperation, this.dataType, this.fractionDigits);
-        }
-        else {
-            this.value = this.formatWriteValue();
+        this.isSubmitting = true;
+        if (this.args.enableDataParsed) {
+            if (this.enableNumericalOperation) {
+                this.value = this.numericalOperationService.getWriteValue(this.args.version, this.value, this.numericalOperation, this.dataType, this.fractionDigits);
+            }
+            else {
+                this.value = this.formatWriteValue();
+            }
         }
-        this.close({ value: this.value });
+        this.onClosed({ value: this.value });
     }
-    close(modalResult) {
-        this._onClosed.next(modalResult);
-        this._onClosed.complete();
+    close() {
+        this.bsModalRef.hide();
     }
     validate() {
         // 校验数值必填
@@ -125,7 +135,7 @@ let WriteValueModalComponent = class WriteValueModalComponent {
         }
         if (this.dataTypeService.isBinaryType(this.args.version, this.dataType) || this.dataTypeService.isHexType(this.args.version, this.dataType)) {
             // 校验数值最大长度
-            const valueMaxLength = this.dataTypeService.getValueMaxLength(this.args.version, this.dataType);
+            const valueMaxLength = this.dataTypeService.getValueMaxLength(this.args.version, this.dataType, this.fBoxDataType);
             const maxLength = this.integerDigits ? Math.min(this.integerDigits, valueMaxLength) : valueMaxLength;
             if (this.value.length > maxLength) {
                 return this.showValidationErrorInfo(this.localization.numericalValueTooLong);
@@ -181,12 +191,13 @@ __decorate([
 WriteValueModalComponent = __decorate([
     Component({
         selector: 'writeValueModal',
-        template: "<form #writeValueForm=\"ngForm\" novalidate (ngSubmit)=\"save()\" bs-modal-drag> <div class=\"modal-header\"> <h4 class=\"modal-title\"> <span>{{localization.setting}}</span> <span>{{variableName}}</span> </h4> <button type=\"button\" class=\"close pull-right\" aria-label=\"Close\" (click)=\"close()\"> <span aria-hidden=\"true\">&times;</span> </button> </div> <div class=\"modal-body\"> <span class=\"write-value-range\">{{localization.writeValueRange}}：&nbsp;{{writeValueRangeText}} <span *ngIf=\"valueType\">({{valueType}})</span> </span> <input type=\"text\" name=\"valueInput\" autoFocus class=\"form-control write-value\" [(ngModel)]=\"value\" (keyup)=\"validate()\" autocomplete=\"off\"> <span class=\"help-block text-danger\" [hidden]=\"!validationError\">{{validationErrorText}}</span> </div> <div class=\"modal-footer\"> <button type=\"submit\" class=\"btn md-skip btn-primary btn-block\" [disabled]=\"validationError\">{{localization.submit}}</button> </div> </form> ",
+        template: "<form #writeValueForm=\"ngForm\" novalidate (ngSubmit)=\"save()\" bs-modal-drag> <div class=\"modal-header\"> <h4 class=\"modal-title\"> <span>{{localization.setting}}</span> <span>{{variableName}}</span> </h4> <button type=\"button\" class=\"close pull-right\" aria-label=\"Close\" (click)=\"close()\"> <span aria-hidden=\"true\">&times;</span> </button> </div> <div class=\"modal-body\"> <span class=\"write-value-range\">{{localization.writeValueRange}}：&nbsp;{{writeValueRangeText}} <span *ngIf=\"valueType\">({{valueType}})</span> </span> <input type=\"text\" name=\"valueInput\" autoFocus class=\"form-control write-value\" [(ngModel)]=\"value\" (keyup)=\"validate()\" autocomplete=\"off\"> <span class=\"help-block text-danger\" [hidden]=\"!validationError\">{{validationErrorText}}</span> </div> <div class=\"modal-footer\"> <button type=\"submit\" class=\"btn md-skip btn-primary btn-block\" [disabled]=\"validationError || isSubmitting\"> <ng-container *ngIf=\"!isSubmitting\">{{localization.submit}}</ng-container> <ng-container *ngIf=\"isSubmitting\">{{localization.submitting}}</ng-container> </button> </div> </form> ",
         styles: [".modal-header { padding: 10px; border-color: transparent; } .modal-body { position: relative; padding: 0px 5px !important; padding-top: 10px !important; } .modal-title { display: unset; margin-left: -6px; font-size: 16px !important; } .form-control { margin: 0 5%; float: none; width: 90%; } .modal-footer { padding: 10px 4px 20px 5px !important; text-align: right; border-color: transparent; } .text-danger { display: block; color: #ed6b75; font-size: 14px; margin: 5px 0px 0px 15px; } .btn-primary { background-color: #3B97FC; border-color: #3B97FC; padding: 5px 30px; width: 90%; margin: 0 5%; height: 32px; } .write-value-range { color: #7f939e; font-size: 14px; margin-left: 15px; } .write-value { padding-left: 8px; margin-left: 16px; height: 32px; } "]
     }),
     __param(0, Inject(LOCALIZATION)),
     __metadata("design:paramtypes", [Object, DataTypeService,
         FractionDigitService,
-        NumericalOperationService])
+        NumericalOperationService,
+        BsModalRef])
 ], WriteValueModalComponent);
 export { WriteValueModalComponent };

package/modal/write-value/write-value-modal.component.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"WriteValueModalComponent":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Component","line":11,"character":1},"arguments":[{"selector":"writeValueModal","template":"<form #writeValueForm=\"ngForm\" novalidate (ngSubmit)=\"save()\" bs-modal-drag> <div class=\"modal-header\"> <h4 class=\"modal-title\"> <span>{{localization.setting}}</span> <span>{{variableName}}</span> </h4> <button type=\"button\" class=\"close pull-right\" aria-label=\"Close\" (click)=\"close()\"> <span aria-hidden=\"true\">&times;</span> </button> </div> <div class=\"modal-body\"> <span class=\"write-value-range\">{{localization.writeValueRange}}：&nbsp;{{writeValueRangeText}} <span *ngIf=\"valueType\">({{valueType}})</span> </span> <input type=\"text\" name=\"valueInput\" autoFocus class=\"form-control write-value\" [(ngModel)]=\"value\" (keyup)=\"validate()\" autocomplete=\"off\"> <span class=\"help-block text-danger\" [hidden]=\"!validationError\">{{validationErrorText}}</span> </div> <div class=\"modal-footer\"> <button type=\"submit\" class=\"btn md-skip btn-primary btn-block\" [disabled]=\"validationError\">{{localization.submit}}</button> </div> </form> ","styles":[".modal-header { padding: 10px; border-color: transparent; } .modal-body { position: relative; padding: 0px 5px !important; padding-top: 10px !important; } .modal-title { display: unset; margin-left: -6px; font-size: 16px !important; } .form-control { margin: 0 5%; float: none; width: 90%; } .modal-footer { padding: 10px 4px 20px 5px !important; text-align: right; border-color: transparent; } .text-danger { display: block; color: #ed6b75; font-size: 14px; margin: 5px 0px 0px 15px; } .btn-primary { background-color: #3B97FC; border-color: #3B97FC; padding: 5px 30px; width: 90%; margin: 0 5%; height: 32px; } .write-value-range { color: #7f939e; font-size: 14px; margin-left: 15px; } .write-value { padding-left: 8px; margin-left: 16px; height: 32px; } "]}]}],"members":{"invalidErrorText":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Output","line":45,"character":5}}]}],"__ctor__":[{"__symbolic":"constructor","parameterDecorators":[[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Inject","line":51,"character":9},"arguments":[{"__symbolic":"reference","module":"../../localization","name":"LOCALIZATION","line":51,"character":16}]}],null,null,null],"parameters":[{"__symbolic":"reference","module":"../../localization","name":"Localization","line":51,"character":51},{"__symbolic":"reference","module":"../../utils/data-type/data-type.service","name":"DataTypeService","line":52,"character":42},{"__symbolic":"reference","module":"../../utils/fraction-digit.service","name":"FractionDigitService","line":53,"character":47},{"__symbolic":"reference","module":"../../utils/numerical-operation.service","name":"NumericalOperationService","line":54,"character":52}]}],"ngOnInit":[{"__symbolic":"method"}],"initData":[{"__symbolic":"method"}],"getWriteValueRangeText":[{"__symbolic":"method"}],"save":[{"__symbolic":"method"}],"close":[{"__symbolic":"method"}],"validate":[{"__symbolic":"method"}],"showValidationErrorInfo":[{"__symbolic":"method"}],"hideValidationErrorInfo":[{"__symbolic":"method"}],"getFractionDigits":[{"__symbolic":"method"}],"formatWriteValue":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"WriteValueModalComponent":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Component","line":10,"character":1},"arguments":[{"selector":"writeValueModal","template":"<form #writeValueForm=\"ngForm\" novalidate (ngSubmit)=\"save()\" bs-modal-drag> <div class=\"modal-header\"> <h4 class=\"modal-title\"> <span>{{localization.setting}}</span> <span>{{variableName}}</span> </h4> <button type=\"button\" class=\"close pull-right\" aria-label=\"Close\" (click)=\"close()\"> <span aria-hidden=\"true\">&times;</span> </button> </div> <div class=\"modal-body\"> <span class=\"write-value-range\">{{localization.writeValueRange}}：&nbsp;{{writeValueRangeText}} <span *ngIf=\"valueType\">({{valueType}})</span> </span> <input type=\"text\" name=\"valueInput\" autoFocus class=\"form-control write-value\" [(ngModel)]=\"value\" (keyup)=\"validate()\" autocomplete=\"off\"> <span class=\"help-block text-danger\" [hidden]=\"!validationError\">{{validationErrorText}}</span> </div> <div class=\"modal-footer\"> <button type=\"submit\" class=\"btn md-skip btn-primary btn-block\" [disabled]=\"validationError || isSubmitting\"> <ng-container *ngIf=\"!isSubmitting\">{{localization.submit}}</ng-container> <ng-container *ngIf=\"isSubmitting\">{{localization.submitting}}</ng-container> </button> </div> </form> ","styles":[".modal-header { padding: 10px; border-color: transparent; } .modal-body { position: relative; padding: 0px 5px !important; padding-top: 10px !important; } .modal-title { display: unset; margin-left: -6px; font-size: 16px !important; } .form-control { margin: 0 5%; float: none; width: 90%; } .modal-footer { padding: 10px 4px 20px 5px !important; text-align: right; border-color: transparent; } .text-danger { display: block; color: #ed6b75; font-size: 14px; margin: 5px 0px 0px 15px; } .btn-primary { background-color: #3B97FC; border-color: #3B97FC; padding: 5px 30px; width: 90%; margin: 0 5%; height: 32px; } .write-value-range { color: #7f939e; font-size: 14px; margin-left: 15px; } .write-value { padding-left: 8px; margin-left: 16px; height: 32px; } "]}]}],"members":{"invalidErrorText":[{"__symbolic":"property","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Output","line":43,"character":5}}]}],"__ctor__":[{"__symbolic":"constructor","parameterDecorators":[[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Inject","line":49,"character":9},"arguments":[{"__symbolic":"reference","module":"../../localization","name":"LOCALIZATION","line":49,"character":16}]}],null,null,null,null],"parameters":[{"__symbolic":"reference","module":"../../localization","name":"Localization","line":49,"character":51},{"__symbolic":"reference","module":"../../utils/data-type/data-type.service","name":"DataTypeService","line":50,"character":42},{"__symbolic":"reference","module":"../../utils/fraction-digit.service","name":"FractionDigitService","line":51,"character":47},{"__symbolic":"reference","module":"../../utils/numerical-operation.service","name":"NumericalOperationService","line":52,"character":52},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalRef","line":53,"character":37}]}],"ngOnInit":[{"__symbolic":"method"}],"initData":[{"__symbolic":"method"}],"setValueRangeAccordToDataParsed":[{"__symbolic":"method"}],"getWriteValueRangeText":[{"__symbolic":"method"}],"save":[{"__symbolic":"method"}],"close":[{"__symbolic":"method"}],"validate":[{"__symbolic":"method"}],"showValidationErrorInfo":[{"__symbolic":"method"}],"hideValidationErrorInfo":[{"__symbolic":"method"}],"getFractionDigits":[{"__symbolic":"method"}],"formatWriteValue":[{"__symbolic":"method"}]}}}}]

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

@@ -0,0 +1,23 @@
+import * as moment from 'moment';
+export declare class AirQualityInfo {
+    /** 有无地址 */
+    hasAddress: boolean | undefined;
+    /** 是否获取地址中 */
+    gettingAddress: boolean | undefined;
+    /** 是否支持 */
+    supported: boolean | undefined;
+    airQuality: AirQuality | undefined;
+}
+export declare class AirQuality {
+    city: string | undefined;
+    aqi: string | undefined;
+    level: number | undefined;
+    category: string | undefined;
+    pm10: string | undefined;
+    pm25: string | undefined;
+    no2: string | undefined;
+    so2: string | undefined;
+    co: string | undefined;
+    o3: string | undefined;
+    reportTime: moment.Moment | undefined;
+}

package/model/air-quality/air-quality-info.js

@@ -0,0 +1,4 @@
+export class AirQualityInfo {
+}
+export class AirQuality {
+}

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

@@ -0,0 +1 @@
+[{"__symbolic":"module","version":4,"metadata":{"AirQualityInfo":{"__symbolic":"class"},"AirQuality":{"__symbolic":"class"}}}]

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/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/historical-curve/historical-curve-axis-settings.d.ts

@@ -1,6 +1,13 @@
 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;
 }
+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/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/numerical-display/numerical-display.d.ts

@@ -12,6 +12,7 @@ export interface NumericalDisplay extends ReadableModel, SecurityModel {
     readonly textAlign: string;
     readonly accessPermission: any;
     dataType: number;
+    fBoxDataType: number;
     readonly integerDigits: number;
     readonly fractionDigits: number;
     readonly enableNumericalOperation: boolean;
@@ -24,4 +25,5 @@ export interface NumericalDisplay extends ReadableModel, SecurityModel {
     readonly showVariableText?: boolean;
     readonly variableText?: any;
     readonly displayDataType?: DisplayDataType;
+    readonly enableDataParsed?: boolean;
 }

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/shared/condition/bit-condition-item-observer.d.ts

@@ -8,7 +8,7 @@ export declare class BitConditionItemObserver extends ConditionItemObserver {
     private currentValue;
     private binary;
     constructor(bitConditon: BitConditionModel, variableCommunicator: VariableCommunicator, variableStore: VariableStore);
-    requestData(): void;
+    requestData(appId: string): void;
     private requestconditionEffectiveValue;
     getIsConditionEffective(): boolean;
 }

package/model/shared/condition/bit-condition-item-observer.js

@@ -9,14 +9,14 @@ export class BitConditionItemObserver extends ConditionItemObserver {
         this.bitConditon = bitConditon;
         this.variableCommunicator = variableCommunicator;
     }
-    requestData() {
+    requestData(appId) {
         if (!this.bitConditon) {
             throw new Error('BitConditionModel cannot be null.');
         }
         if (this.variableName) {
             this.variableCommunicator.subscribeVariableState(this.variableName).subscribe(variableValue => {
                 if (variableValue.state === VariableStateEnum.Normal) {
-                    this.requestconditionEffectiveValue(this.variableCommunicator);
+                    this.requestconditionEffectiveValue(this.variableCommunicator, appId);
                 }
                 else {
                     this.conditionEffectiveChanged.emit(new RelationConditionResultState(new VariableState(this.variableName, variableValue.state), false));
@@ -24,8 +24,8 @@ export class BitConditionItemObserver extends ConditionItemObserver {
             });
         }
     }
-    requestconditionEffectiveValue(variableCommunicator) {
-        variableCommunicator.openVariable(this.variableName).subscribe(value => {
+    requestconditionEffectiveValue(variableCommunicator, appId = '') {
+        variableCommunicator.openVariable(this.variableName, appId).subscribe(value => {
             if (this.bitConditon.isBitwiseIndex) {
                 const maxBitIndex = 31;
                 this.binary = new Binary(value.value, maxBitIndex + 1);

package/model/shared/condition/condition-items-result-observer.d.ts

@@ -11,6 +11,6 @@ export declare class ConditionItemsResultObserver implements ConditionItemsObser
     readonly conditionResultChanged: EventEmitter<ConditionControlResultValue>;
     private conditionResults;
     constructor(sourceConditionItems: ConditionItemModel[], variableCommunicator: VariableCommunicator, variableStore: VariableStore);
-    requestData(): void;
+    requestData(appId: string): void;
     private emitConditionResult;
 }

package/model/shared/condition/condition-items-result-observer.js

@@ -1,4 +1,5 @@
 import { EventEmitter } from '@angular/core';
+import { sortBy } from 'lodash';
 import { ConditionType } from './condition-type';
 import { BitConditionItemObserver } from './bit-condition-item-observer';
 import { RelationConditionResult } from './relation-condition-result';
@@ -12,7 +13,7 @@ export class ConditionItemsResultObserver {
         this.conditionResultChanged = new EventEmitter();
         this.conditionResults = new Map();
     }
-    requestData() {
+    requestData(appId) {
         if (null == this.sourceConditionItems || !this.sourceConditionItems.length) {
             return;
         }
@@ -25,10 +26,10 @@ export class ConditionItemsResultObserver {
                         if (this.conditionResults.has(conditionItems.indexOf(item))) {
                             this.conditionResults.delete(conditionItems.indexOf(item));
                         }
-                        this.conditionResults.set(conditionItems.indexOf(item), new RelationConditionResult(item.relationType, itemResult));
+                        this.conditionResults.set(conditionItems.indexOf(item), new RelationConditionResult(conditionItems.indexOf(item), item.relationType, itemResult));
                         this.emitConditionResult();
                     });
-                    bitItem.requestData();
+                    bitItem.requestData(appId);
                     break;
                 case ConditionType.Word:
                     const wordItem = new WordConditionItemObserver(item.condition, this.variableCommunicator, this.variableStore);
@@ -36,10 +37,10 @@ export class ConditionItemsResultObserver {
                         if (this.conditionResults.has(conditionItems.indexOf(item))) {
                             this.conditionResults.delete(conditionItems.indexOf(item));
                         }
-                        this.conditionResults.set(conditionItems.indexOf(item), new RelationConditionResult(item.relationType, itemResult));
+                        this.conditionResults.set(conditionItems.indexOf(item), new RelationConditionResult(conditionItems.indexOf(item), item.relationType, itemResult));
                         this.emitConditionResult();
                     });
-                    wordItem.requestData();
+                    wordItem.requestData(appId);
                     break;
                 default:
                     throw new Error(`Unknown ConditionType :${item.conditionType}`);
@@ -49,23 +50,32 @@ export class ConditionItemsResultObserver {
     emitConditionResult() {
         let isControl = true;
         const elementStates = [];
+        const formatConditionResults = [];
         this.conditionResults.forEach(t => {
+            formatConditionResults.push({
+                key: t.key,
+                result: t
+            });
             // eslint-disable-next-line eqeqeq
             if (t.relationType == RelationType.None) {
                 isControl = t.result.value;
                 elementStates.push(t.result.state);
             }
         });
-        this.conditionResults.forEach(item => {
+        const formatResults = sortBy(formatConditionResults, data => {
+            return data.key;
+        });
+        formatResults.forEach(item => {
+            const relationCondition = item.result;
             // eslint-disable-next-line eqeqeq
-            if (item.relationType == RelationType.Or) {
-                isControl = isControl || item.result.value;
-                elementStates.push(item.result.state);
+            if (relationCondition.relationType == RelationType.Or) {
+                isControl = isControl || relationCondition.result.value;
+                elementStates.push(relationCondition.result.state);
                 // eslint-disable-next-line eqeqeq
             }
-            else if (item.relationType == RelationType.And) {
-                isControl = isControl && item.result.value;
-                elementStates.push(item.result.state);
+            else if (relationCondition.relationType == RelationType.And) {
+                isControl = isControl && relationCondition.result.value;
+                elementStates.push(relationCondition.result.state);
             }
         });
         const conditionControlResult = {

package/model/shared/condition/condition-items-result-observer.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"ConditionItemsResultObserver":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","module":"./condition-item-model","name":"ConditionItemModel","line":19,"character":55}]},{"__symbolic":"reference","module":"../../../communication","name":"VariableCommunicator","line":20,"character":47},{"__symbolic":"reference","module":"../../../config","name":"VariableStore","line":21,"character":40}]}],"requestData":[{"__symbolic":"method"}],"emitConditionResult":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"ConditionItemsResultObserver":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","module":"./condition-item-model","name":"ConditionItemModel","line":20,"character":55}]},{"__symbolic":"reference","module":"../../../communication","name":"VariableCommunicator","line":21,"character":47},{"__symbolic":"reference","module":"../../../config","name":"VariableStore","line":22,"character":40}]}],"requestData":[{"__symbolic":"method"}],"emitConditionResult":[{"__symbolic":"method"}]}}}}]

package/model/shared/condition/convert-condition-model.d.ts

@@ -0,0 +1,5 @@
+import { RelationConditionResult } from './relation-condition-result';
+export interface ConvertConditionModel {
+    readonly key: number;
+    readonly result: RelationConditionResult;
+}

package/model/shared/condition/convert-condition-model.metadata.json

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

package/model/shared/condition/relation-condition-result.d.ts

@@ -1,7 +1,8 @@
 import { RelationType } from './relation-type';
 import { RelationConditionResultState } from './relation-condition-result-state';
 export declare class RelationConditionResult {
+    readonly key: number;
     readonly relationType: RelationType;
     readonly result: RelationConditionResultState;
-    constructor(relationType: RelationType, result: RelationConditionResultState);
+    constructor(key: number, relationType: RelationType, result: RelationConditionResultState);
 }

package/model/shared/condition/relation-condition-result.js

@@ -1,5 +1,6 @@
 export class RelationConditionResult {
-    constructor(relationType, result) {
+    constructor(key, relationType, result) {
+        this.key = key;
         this.relationType = relationType;
         this.result = result;
     }

package/model/shared/condition/relation-condition-result.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"RelationConditionResult":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"./relation-type","name":"RelationType","line":4,"character":46},{"__symbolic":"reference","module":"./relation-condition-result-state","name":"RelationConditionResultState","line":4,"character":84}]}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"RelationConditionResult":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","module":"./relation-type","name":"RelationType","line":4,"character":75},{"__symbolic":"reference","module":"./relation-condition-result-state","name":"RelationConditionResultState","line":4,"character":113}]}]}}}}]

package/model/shared/condition/word-condition-item-observer.d.ts

@@ -12,7 +12,7 @@ export declare class WordConditionItemObserver extends ConditionItemObserver {
     get baseVariable(): string;
     get realtionVariable(): string;
     constructor(wordCondition: WordConditionModel, variableCommunicator: VariableCommunicator, variableStore: VariableStore);
-    requestData(): void;
+    requestData(appId: string): void;
     private requestconditionEffectiveValue;
     private requestconditionEffectiveBaseValue;
     private requestconditionEffectiveRealtionValue;

package/model/shared/condition/word-condition-item-observer.js

@@ -28,7 +28,7 @@ export class WordConditionItemObserver extends ConditionItemObserver {
         const variable = new VariableDefinition(variableValue.variableName, variableValue.variableGroupName, variableValue.dataSourceCode, variableValue.variableVersion);
         return VariableUtil.getConvertedVariableName(this.variableStore, variable);
     }
-    requestData() {
+    requestData(appId) {
         if (!this.wordCondition) {
             throw new Error('WordConditionModel cannot be null.');
         }
@@ -43,7 +43,7 @@ export class WordConditionItemObserver extends ConditionItemObserver {
             if (this.variableName) {
                 this.variableCommunicator.subscribeVariableState(this.variableName).subscribe(variableValue => {
                     if (variableValue.state === VariableStateEnum.Normal) {
-                        this.requestconditionEffectiveBaseValue(this.variableCommunicator);
+                        this.requestconditionEffectiveBaseValue(this.variableCommunicator, appId);
                     }
                     else {
                         this.conditionEffectiveChanged.emit(new RelationConditionResultState(new VariableState(this.variableName, variableValue.state), false));
@@ -63,7 +63,7 @@ export class WordConditionItemObserver extends ConditionItemObserver {
                 if (this.variableName) {
                     this.variableCommunicator.subscribeVariableState(this.variableName).subscribe(variableState => {
                         if (variableState.state === VariableStateEnum.Normal) {
-                            this.requestconditionEffectiveRealtionValue(this.variableCommunicator);
+                            this.requestconditionEffectiveRealtionValue(this.variableCommunicator, appId);
                         }
                         else {
                             this.conditionEffectiveChanged.emit(new RelationConditionResultState(new VariableState(this.variableName, variableState.state), false));
@@ -71,14 +71,14 @@ export class WordConditionItemObserver extends ConditionItemObserver {
                     });
                 }
                 else {
-                    this.requestconditionEffectiveRealtionValue(this.variableCommunicator);
+                    this.requestconditionEffectiveRealtionValue(this.variableCommunicator, appId);
                 }
             }
         }
         if (this.variableName) {
             this.variableCommunicator.subscribeVariableState(this.variableName).subscribe(variableValue => {
                 if (variableValue.state === VariableStateEnum.Normal) {
-                    this.requestconditionEffectiveValue(this.variableCommunicator);
+                    this.requestconditionEffectiveValue(this.variableCommunicator, appId);
                 }
                 else {
                     this.conditionEffectiveChanged.emit(new RelationConditionResultState(new VariableState(this.variableName, variableValue.state), false));
@@ -86,22 +86,22 @@ export class WordConditionItemObserver extends ConditionItemObserver {
             });
         }
     }
-    requestconditionEffectiveValue(variableCommunicator) {
-        variableCommunicator.openVariable(this.variableName).subscribe(variableValue => {
+    requestconditionEffectiveValue(variableCommunicator, appId = '') {
+        variableCommunicator.openVariable(this.variableName, appId).subscribe(variableValue => {
             this.currentValue = variableValue;
             this.isConditionEffective = this.getIsConditionEffective();
             this.conditionEffectiveChanged.emit(new RelationConditionResultState(new VariableState(this.variableName, variableValue.state), this.isConditionEffective));
         });
     }
-    requestconditionEffectiveBaseValue(variableCommunicator) {
-        variableCommunicator.openVariable(this.baseVariable).subscribe(variableValue => {
+    requestconditionEffectiveBaseValue(variableCommunicator, appId = '') {
+        variableCommunicator.openVariable(this.baseVariable, appId).subscribe(variableValue => {
             this.baseVariableValue = variableValue;
             this.isConditionEffective = this.getIsConditionEffective();
             this.conditionEffectiveChanged.emit(new RelationConditionResultState(new VariableState(this.variableName, variableValue.state), this.isConditionEffective));
         });
     }
-    requestconditionEffectiveRealtionValue(variableCommunicator) {
-        variableCommunicator.openVariable(this.realtionVariable).subscribe(variableValue => {
+    requestconditionEffectiveRealtionValue(variableCommunicator, appId = '') {
+        variableCommunicator.openVariable(this.realtionVariable, appId).subscribe(variableValue => {
             this.realtionVariableValue = variableValue;
             this.isConditionEffective = this.getIsConditionEffective();
             this.conditionEffectiveChanged.emit(new RelationConditionResultState(new VariableState(this.variableName, variableValue.state), this.isConditionEffective));