@flexem/fc-gui 3.0.0-alpha.35 → 3.0.0-alpha.36

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

@@ -22,7 +22,7 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
             marginRight: 20,
             mobileMinWidth: 450,
             operationAreaHeight: 32,
-            operationAreaMarginTop: 10,
+            operationAreaMarginTop: 25,
             operationSelectFontSize: '16px',
             operationButtonWidth: 24,
             operationButtonHeight: 24,
@@ -39,7 +39,7 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
         }, this.model.displaySetting.refreshInterval * 1000);
         this.isMobileMode = DisplayMode.Mobile === injector.get(GlobalSettings).displayMode;
         if (this.isMobileMode) {
-            this.displayOption.operationAreaMarginTop = 20;
+            this.displayOption.operationAreaMarginTop = 35;
             if (this.model.displaySetting.size.width >= this.displayOption.mobileMinWidth) {
                 this.displayOption.operationAreaHeight = 68;
                 this.displayOption.operationSelectFontSize = '24px';
@@ -206,7 +206,7 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
         chart.tooltip.headerFormatter(d => this.timeFormat(d, '%x %X'));
         if (this.model.displaySetting.showAxis) {
             chart.xAxis.showMaxMin(true).tickFormat(d => {
-                if (this.currentTimePeriod >= 3) {
+                if (this.currentTimePeriod === 3 || this.currentTimePeriod === 4 || this.currentTimePeriod === 5) {
                     return this.timeFormat(d, '%y-%m-%d');
                 }
                 return this.timeFormat(Number(d), '%X');
@@ -258,7 +258,7 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
                 .attr('class', 'full-date')
                 .attr('x', 0)
                 .attr('y', 0)
-                .attr('dy', '2.4em')
+                .attr('dy', '2.3em')
                 .style('text-anchor', 'middle')
                 .style('font-size', fontSize)
                 .text((d) => d);
@@ -273,10 +273,42 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
                 .attr('class', 'full-date')
                 .attr('x', 0)
                 .attr('y', 0)
-                .attr('dy', '2.4em')
+                .attr('dy', '2.3em')
                 .style('text-anchor', 'middle')
                 .style('font-size', fontSize)
                 .text((d) => d);
+            const h = this.rootElement
+                .selectAll('.nv-focusWrap')
+                .attr('transform')
+                .slice(0, -1)
+                .split(',')[1];
+            this.rootElement
+                .selectAll('.nv-focusWrap')
+                .attr('transform', `translate(0,${Number(h) + 15})`);
+            const resizeObserver = new window.MutationObserver(() => {
+                this.rootElement
+                    .selectAll('.nv-x')
+                    .selectAll('.tick')
+                    .selectAll('.full-date')
+                    .remove();
+                this.rootElement
+                    .selectAll('.nv-x')
+                    .selectAll('.tick')
+                    .selectAll('text')
+                    .data(function (d) {
+                    return [self.timeFormat(Number(d), '%y-%m-%d'), self.timeFormat(Number(d), '%H:%M:%S')];
+                })
+                    .enter()
+                    .append('text')
+                    .attr('class', 'full-date')
+                    .attr('x', 0)
+                    .attr('y', 0)
+                    .attr('dy', '2.3em')
+                    .style('text-anchor', 'middle')
+                    .style('font-size', fontSize)
+                    .text((d) => d);
+            });
+            resizeObserver.observe(document.getElementsByClassName('extent')[0], { attributes: true });
         }
         else {
             this.rootElement

package/package.json

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