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

package/CHANGELOG.md

@@ -456,7 +456,12 @@
 #### Features
     1. FLEXCLOUD-2957 切换仪表盘时console报错，由于历史曲线中设置了windowResize但未清除，导致resize会执行已经不存在的历史曲线的数据
 
-## 3.0.0-alpha.102(2023-12-18)
+## 3.0.0-alpha.102(2023-12-18)，3.0.0-alpha.103(2024-03-07)
 ### Web端
 #### Features
-    1. FLEXCLOUD-2619 棒图、环形图设置最大值、最小值为参数后，刻度数值对齐及模糊问题
+    1. FLEXCLOUD-2619 棒图、环形图设置最大值、最小值为参数后，刻度数值对齐及模糊问题
+
+## 3.0.0-alpha.104(2024-03-13)
+### Web端
+#### Features
+    1. FLEXCLOUD-2619 环形图配置常数后再配置变量导致刻度值间隔较大

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

@@ -22111,7 +22111,7 @@ class ConsoleLoggerService {
 
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return VariableUtil; });
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12);
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(13);
 
 class VariableUtil {
     static getConvertedVariableName(variableStore, variable) {
@@ -22226,6 +22226,19 @@ class VariableDefinition {
 /* 11 */
 /***/ (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 = {}));
+
+
+/***/ }),
+/* 12 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return __extends; });
 /* unused harmony export __assign */
@@ -22435,7 +22448,7 @@ function __importDefault(mod) {
 
 
 /***/ }),
-/* 12 */
+/* 13 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -22598,19 +22611,6 @@ 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__) {
@@ -32958,7 +32958,7 @@ class Guid {
 "use strict";
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Subscriber; });
 /* unused harmony export SafeSubscriber */
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(11);
+/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(12);
 /* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(51);
 /* harmony import */ var _Observer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(53);
 /* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(23);
@@ -35342,7 +35342,7 @@ function degreesToRadians(degrees) {
 }
 
 // EXTERNAL MODULE: ./.tmp/model/shared/condition/variable-value-type.ts
-var variable_value_type = __webpack_require__(13);
+var variable_value_type = __webpack_require__(11);
 
 // CONCATENATED MODULE: ./.tmp/elements/bar-graph-element.ts
 
@@ -35359,6 +35359,8 @@ class bar_graph_element_BarGraphElement extends readable_element_ReadableElement
         this.barText = '';
         this.valueObj = {};
         this.isNeedUpdateScale = false;
+        this.needAddNumber = 0;
+        this.needInitTransform = true;
         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;
@@ -35374,8 +35376,10 @@ class bar_graph_element_BarGraphElement extends readable_element_ReadableElement
             this.$barRect.attr('transform', this.defaultTransform);
         }
         setTimeout(() => {
-            this.initFrameNode();
-        }, 0);
+            if (this.model.maxValueType !== variable_value_type["a" /* VariableValueType */].Variable || this.model.minValueType !== variable_value_type["a" /* VariableValueType */].Variable) {
+                this.initFrameNode();
+            }
+        });
     }
     get readVariableName() {
         if (!this.model) {
@@ -35392,10 +35396,42 @@ class bar_graph_element_BarGraphElement extends readable_element_ReadableElement
             return variable_util["a" /* VariableUtil */].getConvertedVariableName(this.variableStore, variable);
         }
     }
+    initTransform() {
+        if (this.needAddNumber <= 3)
+            return;
+        this.$element[0].childNodes.forEach((node, index) => {
+            const matrixE = node.transform.baseVal[0].matrix.e;
+            node.transform.baseVal[0].matrix.e = matrixE + (this.needAddNumber - 3) * 7;
+            if (node.nodeName === 'g') {
+                const nodeValue = node.attributes['clip-path'].value.replace('url(#', '').replace(')', '');
+                const rootNode = node.parentNode.parentNode.parentElement;
+                const clipPath = $(rootNode).find(`clipPath[id="${nodeValue}"]`);
+                const demoPath = clipPath.find('path');
+                const dValues = demoPath.attr('d').split(',');
+                const retValues = [];
+                dValues.forEach((line) => {
+                    const values = [];
+                    line.split(' ').forEach((item) => {
+                        const nItem = Number(item);
+                        if (!isNaN(nItem) && item < 100) {
+                            item = nItem > 0 ? nItem + (this.needAddNumber - 3) * 7 : nItem - (this.needAddNumber - 3) * 7;
+                        }
+                        values.push(item);
+                    });
+                    retValues.push(values.join(' '));
+                });
+                demoPath.attr('d', retValues.join(','));
+            }
+            else if (index === this.$element[0].childNodes.length - 1) {
+                this.defaultTransform = node.attributes['transform'].value;
+            }
+        });
+    }
     initFrameNode() {
         const arcPath = Snap(this.$element[0]);
         const b = arcPath.getBBox(true);
-        this.rootElement.append('rect').attr('id', 'StateFrame').attr('width', b.width).attr('height', b.height).attr('fill', 'transparent');
+        const width = this.needAddNumber <= 3 ? b.width : b.width + (this.needAddNumber - 3) * 7;
+        this.rootElement.append('rect').attr('id', 'StateFrame').attr('width', width).attr('height', b.height).attr('fill', 'transparent');
     }
     updateValueObj(value, variableName) {
         var _a, _b, _c;
@@ -35425,6 +35461,14 @@ class bar_graph_element_BarGraphElement extends readable_element_ReadableElement
             min = bar_graph_element_BarGraphElement.DEFAULT_MIN_VALUE;
             max = bar_graph_element_BarGraphElement.DEFAULT_MAX_VALUE;
         }
+        if (this.model.maxValueType === variable_value_type["a" /* VariableValueType */].Variable && this.model.minValueType === variable_value_type["a" /* VariableValueType */].Variable) {
+            this.needAddNumber = max.toString().length > min.toString().length ? max.toString().length : min.toString().length;
+            if (this.needInitTransform) {
+                this.initTransform();
+                this.initFrameNode();
+                this.needInitTransform = false;
+            }
+        }
         const avgSacle = ((max - min) / this.model.masterDivisionNumber).toFixed(5);
         for (let i = 0; i < textElements.length; i++) {
             const text = textElements[i];
@@ -35441,7 +35485,8 @@ class bar_graph_element_BarGraphElement extends readable_element_ReadableElement
                 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) {
+                    const sacleLen = sacleValue.toString().length;
+                    switch (sacleLen) {
                         case 1:
                             translateX = 13;
                             break;
@@ -35452,6 +35497,9 @@ class bar_graph_element_BarGraphElement extends readable_element_ReadableElement
                             translateX = this.model.fractionDigits ? 5 : 0;
                             break;
                         default:
+                            if (sacleLen > 3 && this.needAddNumber > 3) {
+                                translateX = -(sacleLen - 3) * 7;
+                            }
                             break;
                     }
                     text.transform.baseVal[0].matrix.e = translateX;
@@ -35550,7 +35598,7 @@ bar_graph_element_BarGraphElement.DEFAULT_MAX_VALUE = 100;
 
 
 // EXTERNAL MODULE: ./.tmp/config/index.ts + 11 modules
-var _tmp_config = __webpack_require__(12);
+var _tmp_config = __webpack_require__(13);
 
 // EXTERNAL MODULE: ./.tmp/modal/alert/alert-modal.component.ts
 var alert_modal_component = __webpack_require__(20);
@@ -37860,6 +37908,7 @@ class ring_graph_element_RingGraphElement extends readable_element_ReadableEleme
         this.valueObj = {};
         this.isNeedUpdateScale = false;
         this.initTransform = false;
+        this.needAddNumber = 0;
         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;
@@ -37904,6 +37953,34 @@ class ring_graph_element_RingGraphElement extends readable_element_ReadableEleme
         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);
     }
+    initTransformFun(len) {
+        this.$element[0].childNodes.forEach((node) => {
+            if (!node.transform.baseVal[0])
+                return;
+            // const matrixE = node.transform.baseVal[0].matrix.e;
+            // node.transform.baseVal[0].matrix.e = matrixE + len * 5;
+            if (node.nodeName === 'g') {
+                const nodeValue = node.attributes['clip-path'].value.replace('url(#', '').replace(')', '');
+                const rootNode = node.parentNode.parentNode.parentElement;
+                const clipPath = $(rootNode).find(`clipPath[id="${nodeValue}"]`);
+                const demoPath = clipPath.find('path');
+                const dValues = demoPath.attr('d').split(',');
+                const retValues = [];
+                dValues.forEach((line, index) => {
+                    const values = [];
+                    line.split(' ').forEach((item) => {
+                        const nItem = Number(item);
+                        if (!isNaN(nItem) && (index === 1 || index === 2 || nItem === -1)) {
+                            item = nItem > 0 ? (index === 1 || index === 2 ? nItem + (len + 2) * 8 : nItem + len * 8) : nItem - len * 8;
+                        }
+                        values.push(item);
+                    });
+                    retValues.push(values.join(' '));
+                });
+                demoPath.attr('d', retValues.join(','));
+            }
+        });
+    }
     initFrameNode() {
         const arcPath = Snap(this.$element[0]);
         const b = arcPath.getBBox(true);
@@ -37939,7 +38016,6 @@ 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)`;
@@ -37956,6 +38032,15 @@ class ring_graph_element_RingGraphElement extends readable_element_ReadableEleme
             min = ring_graph_element_RingGraphElement.DEFAULT_MIN_VALUE;
             max = ring_graph_element_RingGraphElement.DEFAULT_MAX_VALUE;
         }
+        if (this.model.minValueType === variable_value_type["a" /* VariableValueType */].Variable || this.model.maxValueType === variable_value_type["a" /* VariableValueType */].Variable) {
+            const len = max.toString().length > min.toString().length ? max.toString().length : min.toString().length;
+            if (Math.abs(len - this.needAddNumber) > 2) {
+                const width = this.$element.find('rect').attr('width');
+                this.$element.find('rect').attr('width', Number(width) + (len - this.needAddNumber) * 8);
+                this.initTransformFun(Math.abs(len - this.needAddNumber));
+                this.needAddNumber = len;
+            }
+        }
         const avgSacle = ((max - min) / this.model.masterDivisionNumber).toFixed(5);
         for (let i = 0; i < textElements.length; i++) {
             const text = textElements[i];
@@ -37968,18 +38053,23 @@ class ring_graph_element_RingGraphElement extends readable_element_ReadableEleme
                 sacleValue = (sacleValue / Math.pow(10, this.model.fractionDigits)).toFixed(this.model.fractionDigits);
             }
             if (!isNaN(sacleValue)) {
+                const oriValue = text.innerHTML;
                 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;
+                    const len = oriValue.toString().length - sacleValue.toString().length;
+                    if (order <= 0.7 && len > 1 && !this.initTransform) {
+                        text.transform.baseVal[0].matrix.e += (len - 1) * 5;
+                    }
+                    if (order > 0.7 && Math.abs(len) > 0) {
+                        text.transform.baseVal[0].matrix.e += len > 1 ? (len - 1) * 5 : len < -1 ? (len + 1) * 5 : len * 5;
+                        text.transform.baseVal[0].matrix.e += len === -2 ? -3 : 0;
                     }
                 }
             }
         }
-        this.initTransform = this.initTransform || isInitTransform;
+        this.initTransform = true;
     }
     updateVariableValue(value, variableName) {
         this.updateValueObj(value, variableName);
@@ -61523,7 +61613,7 @@ nv.version = "1.8.6-dev";
 "use strict";
 
 // EXTERNAL MODULE: ./node_modules/rxjs/node_modules/tslib/tslib.es6.js
-var tslib_es6 = __webpack_require__(11);
+var tslib_es6 = __webpack_require__(12);
 
 // EXTERNAL MODULE: ./node_modules/rxjs/_esm5/internal/Observable.js + 3 modules
 var Observable = __webpack_require__(14);
@@ -63291,7 +63381,7 @@ var Subject = __webpack_require__(39);
 var operators_ = __webpack_require__(16);
 
 // EXTERNAL MODULE: ./.tmp/config/index.ts + 11 modules
-var _tmp_config = __webpack_require__(12);
+var _tmp_config = __webpack_require__(13);
 
 // EXTERNAL MODULE: ./.tmp/core/stringifying-map.ts
 var stringifying_map = __webpack_require__(29);
@@ -64021,7 +64111,7 @@ class RelationConditionResult {
 }
 
 // EXTERNAL MODULE: ./.tmp/model/shared/condition/variable-value-type.ts
-var variable_value_type = __webpack_require__(13);
+var variable_value_type = __webpack_require__(11);
 
 // EXTERNAL MODULE: ./.tmp/model/shared/condition/relation-type.ts
 var relation_type = __webpack_require__(21);
@@ -65535,7 +65625,7 @@ var Observable = __webpack_require__(14);
 var isScheduler = __webpack_require__(50);
 
 // EXTERNAL MODULE: ./node_modules/rxjs/node_modules/tslib/tslib.es6.js
-var tslib_es6 = __webpack_require__(11);
+var tslib_es6 = __webpack_require__(12);
 
 // EXTERNAL MODULE: ./node_modules/rxjs/_esm5/internal/Subscriber.js
 var Subscriber = __webpack_require__(28);
@@ -83971,7 +84061,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _core__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(43);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "StringifyingMap", function() { return _core__WEBPACK_IMPORTED_MODULE_3__["a"]; });
 
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(12);
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(13);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ConfigStore", function() { return _config__WEBPACK_IMPORTED_MODULE_4__["b"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Graph", function() { return _config__WEBPACK_IMPORTED_MODULE_4__["f"]; });