@flexem/fc-gui 3.0.0-alpha.28 → 3.0.0-alpha.31

package/CHANGELOG.md

@@ -119,3 +119,18 @@
 ### Web端
 #### Bug Fix
     1. FLEXCLOUD-1851 无数据时，默认应展示0值
+
+## 3.0.0-alpha.29(2021-11-04)
+### Web端
+#### Bug Fix
+    1. FLEXCLOUD-1851 无数据时，默认应展示0值
+
+## 3.0.0-alpha.30(2021-12-03)
+### Web端
+#### Bug Fix
+    1. FLEXCLOUD-1969: 天津亿晟：组态中的历史曲线增加时间筛选刻度
+
+## 3.0.0-alpha.31(2021-12-16)
+### Web端
+#### Bug Fix
+    1. FLEXCLOUD-1817: 组件更改其中一变量，其余变量应不生效，模板中删除、更改变量，删除与更改变量应不生效

package/bundles/@flexem/fc-gui.umd.js

@@ -22164,7 +22164,9 @@ const Localization_zh_CN = {
     permissiontip: '您无权限执行此操作',
     conditionIsNotMetTip: '操作条件不满足或逻辑控制变量异常',
     chartNoData: '无数据',
+    lastThirtyMinutes: '最近30分钟',
     lastOneHour: '最近1小时',
+    lastEightHour: '最近8小时',
     lastTwentyFourHours: '最近24小时',
     lastSevenDays: '最近7天',
     lastThirtyDays: '最近30天',
@@ -22890,7 +22892,9 @@ 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',
@@ -25699,7 +25703,9 @@ class readable_element_ReadableElement extends conditional_enable_element_Condit
                 this.changeStates();
             }
         });
-        if (this.state === _tmp_model["State"].Normal || this.state === _tmp_model["State"].Disable) {
+        if (this.state === _tmp_model["State"].Normal || this.state === _tmp_model["State"].Disable
+            || value.variableName === this.minVariableName
+            || value.variableName === this.maxVariableName) {
             this.updateVariableValue(value.value, value.variableName);
         }
     }
@@ -25730,7 +25736,6 @@ var variable_value_type = __webpack_require__(15);
 
 
 
-
 class bar_graph_element_BarGraphElement extends readable_element_ReadableElement {
     constructor(element, permissionChecker, variableCommunicator, variableStore, localization, signalRAppId) {
         super(element, permissionChecker, variableCommunicator, variableStore, localization, signalRAppId);
@@ -25780,21 +25785,17 @@ class bar_graph_element_BarGraphElement extends readable_element_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() {
@@ -25804,11 +25805,13 @@ class bar_graph_element_BarGraphElement extends readable_element_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 (!Object(lodash["isNumber"])(min) || !Object(lodash["isNumber"])(max)) {
+        min = Number(min);
+        max = Number(max);
+        if (isNaN(min) || isNaN(max)) {
             min = bar_graph_element_BarGraphElement.DEFAULT_MIN_VALUE;
             max = bar_graph_element_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) {
@@ -25827,14 +25830,16 @@ class bar_graph_element_BarGraphElement extends readable_element_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 (!Object(lodash["isNumber"])(minValue) || !Object(lodash["isNumber"])(maxValue)) {
+        minValue = Number(minValue);
+        maxValue = Number(maxValue);
+        if (isNaN(minValue) || isNaN(maxValue)) {
             minValue = bar_graph_element_BarGraphElement.DEFAULT_MIN_VALUE;
             maxValue = bar_graph_element_BarGraphElement.DEFAULT_MAX_VALUE;
         }
-        if (!Object(lodash["isNumber"])(variableValue)) {
+        if (isNaN(variableValue)) {
             return;
         }
         const useAlarmLimit = this.model.useAlarmLimit;
@@ -26760,7 +26765,9 @@ class historical_curve_element_HistoricalCurveElement extends conditional_displa
     }
     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 });
@@ -26786,6 +26793,12 @@ class historical_curve_element_HistoricalCurveElement extends conditional_displa
             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');
         }
@@ -27111,21 +27124,17 @@ class meter_element_MeterElement extends readable_element_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) {
@@ -27146,11 +27155,13 @@ class meter_element_MeterElement extends readable_element_ReadableElement {
         }
         let min = this.model.minValueType ? this.valueObj.min : this.model.min;
         let max = this.model.maxValueType ? this.valueObj.max : this.model.max;
-        if (!Object(lodash["isNumber"])(min) || !Object(lodash["isNumber"])(max)) {
+        min = Number(min);
+        max = Number(max);
+        if (isNaN(min) || isNaN(max)) {
             min = meter_element_MeterElement.DEFAULT_MIN_VALUE;
             max = meter_element_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];
@@ -27170,11 +27181,13 @@ class meter_element_MeterElement extends readable_element_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 (!Object(lodash["isNumber"])(min) || !Object(lodash["isNumber"])(max)) {
+        min = Number(min);
+        max = Number(max);
+        if (isNaN(min) || isNaN(max)) {
             min = meter_element_MeterElement.DEFAULT_MIN_VALUE;
             max = meter_element_MeterElement.DEFAULT_MAX_VALUE;
         }
-        if (!this.valueObj.value && !Object(lodash["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);
@@ -27995,6 +28008,9 @@ class ring_graph_element_RingGraphElement extends readable_element_ReadableEleme
         if (!this.model.variableId) {
             return '';
         }
+        if (!this.model.variableId.variableName || !this.model.variableId.variableName.name) {
+            return undefined;
+        }
         const variable = new variable_definition["a" /* VariableDefinition */](this.model.variableId.variableName.name, this.model.variableId.variableName.groupName, this.model.variableId.dataSourceCode, this.model.variableId.variableName.variableVersion);
         return variable_util["a" /* VariableUtil */].getConvertedVariableName(this.variableStore, variable);
     }
@@ -28002,14 +28018,20 @@ class ring_graph_element_RingGraphElement extends readable_element_ReadableEleme
         if (!this.model.minValueType) {
             return undefined;
         }
-        const variable = new variable_definition["a" /* VariableDefinition */](this.model.minVariable.variableName.name, this.model.minVariable.variableName.groupName, this.model.minVariable.dataSourceCode, this.model.minVariable.variableName.variableVersion);
+        if (!this.model.minVariable || !this.model.minVariable.name) {
+            return undefined;
+        }
+        const variable = new variable_definition["a" /* VariableDefinition */](this.model.minVariable.name, this.model.minVariable.groupName, this.model.minVariable.dataSourceCode, this.model.minVariable.variableVersion);
         return variable_util["a" /* VariableUtil */].getConvertedVariableName(this.variableStore, variable);
     }
     get maxVariableName() {
         if (!this.model.maxValueType) {
             return undefined;
         }
-        const variable = new variable_definition["a" /* VariableDefinition */](this.model.maxVariable.variableName.name, this.model.maxVariable.variableName.groupName, this.model.maxVariable.dataSourceCode, this.model.maxVariable.variableName.variableVersion);
+        if (!this.model.maxVariable || !this.model.maxVariable.name) {
+            return undefined;
+        }
+        const variable = new variable_definition["a" /* VariableDefinition */](this.model.maxVariable.name, this.model.maxVariable.groupName, this.model.maxVariable.dataSourceCode, this.model.maxVariable.variableVersion);
         return variable_util["a" /* VariableUtil */].getConvertedVariableName(this.variableStore, variable);
     }
     initFrameNode() {
@@ -28032,21 +28054,17 @@ class ring_graph_element_RingGraphElement extends readable_element_ReadableEleme
     }
     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.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() {
@@ -28056,11 +28074,13 @@ class ring_graph_element_RingGraphElement extends readable_element_ReadableEleme
         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 (!Object(lodash["isNumber"])(min) || !Object(lodash["isNumber"])(max)) {
+        min = Number(min);
+        max = Number(max);
+        if (isNaN(min) || isNaN(max)) {
             min = ring_graph_element_RingGraphElement.DEFAULT_MIN_VALUE;
             max = ring_graph_element_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) {
@@ -28081,7 +28101,9 @@ class ring_graph_element_RingGraphElement extends readable_element_ReadableEleme
         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 (!Object(lodash["isNumber"])(min) || !Object(lodash["isNumber"])(max)) {
+        min = Number(min);
+        max = Number(max);
+        if (isNaN(min) || isNaN(max)) {
             min = ring_graph_element_RingGraphElement.DEFAULT_MIN_VALUE;
             max = ring_graph_element_RingGraphElement.DEFAULT_MAX_VALUE;
         }