@flexem/fc-gui 3.0.0-alpha.168 → 3.0.0-alpha.169

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

@@ -42842,7 +42842,6 @@ class alarm_element_AlarmElement extends conditional_display_element_Conditional
 
 
 
-
 var ScrollAlarmElementStatus;
 (function (ScrollAlarmElementStatus) {
     ScrollAlarmElementStatus[ScrollAlarmElementStatus["Normal"] = 0] = "Normal";
@@ -42855,7 +42854,7 @@ class scroll_alarm_element_ScrollAlarmElement extends conditional_dynamic_displa
         this.alarmsStore = alarmsStore;
         this.elementStatus = ScrollAlarmElementStatus.Loading;
         this.alarmNames = [];
-        this.isWaitingForAlarmRefresh = false; // 是否正在等待刷新(节流期间)
+        this.isReplacingContent = false; // 标记是否正在替换内容（防止并发执行）
         this.isScrolling = false;
         this.isDisposed = false;
         this.isRefreshingCurrentPage = false; // 标记是否正在刷新当前页（而不是加载新页）
@@ -42871,6 +42870,7 @@ class scroll_alarm_element_ScrollAlarmElement extends conditional_dynamic_displa
         this.isLoadingNextPage = false;
         this.hasTriedFirstPage = false; // 是否已经尝试加载过第一页
         this.isSimulateMode = false; // 是否是模拟运行模式
+        this._canvasCtx = null;
         this.rootElement.selectAll('*').remove();
         this.setStatusAsLoading();
         this.logger = injector.get(logger["b" /* LOGGER_SERVICE_TOKEN */]);
@@ -42894,26 +42894,16 @@ class scroll_alarm_element_ScrollAlarmElement extends conditional_dynamic_displa
             else {
                 // 真实运行模式：使用原有的数据查询逻辑
                 this.updateQueryTimeRange();
-                // 监听告警更新 (带节流,1秒内只执行一次)
-                variableCommunicator.subscribeUserDeviceAlarms(signalRAppId).subscribe(alarms => {
-                    alarms.forEach(alarm => {
-                        if (this.alarmNames.indexOf(alarm.name) !== -1) {
-                            // 如果已经在等待刷新,直接返回,避免重复清理和创建定时器
-                            if (this.isWaitingForAlarmRefresh) {
-                                return;
-                            }
-                            // 标记为等待刷新状态
-                            this.isWaitingForAlarmRefresh = true;
-                            // 设置节流定时器,1秒后执行
-                            this.alarmRefreshThrottleId = setTimeout(() => {
-                                // 收到新告警消息，实时替换当前滚动内容，不影响滚动
-                                this.replaceCurrentScrollingContent();
-                                // 重置等待刷新标志
-                                this.isWaitingForAlarmRefresh = false;
-                            }, 1000);
-                            return;
-                        }
-                    });
+                // 监听单设备告警更新（防抖：连续推送只取最后一次）
+                // 保存订阅对象，dispose 时取消，防止组件销毁后仍触发回调
+                this.signalRSubscription = variableCommunicator.subscribeUserOneDeviceAlarms(signalRAppId).subscribe((alarmWithAppId) => {
+                    const alarm = alarmWithAppId.alarm;
+                    if (this.alarmNames.indexOf(alarm.name) !== -1) {
+                        clearTimeout(this.alarmRefreshThrottleId);
+                        this.alarmRefreshThrottleId = setTimeout(() => {
+                            this.replaceCurrentScrollingContent();
+                        }, 300);
+                    }
                 });
                 // 初始化显示容器
                 this.initDisplayContainer();
@@ -42942,10 +42932,19 @@ class scroll_alarm_element_ScrollAlarmElement extends conditional_dynamic_displa
         clearInterval(this.scrollIntervalId);
         clearTimeout(this.getAlarmDataId);
         clearTimeout(this.alarmRefreshThrottleId);
+        // 取消 HTTP 请求订阅，防止 dispose 后回调仍然操作已卸载的 DOM
+        if (this.alarmRefreshSubscription) {
+            this.alarmRefreshSubscription.unsubscribe();
+            this.alarmRefreshSubscription = null;
+        }
+        // 取消 SignalR 推送订阅，防止 dispose 后继续触发 replaceCurrentScrollingContent
+        if (this.signalRSubscription) {
+            this.signalRSubscription.unsubscribe();
+            this.signalRSubscription = null;
+        }
         if (this.element && this.element.tooltip) {
             this.element.tooltip.hidden(true);
         }
-        this.logger.debug(`[GUI]Dispose Scroll Alarm Refresh Interval:${d3["time"].format('%x %X')(new Date())}`);
         // 重置所有状态
         this.isScrolling = false;
     }
@@ -43163,14 +43162,35 @@ class scroll_alarm_element_ScrollAlarmElement extends conditional_dynamic_displa
         }
         return g;
     }
+    _measureTextWithCanvas(textContent, fontSize, fontFamily, isBold, isItalic) {
+        if (!this._canvasCtx) {
+            const canvas = document.createElement('canvas');
+            this._canvasCtx = canvas.getContext('2d');
+        }
+        if (!this._canvasCtx) {
+            return 0;
+        }
+        const weight = isBold ? 'bold' : 'normal';
+        const style = isItalic ? 'italic' : 'normal';
+        this._canvasCtx.font = `${style} ${weight} ${fontSize}px ${fontFamily}`;
+        return this._canvasCtx.measureText(textContent).width;
+    }
     _getSvgTextWidth(g) {
+        var _a, _b, _c, _d;
         const text = g.querySelector('text');
         if (!text) {
             return 100;
         }
-        return text.getComputedTextLength
-            ? text.getComputedTextLength()
-            : (text.getBBox ? text.getBBox().width : 100);
+        const len = (_b = (_a = text).getComputedTextLength) === null || _b === void 0 ? void 0 : _b.call(_a);
+        if (len > 0)
+            return len;
+        const bbox = (_d = (_c = text).getBBox) === null || _d === void 0 ? void 0 : _d.call(_c);
+        if ((bbox === null || bbox === void 0 ? void 0 : bbox.width) > 0)
+            return bbox.width;
+        // SVG 节点游离于 DOM 外时 getComputedTextLength/getBBox 均返回 0，
+        // 改用 Canvas measureText 离屏计算
+        const fa = this._buildFontAttrs();
+        return this._measureTextWithCanvas(text.textContent || '', fa.fontSize, fa.fontFamily, fa.isBold, fa.isItalic);
     }
     _updateUnderlineWidth(g, width) {
         const underline = g.querySelector('line.text-underline');
@@ -43218,7 +43238,7 @@ class scroll_alarm_element_ScrollAlarmElement extends conditional_dynamic_displa
         this.pageWidths.push(pageWidth);
         this.totalWidth += (this.totalWidth > 0 && pageWidth > 0 ? GAP : 0) + pageWidth;
     }
-    _rebaseTextNodes() {
+    _rebaseTextNodes(onDone) {
         const GAP = 80;
         let x = 0;
         Array.from(this.allAlarmsContainer.children).forEach(node => {
@@ -43230,6 +43250,8 @@ class scroll_alarm_element_ScrollAlarmElement extends conditional_dynamic_displa
         const newTotal = x > 0 ? x - GAP : 0;
         this.totalWidth = newTotal;
         this.pageWidths = [newTotal];
+        if (onDone)
+            onDone();
     }
     removeOldestPage() {
         // 移除最旧的一页数据
@@ -43287,8 +43309,9 @@ class scroll_alarm_element_ScrollAlarmElement extends conditional_dynamic_displa
                     }
                     else {
                         // 单页循环：重排 x 从 0 开始，currentLeft 重置到右侧
-                        this._rebaseTextNodes();
-                        this.currentLeft = this.model.size.width;
+                        this._rebaseTextNodes(() => {
+                            this.currentLeft = this.model.size.width;
+                        });
                     }
                 }
             }
@@ -43518,6 +43541,17 @@ class scroll_alarm_element_ScrollAlarmElement extends conditional_dynamic_displa
      */
     replaceCurrentScrollingContent() {
         var _a, _b;
+        // 防止并发执行：如果正在替换内容，直接返回
+        if (this.isReplacingContent) {
+            return;
+        }
+        this.isReplacingContent = true;
+        // 暂停滚动定时器，防止在内容更新过程中 scrollContent 读取到中间状态导致重叠
+        clearInterval(this.scrollIntervalId);
+        if (this.alarmRefreshSubscription) {
+            this.alarmRefreshSubscription.unsubscribe();
+            this.alarmRefreshSubscription = null;
+        }
         // 更新查询时间范围
         this.updateQueryTimeRange();
         // 查询所有当前应该显示的数据（查询足够多的数据以确保包含所有新增/删除）
@@ -43539,7 +43573,7 @@ class scroll_alarm_element_ScrollAlarmElement extends conditional_dynamic_displa
             : undefined;
         const input = new _tmp_config["c" /* GetAlarmsArgs */](this.alarmNames, this.startTime, this.endTime, queryCount, 0, // skipCount
         stateFilter, sorting);
-        this.alarmsStore.getHistoryAlarms(input).subscribe(result => {
+        this.alarmRefreshSubscription = this.alarmsStore.getHistoryAlarms(input).subscribe(result => {
             if (!result.error && result.items) {
                 const newItems = result.items;
                 // 如果没有数据，清空显示
@@ -43558,6 +43592,9 @@ class scroll_alarm_element_ScrollAlarmElement extends conditional_dynamic_displa
                         this.currentLeft = this.model.size.width;
                         this.allAlarmsContainer.setAttribute('transform', `translate(${this.currentLeft}, 0)`);
                     }
+                    this.isReplacingContent = false;
+                    // 无数据时停止滚动（scrollContent 会因 displayedItems.length === 0 直接返回）
+                    this.isScrolling = false;
                     return;
                 }
                 // 如果是首次加载或当前没有数据，直接渲染并启动滚动
@@ -43574,10 +43611,13 @@ class scroll_alarm_element_ScrollAlarmElement extends conditional_dynamic_displa
                     this.currentLeft = this.model.size.width;
                     this.allAlarmsContainer.setAttribute('transform', `translate(${this.currentLeft}, 0)`);
                     this.renderNewPage(newItems);
-                    // 启动滚动
-                    if (!this.isScrolling) {
-                        this.initScrolling();
-                    }
+                    requestAnimationFrame(() => {
+                        this._rebaseTextNodes(() => {
+                            this.isReplacingContent = false;
+                            this.isScrolling = false;
+                            this.initScrolling();
+                        });
+                    });
                     return;
                 }
                 // 保存当前的滚动位置
@@ -43592,10 +43632,30 @@ class scroll_alarm_element_ScrollAlarmElement extends conditional_dynamic_displa
                 // 更新状态
                 this.displayedItems = newItems;
                 this.hasMoreData = result.totalCount > newItems.length;
-                // 保持滚动位置不变，继续滚动
-                this.currentLeft = currentScrollPosition;
-                this.allAlarmsContainer.setAttribute('transform', `translate(${this.currentLeft}, 0)`);
+                // renderNewPage 里 getComputedTextLength 在刚 append 时可能返回 0，
+                // 延迟一帧让浏览器完成布局后用 _rebaseTextNodes 修正所有节点位置
+                requestAnimationFrame(() => {
+                    this._rebaseTextNodes(() => {
+                        // 保持滚动位置不变，内容更新完成后重新启动滚动
+                        this.currentLeft = currentScrollPosition;
+                        this.allAlarmsContainer.setAttribute('transform', `translate(${this.currentLeft}, 0)`);
+                        this.isReplacingContent = false;
+                        this.isScrolling = false;
+                        this.initScrolling();
+                    });
+                });
+                return;
             }
+            // 重置标志，内容更新完成后重新启动滚动
+            this.isReplacingContent = false;
+            this.isScrolling = false;
+            this.initScrolling();
+        }, (error) => {
+            // 错误处理：重置标志，恢复滚动
+            this.isReplacingContent = false;
+            this.isScrolling = false;
+            this.initScrolling();
+            this.logger.error('Failed to replace scrolling content:', error);
         });
     }
 }
@@ -44032,6 +44092,12 @@ class per_view_variable_communicator_PerViewVariableCommunicator {
             this.alarmSubscription.push(subscription);
         });
     }
+    subscribeUserOneDeviceAlarms(appId = '') {
+        return new Observable["a" /* Observable */](subscriber => {
+            const subscription = this._rawVariableCommunicator.subscribeUserOneDeviceAlarms(appId).subscribe((value) => subscriber.next(value), (error) => subscriber.error(error), () => subscriber.complete());
+            this.alarmSubscription.push(subscription);
+        });
+    }
     dispose() {
         Object(lodash["forEach"])(this.variableValuesChangedSubscriptions, s => s.unsubscribe());
         Object(lodash["forEach"])(this.variableStatesChangedSubscription, s => s.unsubscribe());
@@ -66947,6 +67013,16 @@ class remote_variable_communicator_RemoteVariableCommunicator {
             };
         });
     }
+    subscribeUserOneDeviceAlarms(appId = '') {
+        return new Observable["a" /* Observable */](observer => {
+            const subscription = this.remoteVariableProtocol.historyAlarmChanged.subscribe(value => observer.next(value), error => observer.error(error), () => observer.complete());
+            this.remoteVariableProtocol.subscribeUserOneDeviceAlarms(appId);
+            return () => {
+                subscription.unsubscribe();
+                this.remoteVariableProtocol.unsubscribeUserOneDeviceAlarms(appId);
+            };
+        });
+    }
     /**
      * 注册系统变量处理器
      * @param variableName 变量名（如"当前语种ID"）