@flexem/fc-gui 3.0.0-alpha.154 → 3.0.0-alpha.156

package/modal/write-value/write-value-modal.component.js

@@ -36,11 +36,11 @@ let WriteValueModalComponent = class WriteValueModalComponent {
         this.validate();
     }
     initData(option) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         this.variableName = option.variableName;
         this.displayVariableName = this.variableName;
         if (this.variableName === '当前语种ID') {
-            const language = (_c = (_b = (_a = window.abp) === null || _a === void 0 ? void 0 : _a.localization) === null || _b === void 0 ? void 0 : _b.currentLanguage) === null || _c === void 0 ? void 0 : _c.name;
+            const language = ((_c = (_b = (_a = window.abp) === null || _a === void 0 ? void 0 : _a.localization) === null || _b === void 0 ? void 0 : _b.currentLanguage) === null || _c === void 0 ? void 0 : _c.name) || ((_e = (_d = this.localization.localizationService) === null || _d === void 0 ? void 0 : _d.translate) === null || _e === void 0 ? void 0 : _e.currentLang);
             const isTraditionalChinese = language === 'zh-Hant' || language === 'zh-TW' || language === 'zh-tw';
             const isChinese = language === 'zh-Hans' || language === 'zh';
             if (isTraditionalChinese) {

package/package.json

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

package/remote/communication/variable/remote-variable-communicator.js

@@ -94,10 +94,18 @@ export class RemoteVariableCommunicator {
                             ob.next([state]);
                         });
                     }
-                    // 离线时从预加载缓存取值推送给值订阅者
-                    if (GuiFeatureConfig.isOfflineDisplayEnabled && state.state === VariableStateEnum.Offline && this.offlineValueCache.has(variableName)) {
-                        const cachedValue = this.offlineValueCache.get(variableName);
-                        if (cachedValue !== null) {
+                    // 离线时推送最后已知值给值订阅者
+                    if (GuiFeatureConfig.isOfflineDisplayEnabled && state.state === VariableStateEnum.Offline) {
+                        let cachedValue;
+                        // 优先用最后一次收到的值（可能是在线时推送的），覆盖所有切页/重连场景
+                        if (this.variableValueCache.has(variableName)) {
+                            cachedValue = this.variableValueCache.get(variableName).value;
+                        }
+                        else if (this.offlineValueCache.has(variableName)) {
+                            // 兜底：变量从未收到过值，用预加载的离线值
+                            cachedValue = this.offlineValueCache.get(variableName);
+                        }
+                        if (cachedValue !== null && cachedValue !== undefined) {
                             const variableValue = {
                                 variableName,
                                 value: cachedValue,
@@ -111,8 +119,6 @@ export class RemoteVariableCommunicator {
                             }
                         }
                     }
-                    // 无论什么状态，推送后清除缓存，防止后续再次离线时用旧值
-                    this.offlineValueCache.delete(variableName);
                 });
             });
     }