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

package/elements/bar-graph-element.d.ts

@@ -19,7 +19,6 @@ export declare class BarGraphElement extends ReadableElement {
     private valueObj;
     private isNeedUpdateScale;
     private needAddNumber;
-    private needInitTransform;
     get readVariableName(): string;
     constructor(element: HTMLElement, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, localization: Localization, signalRAppId: string);
     private initTransform;

package/elements/bar-graph-element.js

@@ -13,7 +13,6 @@ export class BarGraphElement extends ReadableElement {
         this.valueObj = {};
         this.isNeedUpdateScale = false;
         this.needAddNumber = 0;
-        this.needInitTransform = true;
         if ((this.model.minValueType === VariableValueType.Constant && this.model.maxValueType === VariableValueType.Variable)
             || this.model.maxValueType === VariableValueType.Constant && this.model.minValueType === VariableValueType.Variable) {
             this.isNeedUpdateScale = true;
@@ -29,9 +28,7 @@ export class BarGraphElement extends ReadableElement {
             this.$barRect.attr('transform', this.defaultTransform);
         }
         setTimeout(() => {
-            if (this.model.maxValueType !== VariableValueType.Variable || this.model.minValueType !== VariableValueType.Variable) {
-                this.initFrameNode();
-            }
+            this.initFrameNode();
         });
     }
     get readVariableName() {
@@ -53,8 +50,10 @@ export class BarGraphElement extends ReadableElement {
         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;
+            // const matrixE = node.transform.baseVal[0].matrix.e;
+            // node.transform.baseVal[0].matrix.e = matrixE + (this.needAddNumber - 3) * 7;
+            if (!node.transform.baseVal[0])
+                return;
             if (node.nodeName === 'g') {
                 const nodeValue = node.attributes['clip-path'].value.replace('url(#', '').replace(')', '');
                 const rootNode = node.parentNode.parentNode.parentElement;
@@ -66,8 +65,8 @@ export class BarGraphElement extends ReadableElement {
                     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;
+                        if (nItem === -1) {
+                            item = nItem - (this.needAddNumber - 3) * 7;
                         }
                         values.push(item);
                     });
@@ -83,8 +82,7 @@ export class BarGraphElement 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) * 7;
-        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');
     }
     updateValueObj(value, variableName) {
         var _a, _b, _c;
@@ -114,13 +112,9 @@ export class BarGraphElement extends ReadableElement {
             min = BarGraphElement.DEFAULT_MIN_VALUE;
             max = BarGraphElement.DEFAULT_MAX_VALUE;
         }
-        if (this.model.maxValueType === VariableValueType.Variable && this.model.minValueType === VariableValueType.Variable) {
+        if (this.model.maxValueType === VariableValueType.Variable || this.model.minValueType === 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;
-            }
+            this.initTransform();
         }
         const avgSacle = ((max - min) / this.model.masterDivisionNumber).toFixed(5);
         for (let i = 0; i < textElements.length; i++) {
@@ -155,6 +149,10 @@ export class BarGraphElement extends ReadableElement {
                             }
                             break;
                     }
+                    if (this.model.minValueType !== VariableValueType.Constant && this.model.maxValueType === VariableValueType.Constant) {
+                        const maxLen = this.model.max && this.model.max.toString().length;
+                        translateX += maxLen > 2 ? (maxLen - 3) * 7 : 0;
+                    }
                     text.transform.baseVal[0].matrix.e = translateX;
                 }
             }

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":10,"character":37},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":40,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"../service","name":"PermissionChecker","line":40,"character":57},{"__symbolic":"reference","module":"../communication","name":"VariableCommunicator","line":41,"character":30},{"__symbolic":"reference","module":"../config","name":"VariableStore","line":42,"character":23},{"__symbolic":"reference","module":"../localization","name":"Localization","line":43,"character":22},{"__symbolic":"reference","name":"string"}]}],"initTransform":[{"__symbolic":"method"}],"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":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"}]}],"initTransform":[{"__symbolic":"method"}],"initFrameNode":[{"__symbolic":"method"}],"updateValueObj":[{"__symbolic":"method"}],"updateScale":[{"__symbolic":"method"}],"updateVariableValue":[{"__symbolic":"method"}]},"statics":{"DEFAULT_MIN_VALUE":0,"DEFAULT_MAX_VALUE":100}}}}]

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

@@ -411,11 +411,12 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
         }
     }
     renderOperationArea(chartWidth, chartHeight) {
+        const backgroundColor = this.model.displaySetting.axisSetting.filterBackgroudColor || 'inherit';
         const operationArea = this.rootElement.append('g').attr('transform', `translate(0,${chartHeight + this.displayOption.operationAreaMarginTop})`)
             .append('foreignObject').attr('width', chartWidth).attr('height', this.displayOption.operationAreaHeight).attr('fill', 'none')
             .append('xhtml:div').style('height', (this.displayOption.operationAreaHeight - 4) + 'px').style('overflow', 'hidden').style('margin-top', '4px');
         const selectElement = operationArea.append('select').style('margin-left', this.displayOption.marginLeft + 'px')
-            .style('background-color', 'inherit')
+            .style('background-color', backgroundColor)
             .style('font-size', this.displayOption.operationSelectFontSize).on('change', () => {
             const displayTimePeriod = this.rootElement.select('select').property('value');
             this.updateTimeRange(displayTimePeriod);
@@ -425,26 +426,26 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
         const fillColor = rect.attr('fill');
         const options = selectElement.selectAll('option').data(this.timePeriods).enter().append('option');
         options.text(d => d.name).attr('value', d => d.key).property('selected', d => d.key === Number(this.currentTimePeriod))
-            .style('background-color', fillColor);
+            .style('background-color', this.model.displaySetting.axisSetting.filterBackgroudColor || fillColor);
         const buttonWidth = this.displayOption.operationButtonWidth + 'px', buttonHeight = this.displayOption.operationButtonHeight + 'px';
         operationArea.append('button').style('width', buttonWidth).style('height', buttonHeight).style('border', 'none')
-            .style('float', 'right').style('background-image', 'url(assets/img/last_page.svg)')
-            .style('background-color', 'inherit')
+            .style('float', 'right').style('background-image', 'url(assets/img/black_last_page.png)')
+            .style('background-color', backgroundColor).style('background-size', 'cover')
             .on('click', () => { this.loadLastPage(); });
         operationArea.append('button').style('width', buttonWidth).style('height', buttonHeight).style('border', 'none')
-            .style('float', 'right').style('background-image', 'url(assets/img/next_page.svg)')
+            .style('float', 'right').style('background-image', 'url(assets/img/black_next_page.png)')
             .style('margin', `0 ${this.displayOption.operationButtonMargin}px 0 0`)
-            .style('background-color', 'inherit')
+            .style('background-color', backgroundColor).style('background-size', 'cover')
             .on('click', () => { this.loadNextPage(); });
         operationArea.append('button').style('width', buttonWidth).style('height', buttonHeight).style('border', 'none')
-            .style('float', 'right').style('background-image', 'url(assets/img/previous_page.svg)')
+            .style('float', 'right').style('background-image', 'url(assets/img/black_previous_page.png)')
             .style('margin', `0 ${this.displayOption.operationButtonMargin}px 0 0`)
-            .style('background-color', 'inherit')
+            .style('background-color', backgroundColor).style('background-size', 'cover')
             .on('click', () => { this.loadPreviousPage(); });
         operationArea.append('button').style('width', buttonWidth).style('height', buttonHeight).style('border', 'none')
-            .style('float', 'right').style('background-image', 'url(assets/img/first_page.svg)')
+            .style('float', 'right').style('background-image', 'url(assets/img/black_first_page.png)')
             .style('margin', `0 ${this.displayOption.operationButtonMargin}px 0 0`)
-            .style('background-color', 'inherit')
+            .style('background-color', backgroundColor).style('background-size', 'cover')
             .on('click', () => { this.loadFirstPage(); });
     }
     timeFormat(datetime, specifier) {

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/model/historical-curve/historical-curve-axis-settings.d.ts

@@ -9,6 +9,7 @@ export interface HistoricalCurveAxisSettings {
     readonly showTick?: boolean;
     readonly xAxisTickColor?: string;
     readonly yAxisTickColor?: string;
+    readonly filterBackgroudColor?: string;
 }
 export declare enum AxisRangeType {
     Auto = 0,

package/package.json

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