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

package/CHANGELOG.md

@@ -146,12 +146,7 @@
 #### Bug Fix
     1. FLEXCLOUD-2171: 设备仪表盘:空气质量指数元件数值展示优化
 
-## 3.0.0-alpha.34(2022-08-31)
-### Web端
-#### Features
-    1. FLEXCLOUD-2218: 组态设计：历史曲线表，超过24小时，按天统计，X轴显示增加日期（年月日）
-
-## 3.0.0-alpha.35(2022-08-31)
+## 3.0.0-alpha.36(2022-09-02)
 ### Web端
 #### Features
     1. FLEXCLOUD-2218: 组态设计：历史曲线表，超过24小时，按天统计，X轴显示增加日期（年月日）

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

@@ -26736,7 +26736,7 @@ class historical_curve_element_HistoricalCurveElement extends conditional_displa
             marginRight: 20,
             mobileMinWidth: 450,
             operationAreaHeight: 32,
-            operationAreaMarginTop: 10,
+            operationAreaMarginTop: 25,
             operationSelectFontSize: '16px',
             operationButtonWidth: 24,
             operationButtonHeight: 24,
@@ -26753,7 +26753,7 @@ class historical_curve_element_HistoricalCurveElement extends conditional_displa
         }, this.model.displaySetting.refreshInterval * 1000);
         this.isMobileMode = _tmp_settings["a" /* DisplayMode */].Mobile === injector.get(_tmp_settings["b" /* 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';
@@ -26920,7 +26920,7 @@ class historical_curve_element_HistoricalCurveElement extends conditional_displa
         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');
@@ -26972,7 +26972,7 @@ class historical_curve_element_HistoricalCurveElement extends conditional_displa
                 .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);
@@ -26987,10 +26987,42 @@ class historical_curve_element_HistoricalCurveElement extends conditional_displa
                 .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