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

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

@@ -1,38 +1,31 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(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 { 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 * as i0 from "@angular/core";
-import * as i1 from "../../utils/data-type/data-type.service";
-import * as i2 from "../../utils/fraction-digit.service";
-import * as i3 from "../../utils/numerical-operation.service";
-import * as i4 from "@angular/forms";
-import * as i5 from "../../utils/bs-modal-drag.directive";
-import * as i6 from "@angular/common";
-import * as i7 from "../../utils/auto-focus.directive";
-function WriteValueModalComponent_span_14_Template(rf, ctx) { if (rf & 1) {
-    i0.ɵɵelementStart(0, "span");
-    i0.ɵɵtext(1);
-    i0.ɵɵelementEnd();
-} if (rf & 2) {
-    const ctx_r1 = i0.ɵɵnextContext();
-    i0.ɵɵadvance(1);
-    i0.ɵɵtextInterpolate1("(", ctx_r1.valueType, ")");
-} }
-export class WriteValueModalComponent {
-    constructor(localization, dataTypeService, fractionDigitService, numericalOperationService) {
+import { BsModalRef } from 'ngx-bootstrap/modal';
+let WriteValueModalComponent = class WriteValueModalComponent {
+    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;
@@ -44,6 +37,7 @@ export 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);
@@ -52,15 +46,25 @@ export 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);
         }
@@ -74,7 +78,6 @@ export 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 = '';
@@ -84,7 +87,7 @@ export 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();
             }
@@ -96,19 +99,49 @@ export 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;
+        let value = this.value;
+        const showValue = this.value;
+        if (this.args.enableDataParsed) {
+            if (this.enableNumericalOperation) {
+                value = this.numericalOperationService.getWriteValue(this.args.version, this.value, this.numericalOperation, this.dataType, this.fractionDigits);
+            }
+            else {
+                value = this.formatWriteValue();
+            }
         }
-        this.close({ value: this.value });
+        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();
+    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);
@@ -130,7 +163,7 @@ export 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);
@@ -177,75 +210,22 @@ export class WriteValueModalComponent {
         }
         return this.value;
     }
-}
-WriteValueModalComponent.ɵfac = function WriteValueModalComponent_Factory(t) { return new (t || WriteValueModalComponent)(i0.ɵɵdirectiveInject(LOCALIZATION), i0.ɵɵdirectiveInject(i1.DataTypeService), i0.ɵɵdirectiveInject(i2.FractionDigitService), i0.ɵɵdirectiveInject(i3.NumericalOperationService)); };
-WriteValueModalComponent.ɵcmp = i0.ɵɵdefineComponent({ type: WriteValueModalComponent, selectors: [["writeValueModal"]], outputs: { invalidErrorText: "invalidErrorText" }, decls: 21, vars: 10, consts: [["novalidate", "", "bs-modal-drag", "", 3, "ngSubmit"], ["writeValueForm", "ngForm"], [1, "modal-header"], [1, "modal-title"], ["type", "button", "aria-label", "Close", 1, "close", "pull-right", 3, "click"], ["aria-hidden", "true"], [1, "modal-body"], [1, "write-value-range"], [4, "ngIf"], ["type", "text", "name", "valueInput", "autoFocus", "", "autocomplete", "off", 1, "form-control", "write-value", 3, "ngModel", "ngModelChange", "keyup"], [1, "help-block", "text-danger", 3, "hidden"], [1, "modal-footer"], ["type", "submit", 1, "btn", "md-skip", "btn-primary", "btn-block", 3, "disabled"]], template: function WriteValueModalComponent_Template(rf, ctx) { if (rf & 1) {
-        i0.ɵɵelementStart(0, "form", 0, 1);
-        i0.ɵɵlistener("ngSubmit", function WriteValueModalComponent_Template_form_ngSubmit_0_listener() { return ctx.save(); });
-        i0.ɵɵelementStart(2, "div", 2);
-        i0.ɵɵelementStart(3, "h4", 3);
-        i0.ɵɵelementStart(4, "span");
-        i0.ɵɵtext(5);
-        i0.ɵɵelementEnd();
-        i0.ɵɵelementStart(6, "span");
-        i0.ɵɵtext(7);
-        i0.ɵɵelementEnd();
-        i0.ɵɵelementEnd();
-        i0.ɵɵelementStart(8, "button", 4);
-        i0.ɵɵlistener("click", function WriteValueModalComponent_Template_button_click_8_listener() { return ctx.close(); });
-        i0.ɵɵelementStart(9, "span", 5);
-        i0.ɵɵtext(10, "\u00D7");
-        i0.ɵɵelementEnd();
-        i0.ɵɵelementEnd();
-        i0.ɵɵelementEnd();
-        i0.ɵɵelementStart(11, "div", 6);
-        i0.ɵɵelementStart(12, "span", 7);
-        i0.ɵɵtext(13);
-        i0.ɵɵtemplate(14, WriteValueModalComponent_span_14_Template, 2, 1, "span", 8);
-        i0.ɵɵelementEnd();
-        i0.ɵɵelementStart(15, "input", 9);
-        i0.ɵɵlistener("ngModelChange", function WriteValueModalComponent_Template_input_ngModelChange_15_listener($event) { return ctx.value = $event; })("keyup", function WriteValueModalComponent_Template_input_keyup_15_listener() { return ctx.validate(); });
-        i0.ɵɵelementEnd();
-        i0.ɵɵelementStart(16, "span", 10);
-        i0.ɵɵtext(17);
-        i0.ɵɵelementEnd();
-        i0.ɵɵelementEnd();
-        i0.ɵɵelementStart(18, "div", 11);
-        i0.ɵɵelementStart(19, "button", 12);
-        i0.ɵɵtext(20);
-        i0.ɵɵelementEnd();
-        i0.ɵɵelementEnd();
-        i0.ɵɵelementEnd();
-    } if (rf & 2) {
-        i0.ɵɵadvance(5);
-        i0.ɵɵtextInterpolate(ctx.localization.setting);
-        i0.ɵɵadvance(2);
-        i0.ɵɵtextInterpolate(ctx.variableName);
-        i0.ɵɵadvance(6);
-        i0.ɵɵtextInterpolate2("", ctx.localization.writeValueRange, "\uFF1A\u00A0", ctx.writeValueRangeText, " ");
-        i0.ɵɵadvance(1);
-        i0.ɵɵproperty("ngIf", ctx.valueType);
-        i0.ɵɵadvance(1);
-        i0.ɵɵproperty("ngModel", ctx.value);
-        i0.ɵɵadvance(1);
-        i0.ɵɵproperty("hidden", !ctx.validationError);
-        i0.ɵɵadvance(1);
-        i0.ɵɵtextInterpolate(ctx.validationErrorText);
-        i0.ɵɵadvance(2);
-        i0.ɵɵproperty("disabled", ctx.validationError);
-        i0.ɵɵadvance(1);
-        i0.ɵɵtextInterpolate(ctx.localization.submit);
-    } }, directives: [i4.ɵangular_packages_forms_forms_y, i4.NgControlStatusGroup, i4.NgForm, i5.BsModalDragDirective, i6.NgIf, i4.DefaultValueAccessor, i7.AutoFocusDirective, i4.NgControlStatus, i4.NgModel], styles: [".modal-header[_ngcontent-%COMP%] { padding: 10px; border-color: transparent; } .modal-body[_ngcontent-%COMP%] { position: relative; padding: 0px 5px !important; padding-top: 10px !important; } .modal-title[_ngcontent-%COMP%] { display: unset; margin-left: -6px; font-size: 16px !important; } .form-control[_ngcontent-%COMP%] { margin: 0 5%; float: none; width: 90%; } .modal-footer[_ngcontent-%COMP%] { padding: 10px 4px 20px 5px !important; text-align: right; border-color: transparent; } .text-danger[_ngcontent-%COMP%] { display: block; color: #ed6b75; font-size: 14px; margin: 5px 0px 0px 15px; } .btn-primary[_ngcontent-%COMP%] { background-color: #3B97FC; border-color: #3B97FC; padding: 5px 30px; width: 90%; margin: 0 5%; height: 32px; } .write-value-range[_ngcontent-%COMP%] { color: #7f939e; font-size: 14px; margin-left: 15px; } .write-value[_ngcontent-%COMP%] { padding-left: 8px; margin-left: 16px; height: 32px; }"] });
-/*@__PURE__*/ (function () { i0.ɵsetClassMetadata(WriteValueModalComponent, [{
-        type: Component,
-        args: [{
-                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; } "]
-            }]
-    }], function () { return [{ type: undefined, decorators: [{
-                type: Inject,
-                args: [LOCALIZATION]
-            }] }, { type: i1.DataTypeService }, { type: i2.FractionDigitService }, { type: i3.NumericalOperationService }]; }, { invalidErrorText: [{
-            type: Output
-        }] }); })();
+};
+__decorate([
+    Output(),
+    __metadata("design:type", String),
+    __metadata("design:paramtypes", [])
+], WriteValueModalComponent.prototype, "invalidErrorText", null);
+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}}：</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,
+        BsModalRef])
+], WriteValueModalComponent);
+export { WriteValueModalComponent };

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

@@ -0,0 +1 @@
+[{"__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"}],"close":[{"__symbolic":"method"}],"validate":[{"__symbolic":"method"}],"showValidationErrorInfo":[{"__symbolic":"method"}],"hideValidationErrorInfo":[{"__symbolic":"method"}],"getFractionDigits":[{"__symbolic":"method"}],"formatWriteValue":[{"__symbolic":"method"}]}}}}]

package/modal/write-value/write-value-model-result.metadata.json

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

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/FontStyleData.metadata.json

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

package/model/bar-graph/bar-graph-direction.metadata.json

@@ -0,0 +1 @@
+[{"__symbolic":"module","version":4,"metadata":{"BarGraphDirection":{"DownToUp":0,"UpToDown":1,"LeftToRight":2,"RightToLeft":3}}}]

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/bar-graph/bar-graph.metadata.json

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

package/model/base/base-element-model.metadata.json

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

package/model/base/conditional-control-model.metadata.json

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

package/model/base/conditional-display-model.metadata.json

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

package/model/base/conditional-dynamic-display-model.metadata.json

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

package/model/base/conditional-enable-model.metadata.json

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

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

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

package/model/base/index.metadata.json

@@ -0,0 +1 @@
+[{"__symbolic":"module","version":4,"metadata":{},"exports":[{"from":"./base-element-model","export":["BaseElementModel"]},{"from":"./readable-model","export":["ReadableModel"]},{"from":"./conditional-display-model","export":["ConditionalDisplayModel"]},{"from":"./conditional-enable-model","export":["ConditionalEnableModel"]},{"from":"./conditional-control-model","export":["ConditionalControlModel"]},{"from":"./conditional-dynamic-display-model","export":["ConditionalDynamicDisplayModel"]},{"from":"./security-model","export":["SecurityModel"]}]}]

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/base/readable-model.metadata.json

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

package/model/base/security-model.metadata.json

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

package/model/character-display/character-display.metadata.json

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

package/model/datetime-display/date-format-type.metadata.json

@@ -0,0 +1 @@
+[{"__symbolic":"module","version":4,"metadata":{"DateFormatType":{"YYMMDD":0,"MMDDYY":1,"DDMMYY":2}}}]

package/model/datetime-display/datetime-display-settings.metadata.json

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

package/model/datetime-display/datetime-display.metadata.json

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

package/model/datetime-display/datetime-separator-type.metadata.json

@@ -0,0 +1 @@
+[{"__symbolic":"module","version":4,"metadata":{"DatetimeSeparatorType":{"Dot":0,"Line":1,"Slash":2,"CHS":3}}}]

package/model/datetime-display/time-format-type.metadata.json

@@ -0,0 +1 @@
+[{"__symbolic":"module","version":4,"metadata":{"TimeFormatType":{"HHMM":0,"HHMMSS":1}}}]

package/model/historical-curve/curve-type.metadata.json

@@ -0,0 +1 @@
+[{"__symbolic":"module","version":4,"metadata":{"CurveType":{"Line":0,"BarGroup":1,"BarStack":2}}}]

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

@@ -1,6 +1,16 @@
 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;
+}
+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

@@ -0,0 +1 @@
+[{"__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-chanel.model.metadata.json

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

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

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

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

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

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

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

package/model/historical-curve/index.metadata.json

@@ -0,0 +1 @@
+[{"__symbolic":"module","version":4,"metadata":{},"exports":[{"from":"./historical-curve.model","export":["HistoricalCurveModel"]},{"from":"./historical-curve.display-settings","export":["HistoricalCurveDisplaySettings"]},{"from":"./historical-curve.data-settings","export":["HistoricalCurveDataSettings"]},{"from":"./historical-curve-chanel.model","export":["HistroicalCurveChannelModel"]}]}]

package/model/hyperlink/hyperlink.model.metadata.json

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

package/model/image/image-fill-type.metadata.json

@@ -0,0 +1 @@
+[{"__symbolic":"module","version":4,"metadata":{"ImageFillType":{"Image":0,"Graph":1}}}]

package/model/image/image.metadata.json

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

package/model/index.metadata.json

@@ -0,0 +1 @@
+[{"__symbolic":"module","version":4,"metadata":{},"exports":[{"from":"./base"},{"from":"./image/image"},{"from":"./shared"},{"from":"./switch-indicator-light"},{"from":"./bar-graph/bar-graph"},{"from":"./bar-graph/bar-graph-direction"},{"from":"./character-display/character-display"},{"from":"./pipe"},{"from":"./view-operation"},{"from":"./meter/meter"},{"from":"./numerical-display"},{"from":"./historical-curve"},{"from":"./text/text.model"},{"from":"./ring-graph/ring-graph.model"},{"from":"./settings"}]}]

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/meter/meter.metadata.json

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

package/model/numerical-display/index.metadata.json

@@ -0,0 +1 @@
+[{"__symbolic":"module","version":4,"metadata":{},"exports":[{"from":"./numerical-display","export":["NumericalDisplay"]},{"from":"./numerical-operation-settings","export":["NumericalOperationSettings"]},{"from":"./numerical-operation-type","export":["NumericalOperationType"]},{"from":"./numerical-operation","export":["NumericalOperation"]},{"from":"./proportional-conversion","export":["ProportionalConversion"]},{"from":"./type-settings","export":["TypeSettings"]},{"from":"./zoom","export":["Zoom"]},{"from":"../shared/data-type/display-data-type","export":["DisplayDataType"]}]}]

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/numerical-display/numerical-display.metadata.json

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

package/model/numerical-display/numerical-operation-settings.metadata.json

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

package/model/numerical-display/numerical-operation-type.metadata.json

@@ -0,0 +1 @@
+[{"__symbolic":"module","version":4,"metadata":{"NumericalOperationType":{"ProportionalConversion":2,"Zoom":4}}}]

package/model/numerical-display/numerical-operation.metadata.json

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

package/model/numerical-display/proportional-conversion.metadata.json

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

package/model/numerical-display/type-settings.metadata.json

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

package/model/numerical-display/zoom.metadata.json

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

package/model/pipe/flow-direction-type.metadata.json

@@ -0,0 +1 @@
+[{"__symbolic":"module","version":4,"metadata":{"FlowDirectionType":{"Positive":0,"Negative":1}}}]

package/model/pipe/index.metadata.json

@@ -0,0 +1 @@
+[{"__symbolic":"module","version":4,"metadata":{},"exports":[{"from":"./flow-direction-type","export":["FlowDirectionType"]},{"from":"./pipe","export":["Pipe"]}]}]

package/model/pipe/pipe.metadata.json

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

package/model/poly-line/poly-line-model.metadata.json

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