@flexem/fc-gui 3.0.0-alpha.27 → 3.0.0-alpha.30

package/elements/bar-graph-element.js

@@ -2,7 +2,6 @@ import { BarGraphDirection } from '../model';
 import { ReadableElement } from './base/readable-element';
 import { calculatePercent } from './shared/math-utils';
 import { VariableUtil } from '../utils/variable-util';
-import { isNumber } from 'lodash';
 import { VariableValueType } from '../model/shared/condition/variable-value-type';
 export class BarGraphElement extends ReadableElement {
     constructor(element, permissionChecker, variableCommunicator, variableStore, localization, signalRAppId) {
@@ -53,21 +52,17 @@ export class BarGraphElement extends ReadableElement {
     }
     updateValueObj(value, variableName) {
         var _a, _b, _c;
-        switch (variableName) {
-            case (_a = this.model.readVariable) === null || _a === void 0 ? void 0 : _a.name:
-                this.isNeedUpdateScale = false;
-                this.valueObj.value = value;
-                break;
-            case (_b = this.model.minVariable) === null || _b === void 0 ? void 0 : _b.name:
-                this.isNeedUpdateScale = true;
-                this.valueObj.min = value;
-                break;
-            case (_c = this.model.maxVariable) === null || _c === void 0 ? void 0 : _c.name:
-                this.isNeedUpdateScale = true;
-                this.valueObj.max = value;
-                break;
-            default:
-                break;
+        if (((_a = this.model.readVariable) === null || _a === void 0 ? void 0 : _a.name) === variableName) {
+            this.isNeedUpdateScale = false;
+            this.valueObj.value = value;
+        }
+        if (((_b = this.model.minVariable) === null || _b === void 0 ? void 0 : _b.name) === variableName) {
+            this.isNeedUpdateScale = true;
+            this.valueObj.min = value;
+        }
+        if (((_c = this.model.maxVariable) === null || _c === void 0 ? void 0 : _c.name) === variableName) {
+            this.isNeedUpdateScale = true;
+            this.valueObj.max = value;
         }
     }
     updateScale() {
@@ -77,11 +72,13 @@ export class BarGraphElement extends ReadableElement {
         const textElements = this.$element.find('g:first > text');
         let min = this.model.minValueType ? this.valueObj.min : this.model.min;
         let max = this.model.maxValueType ? this.valueObj.max : this.model.max;
-        if (!isNumber(min) || !isNumber(max)) {
+        min = Number(min);
+        max = Number(max);
+        if (isNaN(min) || isNaN(max)) {
             min = BarGraphElement.DEFAULT_MIN_VALUE;
             max = BarGraphElement.DEFAULT_MAX_VALUE;
         }
-        const avgSacle = ((Number(max) - Number(min)) / this.model.masterDivisionNumber).toFixed(5);
+        const avgSacle = ((max - min) / this.model.masterDivisionNumber).toFixed(5);
         for (let i = 0; i < textElements.length; i++) {
             const text = textElements[i];
             if (!text.innerHTML) {
@@ -100,14 +97,16 @@ export class BarGraphElement extends ReadableElement {
     updateVariableValue(value, variableName) {
         this.updateValueObj(value, variableName);
         this.updateScale();
-        const variableValue = this.valueObj.value;
+        const variableValue = Number(this.valueObj.value);
         let maxValue = this.model.maxValueType ? this.valueObj.max : this.model.max;
         let minValue = this.model.minValueType ? this.valueObj.min : this.model.min;
-        if (!isNumber(minValue) || !isNumber(maxValue)) {
+        minValue = Number(minValue);
+        maxValue = Number(maxValue);
+        if (isNaN(minValue) || isNaN(maxValue)) {
             minValue = BarGraphElement.DEFAULT_MIN_VALUE;
             maxValue = BarGraphElement.DEFAULT_MAX_VALUE;
         }
-        if (!isNumber(variableValue)) {
+        if (isNaN(variableValue)) {
             return;
         }
         const useAlarmLimit = this.model.useAlarmLimit;

package/elements/bar-graph-element.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"BarGraphElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"./base/readable-element","name":"ReadableElement","line":11,"character":37},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":39,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"../service","name":"PermissionChecker","line":39,"character":57},{"__symbolic":"reference","module":"../communication","name":"VariableCommunicator","line":40,"character":30},{"__symbolic":"reference","module":"../config","name":"VariableStore","line":41,"character":23},{"__symbolic":"reference","module":"../localization","name":"Localization","line":42,"character":22},{"__symbolic":"reference","name":"string"}]}],"initFrameNode":[{"__symbolic":"method"}],"updateValueObj":[{"__symbolic":"method"}],"updateScale":[{"__symbolic":"method"}],"updateVariableValue":[{"__symbolic":"method"}]},"statics":{"DEFAULT_MIN_VALUE":0,"DEFAULT_MAX_VALUE":100}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"BarGraphElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"./base/readable-element","name":"ReadableElement","line":10,"character":37},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":38,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"../service","name":"PermissionChecker","line":38,"character":57},{"__symbolic":"reference","module":"../communication","name":"VariableCommunicator","line":39,"character":30},{"__symbolic":"reference","module":"../config","name":"VariableStore","line":40,"character":23},{"__symbolic":"reference","module":"../localization","name":"Localization","line":41,"character":22},{"__symbolic":"reference","name":"string"}]}],"initFrameNode":[{"__symbolic":"method"}],"updateValueObj":[{"__symbolic":"method"}],"updateScale":[{"__symbolic":"method"}],"updateVariableValue":[{"__symbolic":"method"}]},"statics":{"DEFAULT_MIN_VALUE":0,"DEFAULT_MAX_VALUE":100}}}}]

package/elements/base/readable-element.js

@@ -78,7 +78,9 @@ export class ReadableElement extends ConditionalEnableElement {
                 this.changeStates();
             }
         });
-        if (this.state === State.Normal || this.state === State.Disable) {
+        if (this.state === State.Normal || this.state === State.Disable
+            || value.variableName === this.minVariableName
+            || value.variableName === this.maxVariableName) {
             this.updateVariableValue(value.value, value.variableName);
         }
     }

package/elements/historical-curve/historical-curve.element.js

@@ -58,7 +58,9 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
     }
     getValidTimePeriods() {
         const timePeriods = new Array();
+        timePeriods.push({ key: 6, name: this.localization.lastThirtyMinutes });
         timePeriods.push({ key: 1, name: this.localization.lastOneHour });
+        timePeriods.push({ key: 7, name: this.localization.lastEightHour });
         timePeriods.push({ key: 2, name: this.localization.lastTwentyFourHours });
         timePeriods.push({ key: 3, name: this.localization.lastSevenDays });
         timePeriods.push({ key: 4, name: this.localization.lastThirtyDays });
@@ -84,6 +86,12 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
             case 5:
                 this.startTime = moment().subtract(1, 'years');
                 break;
+            case 6:
+                this.startTime = moment().subtract(30, 'minutes');
+                break;
+            case 7:
+                this.startTime = moment().subtract(8, 'hours');
+                break;
             default:
                 this.startTime = moment().subtract(1, 'days');
         }

package/elements/meter-element.js

@@ -43,21 +43,17 @@ export class MeterElement extends ReadableElement {
     }
     updateValueObj(value, variableName) {
         var _a, _b, _c;
-        switch (variableName) {
-            case (_a = this.model.readVariable) === null || _a === void 0 ? void 0 : _a.name:
-                this.isNeedUpdateScale = false;
-                this.valueObj.value = value;
-                break;
-            case (_b = this.model.minVariable) === null || _b === void 0 ? void 0 : _b.name:
-                this.isNeedUpdateScale = true;
-                this.valueObj.min = value;
-                break;
-            case (_c = this.model.maxVariable) === null || _c === void 0 ? void 0 : _c.name:
-                this.isNeedUpdateScale = true;
-                this.valueObj.max = value;
-                break;
-            default:
-                break;
+        if (((_a = this.model.readVariable) === null || _a === void 0 ? void 0 : _a.name) === variableName) {
+            this.isNeedUpdateScale = false;
+            this.valueObj.value = value;
+        }
+        if (((_b = this.model.minVariable) === null || _b === void 0 ? void 0 : _b.name) === variableName) {
+            this.isNeedUpdateScale = true;
+            this.valueObj.min = value;
+        }
+        if (((_c = this.model.maxVariable) === null || _c === void 0 ? void 0 : _c.name) === variableName) {
+            this.isNeedUpdateScale = true;
+            this.valueObj.max = value;
         }
     }
     updateVariableValue(value, variableName) {
@@ -78,11 +74,13 @@ export class MeterElement extends ReadableElement {
         }
         let min = this.model.minValueType ? this.valueObj.min : this.model.min;
         let max = this.model.maxValueType ? this.valueObj.max : this.model.max;
-        if (!isNumber(min) || !isNumber(max)) {
+        min = Number(min);
+        max = Number(max);
+        if (isNaN(min) || isNaN(max)) {
             min = MeterElement.DEFAULT_MIN_VALUE;
             max = MeterElement.DEFAULT_MAX_VALUE;
         }
-        const avgSacle = ((Number(max) - Number(min)) / this.model.masterDivisionNumber).toFixed(5);
+        const avgSacle = ((max - min) / this.model.masterDivisionNumber).toFixed(5);
         const textElements = this.$element.find('g:first > text');
         for (let i = 0; i < textElements.length; i++) {
             const text = textElements[i];
@@ -102,11 +100,13 @@ export class MeterElement extends ReadableElement {
     getAngle() {
         let min = this.model.minValueType ? this.valueObj.min : this.model.min;
         let max = this.model.maxValueType ? this.valueObj.max : this.model.max;
-        if (!isNumber(min) || !isNumber(max)) {
+        min = Number(min);
+        max = Number(max);
+        if (isNaN(min) || isNaN(max)) {
             min = MeterElement.DEFAULT_MIN_VALUE;
             max = MeterElement.DEFAULT_MAX_VALUE;
         }
-        if (!this.valueObj.value && !isNumber(this.valueObj.value)) {
+        if (!this.valueObj.value && isNaN(Number(this.valueObj.value))) {
             return undefined;
         }
         const value = Math.min(Math.max(this.valueObj.value || 0, min), max);

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

@@ -354,7 +354,7 @@ export class NumericalDisplayElement extends ReadableElement {
     }
     formatDisplayTextUnit(displayText) {
         if (this.model.showUnit !== false && this.model.unit) {
-            return `${displayText} ${this.model.unit}`;
+            return `${displayText || 0} ${this.model.unit}`;
         }
         return displayText;
     }

package/elements/ring-graph/ring-graph-element.js

@@ -4,7 +4,7 @@ import { RotationDirectionType } from '../../model/shared/rotation/rotation-dire
 import { calculatePercent, degreesToRadians } from '../shared/math-utils';
 import { VariableUtil } from '../../utils/variable-util';
 import { VariableDefinition } from '../../communication/variable/variable-definition';
-import { forEach, isNumber } from 'lodash';
+import { forEach } from 'lodash';
 import { VariableState } from '../../communication';
 import { VariableValueType } from '../../model/shared/condition/variable-value-type';
 export class RingGraphElement extends ReadableElement {
@@ -67,21 +67,17 @@ export class RingGraphElement extends ReadableElement {
     }
     updateValueObj(value, variableName) {
         var _a, _b, _c;
-        switch (variableName) {
-            case (_a = this.model.variableId) === null || _a === void 0 ? void 0 : _a.variableName.name:
-                this.isNeedUpdateScale = false;
-                this.valueObj.value = value;
-                break;
-            case (_b = this.model.minVariable) === null || _b === void 0 ? void 0 : _b.variableName.name:
-                this.isNeedUpdateScale = true;
-                this.valueObj.min = value;
-                break;
-            case (_c = this.model.maxVariable) === null || _c === void 0 ? void 0 : _c.variableName.name:
-                this.isNeedUpdateScale = true;
-                this.valueObj.max = value;
-                break;
-            default:
-                break;
+        if (((_a = this.model.variableId) === null || _a === void 0 ? void 0 : _a.variableName.name) === variableName) {
+            this.isNeedUpdateScale = false;
+            this.valueObj.value = value;
+        }
+        if (((_b = this.model.minVariable) === null || _b === void 0 ? void 0 : _b.variableName.name) === variableName) {
+            this.isNeedUpdateScale = true;
+            this.valueObj.min = value;
+        }
+        if (((_c = this.model.maxVariable) === null || _c === void 0 ? void 0 : _c.variableName.name) === variableName) {
+            this.isNeedUpdateScale = true;
+            this.valueObj.max = value;
         }
     }
     updateScale() {
@@ -91,11 +87,13 @@ export class RingGraphElement extends ReadableElement {
         const textElements = this.$element.find('g:first > text');
         let min = this.model.minValueType ? this.valueObj.min : this.model.min;
         let max = this.model.maxValueType ? this.valueObj.max : this.model.max;
-        if (!isNumber(min) || !isNumber(max)) {
+        min = Number(min);
+        max = Number(max);
+        if (isNaN(min) || isNaN(max)) {
             min = RingGraphElement.DEFAULT_MIN_VALUE;
             max = RingGraphElement.DEFAULT_MAX_VALUE;
         }
-        const avgSacle = ((Number(max) - Number(min)) / this.model.masterDivisionNumber).toFixed(5);
+        const avgSacle = ((max - min) / this.model.masterDivisionNumber).toFixed(5);
         for (let i = 0; i < textElements.length; i++) {
             const text = textElements[i];
             if (!text.innerHTML) {
@@ -116,7 +114,9 @@ export class RingGraphElement extends ReadableElement {
         this.updateScale();
         let min = this.model.minValueType ? this.valueObj.min : this.model.min;
         let max = this.model.maxValueType ? this.valueObj.max : this.model.max;
-        if (!isNumber(min) || !isNumber(max)) {
+        min = Number(min);
+        max = Number(max);
+        if (isNaN(min) || isNaN(max)) {
             min = RingGraphElement.DEFAULT_MIN_VALUE;
             max = RingGraphElement.DEFAULT_MAX_VALUE;
         }

package/localization/localization.service.d.ts

@@ -30,7 +30,9 @@ export interface Localization {
     permissiontip: any;
     conditionIsNotMetTip: any;
     chartNoData: any;
+    lastThirtyMinutes: any;
     lastOneHour: any;
+    lastEightHour: any;
     lastTwentyFourHours: any;
     lastSevenDays: any;
     lastThirtyDays: any;

package/localization/localization.service.js

@@ -30,7 +30,9 @@ export const DefaultLocalization = {
     permissiontip: 'You have no permission to operate.',
     conditionIsNotMetTip: 'Unsatisfied operating conditions or variable abnorma.',
     chartNoData: 'No Data Available',
+    lastThirtyMinutes: 'Last thirty minutes',
     lastOneHour: 'Last one hour',
+    lastEightHour: 'Last eight hours',
     lastTwentyFourHours: 'Last 24 hours',
     lastSevenDays: 'Last 7 days',
     lastThirtyDays: 'Last 30 days',

package/localization/localization.service.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"LOCALIZATION":{"__symbolic":"new","expression":{"__symbolic":"reference","module":"@angular/core","name":"InjectionToken","line":2,"character":32},"arguments":["fc.gui.loc"]},"Localization":{"__symbolic":"interface"},"DefaultLocalization":{"loadFailed":"Load failed.","setting":"Setting","submit":"Submit","numericalValueRequired":"Numerical value can't be emtpy","invalidNumericalValue":"Numerical value is not valid","binaryType":"Binary","decimalType":"Decimal","hexadecimalType":"Hexadecimal","stringType":"String","numericalValueTooLong":"Numerical value too long","fractionDigitsMustLessThan":"Fraction digits must be less than ","canNotBeNegative":"Can not be negative","valueOutOfRange":"Numerical value is out of range","timeout":"timeout","confirmOperationPrompt":"Sure to do this operation?","confirm":"Yes","cancel":"Cancel","characterInputRequired":"Character input can't be empty","character":"(Character)","characterOutofRange":"Character length is out of range","writeValueRange":"Write value range","loading":"Loading","unbind":"Unbind","offline":"Offline","abnormal":"Data abnormal","disable":"Disable","permissiontip":"You have no permission to operate.","conditionIsNotMetTip":"Unsatisfied operating conditions or variable abnorma.","chartNoData":"No Data Available","lastOneHour":"Last one hour","lastTwentyFourHours":"Last 24 hours","lastSevenDays":"Last 7 days","lastThirtyDays":"Last 30 days","lastOneYear":"Last 1 year","grouped":"Grouped","stacked":"Stacked","passwordVerify":"Password verifiers","passwordError":"Password error","password":"Password","passwordToolTip":"Password error, please re-enter","passwordRequired":"Password can't be empty","invalidVideoAddress":"Invalid video address","unconfiguredVideoAddress":"Unconfigured Video Address","weatherNotSupport":"Location not supported","weatherNotAddress":"Address not configured","weatherNotAvailable":"Address not yet available","airQualityNotSupport":"Location not supported","airQualityNotAddress":"Address not configured","airQualityNotAvailable":"Address not yet available"}}}]
+[{"__symbolic":"module","version":4,"metadata":{"LOCALIZATION":{"__symbolic":"new","expression":{"__symbolic":"reference","module":"@angular/core","name":"InjectionToken","line":2,"character":32},"arguments":["fc.gui.loc"]},"Localization":{"__symbolic":"interface"},"DefaultLocalization":{"loadFailed":"Load failed.","setting":"Setting","submit":"Submit","numericalValueRequired":"Numerical value can't be emtpy","invalidNumericalValue":"Numerical value is not valid","binaryType":"Binary","decimalType":"Decimal","hexadecimalType":"Hexadecimal","stringType":"String","numericalValueTooLong":"Numerical value too long","fractionDigitsMustLessThan":"Fraction digits must be less than ","canNotBeNegative":"Can not be negative","valueOutOfRange":"Numerical value is out of range","timeout":"timeout","confirmOperationPrompt":"Sure to do this operation?","confirm":"Yes","cancel":"Cancel","characterInputRequired":"Character input can't be empty","character":"(Character)","characterOutofRange":"Character length is out of range","writeValueRange":"Write value range","loading":"Loading","unbind":"Unbind","offline":"Offline","abnormal":"Data abnormal","disable":"Disable","permissiontip":"You have no permission to operate.","conditionIsNotMetTip":"Unsatisfied operating conditions or variable abnorma.","chartNoData":"No Data Available","lastThirtyMinutes":"Last thirty minutes","lastOneHour":"Last one hour","lastEightHour":"Last eight hours","lastTwentyFourHours":"Last 24 hours","lastSevenDays":"Last 7 days","lastThirtyDays":"Last 30 days","lastOneYear":"Last 1 year","grouped":"Grouped","stacked":"Stacked","passwordVerify":"Password verifiers","passwordError":"Password error","password":"Password","passwordToolTip":"Password error, please re-enter","passwordRequired":"Password can't be empty","invalidVideoAddress":"Invalid video address","unconfiguredVideoAddress":"Unconfigured Video Address","weatherNotSupport":"Location not supported","weatherNotAddress":"Address not configured","weatherNotAvailable":"Address not yet available","airQualityNotSupport":"Location not supported","airQualityNotAddress":"Address not configured","airQualityNotAvailable":"Address not yet available"}}}]

package/localization/localization.service.zh_CN.js

@@ -28,7 +28,9 @@ export const Localization_zh_CN = {
     permissiontip: '您无权限执行此操作',
     conditionIsNotMetTip: '操作条件不满足或逻辑控制变量异常',
     chartNoData: '无数据',
+    lastThirtyMinutes: '最近30分钟',
     lastOneHour: '最近1小时',
+    lastEightHour: '最近8小时',
     lastTwentyFourHours: '最近24小时',
     lastSevenDays: '最近7天',
     lastThirtyDays: '最近30天',

package/localization/localization.service.zh_CN.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"Localization_zh_CN":{"loadFailed":"加载失败.","setting":"设置","submit":"提交","numericalValueRequired":"数值不能为空","invalidNumericalValue":"数值格式不正确","binaryType":"二进制","decimalType":"十进制","hexadecimalType":"十六进制","stringType":"字符串","numericalValueTooLong":"数值超长","fractionDigitsMustLessThan":"小数位不能超过","canNotBeNegative":"不能为负数","valueOutOfRange":"数值超出范围","timeout":"超时","confirmOperationPrompt":"是否确认要执行此操作？","confirm":"确定","cancel":"取消","characterInputRequired":"请输入至少一个字符","character":"(字符串)","characterOutofRange":"字符长度超限","writeValueRange":"写值范围","loading":"加载中","unbind":"未绑定","offline":"离线","abnormal":"数据异常","disable":"禁用","permissiontip":"您无权限执行此操作","conditionIsNotMetTip":"操作条件不满足或逻辑控制变量异常","chartNoData":"无数据","lastOneHour":"最近1小时","lastTwentyFourHours":"最近24小时","lastSevenDays":"最近7天","lastThirtyDays":"最近30天","lastOneYear":"最近1年","grouped":"分组","stacked":"叠加","passwordVerify":"密码校验","passwordError":"密码错误","password":"密码","passwordToolTip":"密码错误，请重新输入","passwordRequired":"密码不能为空","invalidVideoAddress":"无效的视频地址","unconfiguredVideoAddress":"未配置视频地址","weatherNotSupport":"当前位置暂不支持","weatherNotAddress":"当前设备未设置地址","weatherNotAvailable":"暂未获取设备地址","airQualityNotSupport":"当前位置暂不支持","airQualityNotAddress":"当前设备未设置地址","airQualityNotAvailable":"暂未获取设备地址"}}}]
+[{"__symbolic":"module","version":4,"metadata":{"Localization_zh_CN":{"loadFailed":"加载失败.","setting":"设置","submit":"提交","numericalValueRequired":"数值不能为空","invalidNumericalValue":"数值格式不正确","binaryType":"二进制","decimalType":"十进制","hexadecimalType":"十六进制","stringType":"字符串","numericalValueTooLong":"数值超长","fractionDigitsMustLessThan":"小数位不能超过","canNotBeNegative":"不能为负数","valueOutOfRange":"数值超出范围","timeout":"超时","confirmOperationPrompt":"是否确认要执行此操作？","confirm":"确定","cancel":"取消","characterInputRequired":"请输入至少一个字符","character":"(字符串)","characterOutofRange":"字符长度超限","writeValueRange":"写值范围","loading":"加载中","unbind":"未绑定","offline":"离线","abnormal":"数据异常","disable":"禁用","permissiontip":"您无权限执行此操作","conditionIsNotMetTip":"操作条件不满足或逻辑控制变量异常","chartNoData":"无数据","lastThirtyMinutes":"最近30分钟","lastOneHour":"最近1小时","lastEightHour":"最近8小时","lastTwentyFourHours":"最近24小时","lastSevenDays":"最近7天","lastThirtyDays":"最近30天","lastOneYear":"最近1年","grouped":"分组","stacked":"叠加","passwordVerify":"密码校验","passwordError":"密码错误","password":"密码","passwordToolTip":"密码错误，请重新输入","passwordRequired":"密码不能为空","invalidVideoAddress":"无效的视频地址","unconfiguredVideoAddress":"未配置视频地址","weatherNotSupport":"当前位置暂不支持","weatherNotAddress":"当前设备未设置地址","weatherNotAvailable":"暂未获取设备地址","airQualityNotSupport":"当前位置暂不支持","airQualityNotAddress":"当前设备未设置地址","airQualityNotAvailable":"暂未获取设备地址"}}}]

package/package.json

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