@flexem/fc-gui 3.0.0-alpha.16 → 3.0.0-alpha.160
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +492 -69
- package/README.md +4 -4
- package/assets/img/alert.svg +18 -18
- package/assets/img/black_first_page.png +0 -0
- package/assets/img/black_last_page.png +0 -0
- package/assets/img/black_next_page.png +0 -0
- package/assets/img/black_previous_page.png +0 -0
- package/assets/img/first_page.svg +19 -19
- package/assets/img/last_page.svg +19 -19
- package/assets/img/next_page.svg +14 -14
- package/assets/img/previous_page.svg +14 -14
- package/bundles/@flexem/fc-gui.umd.js +25472 -20764
- package/bundles/@flexem/fc-gui.umd.js.map +1 -1
- package/bundles/@flexem/fc-gui.umd.min.js +5 -5
- package/bundles/@flexem/fc-gui.umd.min.js.map +1 -1
- package/communication/index.d.ts +1 -1
- package/communication/index.js +1 -1
- package/communication/variable/index.d.ts +5 -5
- package/communication/variable/index.js +4 -4
- package/communication/variable/variable-communicator.d.ts +16 -12
- package/communication/variable/variable-definition.d.ts +10 -10
- package/communication/variable/variable-definition.js +14 -14
- package/communication/variable/variable-state-enum.d.ts +8 -7
- package/communication/variable/variable-state-enum.js +9 -8
- package/communication/variable/variable-state-enum.metadata.json +1 -1
- package/communication/variable/variable-state.d.ts +6 -6
- package/communication/variable/variable-state.js +6 -6
- package/communication/variable/variable-value.d.ts +11 -8
- package/communication/variable/variable-value.js +11 -8
- package/communication/variable/variable-value.metadata.json +1 -1
- package/config/alarm/alarm.store.d.ts +6 -0
- package/config/alarm/alarm.store.js +0 -0
- package/config/alarm/alarm.store.metadata.json +1 -0
- package/config/alarm/get-alarms-args.d.ts +12 -0
- package/config/alarm/get-alarms-args.js +13 -0
- package/config/alarm/get-alarms-args.metadata.json +1 -0
- package/config/alarm/index.d.ts +2 -0
- package/config/alarm/index.js +1 -0
- package/config/alarm/index.metadata.json +1 -0
- package/config/config-store.d.ts +17 -15
- package/config/graph/graph-result.d.ts +9 -9
- package/config/graph/graph-result.js +13 -13
- package/config/graph/graph-store.d.ts +9 -9
- package/config/graph/graph-type.d.ts +4 -4
- package/config/graph/graph-type.js +5 -5
- package/config/graph/graph.d.ts +6 -6
- package/config/graph/graph.js +6 -6
- package/config/gui-feature-config.d.ts +3 -0
- package/config/gui-feature-config.js +3 -0
- package/config/gui-feature-config.metadata.json +1 -0
- package/config/history-data/get-history-data-args.d.ts +22 -22
- package/config/history-data/get-history-data-args.js +21 -21
- package/config/history-data/historical-curve.time-range.d.ts +18 -18
- package/config/history-data/historical-curve.time-range.js +19 -19
- package/config/history-data/history-data-value.d.ts +6 -6
- package/config/history-data/history-data-value.js +6 -6
- package/config/history-data/history-data.model.d.ts +7 -7
- package/config/history-data/history-data.model.js +7 -7
- package/config/history-data/history-data.store.d.ts +10 -10
- package/config/history-data/index.d.ts +4 -4
- package/config/history-data/index.js +3 -3
- package/config/image/image-store.d.ts +6 -6
- package/config/index.d.ts +12 -10
- package/config/index.js +8 -6
- package/config/index.metadata.json +1 -1
- package/config/variable/get-variable-name-args.d.ts +6 -6
- package/config/variable/get-variable-name-args.js +7 -7
- package/config/variable/index.d.ts +2 -2
- package/config/variable/index.js +1 -1
- package/config/variable/variable-store.d.ts +8 -7
- package/config/view/view-store.d.ts +20 -20
- package/config/view/view.model.d.ts +4 -4
- package/config/view/view.model.js +5 -5
- package/core/index.d.ts +1 -1
- package/core/index.js +1 -1
- package/core/stringifying-map.d.ts +11 -11
- package/core/stringifying-map.js +24 -24
- package/core/stringifying-set.d.ts +10 -10
- package/core/stringifying-set.js +21 -21
- package/elements/air-quality/air-quality-element.d.ts +31 -0
- package/elements/air-quality/air-quality-element.js +194 -0
- package/elements/air-quality/air-quality-element.metadata.json +1 -0
- package/elements/alarm/alarm-element.d.ts +69 -0
- package/elements/alarm/alarm-element.js +497 -0
- package/elements/alarm/alarm-element.metadata.json +1 -0
- package/elements/bar-graph-element.d.ts +29 -21
- package/elements/bar-graph-element.js +244 -114
- package/elements/bar-graph-element.metadata.json +1 -1
- package/elements/base/base-element.d.ts +11 -11
- package/elements/base/base-element.js +9 -9
- package/elements/base/conditional-control-element.d.ts +16 -16
- package/elements/base/conditional-control-element.js +87 -87
- package/elements/base/conditional-display-element.d.ts +24 -24
- package/elements/base/conditional-display-element.js +86 -86
- package/elements/base/conditional-dynamic-display-element.d.ts +26 -26
- package/elements/base/conditional-dynamic-display-element.js +142 -142
- package/elements/base/conditional-enable-element.d.ts +21 -21
- package/elements/base/conditional-enable-element.js +100 -100
- package/elements/base/index.d.ts +3 -3
- package/elements/base/index.js +3 -3
- package/elements/base/readable-element.d.ts +20 -15
- package/elements/base/readable-element.js +122 -58
- package/elements/base/readable-element.metadata.json +1 -1
- package/elements/base/state-control-element.d.ts +26 -24
- package/elements/base/state-control-element.js +196 -180
- package/elements/character-display/character-display-element.d.ts +35 -35
- package/elements/character-display/character-display-element.js +312 -311
- package/elements/character-display/character-display-element.metadata.json +1 -1
- package/elements/datetime-display/datetime-display-element.d.ts +22 -21
- package/elements/datetime-display/datetime-display-element.js +140 -132
- package/elements/datetime-display/datetime-display-element.metadata.json +1 -1
- package/elements/datetime-display/time-zone-select-json.d.ts +8 -0
- package/elements/datetime-display/time-zone-select-json.js +558 -0
- package/elements/historical-curve/historical-curve-element-status.d.ts +6 -6
- package/elements/historical-curve/historical-curve-element-status.js +7 -7
- package/elements/historical-curve/historical-curve.element.d.ts +96 -59
- package/elements/historical-curve/historical-curve.element.js +990 -364
- package/elements/historical-curve/historical-curve.element.metadata.json +1 -1
- package/elements/historical-curve/historical-curve.element.option.d.ts +13 -13
- package/elements/historical-curve/historical-curve.time-period.d.ts +4 -4
- package/elements/main-element.d.ts +46 -45
- package/elements/main-element.js +373 -307
- package/elements/main-element.metadata.json +1 -1
- package/elements/meter-element.d.ts +26 -20
- package/elements/meter-element.js +139 -70
- package/elements/meter-element.metadata.json +1 -1
- package/elements/numerical-display/numerical-display-element.d.ts +60 -41
- package/elements/numerical-display/numerical-display-element.js +476 -361
- package/elements/numerical-display/numerical-display-element.metadata.json +1 -1
- package/elements/per-view-variable-communicator.d.ts +20 -17
- package/elements/per-view-variable-communicator.js +59 -45
- package/elements/per-view-variable-communicator.metadata.json +1 -1
- package/elements/pipe/pipe-element.d.ts +19 -19
- package/elements/pipe/pipe-element.js +141 -141
- package/elements/ring-graph/ring-graph-element.d.ts +31 -19
- package/elements/ring-graph/ring-graph-element.js +250 -89
- package/elements/ring-graph/ring-graph-element.metadata.json +1 -1
- package/elements/scroll-alarm/scroll-alarm-element.d.ts +74 -0
- package/elements/scroll-alarm/scroll-alarm-element.js +761 -0
- package/elements/scroll-alarm/scroll-alarm-element.metadata.json +1 -0
- package/elements/shared/graph/graph-state-element.d.ts +28 -27
- package/elements/shared/graph/graph-state-element.js +139 -110
- package/elements/shared/graph/graph-state-element.metadata.json +1 -1
- package/elements/shared/math-utils.d.ts +2 -2
- package/elements/shared/math-utils.js +14 -14
- package/elements/shared/text/text-element.d.ts +22 -8
- package/elements/shared/text/text-element.js +106 -68
- package/elements/shared/text/text-element.metadata.json +1 -1
- package/elements/shared/text/text-state-element.d.ts +58 -23
- package/elements/shared/text/text-state-element.js +286 -136
- package/elements/shared/text/text-state-element.metadata.json +1 -1
- package/elements/shared/text/text-state.model.d.ts +5 -5
- package/elements/shared/text/text-utils.d.ts +5 -5
- package/elements/shared/text/text-utils.js +45 -45
- package/elements/static-elements/hyperlink-element.d.ts +40 -14
- package/elements/static-elements/hyperlink-element.js +197 -48
- package/elements/static-elements/hyperlink-element.metadata.json +1 -1
- package/elements/static-elements/image-element.d.ts +14 -14
- package/elements/static-elements/image-element.js +41 -41
- package/elements/static-elements/text-element.d.ts +42 -16
- package/elements/static-elements/text-element.js +205 -55
- package/elements/static-elements/text-element.metadata.json +1 -1
- package/elements/switch-indicator-light/bit-indicator-light-operator.d.ts +21 -20
- package/elements/switch-indicator-light/bit-indicator-light-operator.js +85 -78
- package/elements/switch-indicator-light/bit-indicator-light-operator.metadata.json +1 -1
- package/elements/switch-indicator-light/bit-switch-operator.d.ts +19 -19
- package/elements/switch-indicator-light/bit-switch-operator.js +107 -107
- package/elements/switch-indicator-light/current-stateId-value.d.ts +6 -6
- package/elements/switch-indicator-light/current-stateId-value.js +8 -8
- package/elements/switch-indicator-light/indicator-light-operator.d.ts +8 -8
- package/elements/switch-indicator-light/switch-indicator-light-element.d.ts +48 -39
- package/elements/switch-indicator-light/switch-indicator-light-element.js +302 -251
- package/elements/switch-indicator-light/switch-indicator-light-element.metadata.json +1 -1
- package/elements/switch-indicator-light/switch-operator.d.ts +6 -6
- package/elements/switch-indicator-light/word-indicator-light-operator.d.ts +19 -18
- package/elements/switch-indicator-light/word-indicator-light-operator.js +72 -65
- package/elements/switch-indicator-light/word-indicator-light-operator.metadata.json +1 -1
- package/elements/switch-indicator-light/word-switch-operator.d.ts +18 -18
- package/elements/switch-indicator-light/word-switch-operator.js +75 -75
- package/elements/table/table-element.d.ts +9 -9
- package/elements/table/table-element.js +6 -6
- package/elements/vector-graphics/ellipse-element.d.ts +9 -9
- package/elements/vector-graphics/ellipse-element.js +6 -6
- package/elements/vector-graphics/poly-line-element.d.ts +12 -12
- package/elements/vector-graphics/poly-line-element.js +19 -19
- package/elements/vector-graphics/polygon-element.d.ts +12 -12
- package/elements/vector-graphics/polygon-element.js +19 -19
- package/elements/vector-graphics/rectangle-element.d.ts +9 -9
- package/elements/vector-graphics/rectangle-element.js +6 -6
- package/elements/vector-graphics/sector-element.d.ts +9 -9
- package/elements/vector-graphics/sector-element.js +6 -6
- package/elements/vector-graphics/straight-line-element.d.ts +12 -12
- package/elements/vector-graphics/straight-line-element.js +19 -19
- package/elements/video/video-element.d.ts +37 -27
- package/elements/video/video-element.js +258 -160
- package/elements/video/video-element.metadata.json +1 -1
- package/elements/view-operation/view-operation.element.d.ts +62 -36
- package/elements/view-operation/view-operation.element.js +348 -194
- package/elements/view-operation/view-operation.element.metadata.json +1 -1
- package/elements/weather/weater-element.d.ts +38 -38
- package/elements/weather/weater-element.js +237 -238
- package/gui/gui-context.d.ts +33 -16
- package/gui/gui-host.d.ts +50 -50
- package/gui/gui-host.js +173 -173
- package/gui/gui-view.d.ts +45 -42
- package/gui/gui-view.js +265 -204
- package/gui/gui-view.metadata.json +1 -1
- package/gui/gui.component.d.ts +45 -42
- package/gui/gui.component.html +3 -3
- package/gui/gui.component.js +240 -227
- package/gui/gui.component.metadata.json +1 -1
- package/gui/interfaces/gui-options.d.ts +6 -6
- package/gui.module.d.ts +2 -2
- package/gui.module.js +78 -78
- package/localization/index.d.ts +2 -2
- package/localization/index.js +2 -2
- package/localization/localization.service.d.ts +62 -51
- package/localization/localization.service.js +61 -50
- package/localization/localization.service.metadata.json +1 -1
- package/localization/localization.service.zh_CN.d.ts +2 -2
- package/localization/localization.service.zh_CN.js +59 -48
- package/localization/localization.service.zh_CN.metadata.json +1 -1
- package/logger/console-logger.service.d.ts +13 -13
- package/logger/console-logger.service.js +38 -38
- package/logger/index.d.ts +2 -2
- package/logger/index.js +2 -2
- package/logger/logger.service.d.ts +14 -14
- package/logger/logger.service.js +2 -2
- package/modal/alert/alert-modal.component.d.ts +10 -10
- package/modal/alert/alert-modal.component.html +11 -11
- package/modal/alert/alert-modal.component.js +38 -38
- package/modal/alert/alert-modal.component.less +59 -59
- package/modal/confirm-operation/confirm-operation-modal.component.d.ts +10 -10
- package/modal/confirm-operation/confirm-operation-modal.component.html +16 -16
- package/modal/confirm-operation/confirm-operation-modal.component.js +41 -41
- package/modal/confirm-operation/confirm-operation-modal.component.less +58 -58
- package/modal/verify-password/verify-password-modal.component.d.ts +18 -18
- package/modal/verify-password/verify-password-modal.component.html +22 -22
- package/modal/verify-password/verify-password-modal.component.js +66 -66
- package/modal/verify-password/verify-password-modal.component.less +65 -65
- package/modal/write-character/write-character-modal-args.d.ts +7 -7
- package/modal/write-character/write-character-modal-args.js +8 -8
- package/modal/write-character/write-character-modal.component.d.ts +25 -25
- package/modal/write-character/write-character-modal.component.html +21 -21
- package/modal/write-character/write-character-modal.component.js +74 -74
- package/modal/write-character/write-character-modal.component.less +49 -49
- package/modal/write-value/write-value-modal-args.d.ts +16 -12
- package/modal/write-value/write-value-modal-args.js +14 -12
- package/modal/write-value/write-value-modal-args.metadata.json +1 -1
- package/modal/write-value/write-value-modal.component.d.ts +60 -54
- package/modal/write-value/write-value-modal.component.html +26 -21
- package/modal/write-value/write-value-modal.component.js +279 -204
- package/modal/write-value/write-value-modal.component.less +56 -56
- package/modal/write-value/write-value-modal.component.metadata.json +1 -1
- package/modal/write-value/write-value-model-result.d.ts +3 -3
- package/model/air-quality/air-quality-info.d.ts +23 -0
- package/model/air-quality/air-quality-info.js +4 -0
- package/model/air-quality/air-quality-info.metadata.json +1 -0
- package/model/air-quality/air-quality.model.d.ts +7 -0
- package/model/air-quality/air-quality.model.js +0 -0
- package/model/air-quality/air-quality.model.metadata.json +1 -0
- package/model/alarm/alarm.model.d.ts +13 -0
- package/model/alarm/alarm.model.js +0 -0
- package/model/alarm/alarm.model.metadata.json +1 -0
- package/model/bar-graph/FontStyleData.d.ts +7 -7
- package/model/bar-graph/bar-graph-direction.d.ts +6 -6
- package/model/bar-graph/bar-graph-direction.js +7 -7
- package/model/bar-graph/bar-graph.d.ts +26 -22
- package/model/base/base-element-model.d.ts +5 -5
- package/model/base/base-element-model.js +2 -2
- package/model/base/conditional-control-model.d.ts +6 -6
- package/model/base/conditional-display-model.d.ts +9 -9
- package/model/base/conditional-dynamic-display-model.d.ts +13 -13
- package/model/base/conditional-enable-model.d.ts +9 -9
- package/model/base/font-setting-model.d.ts +29 -8
- package/model/base/font-setting-model.metadata.json +1 -1
- package/model/base/index.d.ts +7 -7
- package/model/base/index.js +1 -1
- package/model/base/readable-model.d.ts +14 -10
- package/model/base/security-model.d.ts +6 -6
- package/model/character-display/character-display.d.ts +19 -19
- package/model/datetime-display/date-format-type.d.ts +5 -5
- package/model/datetime-display/date-format-type.js +6 -6
- package/model/datetime-display/datetime-display-settings.d.ts +17 -17
- package/model/datetime-display/datetime-display.d.ts +21 -20
- package/model/datetime-display/datetime-separator-type.d.ts +6 -6
- package/model/datetime-display/datetime-separator-type.js +7 -7
- package/model/datetime-display/time-format-type.d.ts +4 -4
- package/model/datetime-display/time-format-type.js +5 -5
- package/model/historical-curve/curve-type.d.ts +5 -5
- package/model/historical-curve/curve-type.js +6 -6
- package/model/historical-curve/historical-curve-axis-settings.d.ts +17 -6
- package/model/historical-curve/historical-curve-axis-settings.js +5 -0
- package/model/historical-curve/historical-curve-axis-settings.metadata.json +1 -1
- package/model/historical-curve/historical-curve-chanel.model.d.ts +22 -14
- package/model/historical-curve/historical-curve.data-settings.d.ts +9 -9
- package/model/historical-curve/historical-curve.display-settings.d.ts +19 -19
- package/model/historical-curve/historical-curve.model.d.ts +8 -8
- package/model/historical-curve/index.d.ts +4 -4
- package/model/hyperlink/hyperlink.model.d.ts +8 -8
- package/model/image/image-fill-type.d.ts +4 -4
- package/model/image/image-fill-type.js +5 -5
- package/model/image/image.d.ts +9 -9
- package/model/index.d.ts +15 -15
- package/model/index.js +8 -8
- package/model/meter/meter.d.ts +17 -13
- package/model/numerical-display/index.d.ts +8 -8
- package/model/numerical-display/index.js +2 -2
- package/model/numerical-display/numerical-display.d.ts +29 -29
- package/model/numerical-display/numerical-operation-settings.d.ts +6 -6
- package/model/numerical-display/numerical-operation-type.d.ts +4 -4
- package/model/numerical-display/numerical-operation-type.js +5 -5
- package/model/numerical-display/numerical-operation.d.ts +19 -11
- package/model/numerical-display/proportional-conversion.d.ts +4 -4
- package/model/numerical-display/type-settings.d.ts +6 -6
- package/model/numerical-display/zoom.d.ts +4 -4
- package/model/pipe/flow-direction-type.d.ts +4 -4
- package/model/pipe/flow-direction-type.js +5 -5
- package/model/pipe/index.d.ts +2 -2
- package/model/pipe/index.js +1 -1
- package/model/pipe/pipe.d.ts +17 -17
- package/model/poly-line/poly-line-model.d.ts +4 -4
- package/model/polygon/polygon-model.d.ts +4 -4
- package/model/ring-graph/ring-graph.model.d.ts +33 -25
- package/model/scroll-alarm/scroll-alarm.model.d.ts +21 -0
- package/model/scroll-alarm/scroll-alarm.model.js +0 -0
- package/model/scroll-alarm/scroll-alarm.model.metadata.json +1 -0
- package/model/settings/background/view-background-fill-type.d.ts +5 -5
- package/model/settings/background/view-background-fill-type.js +6 -6
- package/model/settings/background/view-background.model.d.ts +8 -8
- package/model/settings/index.d.ts +3 -3
- package/model/settings/index.js +2 -2
- package/model/settings/popup/view-popup-backdrop-type.d.ts +4 -4
- package/model/settings/popup/view-popup-backdrop-type.js +5 -5
- package/model/settings/popup/view-popup-location-type.d.ts +4 -4
- package/model/settings/popup/view-popup-location-type.js +5 -5
- package/model/settings/popup/view-popup-setting.model.d.ts +17 -17
- package/model/settings/popup/view-popup-setting.model.js +2 -2
- package/model/settings/view-settings.model.d.ts +6 -6
- package/model/shared/alarm/alarm-range.model.d.ts +6 -6
- package/model/shared/arc.model.d.ts +4 -4
- package/model/shared/binary.d.ts +7 -7
- package/model/shared/binary.js +37 -37
- package/model/shared/condition/bit-condition-item-observer.d.ts +14 -14
- package/model/shared/condition/bit-condition-item-observer.js +53 -53
- package/model/shared/condition/bit-condition-logic.d.ts +4 -4
- package/model/shared/condition/bit-condition-logic.js +5 -5
- package/model/shared/condition/bit-condition-model.d.ts +8 -8
- package/model/shared/condition/bit-condition.d.ts +4 -4
- package/model/shared/condition/condition-control-result-value.d.ts +5 -5
- package/model/shared/condition/condition-helper.d.ts +4 -4
- package/model/shared/condition/condition-helper.js +22 -22
- package/model/shared/condition/condition-item-model.d.ts +10 -10
- package/model/shared/condition/condition-item-observer.d.ts +12 -12
- package/model/shared/condition/condition-item-observer.js +14 -14
- package/model/shared/condition/condition-items-observer.d.ts +5 -5
- package/model/shared/condition/condition-items-result-observer.d.ts +16 -16
- package/model/shared/condition/condition-items-result-observer.js +87 -87
- package/model/shared/condition/condition-model.d.ts +6 -6
- package/model/shared/condition/condition-type.d.ts +4 -4
- package/model/shared/condition/condition-type.js +5 -5
- package/model/shared/condition/convert-condition-model.d.ts +5 -5
- package/model/shared/condition/index.d.ts +11 -11
- package/model/shared/condition/index.js +4 -4
- package/model/shared/condition/relation-condition-result-state.d.ts +6 -6
- package/model/shared/condition/relation-condition-result-state.js +8 -8
- package/model/shared/condition/relation-condition-result.d.ts +8 -8
- package/model/shared/condition/relation-condition-result.js +7 -7
- package/model/shared/condition/relation-type.d.ts +5 -5
- package/model/shared/condition/relation-type.js +6 -6
- package/model/shared/condition/relational-operator.d.ts +8 -8
- package/model/shared/condition/relational-operator.js +9 -9
- package/model/shared/condition/variable-value-logic-model.d.ts +11 -11
- package/model/shared/condition/variable-value-type.d.ts +4 -4
- package/model/shared/condition/variable-value-type.js +5 -5
- package/model/shared/condition/word-condition-item-observer.d.ts +21 -21
- package/model/shared/condition/word-condition-item-observer.js +165 -165
- package/model/shared/condition/word-condition-model.d.ts +8 -8
- package/model/shared/condition/word-condition.d.ts +5 -5
- package/model/shared/data-type/display-data-type.d.ts +5 -5
- package/model/shared/data-type/display-data-type.js +6 -6
- package/model/shared/data-type/fbox-data-type.d.ts +15 -15
- package/model/shared/data-type/fbox-data-type.js +16 -16
- package/model/shared/data-type/fcloud-data-Type.d.ts +8 -8
- package/model/shared/data-type/fcloud-data-Type.js +9 -9
- package/model/shared/dynamic-display/dynamic-behavior-type.d.ts +5 -5
- package/model/shared/dynamic-display/dynamic-behavior-type.js +6 -6
- package/model/shared/dynamic-display/dynamic-display-behavior-model.d.ts +5 -5
- package/model/shared/dynamic-display/dynamic-display-model.d.ts +10 -10
- package/model/shared/dynamic-display/dynamic-display-result-model.d.ts +7 -7
- package/model/shared/dynamic-display/dynamic-display-result-model.js +7 -7
- package/model/shared/dynamic-display/dynamic-display.d.ts +11 -11
- package/model/shared/dynamic-display/dynamic-display.js +35 -35
- package/model/shared/graph/custom-style.d.ts +14 -14
- package/model/shared/graph/graph-setting.d.ts +10 -10
- package/model/shared/index.d.ts +8 -8
- package/model/shared/index.js +3 -3
- package/model/shared/point.model.d.ts +4 -4
- package/model/shared/rotation/rotation-behavior-model.d.ts +4 -4
- package/model/shared/rotation/rotation-behavior.d.ts +9 -9
- package/model/shared/rotation/rotation-behavior.js +101 -101
- package/model/shared/rotation/rotation-direction-type.d.ts +4 -4
- package/model/shared/rotation/rotation-direction-type.js +5 -5
- package/model/shared/rotation/rotation-model.d.ts +14 -14
- package/model/shared/rotation/rotation-observer-model.d.ts +4 -4
- package/model/shared/rotation/rotation-observer.d.ts +11 -11
- package/model/shared/rotation/rotation-observer.js +28 -28
- package/model/shared/scale/scale-mark.model.d.ts +6 -6
- package/model/shared/scale/scale-model.d.ts +20 -20
- package/model/shared/size.model.d.ts +7 -7
- package/model/shared/size.model.js +12 -12
- package/model/shared/state/index.d.ts +1 -1
- package/model/shared/state/index.js +1 -1
- package/model/shared/state/state.d.ts +9 -8
- package/model/shared/state/state.js +10 -9
- package/model/shared/state/state.metadata.json +1 -1
- package/model/shared/text/font.d.ts +10 -10
- package/model/shared/text/index.d.ts +2 -2
- package/model/shared/text/text.d.ts +8 -5
- package/model/shared/translation/translation-behavior-model.d.ts +4 -4
- package/model/shared/translation/translation-behavior.d.ts +12 -12
- package/model/shared/translation/translation-behavior.js +63 -63
- package/model/shared/translation/translation-direction-type.d.ts +4 -4
- package/model/shared/translation/translation-direction-type.js +5 -5
- package/model/shared/translation/translation-model.d.ts +12 -12
- package/model/shared/translation/translation-observer-model.d.ts +4 -4
- package/model/shared/translation/translation-observer.d.ts +10 -10
- package/model/shared/translation/translation-observer.js +27 -27
- package/model/shared/variable/variable-identifier.model.d.ts +5 -5
- package/model/shared/variable/variable-name.model.d.ts +5 -5
- package/model/straight-line/straight-line-model.d.ts +4 -4
- package/model/switch-indicator-light/bit-indicator-light-settings.d.ts +8 -8
- package/model/switch-indicator-light/bit-switch-operation.d.ts +6 -6
- package/model/switch-indicator-light/bit-switch-operation.js +7 -7
- package/model/switch-indicator-light/bit-switch-settings.d.ts +11 -11
- package/model/switch-indicator-light/fault-flicker.d.ts +5 -5
- package/model/switch-indicator-light/flicker.d.ts +5 -5
- package/model/switch-indicator-light/flicker.js +6 -6
- package/model/switch-indicator-light/index.d.ts +14 -14
- package/model/switch-indicator-light/index.js +5 -5
- package/model/switch-indicator-light/indicator-light-fault-flicker.d.ts +5 -5
- package/model/switch-indicator-light/indicator-light-settings.d.ts +7 -7
- package/model/switch-indicator-light/indicator-light-type.d.ts +4 -4
- package/model/switch-indicator-light/indicator-light-type.js +5 -5
- package/model/switch-indicator-light/switch-indicator-light.d.ts +35 -33
- package/model/switch-indicator-light/switch-indicator-state.d.ts +8 -8
- package/model/switch-indicator-light/switch-settings.d.ts +7 -7
- package/model/switch-indicator-light/switch-type.d.ts +4 -4
- package/model/switch-indicator-light/switch-type.js +5 -5
- package/model/switch-indicator-light/word-indicator-light-settings.d.ts +6 -6
- package/model/switch-indicator-light/word-switch-operation.d.ts +5 -5
- package/model/switch-indicator-light/word-switch-operation.js +6 -6
- package/model/switch-indicator-light/word-switch-settings.d.ts +13 -13
- package/model/table/table-model.d.ts +9 -9
- package/model/text/text.model.d.ts +7 -7
- package/model/video/video.model.d.ts +8 -8
- package/model/view-operation/index.d.ts +2 -2
- package/model/view-operation/index.js +1 -1
- package/model/view-operation/view-operation-element.model.d.ts +25 -19
- package/model/view-operation/view-operation-type.d.ts +18 -18
- package/model/view-operation/view-operation-type.js +19 -19
- package/model/weather/weather-info.d.ts +11 -11
- package/model/weather/weather-info.js +2 -2
- package/model/weather/weather.model.d.ts +7 -7
- package/package.json +1 -1
- package/public_api.d.ts +14 -14
- package/public_api.js +12 -11
- package/remote/communication/variable/remote-variable-communicator.d.ts +59 -30
- package/remote/communication/variable/remote-variable-communicator.js +395 -215
- package/remote/communication/variable/remote-variable-communicator.metadata.json +1 -1
- package/remote/communication/variable/remote-variable-protocol.d.ts +18 -13
- package/remote/config/graph/get-released-graph-state-result.d.ts +6 -6
- package/remote/config/graph/get-released-graph-states.d.ts +4 -4
- package/remote/config/graph/graph-state-key.d.ts +6 -6
- package/remote/config/graph/graph-state-result.d.ts +5 -5
- package/remote/config/graph/graph-state.d.ts +4 -4
- package/remote/config/graph/remote-graph-protocol.d.ts +11 -11
- package/remote/config/graph/remote-graph-store.d.ts +16 -16
- package/remote/config/graph/remote-graph-store.js +101 -101
- package/remote/config/image/remote-image-protocol.d.ts +4 -4
- package/remote/config/image/remote-image-store.d.ts +8 -8
- package/remote/config/image/remote-image-store.js +19 -19
- package/remote/config/view/remote-view-protocol.d.ts +8 -8
- package/remote/config/view/remote-view-store.d.ts +13 -13
- package/remote/config/view/remote-view-store.js +39 -39
- package/remote/config/view/view-result.d.ts +4 -4
- package/remote/index.d.ts +14 -14
- package/remote/index.js +4 -4
- package/security/index.d.ts +1 -1
- package/security/security-checker.d.ts +3 -3
- package/service/index.d.ts +8 -4
- package/service/index.js +1 -0
- package/service/index.metadata.json +1 -1
- package/service/language.service.d.ts +37 -0
- package/service/language.service.js +0 -0
- package/service/language.service.metadata.json +1 -0
- package/service/operation-record/create-operation-record-args.d.ts +5 -5
- package/service/operation-record/index.d.ts +3 -3
- package/service/operation-record/operation-record.service.d.ts +4 -4
- package/service/operation-record/variable-option.model.d.ts +5 -5
- package/service/permission-checker.d.ts +3 -3
- package/service/released-variable/index.d.ts +1 -0
- package/service/released-variable/index.js +0 -0
- package/service/released-variable/index.metadata.json +1 -0
- package/service/released-variable/released-variable.service.d.ts +4 -0
- package/service/released-variable/released-variable.service.js +0 -0
- package/service/released-variable/released-variable.service.metadata.json +1 -0
- package/service/system-text-library.service.d.ts +77 -0
- package/service/system-text-library.service.js +29 -0
- package/service/system-text-library.service.metadata.json +1 -0
- package/service/text-library.service.d.ts +49 -0
- package/service/text-library.service.js +0 -0
- package/service/text-library.service.metadata.json +1 -0
- package/service/video/index.d.ts +2 -2
- package/service/video/video-url.d.ts +4 -4
- package/service/video/video.service.d.ts +4 -4
- package/service/weather.service.d.ts +4 -3
- package/settings/display-mode.d.ts +10 -10
- package/settings/display-mode.js +11 -11
- package/settings/global-settings.d.ts +7 -7
- package/settings/global-settings.js +13 -13
- package/settings/index.d.ts +3 -3
- package/settings/index.js +3 -3
- package/settings/view-resize-mode.d.ts +10 -10
- package/settings/view-resize-mode.js +11 -11
- package/shared/config-is-empty-error.d.ts +3 -3
- package/shared/config-is-empty-error.js +7 -7
- package/shared/disposable.d.ts +3 -3
- package/shared/graph-extended-style.d.ts +4 -4
- package/shared/gui-consts.d.ts +33 -30
- package/shared/gui-consts.js +33 -30
- package/shared/gui-consts.metadata.json +1 -1
- package/shared/index.d.ts +5 -5
- package/shared/index.js +3 -3
- package/shared/operation-helper.d.ts +6 -6
- package/shared/operation-helper.js +38 -38
- package/utils/access-permission.d.ts +5 -5
- package/utils/access-permission.js +6 -6
- package/utils/access-permission.service.d.ts +11 -11
- package/utils/access-permission.service.js +30 -30
- package/utils/auto-focus.directive.d.ts +6 -6
- package/utils/auto-focus.directive.js +27 -27
- package/utils/bs-modal-drag.directive.d.ts +7 -7
- package/utils/bs-modal-drag.directive.js +38 -38
- package/utils/data-type/data-type.service.d.ts +57 -57
- package/utils/data-type/data-type.service.js +155 -155
- package/utils/data-type/fbox-data-type.service.d.ts +54 -54
- package/utils/data-type/fbox-data-type.service.js +300 -260
- package/utils/data-type/fcloud-data-type.service.d.ts +55 -55
- package/utils/data-type/fcloud-data-type.service.js +203 -203
- package/utils/fraction-digit.service.d.ts +41 -41
- package/utils/fraction-digit.service.js +133 -133
- package/utils/graph-util.d.ts +5 -5
- package/utils/graph-util.js +19 -19
- package/utils/guid.d.ts +6 -6
- package/utils/guid.js +27 -27
- package/utils/index.d.ts +7 -7
- package/utils/index.js +7 -7
- package/utils/numerical-operation-type.d.ts +4 -4
- package/utils/numerical-operation-type.js +5 -5
- package/utils/numerical-operation.service.d.ts +17 -17
- package/utils/numerical-operation.service.js +201 -177
- package/utils/variable-util.d.ts +5 -5
- package/utils/variable-util.js +11 -11
- package/view/popup-view.service.d.ts +7 -7
- package/view/view.service.d.ts +6 -6
- package/view/view.service.js +20 -20
|
@@ -1,215 +1,395 @@
|
|
|
1
|
-
import { each, remove, uniq } from 'lodash';
|
|
2
|
-
import { Observable } from 'rxjs';
|
|
3
|
-
import { map } from 'rxjs/operators';
|
|
4
|
-
import {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
this.
|
|
10
|
-
this.
|
|
11
|
-
this.
|
|
12
|
-
this.
|
|
13
|
-
this.
|
|
14
|
-
this.
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
}
|
|
31
|
-
this.
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
});
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
ob
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
this.
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
}
|
|
215
|
-
|
|
1
|
+
import { each, remove, uniq } from 'lodash';
|
|
2
|
+
import { Observable } from 'rxjs';
|
|
3
|
+
import { map } from 'rxjs/operators';
|
|
4
|
+
import { VariableStateEnum } from '../../../communication';
|
|
5
|
+
import { StringifyingMap } from '../../../core';
|
|
6
|
+
import { GuiFeatureConfig } from '../../../config';
|
|
7
|
+
export class RemoteVariableCommunicator {
|
|
8
|
+
constructor(remoteVariableProtocol, logger) {
|
|
9
|
+
this.remoteVariableProtocol = remoteVariableProtocol;
|
|
10
|
+
this.logger = logger;
|
|
11
|
+
this.observers = new Map();
|
|
12
|
+
this.appIdVariablesMap = new Map();
|
|
13
|
+
this.variableStateObservers = new Map();
|
|
14
|
+
this.variableStateCache = new Map();
|
|
15
|
+
this.alarmObservers = [];
|
|
16
|
+
// 系统变量处理器
|
|
17
|
+
this.systemVariableHandlers = new Map();
|
|
18
|
+
// 预加载的离线变量最新值缓存(组态加载时一次性填充,推送后即删除)
|
|
19
|
+
this.offlineValueCache = new Map();
|
|
20
|
+
this.variableValueCache = new StringifyingMap(k => JSON.stringify(k));
|
|
21
|
+
this.connectedSubscription = this.remoteVariableProtocol.connected.subscribe(() => {
|
|
22
|
+
const variableNamesToStart = [];
|
|
23
|
+
this.variableStateObservers.forEach((__, variableName) => {
|
|
24
|
+
variableNamesToStart.push(variableName);
|
|
25
|
+
});
|
|
26
|
+
this.remoteVariableProtocol.subscribeVariableStates(variableNamesToStart);
|
|
27
|
+
this.appIdVariablesMap.forEach((variableNames, appId) => {
|
|
28
|
+
this.remoteVariableProtocol.tryOpenVariables(variableNames, appId);
|
|
29
|
+
});
|
|
30
|
+
});
|
|
31
|
+
this.doVariableStatesChanged();
|
|
32
|
+
this.doVariableValuesChanged();
|
|
33
|
+
this.doVirtualDeviceStatesChanged();
|
|
34
|
+
this.doAlarmChanged();
|
|
35
|
+
}
|
|
36
|
+
doAlarmChanged() {
|
|
37
|
+
if (this.alarmChangedSubscription !== undefined) {
|
|
38
|
+
this.alarmChangedSubscription.unsubscribe();
|
|
39
|
+
}
|
|
40
|
+
this.alarmChangedSubscription = this.remoteVariableProtocol.virtualDeviceAlarmsChanged.subscribe((alarms) => {
|
|
41
|
+
each(this.alarmObservers, ob => {
|
|
42
|
+
ob.next(alarms);
|
|
43
|
+
});
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
doVariableValuesChanged() {
|
|
47
|
+
if (this.variableValuesChangedSubscription !== undefined) {
|
|
48
|
+
this.variableValuesChangedSubscription.unsubscribe();
|
|
49
|
+
}
|
|
50
|
+
this.variableValuesChangedSubscription =
|
|
51
|
+
this.remoteVariableProtocol.variableValuesChanged.subscribe((values) => {
|
|
52
|
+
each(values, variableValue => {
|
|
53
|
+
const variableName = variableValue.variableName;
|
|
54
|
+
this.variableValueCache.set(variableName, variableValue);
|
|
55
|
+
if (this.observers.has(variableName)) {
|
|
56
|
+
each(this.observers.get(variableName), ob => {
|
|
57
|
+
// TODO 同一个ob监听多个变量的情况,组合成数组一次推送。
|
|
58
|
+
ob.next([variableValue]);
|
|
59
|
+
});
|
|
60
|
+
}
|
|
61
|
+
});
|
|
62
|
+
});
|
|
63
|
+
}
|
|
64
|
+
doVirtualDeviceStatesChanged() {
|
|
65
|
+
if (this.virtualDeviceStatesChangedSubscription !== undefined) {
|
|
66
|
+
this.virtualDeviceStatesChangedSubscription.unsubscribe();
|
|
67
|
+
}
|
|
68
|
+
this.virtualDeviceStatesChangedSubscription =
|
|
69
|
+
this.remoteVariableProtocol.virtualDeviceStatesChanged.subscribe((deviceStates) => {
|
|
70
|
+
each(deviceStates, deviceState => {
|
|
71
|
+
const variableName = '设备状态';
|
|
72
|
+
this.variableValueCache.set(variableName, deviceState);
|
|
73
|
+
const data = Object.assign(Object.assign({}, deviceState), { systemName: '设备状态' });
|
|
74
|
+
if (this.observers.has(variableName)) {
|
|
75
|
+
each(this.observers.get(variableName), ob => {
|
|
76
|
+
// TODO 同一个ob监听多个变量的情况,组合成数组一次推送。
|
|
77
|
+
ob.next([data]);
|
|
78
|
+
});
|
|
79
|
+
}
|
|
80
|
+
});
|
|
81
|
+
});
|
|
82
|
+
}
|
|
83
|
+
doVariableStatesChanged() {
|
|
84
|
+
if (this.variableStatesChangedSubscription !== undefined) {
|
|
85
|
+
this.variableStatesChangedSubscription.unsubscribe();
|
|
86
|
+
}
|
|
87
|
+
this.variableStatesChangedSubscription =
|
|
88
|
+
this.remoteVariableProtocol.variableStatesChanged.subscribe((states) => {
|
|
89
|
+
each(states, state => {
|
|
90
|
+
const variableName = state.variableName;
|
|
91
|
+
this.variableStateCache.set(variableName, state);
|
|
92
|
+
if (this.variableStateObservers.has(variableName)) {
|
|
93
|
+
each(this.variableStateObservers.get(variableName), ob => {
|
|
94
|
+
ob.next([state]);
|
|
95
|
+
});
|
|
96
|
+
}
|
|
97
|
+
// 离线时推送最后已知值给值订阅者
|
|
98
|
+
if (GuiFeatureConfig.isOfflineDisplayEnabled && state.state === VariableStateEnum.Offline) {
|
|
99
|
+
let cachedValue;
|
|
100
|
+
// 优先用最后一次收到的值(可能是在线时推送的),覆盖所有切页/重连场景
|
|
101
|
+
if (this.variableValueCache.has(variableName)) {
|
|
102
|
+
cachedValue = this.variableValueCache.get(variableName).value;
|
|
103
|
+
}
|
|
104
|
+
else if (this.offlineValueCache.has(variableName)) {
|
|
105
|
+
// 兜底:变量从未收到过值,用预加载的离线值
|
|
106
|
+
cachedValue = this.offlineValueCache.get(variableName);
|
|
107
|
+
}
|
|
108
|
+
if (cachedValue !== null && cachedValue !== undefined) {
|
|
109
|
+
const variableValue = {
|
|
110
|
+
variableName,
|
|
111
|
+
value: cachedValue,
|
|
112
|
+
state: VariableStateEnum.Offline
|
|
113
|
+
};
|
|
114
|
+
this.variableValueCache.set(variableName, variableValue);
|
|
115
|
+
if (this.observers.has(variableName)) {
|
|
116
|
+
each(this.observers.get(variableName), ob => {
|
|
117
|
+
ob.next([variableValue]);
|
|
118
|
+
});
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
});
|
|
123
|
+
});
|
|
124
|
+
}
|
|
125
|
+
/**
|
|
126
|
+
* 预填充离线变量值缓存,由 GuiContext 在组态加载时一次性调用。
|
|
127
|
+
* 若状态推送早于接口返回,变量已在 Offline 状态,则直接推送;
|
|
128
|
+
* 否则缓存等待状态事件到来时推送。
|
|
129
|
+
*/
|
|
130
|
+
setOfflineValueCache(variableName, value) {
|
|
131
|
+
if (!GuiFeatureConfig.isOfflineDisplayEnabled) {
|
|
132
|
+
return;
|
|
133
|
+
}
|
|
134
|
+
if (value === null || value === undefined) {
|
|
135
|
+
return;
|
|
136
|
+
}
|
|
137
|
+
const cachedState = this.variableStateCache.get(variableName);
|
|
138
|
+
if (cachedState && cachedState.state === VariableStateEnum.Offline) {
|
|
139
|
+
// 状态已推送过,直接补推值给订阅者
|
|
140
|
+
const variableValue = {
|
|
141
|
+
variableName,
|
|
142
|
+
value,
|
|
143
|
+
state: VariableStateEnum.Offline
|
|
144
|
+
};
|
|
145
|
+
this.variableValueCache.set(variableName, variableValue);
|
|
146
|
+
if (this.observers.has(variableName)) {
|
|
147
|
+
each(this.observers.get(variableName), ob => {
|
|
148
|
+
ob.next([variableValue]);
|
|
149
|
+
});
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
else {
|
|
153
|
+
// 状态还未推送,先缓存,等待状态事件
|
|
154
|
+
this.offlineValueCache.set(variableName, value);
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
subscribeVariableStates(variableNames) {
|
|
158
|
+
return new Observable(observer => {
|
|
159
|
+
let variableNamesToStart = [];
|
|
160
|
+
each(variableNames, variableName => {
|
|
161
|
+
if (!this.variableStateObservers.has(variableName)) {
|
|
162
|
+
this.variableStateObservers.set(variableName, []);
|
|
163
|
+
variableNamesToStart.push(variableName);
|
|
164
|
+
}
|
|
165
|
+
else {
|
|
166
|
+
if (this.variableStateCache.has(variableName)) {
|
|
167
|
+
observer.next([this.variableStateCache.get(variableName)]);
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
this.variableStateObservers.get(variableName).push(observer);
|
|
171
|
+
});
|
|
172
|
+
variableNamesToStart = uniq(variableNamesToStart);
|
|
173
|
+
if (variableNamesToStart && variableNamesToStart.length > 0) {
|
|
174
|
+
if (!this.variableStatesToBeOpened) {
|
|
175
|
+
this.variableStatesToBeOpened = [];
|
|
176
|
+
setTimeout(() => {
|
|
177
|
+
this.remoteVariableProtocol.subscribeVariableStates(this.variableStatesToBeOpened);
|
|
178
|
+
delete this.variableStatesToBeOpened;
|
|
179
|
+
});
|
|
180
|
+
}
|
|
181
|
+
this.variableStatesToBeOpened.push(...variableNamesToStart);
|
|
182
|
+
}
|
|
183
|
+
return () => {
|
|
184
|
+
const stopedVariableStates = [];
|
|
185
|
+
each(variableNames, variableName => {
|
|
186
|
+
const obs = this.variableStateObservers.get(variableName);
|
|
187
|
+
if (obs) {
|
|
188
|
+
remove(obs, item => item === observer);
|
|
189
|
+
if (obs.length <= 0) {
|
|
190
|
+
this.variableStateObservers.delete(variableName);
|
|
191
|
+
stopedVariableStates.push(variableName);
|
|
192
|
+
}
|
|
193
|
+
}
|
|
194
|
+
});
|
|
195
|
+
if (!stopedVariableStates.length) {
|
|
196
|
+
return;
|
|
197
|
+
}
|
|
198
|
+
if (!this.variableStatesToBeClosed) {
|
|
199
|
+
this.variableStatesToBeClosed = [];
|
|
200
|
+
setTimeout(() => {
|
|
201
|
+
this.remoteVariableProtocol.unsubscribeVariableStates(this.variableStatesToBeClosed);
|
|
202
|
+
delete this.variableStatesToBeClosed;
|
|
203
|
+
});
|
|
204
|
+
}
|
|
205
|
+
this.variableStatesToBeClosed.push(...stopedVariableStates);
|
|
206
|
+
};
|
|
207
|
+
});
|
|
208
|
+
}
|
|
209
|
+
subscribeVariableState(variableName) {
|
|
210
|
+
return this.subscribeVariableStates([variableName]).pipe(map(values => values[0]));
|
|
211
|
+
}
|
|
212
|
+
requestVirtualDeviceState() {
|
|
213
|
+
return this.remoteVariableProtocol.requestVirtualDeviceState();
|
|
214
|
+
}
|
|
215
|
+
openVariables(variableNames, appId = '') {
|
|
216
|
+
return new Observable(observer => {
|
|
217
|
+
let variablesToStart = [];
|
|
218
|
+
each(variableNames, variableName => {
|
|
219
|
+
if (variableName) {
|
|
220
|
+
if (!this.observers.has(variableName)) {
|
|
221
|
+
this.observers.set(variableName, []);
|
|
222
|
+
variablesToStart.push(variableName);
|
|
223
|
+
}
|
|
224
|
+
else {
|
|
225
|
+
if (this.variableValueCache.has(variableName)) {
|
|
226
|
+
observer.next([this.variableValueCache.get(variableName)]);
|
|
227
|
+
}
|
|
228
|
+
}
|
|
229
|
+
this.observers.get(variableName).push(observer);
|
|
230
|
+
if (!this.appIdVariablesMap.get(appId)) {
|
|
231
|
+
this.appIdVariablesMap.set(appId, []);
|
|
232
|
+
}
|
|
233
|
+
else {
|
|
234
|
+
if (this.appIdVariablesMap.get(appId).indexOf(variableName) === -1) {
|
|
235
|
+
this.appIdVariablesMap.get(appId).push(variableName);
|
|
236
|
+
}
|
|
237
|
+
}
|
|
238
|
+
}
|
|
239
|
+
});
|
|
240
|
+
// 过滤掉系统变量,它们不需要通过SignalR订阅
|
|
241
|
+
const normalVariables = variablesToStart.filter(v => !this.systemVariableHandlers.has(v));
|
|
242
|
+
const systemVariables = variablesToStart.filter(v => this.systemVariableHandlers.has(v));
|
|
243
|
+
// 处理系统变量的初始值
|
|
244
|
+
systemVariables.forEach(variableName => {
|
|
245
|
+
const handler = this.systemVariableHandlers.get(variableName);
|
|
246
|
+
if (handler && handler.getValue) {
|
|
247
|
+
void handler.getValue().then(value => {
|
|
248
|
+
const variableValue = {
|
|
249
|
+
variableName: variableName,
|
|
250
|
+
value: value,
|
|
251
|
+
state: 1 // Normal state
|
|
252
|
+
};
|
|
253
|
+
this.variableValueCache.set(variableName, variableValue);
|
|
254
|
+
if (this.observers.has(variableName)) {
|
|
255
|
+
each(this.observers.get(variableName), ob => {
|
|
256
|
+
ob.next([variableValue]);
|
|
257
|
+
});
|
|
258
|
+
}
|
|
259
|
+
}).catch(error => {
|
|
260
|
+
if (this.logger) {
|
|
261
|
+
this.logger.error(`[RemoteVariableCommunicator] Failed to get system variable "${variableName}" value:`, error);
|
|
262
|
+
}
|
|
263
|
+
});
|
|
264
|
+
}
|
|
265
|
+
});
|
|
266
|
+
variablesToStart = uniq(normalVariables);
|
|
267
|
+
if (variablesToStart && variablesToStart.length > 0) {
|
|
268
|
+
if (!this.variablesToBeOpened) {
|
|
269
|
+
this.variablesToBeOpened = [];
|
|
270
|
+
setTimeout(() => {
|
|
271
|
+
this.remoteVariableProtocol.tryOpenVariables(this.variablesToBeOpened, appId);
|
|
272
|
+
delete this.variablesToBeOpened;
|
|
273
|
+
});
|
|
274
|
+
}
|
|
275
|
+
this.variablesToBeOpened.push(...variablesToStart);
|
|
276
|
+
}
|
|
277
|
+
return () => {
|
|
278
|
+
const stopedDataMonitorPoints = [];
|
|
279
|
+
each(variableNames, variableName => {
|
|
280
|
+
const obs = this.observers.get(variableName);
|
|
281
|
+
if (obs) {
|
|
282
|
+
remove(obs, item => item === observer);
|
|
283
|
+
if (obs.length <= 0) {
|
|
284
|
+
this.observers.delete(variableName);
|
|
285
|
+
stopedDataMonitorPoints.push(variableName);
|
|
286
|
+
}
|
|
287
|
+
}
|
|
288
|
+
});
|
|
289
|
+
if (!stopedDataMonitorPoints.length) {
|
|
290
|
+
return;
|
|
291
|
+
}
|
|
292
|
+
if (!this.variablesToBeClosed) {
|
|
293
|
+
this.variablesToBeClosed = [];
|
|
294
|
+
setTimeout(() => {
|
|
295
|
+
this.remoteVariableProtocol.tryStopVariables(this.variablesToBeClosed, appId);
|
|
296
|
+
delete this.variablesToBeClosed;
|
|
297
|
+
});
|
|
298
|
+
}
|
|
299
|
+
this.variablesToBeClosed.push(...stopedDataMonitorPoints);
|
|
300
|
+
};
|
|
301
|
+
});
|
|
302
|
+
}
|
|
303
|
+
openVariable(variableName, appId = '') {
|
|
304
|
+
if (!variableName) {
|
|
305
|
+
return;
|
|
306
|
+
}
|
|
307
|
+
return this.openVariables([variableName], appId).pipe(map(values => values[0]));
|
|
308
|
+
}
|
|
309
|
+
write(variableName, value) {
|
|
310
|
+
if (!variableName) {
|
|
311
|
+
return new Observable(observer => {
|
|
312
|
+
observer.complete();
|
|
313
|
+
});
|
|
314
|
+
}
|
|
315
|
+
// 检查是否为系统变量
|
|
316
|
+
if (this.systemVariableHandlers.has(variableName)) {
|
|
317
|
+
const handler = this.systemVariableHandlers.get(variableName);
|
|
318
|
+
// 调用系统变量的setValue处理器
|
|
319
|
+
void handler.setValue(value).catch(error => {
|
|
320
|
+
if (this.logger) {
|
|
321
|
+
this.logger.error('[RemoteVariableCommunicator] Failed to set system variable value:', error);
|
|
322
|
+
}
|
|
323
|
+
});
|
|
324
|
+
return new Observable(__ => {
|
|
325
|
+
/* 系统变量通过自己的机制通知变化 */
|
|
326
|
+
});
|
|
327
|
+
}
|
|
328
|
+
// 普通变量通过SignalR写入
|
|
329
|
+
this.remoteVariableProtocol.writeVariable(variableName, value);
|
|
330
|
+
return new Observable(__ => {
|
|
331
|
+
/* do nothing right now, if want value change immediately, can use this code below:
|
|
332
|
+
observer.next(new VariableValue(variable, VariableStateEnum.DataNormal, value))*/
|
|
333
|
+
});
|
|
334
|
+
}
|
|
335
|
+
writeWordByBit(variableName, index, value) {
|
|
336
|
+
if (!variableName) {
|
|
337
|
+
return;
|
|
338
|
+
}
|
|
339
|
+
this.remoteVariableProtocol.writeVariableWordByBit(variableName, index, value);
|
|
340
|
+
return new Observable(__ => {
|
|
341
|
+
/* do nothing right now, if want value change immediately, can use this code below:
|
|
342
|
+
observer.next(new VariableValue(variable, VariableStateEnum.DataNormal, value))*/
|
|
343
|
+
});
|
|
344
|
+
}
|
|
345
|
+
subscribeUserDeviceAlarms(appId = '') {
|
|
346
|
+
return new Observable(observer => {
|
|
347
|
+
this.alarmObservers.push(observer);
|
|
348
|
+
this.remoteVariableProtocol.subscribeVirtualDeviceAlarms(appId);
|
|
349
|
+
return () => {
|
|
350
|
+
this.remoteVariableProtocol.unsubscribeVirtualDeviceAlarms(appId);
|
|
351
|
+
};
|
|
352
|
+
});
|
|
353
|
+
}
|
|
354
|
+
/**
|
|
355
|
+
* 注册系统变量处理器
|
|
356
|
+
* @param variableName 变量名(如"当前语种ID")
|
|
357
|
+
* @param getValue 获取值的函数
|
|
358
|
+
* @param setValue 设置值的函数
|
|
359
|
+
*/
|
|
360
|
+
registerSystemVariableHandler(variableName, getValue, setValue) {
|
|
361
|
+
this.systemVariableHandlers.set(variableName, { getValue, setValue });
|
|
362
|
+
}
|
|
363
|
+
/**
|
|
364
|
+
* 通知系统变量值变化
|
|
365
|
+
* 用于在系统变量值改变时通知所有订阅者
|
|
366
|
+
* @param variableName 变量名
|
|
367
|
+
* @param value 新值
|
|
368
|
+
*/
|
|
369
|
+
notifySystemVariableChange(variableName, value) {
|
|
370
|
+
const variableValue = {
|
|
371
|
+
variableName: variableName,
|
|
372
|
+
value: value,
|
|
373
|
+
state: 1 // Normal state
|
|
374
|
+
};
|
|
375
|
+
// 更新缓存
|
|
376
|
+
this.variableValueCache.set(variableName, variableValue);
|
|
377
|
+
// 通知所有订阅者
|
|
378
|
+
if (this.observers.has(variableName)) {
|
|
379
|
+
each(this.observers.get(variableName), ob => {
|
|
380
|
+
ob.next([variableValue]);
|
|
381
|
+
});
|
|
382
|
+
}
|
|
383
|
+
}
|
|
384
|
+
dispose() {
|
|
385
|
+
// TODO调用所有的ob.complete()。
|
|
386
|
+
this.connectedSubscription.unsubscribe();
|
|
387
|
+
this.variableStatesChangedSubscription.unsubscribe();
|
|
388
|
+
this.variableValuesChangedSubscription.unsubscribe();
|
|
389
|
+
this.virtualDeviceStatesChangedSubscription.unsubscribe();
|
|
390
|
+
this.alarmChangedSubscription.unsubscribe();
|
|
391
|
+
if (this.logger && this.logger.isDebugEnabled()) {
|
|
392
|
+
this.logger.debug('[VariableCommunicator] RemoteVariableCommunicator disposed.');
|
|
393
|
+
}
|
|
394
|
+
}
|
|
395
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
[{"__symbolic":"module","version":4,"metadata":{"RemoteVariableCommunicator":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"./remote-variable-protocol","name":"RemoteVariableProtocol","line":
|
|
1
|
+
[{"__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"}]}}}}]
|