@flexem/fc-gui 3.0.0-alpha.18 → 3.0.0-alpha.181

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

@@ -10,24 +10,25 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 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 { Component, Inject, Injector, Output } from '@angular/core';
 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';
+import { DisplayMode, GlobalSettings } from '../../settings';
 let WriteValueModalComponent = class WriteValueModalComponent {
-    constructor(localization, dataTypeService, fractionDigitService, numericalOperationService) {
+    constructor(localization, dataTypeService, fractionDigitService, numericalOperationService, bsModalRef, injector) {
         this.localization = localization;
         this.dataTypeService = dataTypeService;
         this.fractionDigitService = fractionDigitService;
         this.numericalOperationService = numericalOperationService;
-        this._onClosed = new Subject();
+        this.bsModalRef = bsModalRef;
+        this.displayVariableName = '';
         this.writeValueRangeText = '';
-    }
-    get onClosed() {
-        return this._onClosed;
+        this.isSubmitting = false;
+        this.isMobileMode = DisplayMode.Mobile === injector.get(GlobalSettings).displayMode;
     }
     get invalidErrorText() {
         return this.localization.loadFailed;
@@ -37,7 +38,20 @@ let WriteValueModalComponent = class WriteValueModalComponent {
         this.validate();
     }
     initData(option) {
+        var _a, _b, _c, _d, _e;
         this.variableName = option.variableName;
+        this.displayVariableName = this.variableName;
+        if (this.variableName === '当前语种ID') {
+            const language = ((_c = (_b = (_a = window.abp) === null || _a === void 0 ? void 0 : _a.localization) === null || _b === void 0 ? void 0 : _b.currentLanguage) === null || _c === void 0 ? void 0 : _c.name) || ((_e = (_d = this.localization.localizationService) === null || _d === void 0 ? void 0 : _d.translate) === null || _e === void 0 ? void 0 : _e.currentLang);
+            const isTraditionalChinese = language === 'zh-Hant' || language === 'zh-TW' || language === 'zh-tw';
+            const isChinese = language === 'zh-Hans' || language === 'zh';
+            if (isTraditionalChinese) {
+                this.displayVariableName = '當前語種ID';
+            }
+            else if (!isChinese) {
+                this.displayVariableName = 'Current Language ID';
+            }
+        }
         this.dataType = option.dataType;
         this.fBoxDataType = option.fBoxDataType;
         this.integerDigits = option.integerDigits ? option.integerDigits : 0;
@@ -58,17 +72,20 @@ let WriteValueModalComponent = class WriteValueModalComponent {
         this.writeValueRangeText = this.getWriteValueRangeText();
     }
     setValueRangeAccordToDataParsed(option) {
+        // 上下限已在 numerical-display-element.ts 中解析为数值，直接使用
+        const resolvedUpperLimit = Number(this.numericalOperation.numericalUpperLimit);
+        const resolvedLowerLimit = Number(this.numericalOperation.numericalLowerLimit);
         if (this.dataTypeService.isFloat(option.version, this.dataType) || this.enableNumericalOperation) {
             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;
+            this.numericalLowerLimit = resolvedLowerLimit;
+            this.numericalUpperLimit = resolvedUpperLimit;
         }
         else {
             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);
+            this.numericalLowerLimit = +this.fractionDigitService.movePoint(resolvedLowerLimit, -this.fractionDigits);
+            this.numericalUpperLimit = +this.fractionDigitService.movePoint(resolvedUpperLimit, -this.fractionDigits);
         }
         const minValue = this.numericalOperationService.getWriteMinValue(this.minValueLimit, this.numericalOperation);
         const maxValue = this.numericalOperationService.getWriteMaxValue(this.maxValueLimit, this.numericalOperation);
@@ -101,21 +118,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();
+            }
+        }
+        // 处理系统变量"当前语种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
+            });
+        });
+    }
+    /**
+     * 处理"当前语种ID"系统变量的保存
+     */
+    handleCurrentLanguageIdSave(value) {
+        if (!this.args.guiContext || !this.args.guiContext.updateCurrentLanguageId) {
+            this.showValidationErrorInfo(this.localization.loadFailed);
+            this.isSubmitting = false;
+            return;
         }
-        this.close({ value: this.value });
+        // 转换为数字类型
+        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;
+        });
     }
-    close(modalResult) {
-        this._onClosed.next(modalResult);
-        this._onClosed.complete();
+    close() {
+        this.bsModalRef.hide();
     }
-    validate() {
+    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 +269,14 @@ __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> ",
-        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; } "]
+        template: "<form #writeValueForm=\"ngForm\" novalidate (ngSubmit)=\"save()\" bs-modal-drag> <div class=\"modal-header\"> <h4 class=\"modal-title\"> <span>{{localization.setting}}</span> <span>{{displayVariableName}}</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> <span> {{writeValueRangeText}} <span *ngIf=\"valueType\">({{valueType}})</span> </span> <input type=\"text\" name=\"valueInput\" autoFocus [class.form-control-write]=\"!isMobileMode\" 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\" [class.modal-footer-write]=\"!isMobileMode\"> <button type=\"submit\" [class.btn-primary-write]=\"!isMobileMode\" 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%; } .form-control-write { margin: 0 20px; width: 585px; } .modal-footer { padding: 10px 5px 20px 5px !important; text-align: right; border-color: transparent; } .modal-footer-write { margin-right: 4px; padding: 10px 5px 20px 5px !important; } .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; } .btn-primary-write { width: 585px; margin: 0 15px 0 0; } .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,
+        Injector])
 ], WriteValueModalComponent);
 export { WriteValueModalComponent };

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

@@ -21,12 +21,22 @@
   width: 90%;
 }
 
+.form-control-write {
+  margin: 0 20px;
+  width: 585px;
+}
+
 .modal-footer {
-  padding: 10px 4px 20px 5px !important;
+  padding: 10px 5px 20px 5px !important;
   text-align: right;
   border-color: transparent;
 }
 
+.modal-footer-write {
+  margin-right: 4px;
+  padding: 10px 5px 20px 5px !important;
+}
+
 .text-danger {
   display: block;
   color: #ed6b75;
@@ -43,6 +53,11 @@
   height: 32px;
 }
 
+.btn-primary-write {
+  width: 585px;
+  margin: 0 15px 0 0;
+}
+
 .write-value-range {
   color: #7f939e;
   font-size: 14px;

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":12,"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>{{displayVariableName}}</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> <span> {{writeValueRangeText}} <span *ngIf=\"valueType\">({{valueType}})</span> </span> <input type=\"text\" name=\"valueInput\" autoFocus [class.form-control-write]=\"!isMobileMode\" 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\" [class.modal-footer-write]=\"!isMobileMode\"> <button type=\"submit\" [class.btn-primary-write]=\"!isMobileMode\" 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%; } .form-control-write { margin: 0 20px; width: 585px; } .modal-footer { padding: 10px 5px 20px 5px !important; text-align: right; border-color: transparent; } .modal-footer-write { margin-right: 4px; padding: 10px 5px 20px 5px !important; } .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; } .btn-primary-write { width: 585px; margin: 0 15px 0 0; } .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":48,"character":5}}]}],"__ctor__":[{"__symbolic":"constructor","parameterDecorators":[[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Inject","line":54,"character":9},"arguments":[{"__symbolic":"reference","module":"../../localization","name":"LOCALIZATION","line":54,"character":16}]}],null,null,null,null,null],"parameters":[{"__symbolic":"reference","module":"../../localization","name":"Localization","line":54,"character":51},{"__symbolic":"reference","module":"../../utils/data-type/data-type.service","name":"DataTypeService","line":55,"character":42},{"__symbolic":"reference","module":"../../utils/fraction-digit.service","name":"FractionDigitService","line":56,"character":47},{"__symbolic":"reference","module":"../../utils/numerical-operation.service","name":"NumericalOperationService","line":57,"character":52},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalRef","line":58,"character":37},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":59,"character":18}]}],"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/alarm/alarm.model.d.ts

@@ -0,0 +1,14 @@
+import { ConditionalDisplayModel } from '../base/conditional-display-model';
+import { Point, Size } from '../shared';
+export interface AlarmModel extends ConditionalDisplayModel {
+    readonly version: number;
+    readonly size: Size;
+    readonly initSize?: 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,8 +1,29 @@
+export interface TextLibrarySetting {
+    readonly labelType: 'text' | 'textLibrary';
+    readonly selectedTextLibraryItem?: string | number;
+    readonly selectedTextItem?: string | number;
+}
+export interface TextCultures {
+    readonly cultures: {
+        [languageCode: string]: string;
+    };
+}
+export interface FontStyleCultures {
+    readonly [languageCode: string]: {
+        readonly fontSize: string;
+        readonly fontStyle: string;
+        readonly fontColor: string;
+        readonly isUnderline: boolean;
+        readonly textAlign: string;
+    };
+}
 export interface FontSettingModel {
-    readonly text: string;
+    readonly text: string | TextCultures;
     readonly stroke: string;
     readonly font: string;
     readonly fontSize: string;
     readonly isUnderline: boolean;
     readonly textAlign: string;
+    readonly textLibrary?: TextLibrarySetting;
+    readonly fontStyleCultures?: FontStyleCultures;
 }

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"},"TextCultures":{"__symbolic":"interface"},"FontStyleCultures":{"__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/character-display/character-display.d.ts

@@ -12,6 +12,7 @@ export interface CharacterDisplay extends ReadableModel, SecurityModel {
     readonly graphSetting: GraphSetting;
     readonly charCount: number;
     readonly size: Size;
+    readonly initSize?: Size;
     readonly useGraph: boolean;
     readonly accessPermission: any;
     readonly showVariableText?: boolean;

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.display-settings.d.ts

@@ -4,6 +4,7 @@ import { HistoricalCurveAxisSettings } from './historical-curve-axis-settings';
 import { CurveType } from './curve-type';
 export interface HistoricalCurveDisplaySettings {
     readonly size: Size;
+    readonly initSize?: Size;
     readonly location: Point;
     /**
      * 刷新周期（秒)

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

@@ -4,6 +4,7 @@ import { NumericalOperationSettings } from './numerical-operation-settings';
 import { DisplayDataType } from '../shared/data-type/display-data-type';
 export interface NumericalDisplay extends ReadableModel, SecurityModel {
     readonly size: Size;
+    readonly initSize?: Size;
     readonly useGraph: boolean;
     readonly stroke: string;
     readonly font: string;

package/model/numerical-display/numerical-operation.d.ts

@@ -2,8 +2,16 @@ import { NumericalOperationType } from '../../utils/numerical-operation-type';
 import { ProportionalConversion } from './proportional-conversion';
 import { Zoom } from './zoom';
 export interface NumericalOperation {
-    numericalUpperLimit: number;
-    numericalLowerLimit: number;
+    numericalUpperLimit: number | {
+        type: number;
+        variableName: string;
+        variableVersion?: number;
+    };
+    numericalLowerLimit: number | {
+        type: number;
+        variableName: string;
+        variableVersion?: number;
+    };
     enableNumericalOperation: boolean;
     type: NumericalOperationType;
     proportionalConversion: ProportionalConversion;

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/settings/popup/view-popup-location-type.d.ts

@@ -1,4 +1,5 @@
 export declare enum ViewPopupLocationType {
     Center = 0,
-    Custom = 1
+    Custom = 1,
+    NearButton = 2
 }

package/model/settings/popup/view-popup-location-type.js

@@ -2,4 +2,5 @@ export var ViewPopupLocationType;
 (function (ViewPopupLocationType) {
     ViewPopupLocationType[ViewPopupLocationType["Center"] = 0] = "Center";
     ViewPopupLocationType[ViewPopupLocationType["Custom"] = 1] = "Custom";
+    ViewPopupLocationType[ViewPopupLocationType["NearButton"] = 2] = "NearButton";
 })(ViewPopupLocationType || (ViewPopupLocationType = {}));

package/model/settings/popup/view-popup-location-type.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"ViewPopupLocationType":{"Center":0,"Custom":1}}}]
+[{"__symbolic":"module","version":4,"metadata":{"ViewPopupLocationType":{"Center":0,"Custom":1,"NearButton":2}}}]

package/model/shared/state/state.d.ts

@@ -4,5 +4,6 @@ export declare enum State {
     Unbind = 2,
     Abnormal = 3,
     Loading = 4,
+    InvalidMonitor = 5,
     Disable = 9
 }

package/model/shared/state/state.js

@@ -5,5 +5,6 @@ export var State;
     State[State["Unbind"] = 2] = "Unbind";
     State[State["Abnormal"] = 3] = "Abnormal";
     State[State["Loading"] = 4] = "Loading";
+    State[State["InvalidMonitor"] = 5] = "InvalidMonitor";
     State[State["Disable"] = 9] = "Disable";
 })(State || (State = {}));

package/model/shared/state/state.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"State":{"Normal":0,"Offline":1,"Unbind":2,"Abnormal":3,"Loading":4,"Disable":9}}}]
+[{"__symbolic":"module","version":4,"metadata":{"State":{"Normal":0,"Offline":1,"Unbind":2,"Abnormal":3,"Loading":4,"InvalidMonitor":5,"Disable":9}}}]

package/model/shared/text/font.d.ts

@@ -5,6 +5,6 @@ export interface Font {
     readonly fontSize: string;
     fontFamily?: string;
     readonly color: string;
-    readonly textAlign: string;
+    readonly textAlign?: string;
     readonly fontStyle?: string;
 }

package/model/shared/text/text.d.ts

@@ -2,4 +2,7 @@ import { Font } from './font';
 export interface Text {
     content: string;
     font: Font;
+    cultures?: {
+        [languageCode: string]: string;
+    };
 }

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)}
@@ -24,10 +25,12 @@ export interface SwitchIndicatorLight extends ConditionalEnableModel, SecurityMo
     readonly graphSetting?: GraphSetting;
     readonly location: Point;
     readonly size: Size;
+    readonly initSize?: Size;
     readonly isAwaysDisplay?: boolean;
     readonly conditionItems?: ConditionItemModel[];
     readonly dynamicSetting?: DynamicDisplayModel;
     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.18",
+	"version": "3.0.0-alpha.181",
 	"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';