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

package/config/gui-feature-config.d.ts

@@ -0,0 +1,3 @@
+export declare class GuiFeatureConfig {
+    static isOfflineDisplayEnabled: boolean;
+}

package/config/gui-feature-config.js

@@ -0,0 +1,3 @@
+export class GuiFeatureConfig {
+}
+GuiFeatureConfig.isOfflineDisplayEnabled = false;

package/config/gui-feature-config.metadata.json

@@ -0,0 +1 @@
+[{"__symbolic":"module","version":4,"metadata":{"GuiFeatureConfig":{"__symbolic":"class","statics":{"isOfflineDisplayEnabled":false}}}}]

package/config/index.d.ts

@@ -1,4 +1,5 @@
 export { ConfigStore } from './config-store';
+export { GuiFeatureConfig } from './gui-feature-config';
 export { Graph } from './graph/graph';
 export { GraphResult } from './graph/graph-result';
 export { GraphType } from './graph/graph-type';

package/config/index.js

@@ -1,3 +1,4 @@
+export { GuiFeatureConfig } from './gui-feature-config';
 export { Graph } from './graph/graph';
 export { GraphResult } from './graph/graph-result';
 export { GraphType } from './graph/graph-type';

package/config/index.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{},"exports":[{"from":"./config-store","export":["ConfigStore"]},{"from":"./graph/graph","export":["Graph"]},{"from":"./graph/graph-result","export":["GraphResult"]},{"from":"./graph/graph-type","export":["GraphType"]},{"from":"./graph/graph-store","export":["GraphStore"]},{"from":"./view/view-store","export":["ViewStore"]},{"from":"./view/view.model","export":["ViewModel"]},{"from":"./image/image-store","export":["ImageStore"]},{"from":"./history-data"},{"from":"./variable"},{"from":"./alarm"}]}]
+[{"__symbolic":"module","version":4,"metadata":{},"exports":[{"from":"./config-store","export":["ConfigStore"]},{"from":"./gui-feature-config","export":["GuiFeatureConfig"]},{"from":"./graph/graph","export":["Graph"]},{"from":"./graph/graph-result","export":["GraphResult"]},{"from":"./graph/graph-type","export":["GraphType"]},{"from":"./graph/graph-store","export":["GraphStore"]},{"from":"./view/view-store","export":["ViewStore"]},{"from":"./view/view.model","export":["ViewModel"]},{"from":"./image/image-store","export":["ImageStore"]},{"from":"./history-data"},{"from":"./variable"},{"from":"./alarm"}]}]

package/elements/base/readable-element.js

@@ -3,6 +3,7 @@ import { VariableState } from '../../communication';
 import { ConditionalEnableElement } from './conditional-enable-element';
 import { forEach } from 'lodash';
 import { VariableUtil } from '../../utils/variable-util';
+import { GuiFeatureConfig } from '../../config';
 export class ReadableElement extends ConditionalEnableElement {
     constructor(element, permissionChecker, variableCommunicator, variableStore, localization, signalRAppId) {
         super(element, permissionChecker, variableCommunicator, variableStore, localization, signalRAppId);
@@ -112,7 +113,7 @@ export class ReadableElement extends ConditionalEnableElement {
             return;
         }
         // 处理普通变量
-        if (this.state === State.Normal || this.state === State.Disable || this.state === State.Offline
+        if (this.state === State.Normal || this.state === State.Disable || (GuiFeatureConfig.isOfflineDisplayEnabled && this.state === State.Offline)
             || value.variableName === this.minVariableName
             || value.variableName === this.maxVariableName) {
             this.updateVariableValue(value.value, value.variableName);

package/elements/base/readable-element.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"ReadableElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"./conditional-enable-element","name":"ConditionalEnableElement","line":9,"character":46},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":13,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":13,"character":57},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":13,"character":98},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":14,"character":23},{"__symbolic":"reference","module":"../../localization","name":"Localization","line":14,"character":52},{"__symbolic":"reference","name":"string"}]}],"init":[{"__symbolic":"method"}],"getVariableName":[{"__symbolic":"method"}],"updateVariableValue":[{"__symbolic":"method"}],"reportStateChanged":[{"__symbolic":"method"}],"reportValueChanged":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"ReadableElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"./conditional-enable-element","name":"ConditionalEnableElement","line":10,"character":46},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":14,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":14,"character":57},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":14,"character":98},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":15,"character":23},{"__symbolic":"reference","module":"../../localization","name":"Localization","line":15,"character":52},{"__symbolic":"reference","name":"string"}]}],"init":[{"__symbolic":"method"}],"getVariableName":[{"__symbolic":"method"}],"updateVariableValue":[{"__symbolic":"method"}],"reportStateChanged":[{"__symbolic":"method"}],"reportValueChanged":[{"__symbolic":"method"}]}}}}]

package/elements/character-display/character-display-element.js

@@ -1,4 +1,5 @@
 import { GraphType } from '../../config';
+import { GuiFeatureConfig } from '../../config';
 import { LOGGER_SERVICE_TOKEN } from '../../logger';
 import { AlertModalComponent } from '../../modal/alert/alert-modal.component';
 import { ConfirmOperationModalComponent } from '../../modal/confirm-operation/confirm-operation-modal.component';
@@ -67,7 +68,7 @@ export class CharacterDisplayElement extends ReadableElement {
     }
     changeStates() {
         super.changeStates();
-        if (this.state === State.Normal || this.state === State.Disable || this.state === State.Offline) {
+        if (this.state === State.Normal || this.state === State.Disable || (GuiFeatureConfig.isOfflineDisplayEnabled && this.state === State.Offline)) {
             this.updateDisplayValue(this.displayValue);
         }
         else {

package/elements/character-display/character-display-element.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"CharacterDisplayElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/readable-element","name":"ReadableElement","line":19,"character":45},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":28,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":28,"character":48},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":29,"character":39},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":30,"character":30},{"__symbolic":"reference","module":"../../config","name":"GraphStore","line":31,"character":37},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":32,"character":27},{"__symbolic":"reference","module":"../../service","name":"OperationRecordService","line":33,"character":49},{"__symbolic":"reference","module":"../../security","name":"SecurityChecker","line":34,"character":42},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":35,"character":23},{"__symbolic":"reference","module":"../../localization","name":"Localization","line":36,"character":22},{"__symbolic":"reference","name":"string"}]}],"updateVariableValue":[{"__symbolic":"method"}],"changeStates":[{"__symbolic":"method"}],"updateDisplayValue":[{"__symbolic":"method"}],"getVariableValueText":[{"__symbolic":"method"}],"characterDisplayText":[{"__symbolic":"method"}],"initElement":[{"__symbolic":"method"}],"initVariableText":[{"__symbolic":"method"}],"initClickEvent":[{"__symbolic":"method"}],"checkElementPassword":[{"__symbolic":"method"}],"doWriteCharacterValue":[{"__symbolic":"method"}],"recordOperation":[{"__symbolic":"method"}],"changeGraph":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"CharacterDisplayElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/readable-element","name":"ReadableElement","line":20,"character":45},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":29,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":29,"character":48},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":30,"character":39},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":31,"character":30},{"__symbolic":"reference","module":"../../config","name":"GraphStore","line":32,"character":37},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":33,"character":27},{"__symbolic":"reference","module":"../../service","name":"OperationRecordService","line":34,"character":49},{"__symbolic":"reference","module":"../../security","name":"SecurityChecker","line":35,"character":42},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":36,"character":23},{"__symbolic":"reference","module":"../../localization","name":"Localization","line":37,"character":22},{"__symbolic":"reference","name":"string"}]}],"updateVariableValue":[{"__symbolic":"method"}],"changeStates":[{"__symbolic":"method"}],"updateDisplayValue":[{"__symbolic":"method"}],"getVariableValueText":[{"__symbolic":"method"}],"characterDisplayText":[{"__symbolic":"method"}],"initElement":[{"__symbolic":"method"}],"initVariableText":[{"__symbolic":"method"}],"initClickEvent":[{"__symbolic":"method"}],"checkElementPassword":[{"__symbolic":"method"}],"doWriteCharacterValue":[{"__symbolic":"method"}],"recordOperation":[{"__symbolic":"method"}],"changeGraph":[{"__symbolic":"method"}]}}}}]

package/elements/switch-indicator-light/bit-indicator-light-operator.js

@@ -6,6 +6,7 @@ import { CurrentStateIdValue } from './current-stateId-value';
 import { Binary } from '../../model/shared/binary';
 import { VariableUtil } from '../../utils/variable-util';
 import { VariableDefinition } from '../../communication/variable/variable-definition';
+import { GuiFeatureConfig } from '../../config';
 export class BitIndicatorLightOperator {
     constructor(settings, states, variableCommunicator, variableStore) {
         this.settings = settings;
@@ -48,8 +49,11 @@ export class BitIndicatorLightOperator {
                 if (variableStete.state === VariableStateEnum.Normal) {
                     this.requestCurrentSateIdValue(this.variableCommunicator, appId);
                 }
+                else if (GuiFeatureConfig.isOfflineDisplayEnabled && variableStete.state === VariableStateEnum.Offline && !this.valueSubscription) {
+                    this.requestCurrentSateIdValue(this.variableCommunicator, appId);
+                }
                 else {
-                    this.currentStateIdChanged.emit(new CurrentStateIdValue(new VariableState(this.variableName, variableStete.state)));
+                    this.currentStateIdChanged.emit(new CurrentStateIdValue(new VariableState(this.variableName, variableStete.state), this.currentStateId));
                 }
             });
         }
@@ -59,7 +63,7 @@ export class BitIndicatorLightOperator {
             return;
         }
         this.valueSubscription = variableCommunicator.openVariable(this.variableName, appId).subscribe(value => {
-            if (value.state === VariableStateEnum.DataNormal || value.state === VariableStateEnum.Offline) {
+            if (value.state === VariableStateEnum.DataNormal || (GuiFeatureConfig.isOfflineDisplayEnabled && value.state === VariableStateEnum.Offline)) {
                 if (this.settings.isBitwiseIndex) {
                     const maxBitIndex = 31;
                     this.binary = new Binary(value.value, maxBitIndex + 1);

package/elements/switch-indicator-light/bit-indicator-light-operator.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"BitIndicatorLightOperator":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"../../model","name":"BitIndicatorLightSettings","line":27,"character":43},{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","module":"../../model","name":"SwitchIndicatorState","line":28,"character":16}]},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":29,"character":47},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":30,"character":40}]}],"requestData":[{"__symbolic":"method"}],"requestCurrentSateIdValue":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"BitIndicatorLightOperator":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"../../model","name":"BitIndicatorLightSettings","line":28,"character":43},{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","module":"../../model","name":"SwitchIndicatorState","line":29,"character":16}]},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":30,"character":47},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":31,"character":40}]}],"requestData":[{"__symbolic":"method"}],"requestCurrentSateIdValue":[{"__symbolic":"method"}]}}}}]

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

@@ -1,6 +1,7 @@
 import { LOGGER_SERVICE_TOKEN } from '../../logger';
 import * as d3 from 'd3-selection';
 import { isUndefined } from 'lodash';
+import { GuiFeatureConfig } from '../../config';
 import { IndicatorLightType, SwitchType, State, BitSwitchOperation } from '../../model';
 import { VariableState } from '../../communication';
 import { ConditionalEnableElement } from '../base/conditional-enable-element';
@@ -218,7 +219,7 @@ export class SwitchIndicatorLightElement extends ConditionalEnableElement {
     }
     currentStateIdChange(statusIdValue) {
         this.updateElementStates([statusIdValue.state]);
-        if (this.state === State.Unbind || this.state === State.Offline) {
+        if (this.state === State.Unbind || (GuiFeatureConfig.isOfflineDisplayEnabled && this.state === State.Offline)) {
             if (!isUndefined(statusIdValue.value)) {
                 this.switchToState(statusIdValue.value);
             }

package/elements/switch-indicator-light/switch-indicator-light-element.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"SwitchIndicatorLightElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-enable-element","name":"ConditionalEnableElement","line":33,"character":49},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":52,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":53,"character":18},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":54,"character":39},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":55,"character":30},{"__symbolic":"reference","module":"../../config","name":"GraphStore","line":56,"character":37},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":57,"character":27},{"__symbolic":"reference","module":"../../service","name":"OperationRecordService","line":58,"character":49},{"__symbolic":"reference","module":"../../security","name":"SecurityChecker","line":59,"character":42},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":60,"character":23},{"__symbolic":"reference","module":"../../localization","name":"Localization","line":61,"character":22},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","module":"../../service","name":"TextLibraryService","line":63,"character":46},{"__symbolic":"reference","module":"../../service","name":"LanguageService","line":64,"character":43},{"__symbolic":"reference","module":"../../gui/gui-context","name":"GuiContext","line":65,"character":38}]}],"handleMouseUp":[{"__symbolic":"method"}],"initOnDocMouseUpEvent":[{"__symbolic":"method"}],"checkElementPassword":[{"__symbolic":"method"}],"doSwitchOperator":[{"__symbolic":"method"}],"writeValue":[{"__symbolic":"method"}],"initSwitchOperator":[{"__symbolic":"method"}],"initIndictorLightOperator":[{"__symbolic":"method"}],"currentStateIdChange":[{"__symbolic":"method"}],"switchToState":[{"__symbolic":"method"}],"initGraphAndText":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}],"checkState":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"SwitchIndicatorLightElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-enable-element","name":"ConditionalEnableElement","line":34,"character":49},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":53,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":54,"character":18},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":55,"character":39},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":56,"character":30},{"__symbolic":"reference","module":"../../config","name":"GraphStore","line":57,"character":37},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":58,"character":27},{"__symbolic":"reference","module":"../../service","name":"OperationRecordService","line":59,"character":49},{"__symbolic":"reference","module":"../../security","name":"SecurityChecker","line":60,"character":42},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":61,"character":23},{"__symbolic":"reference","module":"../../localization","name":"Localization","line":62,"character":22},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","module":"../../service","name":"TextLibraryService","line":64,"character":46},{"__symbolic":"reference","module":"../../service","name":"LanguageService","line":65,"character":43},{"__symbolic":"reference","module":"../../gui/gui-context","name":"GuiContext","line":66,"character":38}]}],"handleMouseUp":[{"__symbolic":"method"}],"initOnDocMouseUpEvent":[{"__symbolic":"method"}],"checkElementPassword":[{"__symbolic":"method"}],"doSwitchOperator":[{"__symbolic":"method"}],"writeValue":[{"__symbolic":"method"}],"initSwitchOperator":[{"__symbolic":"method"}],"initIndictorLightOperator":[{"__symbolic":"method"}],"currentStateIdChange":[{"__symbolic":"method"}],"switchToState":[{"__symbolic":"method"}],"initGraphAndText":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}],"checkState":[{"__symbolic":"method"}]}}}}]

package/elements/switch-indicator-light/word-indicator-light-operator.js

@@ -5,6 +5,7 @@ import { VariableStateEnum, VariableState } from '../../communication';
 import { CurrentStateIdValue } from './current-stateId-value';
 import { VariableUtil } from '../../utils/variable-util';
 import { VariableDefinition } from '../../communication/variable/variable-definition';
+import { GuiFeatureConfig } from '../../config';
 export class WordIndicatorLightOperator {
     constructor(settings, states, variableCommunicator, variableStore) {
         this.settings = settings;
@@ -26,8 +27,11 @@ export class WordIndicatorLightOperator {
                 if (variableValue.state === VariableStateEnum.Normal) {
                     this.requestCurrentSateIdValue(this.variableCommunicator, appId);
                 }
+                else if (GuiFeatureConfig.isOfflineDisplayEnabled && variableValue.state === VariableStateEnum.Offline && !this.valueSubscription) {
+                    this.requestCurrentSateIdValue(this.variableCommunicator, appId);
+                }
                 else {
-                    this.currentStateIdChanged.emit(new CurrentStateIdValue(new VariableState(this.variableName, variableValue.state)));
+                    this.currentStateIdChanged.emit(new CurrentStateIdValue(new VariableState(this.variableName, variableValue.state), this.currentStateId));
                 }
             });
         }
@@ -41,7 +45,7 @@ export class WordIndicatorLightOperator {
         }
         // TODO 检查状态id是从0-n连续编号的。
         this.valueSubscription = variableCommunicator.openVariable(this.variableName, appId).subscribe(value => {
-            if (value.state === VariableStateEnum.DataNormal || value.state === VariableStateEnum.Offline) {
+            if (value.state === VariableStateEnum.DataNormal || (GuiFeatureConfig.isOfflineDisplayEnabled && value.state === VariableStateEnum.Offline)) {
                 let stateId = 0;
                 for (let index = 0; index < this.sortedStates.length - 1; index++) {
                     const element = this.sortedStates[index];

package/elements/switch-indicator-light/word-indicator-light-operator.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"WordIndicatorLightOperator":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"../../model","name":"WordIndicatorLightSettings","line":24,"character":43},{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","module":"../../model","name":"SwitchIndicatorState","line":25,"character":16}]},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":26,"character":47},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":27,"character":40}]}],"requestData":[{"__symbolic":"method"}],"requestCurrentSateIdValue":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"WordIndicatorLightOperator":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"../../model","name":"WordIndicatorLightSettings","line":25,"character":43},{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","module":"../../model","name":"SwitchIndicatorState","line":26,"character":16}]},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":27,"character":47},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":28,"character":40}]}],"requestData":[{"__symbolic":"method"}],"requestCurrentSateIdValue":[{"__symbolic":"method"}]}}}}]

package/gui/gui-view.js

@@ -9,6 +9,7 @@ import { ViewPopupBackdropType, ViewPopupLocationType } from '../model';
 import { ViewResizeMode, DisplayMode, GlobalSettings } from '../settings';
 import { ConfigIsEmptyError } from '../shared';
 import { Guid } from '../utils/guid';
+import { GuiFeatureConfig } from '../config';
 export class GuiView {
     constructor(injector, bsModalService, context, parentView) {
         this.injector = injector;
@@ -115,7 +116,8 @@ export class GuiView {
                 this.mainElement.reportVariableStates(states);
                 const normalVariableNames = [];
                 each(states, v => {
-                    if ((v.state === VariableStateEnum.Normal || v.state === VariableStateEnum.Offline) && normalVariableNames.indexOf(v.variableName) === -1) {
+                    if ((v.state === VariableStateEnum.Normal || (GuiFeatureConfig.isOfflineDisplayEnabled && v.state === VariableStateEnum.Offline))
+                        && normalVariableNames.indexOf(v.variableName) === -1) {
                         normalVariableNames.push(v.variableName);
                     }
                 });

package/gui/gui-view.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"GuiView":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":50,"character":43},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":51,"character":41},{"__symbolic":"reference","module":"./gui-context","name":"GuiContext","line":52,"character":34},{"__symbolic":"reference","name":"GuiView"}]}],"resize":[{"__symbolic":"method"}],"load":[{"__symbolic":"method"}],"loadElementState":[{"__symbolic":"method"}],"popView":[{"__symbolic":"method"}],"closeView":[{"__symbolic":"method"}],"moveView":[{"__symbolic":"method"}],"showMusk":[{"__symbolic":"method"}],"showShadow":[{"__symbolic":"method"}],"hideMusk":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}],"normalOpenedVariableNames":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"GuiView":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":51,"character":43},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":52,"character":41},{"__symbolic":"reference","module":"./gui-context","name":"GuiContext","line":53,"character":34},{"__symbolic":"reference","name":"GuiView"}]}],"resize":[{"__symbolic":"method"}],"load":[{"__symbolic":"method"}],"loadElementState":[{"__symbolic":"method"}],"popView":[{"__symbolic":"method"}],"closeView":[{"__symbolic":"method"}],"moveView":[{"__symbolic":"method"}],"showMusk":[{"__symbolic":"method"}],"showShadow":[{"__symbolic":"method"}],"hideMusk":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}],"normalOpenedVariableNames":[{"__symbolic":"method"}]}}}}]

package/package.json

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

package/remote/communication/variable/remote-variable-communicator.d.ts

@@ -28,7 +28,9 @@ export declare class RemoteVariableCommunicator implements VariableCommunicator
     private doVirtualDeviceStatesChanged;
     private doVariableStatesChanged;
     /**
-     * 预填充离线变量值缓存，由 GuiContext 在组态加载时一次性调用
+     * 预填充离线变量值缓存，由 GuiContext 在组态加载时一次性调用。
+     * 若状态推送早于接口返回，变量已在 Offline 状态，则直接推送；
+     * 否则缓存等待状态事件到来时推送。
      */
     setOfflineValueCache(variableName: string, value: any): void;
     subscribeVariableStates(variableNames: string[]): Observable<VariableState[]>;

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

@@ -3,6 +3,7 @@ import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { VariableStateEnum } from '../../../communication';
 import { StringifyingMap } from '../../../core';
+import { GuiFeatureConfig } from '../../../config';
 export class RemoteVariableCommunicator {
     constructor(remoteVariableProtocol, logger) {
         this.remoteVariableProtocol = remoteVariableProtocol;
@@ -94,18 +95,20 @@ export class RemoteVariableCommunicator {
                         });
                     }
                     // 离线时从预加载缓存取值推送给值订阅者
-                    if (state.state === VariableStateEnum.Offline && this.offlineValueCache.has(variableName)) {
+                    if (GuiFeatureConfig.isOfflineDisplayEnabled && state.state === VariableStateEnum.Offline && this.offlineValueCache.has(variableName)) {
                         const cachedValue = this.offlineValueCache.get(variableName);
-                        const variableValue = {
-                            variableName,
-                            value: cachedValue,
-                            state: VariableStateEnum.Offline
-                        };
-                        this.variableValueCache.set(variableName, variableValue);
-                        if (this.observers.has(variableName)) {
-                            each(this.observers.get(variableName), ob => {
-                                ob.next([variableValue]);
-                            });
+                        if (cachedValue !== null) {
+                            const variableValue = {
+                                variableName,
+                                value: cachedValue,
+                                state: VariableStateEnum.Offline
+                            };
+                            this.variableValueCache.set(variableName, variableValue);
+                            if (this.observers.has(variableName)) {
+                                each(this.observers.get(variableName), ob => {
+                                    ob.next([variableValue]);
+                                });
+                            }
                         }
                     }
                     // 无论什么状态，推送后清除缓存，防止后续再次离线时用旧值
@@ -114,10 +117,36 @@ export class RemoteVariableCommunicator {
             });
     }
     /**
-     * 预填充离线变量值缓存，由 GuiContext 在组态加载时一次性调用
+     * 预填充离线变量值缓存，由 GuiContext 在组态加载时一次性调用。
+     * 若状态推送早于接口返回，变量已在 Offline 状态，则直接推送；
+     * 否则缓存等待状态事件到来时推送。
      */
     setOfflineValueCache(variableName, value) {
-        this.offlineValueCache.set(variableName, value);
+        if (!GuiFeatureConfig.isOfflineDisplayEnabled) {
+            return;
+        }
+        if (value === null || value === undefined) {
+            return;
+        }
+        const cachedState = this.variableStateCache.get(variableName);
+        if (cachedState && cachedState.state === VariableStateEnum.Offline) {
+            // 状态已推送过，直接补推值给订阅者
+            const variableValue = {
+                variableName,
+                value,
+                state: VariableStateEnum.Offline
+            };
+            this.variableValueCache.set(variableName, variableValue);
+            if (this.observers.has(variableName)) {
+                each(this.observers.get(variableName), ob => {
+                    ob.next([variableValue]);
+                });
+            }
+        }
+        else {
+            // 状态还未推送，先缓存，等待状态事件
+            this.offlineValueCache.set(variableName, value);
+        }
     }
     subscribeVariableStates(variableNames) {
         return new Observable(observer => {

package/remote/communication/variable/remote-variable-communicator.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"RemoteVariableCommunicator":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"./remote-variable-protocol","name":"RemoteVariableProtocol","line":37,"character":57},{"__symbolic":"reference","module":"../../../logger","name":"LoggerService","line":37,"character":106}]}],"doAlarmChanged":[{"__symbolic":"method"}],"doVariableValuesChanged":[{"__symbolic":"method"}],"doVirtualDeviceStatesChanged":[{"__symbolic":"method"}],"doVariableStatesChanged":[{"__symbolic":"method"}],"setOfflineValueCache":[{"__symbolic":"method"}],"subscribeVariableStates":[{"__symbolic":"method"}],"subscribeVariableState":[{"__symbolic":"method"}],"requestVirtualDeviceState":[{"__symbolic":"method"}],"openVariables":[{"__symbolic":"method"}],"openVariable":[{"__symbolic":"method"}],"write":[{"__symbolic":"method"}],"writeWordByBit":[{"__symbolic":"method"}],"subscribeUserDeviceAlarms":[{"__symbolic":"method"}],"registerSystemVariableHandler":[{"__symbolic":"method"}],"notifySystemVariableChange":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"RemoteVariableCommunicator":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"./remote-variable-protocol","name":"RemoteVariableProtocol","line":38,"character":57},{"__symbolic":"reference","module":"../../../logger","name":"LoggerService","line":38,"character":106}]}],"doAlarmChanged":[{"__symbolic":"method"}],"doVariableValuesChanged":[{"__symbolic":"method"}],"doVirtualDeviceStatesChanged":[{"__symbolic":"method"}],"doVariableStatesChanged":[{"__symbolic":"method"}],"setOfflineValueCache":[{"__symbolic":"method"}],"subscribeVariableStates":[{"__symbolic":"method"}],"subscribeVariableState":[{"__symbolic":"method"}],"requestVirtualDeviceState":[{"__symbolic":"method"}],"openVariables":[{"__symbolic":"method"}],"openVariable":[{"__symbolic":"method"}],"write":[{"__symbolic":"method"}],"writeWordByBit":[{"__symbolic":"method"}],"subscribeUserDeviceAlarms":[{"__symbolic":"method"}],"registerSystemVariableHandler":[{"__symbolic":"method"}],"notifySystemVariableChange":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}]}}}}]