@flexem/fc-gui 3.0.0-alpha.13 → 3.0.0-alpha.130

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

@@ -9,13 +9,18 @@
     </button>
   </div>
   <div class="modal-body">
-    <span class="write-value-range">{{localization.writeValueRange}}：&nbsp;{{writeValueRangeText}}
+    <span class="write-value-range">{{localization.writeValueRange}}：</span>
+    <div class="write-value-range">
+      {{writeValueRangeText}}
       <span *ngIf="valueType">({{valueType}})</span>
-    </span>
-    <input type="text" name="valueInput" autoFocus class="form-control write-value" [(ngModel)]="value" (keyup)="validate()" autocomplete="off">
+    </div>
+    <input type="text" name="valueInput" autoFocus class="form-control write-value" [(ngModel)]="value" (keyup)="validate($event)" 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>
+    <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;
@@ -101,21 +99,80 @@ let WriteValueModalComponent = class WriteValueModalComponent {
         return minValue + '~' + maxValue;
     }
     save() {
+        this.isSubmitting = true;
+        let value = this.value;
+        const showValue = this.value;
         if (this.args.enableDataParsed) {
             if (this.enableNumericalOperation) {
-                this.value = this.numericalOperationService.getWriteValue(this.args.version, this.value, this.numericalOperation, this.dataType, this.fractionDigits);
+                value = this.numericalOperationService.getWriteValue(this.args.version, this.value, this.numericalOperation, this.dataType, this.fractionDigits);
             }
             else {
-                this.value = this.formatWriteValue();
+                value = this.formatWriteValue();
             }
         }
-        this.close({ value: this.value });
+        // 处理系统变量"当前语种ID"
+        if (this.variableName === '当前语种ID') {
+            this.handleCurrentLanguageIdSave(value);
+            return;
+        }
+        if (!this.args.releasedVariableService) {
+            this.onClosed({
+                value: value,
+                showValue: showValue,
+                enableNumericalOperation: false,
+                isNumericalOperation: this.isNumericalOperation,
+                variableRwType: 6
+            });
+            return;
+        }
+        this.args.releasedVariableService.getVariableWithValueTransform(this.variableName).subscribe(result => {
+            const valueTransform = JSON.parse(result.valueTransform);
+            if ((valueTransform === null || valueTransform === void 0 ? void 0 : valueTransform.Type) !== 0) {
+                this.isNumericalOperation = true;
+            }
+            this.onClosed({
+                value: value,
+                showValue: showValue,
+                enableNumericalOperation: this.enableNumericalOperation,
+                isNumericalOperation: this.isNumericalOperation,
+                variableRwType: result.variableRwType
+            });
+        });
     }
-    close(modalResult) {
-        this._onClosed.next(modalResult);
-        this._onClosed.complete();
+    /**
+     * 处理"当前语种ID"系统变量的保存
+     */
+    handleCurrentLanguageIdSave(value) {
+        if (!this.args.guiContext || !this.args.guiContext.updateCurrentLanguageId) {
+            this.showValidationErrorInfo(this.localization.loadFailed);
+            this.isSubmitting = false;
+            return;
+        }
+        // 转换为数字类型
+        const languageId = value === '' || value == null ? null : Number(value);
+        // 调用 GuiContext 的语种切换方法
+        this.args.guiContext.updateCurrentLanguageId(languageId).then(() => {
+            // 语种切换成功，调用 onClosed 回调，让数字显示元件也能更新
+            this.onClosed({
+                value: value,
+                showValue: value,
+                enableNumericalOperation: false,
+                isNumericalOperation: false,
+                variableRwType: 6
+            });
+        }).catch(() => {
+            this.showValidationErrorInfo(this.localization.loadFailed);
+            this.isSubmitting = false;
+        });
     }
-    validate() {
+    close() {
+        this.bsModalRef.hide();
+    }
+    validate(event = null) {
+        if (event && event.keyCode === 13 && !this.validationError) {
+            this.save();
+            return;
+        }
         // 校验数值必填
         if (null == this.value || '' === this.value.trim()) {
             return this.showValidationErrorInfo(this.localization.numericalValueRequired);
@@ -193,12 +250,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}}：</span> <div class=\"write-value-range\"> {{writeValueRangeText}} <span *ngIf=\"valueType\">({{valueType}})</span> </div> <input type=\"text\" name=\"valueInput\" autoFocus class=\"form-control write-value\" [(ngModel)]=\"value\" (keyup)=\"validate($event)\" 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":46,"character":5}}]}],"__ctor__":[{"__symbolic":"constructor","parameterDecorators":[[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Inject","line":52,"character":9},"arguments":[{"__symbolic":"reference","module":"../../localization","name":"LOCALIZATION","line":52,"character":16}]}],null,null,null],"parameters":[{"__symbolic":"reference","module":"../../localization","name":"Localization","line":52,"character":51},{"__symbolic":"reference","module":"../../utils/data-type/data-type.service","name":"DataTypeService","line":53,"character":42},{"__symbolic":"reference","module":"../../utils/fraction-digit.service","name":"FractionDigitService","line":54,"character":47},{"__symbolic":"reference","module":"../../utils/numerical-operation.service","name":"NumericalOperationService","line":55,"character":52}]}],"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"}]}}}}]
+[{"__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}}：</span> <div class=\"write-value-range\"> {{writeValueRangeText}} <span *ngIf=\"valueType\">({{valueType}})</span> </div> <input type=\"text\" name=\"valueInput\" autoFocus class=\"form-control write-value\" [(ngModel)]=\"value\" (keyup)=\"validate($event)\" 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":44,"character":5}}]}],"__ctor__":[{"__symbolic":"constructor","parameterDecorators":[[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Inject","line":50,"character":9},"arguments":[{"__symbolic":"reference","module":"../../localization","name":"LOCALIZATION","line":50,"character":16}]}],null,null,null,null],"parameters":[{"__symbolic":"reference","module":"../../localization","name":"Localization","line":50,"character":51},{"__symbolic":"reference","module":"../../utils/data-type/data-type.service","name":"DataTypeService","line":51,"character":42},{"__symbolic":"reference","module":"../../utils/fraction-digit.service","name":"FractionDigitService","line":52,"character":47},{"__symbolic":"reference","module":"../../utils/numerical-operation.service","name":"NumericalOperationService","line":53,"character":52},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalRef","line":54,"character":37}]}],"ngOnInit":[{"__symbolic":"method"}],"initData":[{"__symbolic":"method"}],"setValueRangeAccordToDataParsed":[{"__symbolic":"method"}],"getWriteValueRangeText":[{"__symbolic":"method"}],"save":[{"__symbolic":"method"}],"handleCurrentLanguageIdSave":[{"__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/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/font-setting-model.d.ts

@@ -1,3 +1,8 @@
+export interface TextLibrarySetting {
+    readonly labelType: 'text' | 'textLibrary';
+    readonly selectedTextLibraryItem?: string | number;
+    readonly selectedTextItem?: string | number;
+}
 export interface FontSettingModel {
     readonly text: string;
     readonly stroke: string;
@@ -5,4 +10,5 @@ export interface FontSettingModel {
     readonly fontSize: string;
     readonly isUnderline: boolean;
     readonly textAlign: string;
+    readonly textLibrary?: TextLibrarySetting;
 }

package/model/base/font-setting-model.metadata.json

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

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

@@ -1,9 +1,26 @@
 import { HistroicalCurveChannelModel } from './historical-curve-chanel.model';
+/**
+ * 单个历史数据条目的运行时配置
+ */
+export interface HistoricalCurveDataItem {
+    /** 历史数据条目名称 */
+    readonly dataName: string;
+    /** 该条目的通道列表 */
+    readonly channels: Array<HistroicalCurveChannelModel>;
+}
 export interface HistoricalCurveDataSettings {
     readonly dataSourceCode: number;
     /**
-     * 历史数据名称
+     * 【旧格式-兼容】历史数据名称，单条目模式
      */
     readonly dataName: string;
+    /**
+     * 【旧格式-兼容】通道列表，单条目模式
+     */
     readonly channels: Array<HistroicalCurveChannelModel>;
+    /**
+     * 【新格式】多个历史数据条目配置
+     * 如果此字段有值，优先使用此字段
+     */
+    readonly dataItems?: Array<HistoricalCurveDataItem>;
 }

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

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

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/scroll-alarm/scroll-alarm.model.d.ts

@@ -0,0 +1,21 @@
+import { ConditionalDynamicDisplayModel } from '../base/conditional-dynamic-display-model';
+import { Point, Size } from '../shared';
+import { DynamicDisplayModel } from '../shared/dynamic-display/dynamic-display-model';
+export interface ScrollAlarmModel extends ConditionalDynamicDisplayModel {
+    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[];
+    readonly scrollSetting?: {
+        readonly scrollInterval?: number;
+        readonly scrollDirection?: 'vertical' | 'horizontal';
+        readonly pauseOnHover?: boolean;
+        readonly autoPlay?: boolean;
+    };
+    readonly dynamicSetting?: DynamicDisplayModel;
+}

package/model/scroll-alarm/scroll-alarm.model.metadata.json

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

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/model/switch-indicator-light/switch-indicator-light.d.ts

@@ -5,6 +5,7 @@ import { ConditionalEnableModel } from '../base/conditional-enable-model';
 import { ConditionItemModel, GraphSetting, Point, Size } from '../shared';
 import { DynamicDisplayModel } from '../shared/dynamic-display/dynamic-display-model';
 import { SecurityModel } from '../base/security-model';
+import { TextLibrarySetting } from '../base/font-setting-model';
 export interface SwitchIndicatorLight extends ConditionalEnableModel, SecurityModel {
     /**
        * @type {(number)}
@@ -30,4 +31,5 @@ export interface SwitchIndicatorLight extends ConditionalEnableModel, SecurityMo
     readonly isAwaysEnable?: boolean;
     readonly enableItems?: ConditionItemModel[];
     readonly fixedPositionType?: number;
+    readonly textLibrary?: TextLibrarySetting;
 }

package/model/view-operation/view-operation-element.model.d.ts

@@ -2,12 +2,14 @@ import { Size, Text, GraphSetting } from '../shared';
 import { ConditionalEnableModel } from '../base/conditional-enable-model';
 import { SecurityModel } from '../base';
 import { ViewOperationType } from './view-operation-type';
+import { TextLibrarySetting } from '../base/font-setting-model';
 export interface ViewOperationElementModel extends ConditionalEnableModel, SecurityModel {
     /**
      * 版本 2 : 动态行为调整
      * 版本 3 ：使能控制调整
      * 版本 4 ：新增操作记录
-     * 版本 5 ：新增页面操作类型，之前类型都为“切换页面”
+     * 版本 5 ：新增页面操作类型，之前类型都为"切换页面"
+     * 版本 6 ：新增文本库支持
      */
     readonly version?: number;
     readonly viewIndex?: number;
@@ -16,4 +18,8 @@ export interface ViewOperationElementModel extends ConditionalEnableModel, Secur
     readonly useGraph: boolean;
     readonly graphSetting: GraphSetting;
     readonly operationType: ViewOperationType;
+    /**
+     * 文本库配置（版本6新增）
+     */
+    readonly textLibrary?: TextLibrarySetting;
 }

package/package.json

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

package/public_api.js

@@ -8,4 +8,5 @@ export * from './localization';
 export * from './shared';
 export { GuiModule } from './gui.module';
 export * from './remote';
+export * from './service';
 export { LOGGER_SERVICE_TOKEN, ConsoleLoggerService } from './logger';

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,35 @@ export declare class RemoteVariableCommunicator implements VariableCommunicator
     private variableStateCache;
     private variableStatesToBeOpened;
     private variableStatesToBeClosed;
+    private alarmObservers;
+    private alarmChangedSubscription;
+    private systemVariableHandlers;
     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[]>;
+    /**
+     * 注册系统变量处理器
+     * @param variableName 变量名（如"当前语种ID"）
+     * @param getValue 获取值的函数
+     * @param setValue 设置值的函数
+     */
+    registerSystemVariableHandler(variableName: string, getValue: () => Promise<any>, setValue: (value: any) => Promise<void>): void;
+    /**
+     * 通知系统变量值变化
+     * 用于在系统变量值改变时通知所有订阅者
+     * @param variableName 变量名
+     * @param value 新值
+     */
+    notifySystemVariableChange(variableName: string, value: any): void;
     dispose(): void;
 }