@flexem/fc-gui 3.0.0-alpha.150 → 3.0.0-alpha.152

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

@@ -35414,7 +35414,7 @@ class readable_element_ReadableElement extends conditional_enable_element_Condit
             return;
         }
         // 处理普通变量
-        if (this.state === _tmp_model["State"].Normal || this.state === _tmp_model["State"].Disable
+        if (this.state === _tmp_model["State"].Normal || this.state === _tmp_model["State"].Disable || this.state === _tmp_model["State"].Offline
             || value.variableName === this.minVariableName
             || value.variableName === this.maxVariableName) {
             this.updateVariableValue(value.value, value.variableName);
@@ -35936,7 +35936,7 @@ class character_display_element_CharacterDisplayElement extends readable_element
     }
     changeStates() {
         super.changeStates();
-        if (this.state === _tmp_model["State"].Normal || this.state === _tmp_model["State"].Disable) {
+        if (this.state === _tmp_model["State"].Normal || this.state === _tmp_model["State"].Disable || this.state === _tmp_model["State"].Offline) {
             this.updateDisplayValue(this.displayValue);
         }
         else {
@@ -39593,8 +39593,11 @@ class bit_indicator_light_operator_BitIndicatorLightOperator {
         }
     }
     requestCurrentSateIdValue(variableCommunicator, appId = '') {
-        variableCommunicator.openVariable(this.variableName, appId).subscribe(value => {
-            if (value.state === communication["d" /* VariableStateEnum */].DataNormal) {
+        if (this.valueSubscription) {
+            return;
+        }
+        this.valueSubscription = variableCommunicator.openVariable(this.variableName, appId).subscribe(value => {
+            if (value.state === communication["d" /* VariableStateEnum */].DataNormal || value.state === communication["d" /* VariableStateEnum */].Offline) {
                 if (this.settings.isBitwiseIndex) {
                     const maxBitIndex = 31;
                     this.binary = new binary["a" /* Binary */](value.value, maxBitIndex + 1);
@@ -39763,9 +39766,12 @@ class word_indicator_light_operator_WordIndicatorLightOperator {
         }
     }
     requestCurrentSateIdValue(variableCommunicator, appId = '') {
+        if (this.valueSubscription) {
+            return;
+        }
         // TODO 检查状态id是从0-n连续编号的。
-        variableCommunicator.openVariable(this.variableName, appId).subscribe(value => {
-            if (value.state === communication["d" /* VariableStateEnum */].DataNormal) {
+        this.valueSubscription = variableCommunicator.openVariable(this.variableName, appId).subscribe(value => {
+            if (value.state === communication["d" /* VariableStateEnum */].DataNormal || value.state === communication["d" /* VariableStateEnum */].Offline) {
                 let stateId = 0;
                 for (let index = 0; index < this.sortedStates.length - 1; index++) {
                     const element = this.sortedStates[index];
@@ -40088,12 +40094,17 @@ class switch_indicator_light_element_SwitchIndicatorLightElement extends conditi
         this.indicatorLightOperator.requestData(this.signalRAppId);
     }
     currentStateIdChange(statusIdValue) {
-        if (!Object(lodash["isUndefined"])(statusIdValue.value)) {
-            this.switchToState(statusIdValue.value);
-        }
         this.updateElementStates([statusIdValue.state]);
         if (this.state === _tmp_model["State"].Unbind || this.state === _tmp_model["State"].Offline) {
-            this.switchToState(0);
+            if (!Object(lodash["isUndefined"])(statusIdValue.value)) {
+                this.switchToState(statusIdValue.value);
+            }
+            else {
+                this.switchToState(0);
+            }
+        }
+        else if (!Object(lodash["isUndefined"])(statusIdValue.value)) {
+            this.switchToState(statusIdValue.value);
         }
     }
     switchToState(stateId) {
@@ -43414,7 +43425,10 @@ class per_view_variable_communicator_PerViewVariableCommunicator {
                 if (!this.observers.has(variableName)) {
                     this.observers.set(variableName, []);
                 }
-                this.observers.get(variableName).push(subscriber);
+                const obs = this.observers.get(variableName);
+                if (obs) {
+                    obs.push(subscriber);
+                }
             });
             const subscription = this._rawVariableCommunicator.openVariables(variableNames, appId).subscribe(values => subscriber.next(values), error => subscriber.error(error), () => subscriber.complete());
             this.variableValuesChangedSubscriptions.push(subscription);
@@ -43440,7 +43454,7 @@ class per_view_variable_communicator_PerViewVariableCommunicator {
     }
     subscribeUserDeviceAlarms(appId = '') {
         return new Observable["a" /* Observable */](subscriber => {
-            const subscription = this._rawVariableCommunicator.subscribeUserDeviceAlarms(appId).subscribe(values => subscriber.next(values), error => subscriber.error(error), () => subscriber.complete());
+            const subscription = this._rawVariableCommunicator.subscribeUserDeviceAlarms(appId).subscribe((values) => subscriber.next(values), (error) => subscriber.error(error), () => subscriber.complete());
             this.alarmSubscription.push(subscription);
         });
     }
@@ -43471,6 +43485,8 @@ class gui_view_GuiView {
         this.context = context;
         this.parentView = parentView;
         this.viewId = guid["a" /* Guid */].newGuid().toString('n');
+        this.openVariablesSubscriptions = [];
+        this.openedVariableNamesForValues = new Set();
         this.logger = injector.get(logger["b" /* LOGGER_SERVICE_TOKEN */]);
         this.childViews = new Array();
         if (parentView) {
@@ -43526,6 +43542,9 @@ class gui_view_GuiView {
         if (this.openVariableStatesSubscription) {
             this.openVariableStatesSubscription.unsubscribe();
         }
+        this.openVariablesSubscriptions.forEach(s => s.unsubscribe());
+        this.openVariablesSubscriptions = [];
+        this.openedVariableNamesForValues.clear();
         this.openedVariableNames = this.mainElement.getVariableNames();
         // 分离系统变量和普通变量
         const systemVariables = [];
@@ -43565,7 +43584,7 @@ class gui_view_GuiView {
                 this.mainElement.reportVariableStates(states);
                 const normalVariableNames = [];
                 Object(lodash["each"])(states, v => {
-                    if (v.state === communication["d" /* VariableStateEnum */].Normal && normalVariableNames.indexOf(v.variableName) === -1) {
+                    if ((v.state === communication["d" /* VariableStateEnum */].Normal || v.state === communication["d" /* VariableStateEnum */].Offline) && normalVariableNames.indexOf(v.variableName) === -1) {
                         normalVariableNames.push(v.variableName);
                     }
                 });
@@ -43672,8 +43691,8 @@ class gui_view_GuiView {
         if (this.virtualDeviceStatesChanged) {
             this.virtualDeviceStatesChanged.unsubscribe();
         }
-        if (this.openVariablesSubscription) {
-            this.openVariablesSubscription.unsubscribe();
+        if (this.openVariablesSubscriptions) {
+            this.openVariablesSubscriptions.forEach(s => s.unsubscribe());
         }
         if (this.perViewVariableCommunicator) {
             this.perViewVariableCommunicator.dispose();
@@ -43687,9 +43706,12 @@ class gui_view_GuiView {
         this.logger.debug('[GUI] View disposed.');
     }
     normalOpenedVariableNames(normalVariableNames) {
-        if (normalVariableNames.length > 0) {
-            this.openVariablesSubscription = this.perViewVariableCommunicator.openVariables(normalVariableNames, this.signalRAppId)
+        const newVariables = normalVariableNames.filter(v => !this.openedVariableNamesForValues.has(v));
+        if (newVariables.length > 0) {
+            newVariables.forEach(v => this.openedVariableNamesForValues.add(v));
+            const sub = this.perViewVariableCommunicator.openVariables(newVariables, this.signalRAppId)
                 .subscribe(variableValues => this.mainElement.reportVariableValues(variableValues));
+            this.openVariablesSubscriptions.push(sub);
         }
     }
 }
@@ -65947,6 +65969,9 @@ class RemoteImageStore {
 // EXTERNAL MODULE: ./node_modules/rxjs/_esm5/internal/Observable.js + 3 modules
 var Observable = __webpack_require__(15);
 
+// EXTERNAL MODULE: ./.tmp/communication/index.ts + 4 modules
+var communication = __webpack_require__(4);
+
 // EXTERNAL MODULE: ./.tmp/core/index.ts
 var core = __webpack_require__(43);
 
@@ -65955,6 +65980,7 @@ var core = __webpack_require__(43);
 
 
 
+
 class remote_variable_communicator_RemoteVariableCommunicator {
     constructor(remoteVariableProtocol, logger) {
         this.remoteVariableProtocol = remoteVariableProtocol;
@@ -65966,6 +65992,8 @@ class remote_variable_communicator_RemoteVariableCommunicator {
         this.alarmObservers = [];
         // 系统变量处理器
         this.systemVariableHandlers = new Map();
+        // 预加载的离线变量最新值缓存（组态加载时一次性填充，推送后即删除）
+        this.offlineValueCache = new Map();
         this.variableValueCache = new core["a" /* StringifyingMap */](k => JSON.stringify(k));
         this.connectedSubscription = this.remoteVariableProtocol.connected.subscribe(() => {
             const variableNamesToStart = [];
@@ -66040,13 +66068,35 @@ class remote_variable_communicator_RemoteVariableCommunicator {
                     this.variableStateCache.set(variableName, state);
                     if (this.variableStateObservers.has(variableName)) {
                         Object(lodash["each"])(this.variableStateObservers.get(variableName), ob => {
-                            // TODO 同一个ob监听多个变量的情况，组合成数组一次推送。
                             ob.next([state]);
                         });
                     }
+                    // 离线时从预加载缓存取值推送给值订阅者
+                    if (state.state === communication["d" /* VariableStateEnum */].Offline && this.offlineValueCache.has(variableName)) {
+                        const cachedValue = this.offlineValueCache.get(variableName);
+                        const variableValue = {
+                            variableName,
+                            value: cachedValue,
+                            state: communication["d" /* VariableStateEnum */].Offline
+                        };
+                        this.variableValueCache.set(variableName, variableValue);
+                        if (this.observers.has(variableName)) {
+                            Object(lodash["each"])(this.observers.get(variableName), ob => {
+                                ob.next([variableValue]);
+                            });
+                        }
+                    }
+                    // 无论什么状态，推送后清除缓存，防止后续再次离线时用旧值
+                    this.offlineValueCache.delete(variableName);
                 });
             });
     }
+    /**
+     * 预填充离线变量值缓存，由 GuiContext 在组态加载时一次性调用
+     */
+    setOfflineValueCache(variableName, value) {
+        this.offlineValueCache.set(variableName, value);
+    }
     subscribeVariableStates(variableNames) {
         return new Observable["a" /* Observable */](observer => {
             let variableNamesToStart = [];