@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.
Files changed (567) hide show
  1. package/CHANGELOG.md +492 -69
  2. package/README.md +4 -4
  3. package/assets/img/alert.svg +18 -18
  4. package/assets/img/black_first_page.png +0 -0
  5. package/assets/img/black_last_page.png +0 -0
  6. package/assets/img/black_next_page.png +0 -0
  7. package/assets/img/black_previous_page.png +0 -0
  8. package/assets/img/first_page.svg +19 -19
  9. package/assets/img/last_page.svg +19 -19
  10. package/assets/img/next_page.svg +14 -14
  11. package/assets/img/previous_page.svg +14 -14
  12. package/bundles/@flexem/fc-gui.umd.js +25472 -20764
  13. package/bundles/@flexem/fc-gui.umd.js.map +1 -1
  14. package/bundles/@flexem/fc-gui.umd.min.js +5 -5
  15. package/bundles/@flexem/fc-gui.umd.min.js.map +1 -1
  16. package/communication/index.d.ts +1 -1
  17. package/communication/index.js +1 -1
  18. package/communication/variable/index.d.ts +5 -5
  19. package/communication/variable/index.js +4 -4
  20. package/communication/variable/variable-communicator.d.ts +16 -12
  21. package/communication/variable/variable-definition.d.ts +10 -10
  22. package/communication/variable/variable-definition.js +14 -14
  23. package/communication/variable/variable-state-enum.d.ts +8 -7
  24. package/communication/variable/variable-state-enum.js +9 -8
  25. package/communication/variable/variable-state-enum.metadata.json +1 -1
  26. package/communication/variable/variable-state.d.ts +6 -6
  27. package/communication/variable/variable-state.js +6 -6
  28. package/communication/variable/variable-value.d.ts +11 -8
  29. package/communication/variable/variable-value.js +11 -8
  30. package/communication/variable/variable-value.metadata.json +1 -1
  31. package/config/alarm/alarm.store.d.ts +6 -0
  32. package/config/alarm/alarm.store.js +0 -0
  33. package/config/alarm/alarm.store.metadata.json +1 -0
  34. package/config/alarm/get-alarms-args.d.ts +12 -0
  35. package/config/alarm/get-alarms-args.js +13 -0
  36. package/config/alarm/get-alarms-args.metadata.json +1 -0
  37. package/config/alarm/index.d.ts +2 -0
  38. package/config/alarm/index.js +1 -0
  39. package/config/alarm/index.metadata.json +1 -0
  40. package/config/config-store.d.ts +17 -15
  41. package/config/graph/graph-result.d.ts +9 -9
  42. package/config/graph/graph-result.js +13 -13
  43. package/config/graph/graph-store.d.ts +9 -9
  44. package/config/graph/graph-type.d.ts +4 -4
  45. package/config/graph/graph-type.js +5 -5
  46. package/config/graph/graph.d.ts +6 -6
  47. package/config/graph/graph.js +6 -6
  48. package/config/gui-feature-config.d.ts +3 -0
  49. package/config/gui-feature-config.js +3 -0
  50. package/config/gui-feature-config.metadata.json +1 -0
  51. package/config/history-data/get-history-data-args.d.ts +22 -22
  52. package/config/history-data/get-history-data-args.js +21 -21
  53. package/config/history-data/historical-curve.time-range.d.ts +18 -18
  54. package/config/history-data/historical-curve.time-range.js +19 -19
  55. package/config/history-data/history-data-value.d.ts +6 -6
  56. package/config/history-data/history-data-value.js +6 -6
  57. package/config/history-data/history-data.model.d.ts +7 -7
  58. package/config/history-data/history-data.model.js +7 -7
  59. package/config/history-data/history-data.store.d.ts +10 -10
  60. package/config/history-data/index.d.ts +4 -4
  61. package/config/history-data/index.js +3 -3
  62. package/config/image/image-store.d.ts +6 -6
  63. package/config/index.d.ts +12 -10
  64. package/config/index.js +8 -6
  65. package/config/index.metadata.json +1 -1
  66. package/config/variable/get-variable-name-args.d.ts +6 -6
  67. package/config/variable/get-variable-name-args.js +7 -7
  68. package/config/variable/index.d.ts +2 -2
  69. package/config/variable/index.js +1 -1
  70. package/config/variable/variable-store.d.ts +8 -7
  71. package/config/view/view-store.d.ts +20 -20
  72. package/config/view/view.model.d.ts +4 -4
  73. package/config/view/view.model.js +5 -5
  74. package/core/index.d.ts +1 -1
  75. package/core/index.js +1 -1
  76. package/core/stringifying-map.d.ts +11 -11
  77. package/core/stringifying-map.js +24 -24
  78. package/core/stringifying-set.d.ts +10 -10
  79. package/core/stringifying-set.js +21 -21
  80. package/elements/air-quality/air-quality-element.d.ts +31 -0
  81. package/elements/air-quality/air-quality-element.js +194 -0
  82. package/elements/air-quality/air-quality-element.metadata.json +1 -0
  83. package/elements/alarm/alarm-element.d.ts +69 -0
  84. package/elements/alarm/alarm-element.js +497 -0
  85. package/elements/alarm/alarm-element.metadata.json +1 -0
  86. package/elements/bar-graph-element.d.ts +29 -21
  87. package/elements/bar-graph-element.js +244 -114
  88. package/elements/bar-graph-element.metadata.json +1 -1
  89. package/elements/base/base-element.d.ts +11 -11
  90. package/elements/base/base-element.js +9 -9
  91. package/elements/base/conditional-control-element.d.ts +16 -16
  92. package/elements/base/conditional-control-element.js +87 -87
  93. package/elements/base/conditional-display-element.d.ts +24 -24
  94. package/elements/base/conditional-display-element.js +86 -86
  95. package/elements/base/conditional-dynamic-display-element.d.ts +26 -26
  96. package/elements/base/conditional-dynamic-display-element.js +142 -142
  97. package/elements/base/conditional-enable-element.d.ts +21 -21
  98. package/elements/base/conditional-enable-element.js +100 -100
  99. package/elements/base/index.d.ts +3 -3
  100. package/elements/base/index.js +3 -3
  101. package/elements/base/readable-element.d.ts +20 -15
  102. package/elements/base/readable-element.js +122 -58
  103. package/elements/base/readable-element.metadata.json +1 -1
  104. package/elements/base/state-control-element.d.ts +26 -24
  105. package/elements/base/state-control-element.js +196 -180
  106. package/elements/character-display/character-display-element.d.ts +35 -35
  107. package/elements/character-display/character-display-element.js +312 -311
  108. package/elements/character-display/character-display-element.metadata.json +1 -1
  109. package/elements/datetime-display/datetime-display-element.d.ts +22 -21
  110. package/elements/datetime-display/datetime-display-element.js +140 -132
  111. package/elements/datetime-display/datetime-display-element.metadata.json +1 -1
  112. package/elements/datetime-display/time-zone-select-json.d.ts +8 -0
  113. package/elements/datetime-display/time-zone-select-json.js +558 -0
  114. package/elements/historical-curve/historical-curve-element-status.d.ts +6 -6
  115. package/elements/historical-curve/historical-curve-element-status.js +7 -7
  116. package/elements/historical-curve/historical-curve.element.d.ts +96 -59
  117. package/elements/historical-curve/historical-curve.element.js +990 -364
  118. package/elements/historical-curve/historical-curve.element.metadata.json +1 -1
  119. package/elements/historical-curve/historical-curve.element.option.d.ts +13 -13
  120. package/elements/historical-curve/historical-curve.time-period.d.ts +4 -4
  121. package/elements/main-element.d.ts +46 -45
  122. package/elements/main-element.js +373 -307
  123. package/elements/main-element.metadata.json +1 -1
  124. package/elements/meter-element.d.ts +26 -20
  125. package/elements/meter-element.js +139 -70
  126. package/elements/meter-element.metadata.json +1 -1
  127. package/elements/numerical-display/numerical-display-element.d.ts +60 -41
  128. package/elements/numerical-display/numerical-display-element.js +476 -361
  129. package/elements/numerical-display/numerical-display-element.metadata.json +1 -1
  130. package/elements/per-view-variable-communicator.d.ts +20 -17
  131. package/elements/per-view-variable-communicator.js +59 -45
  132. package/elements/per-view-variable-communicator.metadata.json +1 -1
  133. package/elements/pipe/pipe-element.d.ts +19 -19
  134. package/elements/pipe/pipe-element.js +141 -141
  135. package/elements/ring-graph/ring-graph-element.d.ts +31 -19
  136. package/elements/ring-graph/ring-graph-element.js +250 -89
  137. package/elements/ring-graph/ring-graph-element.metadata.json +1 -1
  138. package/elements/scroll-alarm/scroll-alarm-element.d.ts +74 -0
  139. package/elements/scroll-alarm/scroll-alarm-element.js +761 -0
  140. package/elements/scroll-alarm/scroll-alarm-element.metadata.json +1 -0
  141. package/elements/shared/graph/graph-state-element.d.ts +28 -27
  142. package/elements/shared/graph/graph-state-element.js +139 -110
  143. package/elements/shared/graph/graph-state-element.metadata.json +1 -1
  144. package/elements/shared/math-utils.d.ts +2 -2
  145. package/elements/shared/math-utils.js +14 -14
  146. package/elements/shared/text/text-element.d.ts +22 -8
  147. package/elements/shared/text/text-element.js +106 -68
  148. package/elements/shared/text/text-element.metadata.json +1 -1
  149. package/elements/shared/text/text-state-element.d.ts +58 -23
  150. package/elements/shared/text/text-state-element.js +286 -136
  151. package/elements/shared/text/text-state-element.metadata.json +1 -1
  152. package/elements/shared/text/text-state.model.d.ts +5 -5
  153. package/elements/shared/text/text-utils.d.ts +5 -5
  154. package/elements/shared/text/text-utils.js +45 -45
  155. package/elements/static-elements/hyperlink-element.d.ts +40 -14
  156. package/elements/static-elements/hyperlink-element.js +197 -48
  157. package/elements/static-elements/hyperlink-element.metadata.json +1 -1
  158. package/elements/static-elements/image-element.d.ts +14 -14
  159. package/elements/static-elements/image-element.js +41 -41
  160. package/elements/static-elements/text-element.d.ts +42 -16
  161. package/elements/static-elements/text-element.js +205 -55
  162. package/elements/static-elements/text-element.metadata.json +1 -1
  163. package/elements/switch-indicator-light/bit-indicator-light-operator.d.ts +21 -20
  164. package/elements/switch-indicator-light/bit-indicator-light-operator.js +85 -78
  165. package/elements/switch-indicator-light/bit-indicator-light-operator.metadata.json +1 -1
  166. package/elements/switch-indicator-light/bit-switch-operator.d.ts +19 -19
  167. package/elements/switch-indicator-light/bit-switch-operator.js +107 -107
  168. package/elements/switch-indicator-light/current-stateId-value.d.ts +6 -6
  169. package/elements/switch-indicator-light/current-stateId-value.js +8 -8
  170. package/elements/switch-indicator-light/indicator-light-operator.d.ts +8 -8
  171. package/elements/switch-indicator-light/switch-indicator-light-element.d.ts +48 -39
  172. package/elements/switch-indicator-light/switch-indicator-light-element.js +302 -251
  173. package/elements/switch-indicator-light/switch-indicator-light-element.metadata.json +1 -1
  174. package/elements/switch-indicator-light/switch-operator.d.ts +6 -6
  175. package/elements/switch-indicator-light/word-indicator-light-operator.d.ts +19 -18
  176. package/elements/switch-indicator-light/word-indicator-light-operator.js +72 -65
  177. package/elements/switch-indicator-light/word-indicator-light-operator.metadata.json +1 -1
  178. package/elements/switch-indicator-light/word-switch-operator.d.ts +18 -18
  179. package/elements/switch-indicator-light/word-switch-operator.js +75 -75
  180. package/elements/table/table-element.d.ts +9 -9
  181. package/elements/table/table-element.js +6 -6
  182. package/elements/vector-graphics/ellipse-element.d.ts +9 -9
  183. package/elements/vector-graphics/ellipse-element.js +6 -6
  184. package/elements/vector-graphics/poly-line-element.d.ts +12 -12
  185. package/elements/vector-graphics/poly-line-element.js +19 -19
  186. package/elements/vector-graphics/polygon-element.d.ts +12 -12
  187. package/elements/vector-graphics/polygon-element.js +19 -19
  188. package/elements/vector-graphics/rectangle-element.d.ts +9 -9
  189. package/elements/vector-graphics/rectangle-element.js +6 -6
  190. package/elements/vector-graphics/sector-element.d.ts +9 -9
  191. package/elements/vector-graphics/sector-element.js +6 -6
  192. package/elements/vector-graphics/straight-line-element.d.ts +12 -12
  193. package/elements/vector-graphics/straight-line-element.js +19 -19
  194. package/elements/video/video-element.d.ts +37 -27
  195. package/elements/video/video-element.js +258 -160
  196. package/elements/video/video-element.metadata.json +1 -1
  197. package/elements/view-operation/view-operation.element.d.ts +62 -36
  198. package/elements/view-operation/view-operation.element.js +348 -194
  199. package/elements/view-operation/view-operation.element.metadata.json +1 -1
  200. package/elements/weather/weater-element.d.ts +38 -38
  201. package/elements/weather/weater-element.js +237 -238
  202. package/gui/gui-context.d.ts +33 -16
  203. package/gui/gui-host.d.ts +50 -50
  204. package/gui/gui-host.js +173 -173
  205. package/gui/gui-view.d.ts +45 -42
  206. package/gui/gui-view.js +265 -204
  207. package/gui/gui-view.metadata.json +1 -1
  208. package/gui/gui.component.d.ts +45 -42
  209. package/gui/gui.component.html +3 -3
  210. package/gui/gui.component.js +240 -227
  211. package/gui/gui.component.metadata.json +1 -1
  212. package/gui/interfaces/gui-options.d.ts +6 -6
  213. package/gui.module.d.ts +2 -2
  214. package/gui.module.js +78 -78
  215. package/localization/index.d.ts +2 -2
  216. package/localization/index.js +2 -2
  217. package/localization/localization.service.d.ts +62 -51
  218. package/localization/localization.service.js +61 -50
  219. package/localization/localization.service.metadata.json +1 -1
  220. package/localization/localization.service.zh_CN.d.ts +2 -2
  221. package/localization/localization.service.zh_CN.js +59 -48
  222. package/localization/localization.service.zh_CN.metadata.json +1 -1
  223. package/logger/console-logger.service.d.ts +13 -13
  224. package/logger/console-logger.service.js +38 -38
  225. package/logger/index.d.ts +2 -2
  226. package/logger/index.js +2 -2
  227. package/logger/logger.service.d.ts +14 -14
  228. package/logger/logger.service.js +2 -2
  229. package/modal/alert/alert-modal.component.d.ts +10 -10
  230. package/modal/alert/alert-modal.component.html +11 -11
  231. package/modal/alert/alert-modal.component.js +38 -38
  232. package/modal/alert/alert-modal.component.less +59 -59
  233. package/modal/confirm-operation/confirm-operation-modal.component.d.ts +10 -10
  234. package/modal/confirm-operation/confirm-operation-modal.component.html +16 -16
  235. package/modal/confirm-operation/confirm-operation-modal.component.js +41 -41
  236. package/modal/confirm-operation/confirm-operation-modal.component.less +58 -58
  237. package/modal/verify-password/verify-password-modal.component.d.ts +18 -18
  238. package/modal/verify-password/verify-password-modal.component.html +22 -22
  239. package/modal/verify-password/verify-password-modal.component.js +66 -66
  240. package/modal/verify-password/verify-password-modal.component.less +65 -65
  241. package/modal/write-character/write-character-modal-args.d.ts +7 -7
  242. package/modal/write-character/write-character-modal-args.js +8 -8
  243. package/modal/write-character/write-character-modal.component.d.ts +25 -25
  244. package/modal/write-character/write-character-modal.component.html +21 -21
  245. package/modal/write-character/write-character-modal.component.js +74 -74
  246. package/modal/write-character/write-character-modal.component.less +49 -49
  247. package/modal/write-value/write-value-modal-args.d.ts +16 -12
  248. package/modal/write-value/write-value-modal-args.js +14 -12
  249. package/modal/write-value/write-value-modal-args.metadata.json +1 -1
  250. package/modal/write-value/write-value-modal.component.d.ts +60 -54
  251. package/modal/write-value/write-value-modal.component.html +26 -21
  252. package/modal/write-value/write-value-modal.component.js +279 -204
  253. package/modal/write-value/write-value-modal.component.less +56 -56
  254. package/modal/write-value/write-value-modal.component.metadata.json +1 -1
  255. package/modal/write-value/write-value-model-result.d.ts +3 -3
  256. package/model/air-quality/air-quality-info.d.ts +23 -0
  257. package/model/air-quality/air-quality-info.js +4 -0
  258. package/model/air-quality/air-quality-info.metadata.json +1 -0
  259. package/model/air-quality/air-quality.model.d.ts +7 -0
  260. package/model/air-quality/air-quality.model.js +0 -0
  261. package/model/air-quality/air-quality.model.metadata.json +1 -0
  262. package/model/alarm/alarm.model.d.ts +13 -0
  263. package/model/alarm/alarm.model.js +0 -0
  264. package/model/alarm/alarm.model.metadata.json +1 -0
  265. package/model/bar-graph/FontStyleData.d.ts +7 -7
  266. package/model/bar-graph/bar-graph-direction.d.ts +6 -6
  267. package/model/bar-graph/bar-graph-direction.js +7 -7
  268. package/model/bar-graph/bar-graph.d.ts +26 -22
  269. package/model/base/base-element-model.d.ts +5 -5
  270. package/model/base/base-element-model.js +2 -2
  271. package/model/base/conditional-control-model.d.ts +6 -6
  272. package/model/base/conditional-display-model.d.ts +9 -9
  273. package/model/base/conditional-dynamic-display-model.d.ts +13 -13
  274. package/model/base/conditional-enable-model.d.ts +9 -9
  275. package/model/base/font-setting-model.d.ts +29 -8
  276. package/model/base/font-setting-model.metadata.json +1 -1
  277. package/model/base/index.d.ts +7 -7
  278. package/model/base/index.js +1 -1
  279. package/model/base/readable-model.d.ts +14 -10
  280. package/model/base/security-model.d.ts +6 -6
  281. package/model/character-display/character-display.d.ts +19 -19
  282. package/model/datetime-display/date-format-type.d.ts +5 -5
  283. package/model/datetime-display/date-format-type.js +6 -6
  284. package/model/datetime-display/datetime-display-settings.d.ts +17 -17
  285. package/model/datetime-display/datetime-display.d.ts +21 -20
  286. package/model/datetime-display/datetime-separator-type.d.ts +6 -6
  287. package/model/datetime-display/datetime-separator-type.js +7 -7
  288. package/model/datetime-display/time-format-type.d.ts +4 -4
  289. package/model/datetime-display/time-format-type.js +5 -5
  290. package/model/historical-curve/curve-type.d.ts +5 -5
  291. package/model/historical-curve/curve-type.js +6 -6
  292. package/model/historical-curve/historical-curve-axis-settings.d.ts +17 -6
  293. package/model/historical-curve/historical-curve-axis-settings.js +5 -0
  294. package/model/historical-curve/historical-curve-axis-settings.metadata.json +1 -1
  295. package/model/historical-curve/historical-curve-chanel.model.d.ts +22 -14
  296. package/model/historical-curve/historical-curve.data-settings.d.ts +9 -9
  297. package/model/historical-curve/historical-curve.display-settings.d.ts +19 -19
  298. package/model/historical-curve/historical-curve.model.d.ts +8 -8
  299. package/model/historical-curve/index.d.ts +4 -4
  300. package/model/hyperlink/hyperlink.model.d.ts +8 -8
  301. package/model/image/image-fill-type.d.ts +4 -4
  302. package/model/image/image-fill-type.js +5 -5
  303. package/model/image/image.d.ts +9 -9
  304. package/model/index.d.ts +15 -15
  305. package/model/index.js +8 -8
  306. package/model/meter/meter.d.ts +17 -13
  307. package/model/numerical-display/index.d.ts +8 -8
  308. package/model/numerical-display/index.js +2 -2
  309. package/model/numerical-display/numerical-display.d.ts +29 -29
  310. package/model/numerical-display/numerical-operation-settings.d.ts +6 -6
  311. package/model/numerical-display/numerical-operation-type.d.ts +4 -4
  312. package/model/numerical-display/numerical-operation-type.js +5 -5
  313. package/model/numerical-display/numerical-operation.d.ts +19 -11
  314. package/model/numerical-display/proportional-conversion.d.ts +4 -4
  315. package/model/numerical-display/type-settings.d.ts +6 -6
  316. package/model/numerical-display/zoom.d.ts +4 -4
  317. package/model/pipe/flow-direction-type.d.ts +4 -4
  318. package/model/pipe/flow-direction-type.js +5 -5
  319. package/model/pipe/index.d.ts +2 -2
  320. package/model/pipe/index.js +1 -1
  321. package/model/pipe/pipe.d.ts +17 -17
  322. package/model/poly-line/poly-line-model.d.ts +4 -4
  323. package/model/polygon/polygon-model.d.ts +4 -4
  324. package/model/ring-graph/ring-graph.model.d.ts +33 -25
  325. package/model/scroll-alarm/scroll-alarm.model.d.ts +21 -0
  326. package/model/scroll-alarm/scroll-alarm.model.js +0 -0
  327. package/model/scroll-alarm/scroll-alarm.model.metadata.json +1 -0
  328. package/model/settings/background/view-background-fill-type.d.ts +5 -5
  329. package/model/settings/background/view-background-fill-type.js +6 -6
  330. package/model/settings/background/view-background.model.d.ts +8 -8
  331. package/model/settings/index.d.ts +3 -3
  332. package/model/settings/index.js +2 -2
  333. package/model/settings/popup/view-popup-backdrop-type.d.ts +4 -4
  334. package/model/settings/popup/view-popup-backdrop-type.js +5 -5
  335. package/model/settings/popup/view-popup-location-type.d.ts +4 -4
  336. package/model/settings/popup/view-popup-location-type.js +5 -5
  337. package/model/settings/popup/view-popup-setting.model.d.ts +17 -17
  338. package/model/settings/popup/view-popup-setting.model.js +2 -2
  339. package/model/settings/view-settings.model.d.ts +6 -6
  340. package/model/shared/alarm/alarm-range.model.d.ts +6 -6
  341. package/model/shared/arc.model.d.ts +4 -4
  342. package/model/shared/binary.d.ts +7 -7
  343. package/model/shared/binary.js +37 -37
  344. package/model/shared/condition/bit-condition-item-observer.d.ts +14 -14
  345. package/model/shared/condition/bit-condition-item-observer.js +53 -53
  346. package/model/shared/condition/bit-condition-logic.d.ts +4 -4
  347. package/model/shared/condition/bit-condition-logic.js +5 -5
  348. package/model/shared/condition/bit-condition-model.d.ts +8 -8
  349. package/model/shared/condition/bit-condition.d.ts +4 -4
  350. package/model/shared/condition/condition-control-result-value.d.ts +5 -5
  351. package/model/shared/condition/condition-helper.d.ts +4 -4
  352. package/model/shared/condition/condition-helper.js +22 -22
  353. package/model/shared/condition/condition-item-model.d.ts +10 -10
  354. package/model/shared/condition/condition-item-observer.d.ts +12 -12
  355. package/model/shared/condition/condition-item-observer.js +14 -14
  356. package/model/shared/condition/condition-items-observer.d.ts +5 -5
  357. package/model/shared/condition/condition-items-result-observer.d.ts +16 -16
  358. package/model/shared/condition/condition-items-result-observer.js +87 -87
  359. package/model/shared/condition/condition-model.d.ts +6 -6
  360. package/model/shared/condition/condition-type.d.ts +4 -4
  361. package/model/shared/condition/condition-type.js +5 -5
  362. package/model/shared/condition/convert-condition-model.d.ts +5 -5
  363. package/model/shared/condition/index.d.ts +11 -11
  364. package/model/shared/condition/index.js +4 -4
  365. package/model/shared/condition/relation-condition-result-state.d.ts +6 -6
  366. package/model/shared/condition/relation-condition-result-state.js +8 -8
  367. package/model/shared/condition/relation-condition-result.d.ts +8 -8
  368. package/model/shared/condition/relation-condition-result.js +7 -7
  369. package/model/shared/condition/relation-type.d.ts +5 -5
  370. package/model/shared/condition/relation-type.js +6 -6
  371. package/model/shared/condition/relational-operator.d.ts +8 -8
  372. package/model/shared/condition/relational-operator.js +9 -9
  373. package/model/shared/condition/variable-value-logic-model.d.ts +11 -11
  374. package/model/shared/condition/variable-value-type.d.ts +4 -4
  375. package/model/shared/condition/variable-value-type.js +5 -5
  376. package/model/shared/condition/word-condition-item-observer.d.ts +21 -21
  377. package/model/shared/condition/word-condition-item-observer.js +165 -165
  378. package/model/shared/condition/word-condition-model.d.ts +8 -8
  379. package/model/shared/condition/word-condition.d.ts +5 -5
  380. package/model/shared/data-type/display-data-type.d.ts +5 -5
  381. package/model/shared/data-type/display-data-type.js +6 -6
  382. package/model/shared/data-type/fbox-data-type.d.ts +15 -15
  383. package/model/shared/data-type/fbox-data-type.js +16 -16
  384. package/model/shared/data-type/fcloud-data-Type.d.ts +8 -8
  385. package/model/shared/data-type/fcloud-data-Type.js +9 -9
  386. package/model/shared/dynamic-display/dynamic-behavior-type.d.ts +5 -5
  387. package/model/shared/dynamic-display/dynamic-behavior-type.js +6 -6
  388. package/model/shared/dynamic-display/dynamic-display-behavior-model.d.ts +5 -5
  389. package/model/shared/dynamic-display/dynamic-display-model.d.ts +10 -10
  390. package/model/shared/dynamic-display/dynamic-display-result-model.d.ts +7 -7
  391. package/model/shared/dynamic-display/dynamic-display-result-model.js +7 -7
  392. package/model/shared/dynamic-display/dynamic-display.d.ts +11 -11
  393. package/model/shared/dynamic-display/dynamic-display.js +35 -35
  394. package/model/shared/graph/custom-style.d.ts +14 -14
  395. package/model/shared/graph/graph-setting.d.ts +10 -10
  396. package/model/shared/index.d.ts +8 -8
  397. package/model/shared/index.js +3 -3
  398. package/model/shared/point.model.d.ts +4 -4
  399. package/model/shared/rotation/rotation-behavior-model.d.ts +4 -4
  400. package/model/shared/rotation/rotation-behavior.d.ts +9 -9
  401. package/model/shared/rotation/rotation-behavior.js +101 -101
  402. package/model/shared/rotation/rotation-direction-type.d.ts +4 -4
  403. package/model/shared/rotation/rotation-direction-type.js +5 -5
  404. package/model/shared/rotation/rotation-model.d.ts +14 -14
  405. package/model/shared/rotation/rotation-observer-model.d.ts +4 -4
  406. package/model/shared/rotation/rotation-observer.d.ts +11 -11
  407. package/model/shared/rotation/rotation-observer.js +28 -28
  408. package/model/shared/scale/scale-mark.model.d.ts +6 -6
  409. package/model/shared/scale/scale-model.d.ts +20 -20
  410. package/model/shared/size.model.d.ts +7 -7
  411. package/model/shared/size.model.js +12 -12
  412. package/model/shared/state/index.d.ts +1 -1
  413. package/model/shared/state/index.js +1 -1
  414. package/model/shared/state/state.d.ts +9 -8
  415. package/model/shared/state/state.js +10 -9
  416. package/model/shared/state/state.metadata.json +1 -1
  417. package/model/shared/text/font.d.ts +10 -10
  418. package/model/shared/text/index.d.ts +2 -2
  419. package/model/shared/text/text.d.ts +8 -5
  420. package/model/shared/translation/translation-behavior-model.d.ts +4 -4
  421. package/model/shared/translation/translation-behavior.d.ts +12 -12
  422. package/model/shared/translation/translation-behavior.js +63 -63
  423. package/model/shared/translation/translation-direction-type.d.ts +4 -4
  424. package/model/shared/translation/translation-direction-type.js +5 -5
  425. package/model/shared/translation/translation-model.d.ts +12 -12
  426. package/model/shared/translation/translation-observer-model.d.ts +4 -4
  427. package/model/shared/translation/translation-observer.d.ts +10 -10
  428. package/model/shared/translation/translation-observer.js +27 -27
  429. package/model/shared/variable/variable-identifier.model.d.ts +5 -5
  430. package/model/shared/variable/variable-name.model.d.ts +5 -5
  431. package/model/straight-line/straight-line-model.d.ts +4 -4
  432. package/model/switch-indicator-light/bit-indicator-light-settings.d.ts +8 -8
  433. package/model/switch-indicator-light/bit-switch-operation.d.ts +6 -6
  434. package/model/switch-indicator-light/bit-switch-operation.js +7 -7
  435. package/model/switch-indicator-light/bit-switch-settings.d.ts +11 -11
  436. package/model/switch-indicator-light/fault-flicker.d.ts +5 -5
  437. package/model/switch-indicator-light/flicker.d.ts +5 -5
  438. package/model/switch-indicator-light/flicker.js +6 -6
  439. package/model/switch-indicator-light/index.d.ts +14 -14
  440. package/model/switch-indicator-light/index.js +5 -5
  441. package/model/switch-indicator-light/indicator-light-fault-flicker.d.ts +5 -5
  442. package/model/switch-indicator-light/indicator-light-settings.d.ts +7 -7
  443. package/model/switch-indicator-light/indicator-light-type.d.ts +4 -4
  444. package/model/switch-indicator-light/indicator-light-type.js +5 -5
  445. package/model/switch-indicator-light/switch-indicator-light.d.ts +35 -33
  446. package/model/switch-indicator-light/switch-indicator-state.d.ts +8 -8
  447. package/model/switch-indicator-light/switch-settings.d.ts +7 -7
  448. package/model/switch-indicator-light/switch-type.d.ts +4 -4
  449. package/model/switch-indicator-light/switch-type.js +5 -5
  450. package/model/switch-indicator-light/word-indicator-light-settings.d.ts +6 -6
  451. package/model/switch-indicator-light/word-switch-operation.d.ts +5 -5
  452. package/model/switch-indicator-light/word-switch-operation.js +6 -6
  453. package/model/switch-indicator-light/word-switch-settings.d.ts +13 -13
  454. package/model/table/table-model.d.ts +9 -9
  455. package/model/text/text.model.d.ts +7 -7
  456. package/model/video/video.model.d.ts +8 -8
  457. package/model/view-operation/index.d.ts +2 -2
  458. package/model/view-operation/index.js +1 -1
  459. package/model/view-operation/view-operation-element.model.d.ts +25 -19
  460. package/model/view-operation/view-operation-type.d.ts +18 -18
  461. package/model/view-operation/view-operation-type.js +19 -19
  462. package/model/weather/weather-info.d.ts +11 -11
  463. package/model/weather/weather-info.js +2 -2
  464. package/model/weather/weather.model.d.ts +7 -7
  465. package/package.json +1 -1
  466. package/public_api.d.ts +14 -14
  467. package/public_api.js +12 -11
  468. package/remote/communication/variable/remote-variable-communicator.d.ts +59 -30
  469. package/remote/communication/variable/remote-variable-communicator.js +395 -215
  470. package/remote/communication/variable/remote-variable-communicator.metadata.json +1 -1
  471. package/remote/communication/variable/remote-variable-protocol.d.ts +18 -13
  472. package/remote/config/graph/get-released-graph-state-result.d.ts +6 -6
  473. package/remote/config/graph/get-released-graph-states.d.ts +4 -4
  474. package/remote/config/graph/graph-state-key.d.ts +6 -6
  475. package/remote/config/graph/graph-state-result.d.ts +5 -5
  476. package/remote/config/graph/graph-state.d.ts +4 -4
  477. package/remote/config/graph/remote-graph-protocol.d.ts +11 -11
  478. package/remote/config/graph/remote-graph-store.d.ts +16 -16
  479. package/remote/config/graph/remote-graph-store.js +101 -101
  480. package/remote/config/image/remote-image-protocol.d.ts +4 -4
  481. package/remote/config/image/remote-image-store.d.ts +8 -8
  482. package/remote/config/image/remote-image-store.js +19 -19
  483. package/remote/config/view/remote-view-protocol.d.ts +8 -8
  484. package/remote/config/view/remote-view-store.d.ts +13 -13
  485. package/remote/config/view/remote-view-store.js +39 -39
  486. package/remote/config/view/view-result.d.ts +4 -4
  487. package/remote/index.d.ts +14 -14
  488. package/remote/index.js +4 -4
  489. package/security/index.d.ts +1 -1
  490. package/security/security-checker.d.ts +3 -3
  491. package/service/index.d.ts +8 -4
  492. package/service/index.js +1 -0
  493. package/service/index.metadata.json +1 -1
  494. package/service/language.service.d.ts +37 -0
  495. package/service/language.service.js +0 -0
  496. package/service/language.service.metadata.json +1 -0
  497. package/service/operation-record/create-operation-record-args.d.ts +5 -5
  498. package/service/operation-record/index.d.ts +3 -3
  499. package/service/operation-record/operation-record.service.d.ts +4 -4
  500. package/service/operation-record/variable-option.model.d.ts +5 -5
  501. package/service/permission-checker.d.ts +3 -3
  502. package/service/released-variable/index.d.ts +1 -0
  503. package/service/released-variable/index.js +0 -0
  504. package/service/released-variable/index.metadata.json +1 -0
  505. package/service/released-variable/released-variable.service.d.ts +4 -0
  506. package/service/released-variable/released-variable.service.js +0 -0
  507. package/service/released-variable/released-variable.service.metadata.json +1 -0
  508. package/service/system-text-library.service.d.ts +77 -0
  509. package/service/system-text-library.service.js +29 -0
  510. package/service/system-text-library.service.metadata.json +1 -0
  511. package/service/text-library.service.d.ts +49 -0
  512. package/service/text-library.service.js +0 -0
  513. package/service/text-library.service.metadata.json +1 -0
  514. package/service/video/index.d.ts +2 -2
  515. package/service/video/video-url.d.ts +4 -4
  516. package/service/video/video.service.d.ts +4 -4
  517. package/service/weather.service.d.ts +4 -3
  518. package/settings/display-mode.d.ts +10 -10
  519. package/settings/display-mode.js +11 -11
  520. package/settings/global-settings.d.ts +7 -7
  521. package/settings/global-settings.js +13 -13
  522. package/settings/index.d.ts +3 -3
  523. package/settings/index.js +3 -3
  524. package/settings/view-resize-mode.d.ts +10 -10
  525. package/settings/view-resize-mode.js +11 -11
  526. package/shared/config-is-empty-error.d.ts +3 -3
  527. package/shared/config-is-empty-error.js +7 -7
  528. package/shared/disposable.d.ts +3 -3
  529. package/shared/graph-extended-style.d.ts +4 -4
  530. package/shared/gui-consts.d.ts +33 -30
  531. package/shared/gui-consts.js +33 -30
  532. package/shared/gui-consts.metadata.json +1 -1
  533. package/shared/index.d.ts +5 -5
  534. package/shared/index.js +3 -3
  535. package/shared/operation-helper.d.ts +6 -6
  536. package/shared/operation-helper.js +38 -38
  537. package/utils/access-permission.d.ts +5 -5
  538. package/utils/access-permission.js +6 -6
  539. package/utils/access-permission.service.d.ts +11 -11
  540. package/utils/access-permission.service.js +30 -30
  541. package/utils/auto-focus.directive.d.ts +6 -6
  542. package/utils/auto-focus.directive.js +27 -27
  543. package/utils/bs-modal-drag.directive.d.ts +7 -7
  544. package/utils/bs-modal-drag.directive.js +38 -38
  545. package/utils/data-type/data-type.service.d.ts +57 -57
  546. package/utils/data-type/data-type.service.js +155 -155
  547. package/utils/data-type/fbox-data-type.service.d.ts +54 -54
  548. package/utils/data-type/fbox-data-type.service.js +300 -260
  549. package/utils/data-type/fcloud-data-type.service.d.ts +55 -55
  550. package/utils/data-type/fcloud-data-type.service.js +203 -203
  551. package/utils/fraction-digit.service.d.ts +41 -41
  552. package/utils/fraction-digit.service.js +133 -133
  553. package/utils/graph-util.d.ts +5 -5
  554. package/utils/graph-util.js +19 -19
  555. package/utils/guid.d.ts +6 -6
  556. package/utils/guid.js +27 -27
  557. package/utils/index.d.ts +7 -7
  558. package/utils/index.js +7 -7
  559. package/utils/numerical-operation-type.d.ts +4 -4
  560. package/utils/numerical-operation-type.js +5 -5
  561. package/utils/numerical-operation.service.d.ts +17 -17
  562. package/utils/numerical-operation.service.js +201 -177
  563. package/utils/variable-util.d.ts +5 -5
  564. package/utils/variable-util.js +11 -11
  565. package/view/popup-view.service.d.ts +7 -7
  566. package/view/view.service.d.ts +6 -6
  567. 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 { StringifyingMap } from '../../../core';
5
- export class RemoteVariableCommunicator {
6
- constructor(remoteVariableProtocol, logger) {
7
- this.remoteVariableProtocol = remoteVariableProtocol;
8
- this.logger = logger;
9
- this.observers = new Map();
10
- this.appIdVariablesMap = new Map();
11
- this.variableStateObservers = new Map();
12
- this.variableStateCache = new Map();
13
- this.variableValueCache = new StringifyingMap(k => JSON.stringify(k));
14
- this.connectedSubscription = this.remoteVariableProtocol.connected.subscribe(() => {
15
- const variableNamesToStart = [];
16
- this.variableStateObservers.forEach((__, variableName) => {
17
- variableNamesToStart.push(variableName);
18
- });
19
- this.remoteVariableProtocol.subscribeVariableStates(variableNamesToStart);
20
- this.appIdVariablesMap.forEach((variableNames, appId) => {
21
- this.remoteVariableProtocol.tryOpenVariables(variableNames, appId);
22
- });
23
- });
24
- this.doVariableStatesChanged();
25
- this.doVariableValuesChanged();
26
- }
27
- doVariableValuesChanged() {
28
- if (this.variableValuesChangedSubscription !== undefined) {
29
- this.variableValuesChangedSubscription.unsubscribe();
30
- }
31
- this.variableValuesChangedSubscription =
32
- this.remoteVariableProtocol.variableValuesChanged.subscribe((values) => {
33
- each(values, variableValue => {
34
- const variableName = variableValue.variableName;
35
- this.variableValueCache.set(variableName, variableValue);
36
- if (this.observers.has(variableName)) {
37
- each(this.observers.get(variableName), ob => {
38
- // TODO 同一个ob监听多个变量的情况,组合成数组一次推送。
39
- ob.next([variableValue]);
40
- });
41
- }
42
- });
43
- });
44
- }
45
- doVariableStatesChanged() {
46
- if (this.variableStatesChangedSubscription !== undefined) {
47
- this.variableStatesChangedSubscription.unsubscribe();
48
- }
49
- this.variableStatesChangedSubscription =
50
- this.remoteVariableProtocol.variableStatesChanged.subscribe((states) => {
51
- each(states, state => {
52
- const variableName = state.variableName;
53
- this.variableStateCache.set(variableName, state);
54
- if (this.variableStateObservers.has(variableName)) {
55
- each(this.variableStateObservers.get(variableName), ob => {
56
- // TODO 同一个ob监听多个变量的情况,组合成数组一次推送。
57
- ob.next([state]);
58
- });
59
- }
60
- });
61
- });
62
- }
63
- subscribeVariableStates(variableNames) {
64
- return new Observable(observer => {
65
- let variableNamesToStart = [];
66
- each(variableNames, variableName => {
67
- if (!this.variableStateObservers.has(variableName)) {
68
- this.variableStateObservers.set(variableName, []);
69
- variableNamesToStart.push(variableName);
70
- }
71
- else {
72
- if (this.variableStateCache.has(variableName)) {
73
- observer.next([this.variableStateCache.get(variableName)]);
74
- }
75
- }
76
- this.variableStateObservers.get(variableName).push(observer);
77
- });
78
- variableNamesToStart = uniq(variableNamesToStart);
79
- if (variableNamesToStart && variableNamesToStart.length > 0) {
80
- if (!this.variableStatesToBeOpened) {
81
- this.variableStatesToBeOpened = [];
82
- setTimeout(() => {
83
- this.remoteVariableProtocol.subscribeVariableStates(this.variableStatesToBeOpened);
84
- delete this.variableStatesToBeOpened;
85
- });
86
- }
87
- this.variableStatesToBeOpened.push(...variableNamesToStart);
88
- }
89
- return () => {
90
- const stopedVariableStates = [];
91
- each(variableNames, variableName => {
92
- const obs = this.variableStateObservers.get(variableName);
93
- if (obs) {
94
- remove(obs, item => item === observer);
95
- if (obs.length <= 0) {
96
- this.variableStateObservers.delete(variableName);
97
- stopedVariableStates.push(variableName);
98
- }
99
- }
100
- });
101
- if (!stopedVariableStates.length) {
102
- return;
103
- }
104
- if (!this.variableStatesToBeClosed) {
105
- this.variableStatesToBeClosed = [];
106
- setTimeout(() => {
107
- this.remoteVariableProtocol.unsubscribeVariableStates(this.variableStatesToBeClosed);
108
- delete this.variableStatesToBeClosed;
109
- });
110
- }
111
- this.variableStatesToBeClosed.push(...stopedVariableStates);
112
- };
113
- });
114
- }
115
- subscribeVariableState(variableName) {
116
- return this.subscribeVariableStates([variableName]).pipe(map(values => values[0]));
117
- }
118
- openVariables(variableNames, appId = '') {
119
- return new Observable(observer => {
120
- let variablesToStart = [];
121
- each(variableNames, variableName => {
122
- if (variableName) {
123
- if (!this.observers.has(variableName)) {
124
- this.observers.set(variableName, []);
125
- variablesToStart.push(variableName);
126
- }
127
- else {
128
- if (this.variableValueCache.has(variableName)) {
129
- observer.next([this.variableValueCache.get(variableName)]);
130
- }
131
- }
132
- this.observers.get(variableName).push(observer);
133
- if (!this.appIdVariablesMap.get(appId)) {
134
- this.appIdVariablesMap.set(appId, []);
135
- }
136
- else {
137
- if (this.appIdVariablesMap.get(appId).indexOf(variableName) === -1) {
138
- this.appIdVariablesMap.get(appId).push(variableName);
139
- }
140
- }
141
- }
142
- });
143
- variablesToStart = uniq(variablesToStart);
144
- if (variablesToStart && variablesToStart.length > 0) {
145
- if (!this.variablesToBeOpened) {
146
- this.variablesToBeOpened = [];
147
- setTimeout(() => {
148
- this.remoteVariableProtocol.tryOpenVariables(this.variablesToBeOpened, appId);
149
- delete this.variablesToBeOpened;
150
- });
151
- }
152
- this.variablesToBeOpened.push(...variablesToStart);
153
- }
154
- return () => {
155
- const stopedDataMonitorPoints = [];
156
- each(variableNames, variableName => {
157
- const obs = this.observers.get(variableName);
158
- if (obs) {
159
- remove(obs, item => item === observer);
160
- if (obs.length <= 0) {
161
- this.observers.delete(variableName);
162
- stopedDataMonitorPoints.push(variableName);
163
- }
164
- }
165
- });
166
- if (!stopedDataMonitorPoints.length) {
167
- return;
168
- }
169
- if (!this.variablesToBeClosed) {
170
- this.variablesToBeClosed = [];
171
- setTimeout(() => {
172
- this.remoteVariableProtocol.tryStopVariables(this.variablesToBeClosed, appId);
173
- delete this.variablesToBeClosed;
174
- });
175
- }
176
- this.variablesToBeClosed.push(...stopedDataMonitorPoints);
177
- };
178
- });
179
- }
180
- openVariable(variableName, appId = '') {
181
- if (!variableName) {
182
- return;
183
- }
184
- return this.openVariables([variableName], appId).pipe(map(values => values[0]));
185
- }
186
- write(variableName, value) {
187
- if (!variableName) {
188
- return;
189
- }
190
- this.remoteVariableProtocol.writeVariable(variableName, value);
191
- return new Observable(__ => {
192
- /* do nothing right now, if want value change immediately, can use this code below:
193
- observer.next(new VariableValue(variable, VariableStateEnum.DataNormal, value))*/
194
- });
195
- }
196
- writeWordByBit(variableName, index, value) {
197
- if (!variableName) {
198
- return;
199
- }
200
- this.remoteVariableProtocol.writeVariableWordByBit(variableName, index, value);
201
- return new Observable(__ => {
202
- /* do nothing right now, if want value change immediately, can use this code below:
203
- observer.next(new VariableValue(variable, VariableStateEnum.DataNormal, value))*/
204
- });
205
- }
206
- dispose() {
207
- // TODO调用所有的ob.complete()
208
- this.connectedSubscription.unsubscribe();
209
- this.variableStatesChangedSubscription.unsubscribe();
210
- this.variableValuesChangedSubscription.unsubscribe();
211
- if (this.logger && this.logger.isDebugEnabled()) {
212
- this.logger.debug('[VariableCommunicator] RemoteVariableCommunicator disposed.');
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":24,"character":57},{"__symbolic":"reference","module":"../../../logger","name":"LoggerService","line":24,"character":106}]}],"doVariableValuesChanged":[{"__symbolic":"method"}],"doVariableStatesChanged":[{"__symbolic":"method"}],"subscribeVariableStates":[{"__symbolic":"method"}],"subscribeVariableState":[{"__symbolic":"method"}],"openVariables":[{"__symbolic":"method"}],"openVariable":[{"__symbolic":"method"}],"write":[{"__symbolic":"method"}],"writeWordByBit":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}]}}}}]
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"}]}}}}]