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

package/CHANGELOG.md

@@ -449,4 +449,14 @@
 ## 3.0.0-alpha.100(2023-11-27)
 ### Web端
 #### Features
-    1. FLEXCLOUD-2885 设备模板—组态设计—告警表/历史曲线表，分页图标设置为透明
+    1. FLEXCLOUD-2885 设备模板—组态设计—告警表/历史曲线表，分页图标设置为透明
+
+## 3.0.0-alpha.101(2023-11-29)
+### Web端
+#### Features
+    1. FLEXCLOUD-2957 切换仪表盘时console报错，由于历史曲线中设置了windowResize但未清除，导致resize会执行已经不存在的历史曲线的数据
+
+## 3.0.0-alpha.102(2023-12-18)
+### Web端
+#### Features
+    1. FLEXCLOUD-2619 棒图、环形图设置最大值、最小值为参数后，刻度数值对齐及模糊问题

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

@@ -22602,6 +22602,19 @@ class GetAlarmsArgs {
 /* 13 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return VariableValueType; });
+var VariableValueType;
+(function (VariableValueType) {
+    VariableValueType[VariableValueType["Constant"] = 0] = "Constant";
+    VariableValueType[VariableValueType["Variable"] = 1] = "Variable";
+})(VariableValueType || (VariableValueType = {}));
+
+
+/***/ }),
+/* 14 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
 "use strict";
 
 // EXTERNAL MODULE: ./node_modules/rxjs/_esm5/internal/Subscriber.js
@@ -22807,7 +22820,7 @@ function getPromiseCtor(promiseCtor) {
 
 
 /***/ }),
-/* 14 */
+/* 15 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -22850,19 +22863,6 @@ var global_settings = __webpack_require__(48);
 
 
 
-/***/ }),
-/* 15 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return VariableValueType; });
-var VariableValueType;
-(function (VariableValueType) {
-    VariableValueType[VariableValueType["Constant"] = 0] = "Constant";
-    VariableValueType[VariableValueType["Variable"] = 1] = "Variable";
-})(VariableValueType || (VariableValueType = {}));
-
-
 /***/ }),
 /* 16 */
 /***/ (function(module, exports) {
@@ -35342,7 +35342,7 @@ function degreesToRadians(degrees) {
 }
 
 // EXTERNAL MODULE: ./.tmp/model/shared/condition/variable-value-type.ts
-var variable_value_type = __webpack_require__(15);
+var variable_value_type = __webpack_require__(13);
 
 // CONCATENATED MODULE: ./.tmp/elements/bar-graph-element.ts
 
@@ -35438,6 +35438,24 @@ class bar_graph_element_BarGraphElement extends readable_element_ReadableElement
             }
             if (!isNaN(sacleValue)) {
                 text.innerHTML = sacleValue;
+                if (this.model.minValueType !== variable_value_type["a" /* VariableValueType */].Constant || this.model.maxValueType !== variable_value_type["a" /* VariableValueType */].Constant) {
+                    // FLEXCLOUD-2619 刻度未对齐问题
+                    let translateX = 0;
+                    switch (sacleValue.toString().length) {
+                        case 1:
+                            translateX = 13;
+                            break;
+                        case 2:
+                            translateX = 7;
+                            break;
+                        case 3:
+                            translateX = this.model.fractionDigits ? 5 : 0;
+                            break;
+                        default:
+                            break;
+                    }
+                    text.transform.baseVal[0].matrix.e = translateX;
+                }
             }
         }
     }
@@ -36308,7 +36326,7 @@ var HistoricalCurveElementStatus;
 })(HistoricalCurveElementStatus || (HistoricalCurveElementStatus = {}));
 
 // EXTERNAL MODULE: ./.tmp/settings/index.ts + 2 modules
-var _tmp_settings = __webpack_require__(14);
+var _tmp_settings = __webpack_require__(15);
 
 // CONCATENATED MODULE: ./.tmp/model/historical-curve/curve-type.ts
 var CurveType;
@@ -36384,6 +36402,9 @@ class historical_curve_element_HistoricalCurveElement extends conditional_displa
         if (this.chartElement) {
             this.chartElement.tooltip.hidden(true);
         }
+        if (this.resizeEventListener) {
+            this.resizeEventListener.clear();
+        }
         this.logger.debug(`[GUI]Dispose Histoical Curve Refresh Interval:${d3["time"].format('%x %X')(new Date())}`);
     }
     getValidTimePeriods() {
@@ -36631,7 +36652,7 @@ class historical_curve_element_HistoricalCurveElement extends conditional_displa
         chart.color(this.model.dataSetting.channels.map(c => c.connectorColor));
         this.rootElement.append('g').datum(data).call(chart);
         this.rootElement.selectAll('.nv-noData').attr('x', chartWidth / 2).attr('y', chartHeight / 2 + this.displayOption.operationAreaHeight);
-        nv_d3["utils"].windowResize(() => {
+        this.resizeEventListener = nv_d3["utils"].windowResize(() => {
             chart.update();
             this.rootElement.selectAll('.nv-noData').attr('x', chartWidth / 2).attr('y', chartHeight / 2 + this.displayOption.operationAreaHeight);
         });
@@ -37838,6 +37859,7 @@ class ring_graph_element_RingGraphElement extends readable_element_ReadableEleme
         super(element, permissionChecker, variableCommunicator, variableStore, localization, signalRAppId);
         this.valueObj = {};
         this.isNeedUpdateScale = false;
+        this.initTransform = false;
         if ((this.model.minValueType === variable_value_type["a" /* VariableValueType */].Constant && this.model.maxValueType === variable_value_type["a" /* VariableValueType */].Variable)
             || this.model.maxValueType === variable_value_type["a" /* VariableValueType */].Constant && this.model.minValueType === variable_value_type["a" /* VariableValueType */].Variable) {
             this.isNeedUpdateScale = true;
@@ -37916,6 +37938,12 @@ class ring_graph_element_RingGraphElement extends readable_element_ReadableEleme
         }
     }
     updateScale() {
+        // 刻度模糊问题
+        let isInitTransform = false;
+        const matrix = this.$element[0].transform.baseVal[0].matrix;
+        if (!this.$element[0].style.transform) {
+            this.$element[0].style.transform = `translate3d(${matrix.e}px, ${matrix.f}px, 0)`;
+        }
         if (!this.isNeedUpdateScale) {
             return;
         }
@@ -37941,8 +37969,17 @@ class ring_graph_element_RingGraphElement extends readable_element_ReadableEleme
             }
             if (!isNaN(sacleValue)) {
                 text.innerHTML = sacleValue;
+                if (this.model.minValueType !== variable_value_type["a" /* VariableValueType */].Constant || this.model.maxValueType !== variable_value_type["a" /* VariableValueType */].Constant) {
+                    // FLEXCLOUD-2619 刻度显示不全问题
+                    const order = (i + 1) / textElements.length;
+                    if (!this.initTransform && order > 0.2 && order < 0.5 && sacleValue.toString().length > 2) {
+                        text.transform.baseVal[0].matrix.e -= 5;
+                        isInitTransform = true;
+                    }
+                }
             }
         }
+        this.initTransform = this.initTransform || isInitTransform;
     }
     updateVariableValue(value, variableName) {
         this.updateValueObj(value, variableName);
@@ -40909,7 +40946,7 @@ class main_element_MainElement {
 }
 
 // EXTERNAL MODULE: ./node_modules/rxjs/_esm5/internal/Observable.js + 3 modules
-var Observable = __webpack_require__(13);
+var Observable = __webpack_require__(14);
 
 // CONCATENATED MODULE: ./.tmp/elements/per-view-variable-communicator.ts
 
@@ -41261,7 +41298,7 @@ var lodash = __webpack_require__(2);
 var _tmp_localization = __webpack_require__(9);
 
 // EXTERNAL MODULE: ./.tmp/settings/index.ts + 2 modules
-var settings = __webpack_require__(14);
+var settings = __webpack_require__(15);
 
 // EXTERNAL MODULE: ./.tmp/logger/index.ts + 2 modules
 var logger = __webpack_require__(7);
@@ -61489,7 +61526,7 @@ nv.version = "1.8.6-dev";
 var tslib_es6 = __webpack_require__(11);
 
 // EXTERNAL MODULE: ./node_modules/rxjs/_esm5/internal/Observable.js + 3 modules
-var Observable = __webpack_require__(13);
+var Observable = __webpack_require__(14);
 
 // EXTERNAL MODULE: ./node_modules/rxjs/_esm5/internal/Subscriber.js
 var Subscriber = __webpack_require__(28);
@@ -62928,7 +62965,7 @@ var empty = {
 
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return scheduleArray; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(14);
 /* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(23);
 /** PURE_IMPORTS_START _Observable,_Subscription PURE_IMPORTS_END */
 
@@ -63437,7 +63474,7 @@ class RemoteImageStore {
 }
 
 // EXTERNAL MODULE: ./node_modules/rxjs/_esm5/internal/Observable.js + 3 modules
-var Observable = __webpack_require__(13);
+var Observable = __webpack_require__(14);
 
 // EXTERNAL MODULE: ./.tmp/core/index.ts
 var core = __webpack_require__(43);
@@ -63984,7 +64021,7 @@ class RelationConditionResult {
 }
 
 // EXTERNAL MODULE: ./.tmp/model/shared/condition/variable-value-type.ts
-var variable_value_type = __webpack_require__(15);
+var variable_value_type = __webpack_require__(13);
 
 // EXTERNAL MODULE: ./.tmp/model/shared/condition/relation-type.ts
 var relation_type = __webpack_require__(21);
@@ -65492,7 +65529,7 @@ function __importDefault(mod) {
 var Subject = __webpack_require__(39);
 
 // EXTERNAL MODULE: ./node_modules/rxjs/_esm5/internal/Observable.js + 3 modules
-var Observable = __webpack_require__(13);
+var Observable = __webpack_require__(14);
 
 // EXTERNAL MODULE: ./node_modules/rxjs/_esm5/internal/util/isScheduler.js
 var isScheduler = __webpack_require__(50);
@@ -83554,7 +83591,7 @@ module.exports = __WEBPACK_EXTERNAL_MODULE__267__;
 
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return fromArray; });
-/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
+/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(14);
 /* harmony import */ var _util_subscribeToArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(269);
 /* harmony import */ var _scheduled_scheduleArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(54);
 /** PURE_IMPORTS_START _Observable,_util_subscribeToArray,_scheduled_scheduleArray PURE_IMPORTS_END */