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

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

@@ -24,9 +24,7 @@ export class RingGraphElement extends ReadableElement {
         this._barElement$ = el$.find('path[data-id="barArc"]');
         this._textElement$ = el$.find('text[data-id="pText"]');
         setTimeout(() => {
-            if (this.model.minValueType !== VariableValueType.Variable) {
-                this.initFrameNode();
-            }
+            this.initFrameNode();
             this.changeStates();
         });
     }
@@ -60,12 +58,12 @@ export class RingGraphElement extends ReadableElement {
         const variable = new VariableDefinition(this.model.maxVariable.name, this.model.maxVariable.groupName, this.model.maxVariable.dataSourceCode, this.model.maxVariable.variableVersion);
         return VariableUtil.getConvertedVariableName(this.variableStore, variable);
     }
-    initTransformFun() {
-        if (this.needAddNumber <= 3)
-            return;
+    initTransformFun(len) {
         this.$element[0].childNodes.forEach((node) => {
-            const matrixE = node.transform.baseVal[0].matrix.e;
-            node.transform.baseVal[0].matrix.e = matrixE + (this.needAddNumber - 3) * 5;
+            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;
@@ -77,8 +75,8 @@ export class RingGraphElement extends ReadableElement {
                     const values = [];
                     line.split(' ').forEach((item) => {
                         const nItem = Number(item);
-                        if (!isNaN(nItem) && (index === 1 || nItem === -1)) {
-                            item = nItem > 0 ? nItem + (this.needAddNumber - 3) * 8 : nItem - (this.needAddNumber - 3) * 8;
+                        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);
                     });
@@ -91,8 +89,7 @@ export class RingGraphElement extends ReadableElement {
     initFrameNode() {
         const arcPath = Snap(this.$element[0]);
         const b = arcPath.getBBox(true);
-        const width = this.needAddNumber <= 3 ? b.width : b.width + (this.needAddNumber - 3) * 8;
-        this.rootElement.append('rect').attr('id', 'StateFrame').attr('width', width).attr('height', b.height).attr('fill', 'transparent');
+        this.rootElement.append('rect').attr('id', 'StateFrame').attr('width', b.width).attr('height', b.height).attr('fill', 'transparent');
     }
     init(variableName) {
         if (variableName) {
@@ -124,7 +121,6 @@ export class RingGraphElement extends ReadableElement {
     }
     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)`;
@@ -141,11 +137,13 @@ export class RingGraphElement extends ReadableElement {
             min = RingGraphElement.DEFAULT_MIN_VALUE;
             max = RingGraphElement.DEFAULT_MAX_VALUE;
         }
-        if (this.model.minValueType === VariableValueType.Variable) {
-            this.needAddNumber = max.toString().length > min.toString().length ? max.toString().length : min.toString().length;
-            if (!this.initTransform) {
-                this.initTransformFun();
-                this.initFrameNode();
+        if (this.model.minValueType === VariableValueType.Variable || this.model.maxValueType === 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);
@@ -160,18 +158,23 @@ export class RingGraphElement extends ReadableElement {
                 sacleValue = (sacleValue / Math.pow(10, this.model.fractionDigits)).toFixed(this.model.fractionDigits);
             }
             if (!isNaN(sacleValue)) {
+                const oriValue = text.innerHTML;
                 text.innerHTML = sacleValue;
-                isInitTransform = true;
                 if (this.model.minValueType !== VariableValueType.Constant || this.model.maxValueType !== VariableValueType.Constant) {
                     // FLEXCLOUD-2619 刻度显示不全问题
                     const order = (i + 1) / textElements.length;
-                    if (!this.initTransform && order > 0.7 && sacleValue.toString().length > 3) {
-                        text.transform.baseVal[0].matrix.e -= (sacleValue.toString().length - 3) * 5;
+                    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);

package/package.json

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