@flexem/fc-gui 3.0.0-alpha.113 → 3.0.0-alpha.114

package/elements/historical-curve/historical-curve.element.d.ts

@@ -46,6 +46,7 @@ export declare class HistoricalCurveElement extends ConditionalDisplayElement {
     private updateQueryTimeRange;
     private reRenderElement;
     private renderElement;
+    setupTooltipAutoHide(chart: any): void;
     private renderChart;
     initPoint(): void;
     private getLineChart;

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

@@ -152,6 +152,28 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
             }
         });
     }
+    setupTooltipAutoHide(chart) {
+        const chartContainer = this.rootElement.select('.nv-focus').node();
+        if (!chartContainer || !chart)
+            return;
+        let timeoutId;
+        // 鼠标移入图表时显示 tooltip
+        chartContainer.addEventListener('mouseover', () => {
+            hideTooltipAfterDelay();
+        });
+        const clearTooltipTimeout = () => {
+            if (timeoutId) {
+                clearTimeout(timeoutId);
+                timeoutId = null;
+            }
+        };
+        const hideTooltipAfterDelay = () => {
+            clearTooltipTimeout();
+            timeoutId = setTimeout(() => {
+                chart.tooltip.hidden(true);
+            }, 2000); // 2秒延迟
+        };
+    }
     renderChart(result) {
         const chartWidth = this.model.displaySetting.size.width;
         const chartHeight = this.model.displaySetting.size.height - this.displayOption.operationAreaHeight - this.displayOption.operationAreaMarginTop;
@@ -163,12 +185,16 @@ export class HistoricalCurveElement extends ConditionalDisplayElement {
         });
         this.data = data;
         nv.addGraph(() => {
+            let chart;
             if (this.model.displaySetting.curveType === CurveType.BarGroup || this.model.displaySetting.curveType === CurveType.BarStack) {
-                return this.getMultiBarWithFocusChart(chartWidth, chartHeight, data);
+                chart = this.getMultiBarWithFocusChart(chartWidth, chartHeight, data);
             }
             else {
-                return this.getLineChart(chartWidth, chartHeight, data);
+                chart = this.getLineChart(chartWidth, chartHeight, data);
             }
+            // 设置 tooltip 自动隐藏逻辑
+            this.setupTooltipAutoHide(chart);
+            return chart;
         });
     }
     initPoint() {

package/elements/historical-curve/historical-curve.element.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"HistoricalCurveElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-display-element","name":"ConditionalDisplayElement","line":21,"character":44},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":68,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":69,"character":18},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":70,"character":27},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":71,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":72,"character":23},{"__symbolic":"reference","module":"../../config","name":"HistoryDataStore","line":73,"character":43},{"__symbolic":"reference","name":"string"}]}],"dispose":[{"__symbolic":"method"}],"initKeyboardListener":[{"__symbolic":"method"}],"getValidTimePeriods":[{"__symbolic":"method"}],"updateTimeRange":[{"__symbolic":"method"}],"updateQueryTimeRange":[{"__symbolic":"method"}],"reRenderElement":[{"__symbolic":"method"}],"renderElement":[{"__symbolic":"method"}],"renderChart":[{"__symbolic":"method"}],"initPoint":[{"__symbolic":"method"}],"getLineChart":[{"__symbolic":"method"}],"getMultiBarWithFocusChart":[{"__symbolic":"method"}],"renderCommonProperty":[{"__symbolic":"method"}],"renderOperationArea":[{"__symbolic":"method"}],"timeFormat":[{"__symbolic":"method"}],"loadFirstPage":[{"__symbolic":"method"}],"loadNextPage":[{"__symbolic":"method"}],"loadPreviousPage":[{"__symbolic":"method"}],"loadLastPage":[{"__symbolic":"method"}],"initElementStatus":[{"__symbolic":"method"}],"updateElementStatus":[{"__symbolic":"method"}],"setStatusAsUnbound":[{"__symbolic":"method"}],"setStatusAsLoading":[{"__symbolic":"method"}],"setStatusAsLoadFailed":[{"__symbolic":"method"}],"renderStatus":[{"__symbolic":"method"}],"clearStatus":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"HistoricalCurveElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-display-element","name":"ConditionalDisplayElement","line":21,"character":44},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":68,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":69,"character":18},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":70,"character":27},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":71,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":72,"character":23},{"__symbolic":"reference","module":"../../config","name":"HistoryDataStore","line":73,"character":43},{"__symbolic":"reference","name":"string"}]}],"dispose":[{"__symbolic":"method"}],"initKeyboardListener":[{"__symbolic":"method"}],"getValidTimePeriods":[{"__symbolic":"method"}],"updateTimeRange":[{"__symbolic":"method"}],"updateQueryTimeRange":[{"__symbolic":"method"}],"reRenderElement":[{"__symbolic":"method"}],"renderElement":[{"__symbolic":"method"}],"setupTooltipAutoHide":[{"__symbolic":"method"}],"renderChart":[{"__symbolic":"method"}],"initPoint":[{"__symbolic":"method"}],"getLineChart":[{"__symbolic":"method"}],"getMultiBarWithFocusChart":[{"__symbolic":"method"}],"renderCommonProperty":[{"__symbolic":"method"}],"renderOperationArea":[{"__symbolic":"method"}],"timeFormat":[{"__symbolic":"method"}],"loadFirstPage":[{"__symbolic":"method"}],"loadNextPage":[{"__symbolic":"method"}],"loadPreviousPage":[{"__symbolic":"method"}],"loadLastPage":[{"__symbolic":"method"}],"initElementStatus":[{"__symbolic":"method"}],"updateElementStatus":[{"__symbolic":"method"}],"setStatusAsUnbound":[{"__symbolic":"method"}],"setStatusAsLoading":[{"__symbolic":"method"}],"setStatusAsLoadFailed":[{"__symbolic":"method"}],"renderStatus":[{"__symbolic":"method"}],"clearStatus":[{"__symbolic":"method"}]}}}}]

package/elements/switch-indicator-light/switch-indicator-light-element.js

@@ -72,9 +72,7 @@ export class SwitchIndicatorLightElement extends ConditionalEnableElement {
                             this.isWriteRestorationDownValue = true;
                         }, 1000);
                     }
-                    if (d3.event && d3.event.cancelable) {
-                        d3.event.preventDefault();
-                    }
+                    d3.event.preventDefault();
                 }
             });
             this.rootElement.on(this.isMobileMode && isMobile ? 'touchend' : 'mouseup', () => {
@@ -104,7 +102,7 @@ export class SwitchIndicatorLightElement extends ConditionalEnableElement {
         this.isWriteRestorationDownValue = false;
         if (!this.model.useIndicatorLight) {
             this.switchToState(0);
-            if (d3.event && d3.event.cancelable) {
+            if (d3.event) {
                 d3.event.preventDefault();
             }
         }

package/elements/video/video-element.js

@@ -93,7 +93,7 @@ export class VideoElement extends ConditionalDisplayElement {
                 playsInline webkit-playsinline `;
         if (this.isMobileMode) {
             if (isAndroid) {
-                videoHtml += ' autoplay muted></video>';
+                videoHtml += ' muted></video>';
             }
             else {
                 videoHtml += ' controls muted></video>';
@@ -115,6 +115,12 @@ export class VideoElement extends ConditionalDisplayElement {
             }
             try {
                 this.videoPlayer = new EZUIPlayer(videoId);
+                if (isAndroid) {
+                    // 确保在 EZUIPlayer 初始化后才调用 play 方法
+                    this.videoPlayer.on('canplay', () => {
+                        this.videoPlayer.play();
+                    });
+                }
             }
             catch (err) {
                 console.log(err);

package/package.json

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