@flexem/fc-gui 3.0.0-alpha.17 → 3.0.0-alpha.171

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 (193) hide show
  1. package/CHANGELOG.md +424 -1
  2. package/assets/img/black_first_page.png +0 -0
  3. package/assets/img/black_last_page.png +0 -0
  4. package/assets/img/black_next_page.png +0 -0
  5. package/assets/img/black_previous_page.png +0 -0
  6. package/assets/img/exclamation-outline-circle.png +0 -0
  7. package/bundles/@flexem/fc-gui.umd.js +39304 -34437
  8. package/bundles/@flexem/fc-gui.umd.js.map +1 -1
  9. package/bundles/@flexem/fc-gui.umd.min.js +5 -5
  10. package/bundles/@flexem/fc-gui.umd.min.js.map +1 -1
  11. package/communication/variable/variable-communicator.d.ts +5 -0
  12. package/communication/variable/variable-state-enum.d.ts +1 -0
  13. package/communication/variable/variable-state-enum.js +1 -0
  14. package/communication/variable/variable-state-enum.metadata.json +1 -1
  15. package/communication/variable/variable-value.d.ts +4 -1
  16. package/communication/variable/variable-value.js +4 -1
  17. package/communication/variable/variable-value.metadata.json +1 -1
  18. package/config/alarm/alarm.store.d.ts +6 -0
  19. package/config/alarm/alarm.store.js +0 -0
  20. package/config/alarm/alarm.store.metadata.json +1 -0
  21. package/config/alarm/get-alarms-args.d.ts +12 -0
  22. package/config/alarm/get-alarms-args.js +13 -0
  23. package/config/alarm/get-alarms-args.metadata.json +1 -0
  24. package/config/alarm/index.d.ts +2 -0
  25. package/config/alarm/index.js +1 -0
  26. package/config/alarm/index.metadata.json +1 -0
  27. package/config/config-store.d.ts +2 -0
  28. package/config/gui-feature-config.d.ts +3 -0
  29. package/config/gui-feature-config.js +3 -0
  30. package/config/gui-feature-config.metadata.json +1 -0
  31. package/config/index.d.ts +2 -0
  32. package/config/index.js +2 -0
  33. package/config/index.metadata.json +1 -1
  34. package/config/variable/variable-store.d.ts +1 -0
  35. package/elements/air-quality/air-quality-element.d.ts +31 -0
  36. package/elements/air-quality/air-quality-element.js +194 -0
  37. package/elements/air-quality/air-quality-element.metadata.json +1 -0
  38. package/elements/alarm/alarm-element.d.ts +69 -0
  39. package/elements/alarm/alarm-element.js +497 -0
  40. package/elements/alarm/alarm-element.metadata.json +1 -0
  41. package/elements/bar-graph-element.d.ts +10 -2
  42. package/elements/bar-graph-element.js +135 -5
  43. package/elements/bar-graph-element.metadata.json +1 -1
  44. package/elements/base/readable-element.d.ts +6 -1
  45. package/elements/base/readable-element.js +66 -2
  46. package/elements/base/readable-element.metadata.json +1 -1
  47. package/elements/base/state-control-element.d.ts +3 -1
  48. package/elements/base/state-control-element.js +21 -5
  49. package/elements/character-display/character-display-element.js +3 -2
  50. package/elements/character-display/character-display-element.metadata.json +1 -1
  51. package/elements/datetime-display/datetime-display-element.d.ts +1 -0
  52. package/elements/datetime-display/datetime-display-element.js +10 -2
  53. package/elements/datetime-display/datetime-display-element.metadata.json +1 -1
  54. package/elements/datetime-display/time-zone-select-json.d.ts +8 -0
  55. package/elements/datetime-display/time-zone-select-json.js +558 -0
  56. package/elements/historical-curve/historical-curve.element.d.ts +41 -3
  57. package/elements/historical-curve/historical-curve.element.js +662 -32
  58. package/elements/historical-curve/historical-curve.element.metadata.json +1 -1
  59. package/elements/main-element.d.ts +1 -0
  60. package/elements/main-element.js +75 -9
  61. package/elements/main-element.metadata.json +1 -1
  62. package/elements/meter-element.d.ts +7 -1
  63. package/elements/meter-element.js +76 -7
  64. package/elements/meter-element.metadata.json +1 -1
  65. package/elements/numerical-display/numerical-display-element.d.ts +22 -3
  66. package/elements/numerical-display/numerical-display-element.js +145 -12
  67. package/elements/numerical-display/numerical-display-element.metadata.json +1 -1
  68. package/elements/per-view-variable-communicator.d.ts +4 -0
  69. package/elements/per-view-variable-communicator.js +21 -1
  70. package/elements/per-view-variable-communicator.metadata.json +1 -1
  71. package/elements/ring-graph/ring-graph-element.d.ts +13 -1
  72. package/elements/ring-graph/ring-graph-element.js +164 -3
  73. package/elements/ring-graph/ring-graph-element.metadata.json +1 -1
  74. package/elements/scroll-alarm/scroll-alarm-element.d.ts +78 -0
  75. package/elements/scroll-alarm/scroll-alarm-element.js +843 -0
  76. package/elements/scroll-alarm/scroll-alarm-element.metadata.json +1 -0
  77. package/elements/shared/graph/graph-state-element.d.ts +1 -0
  78. package/elements/shared/graph/graph-state-element.js +30 -1
  79. package/elements/shared/graph/graph-state-element.metadata.json +1 -1
  80. package/elements/shared/text/text-element.d.ts +14 -0
  81. package/elements/shared/text/text-element.js +42 -4
  82. package/elements/shared/text/text-element.metadata.json +1 -1
  83. package/elements/shared/text/text-state-element.d.ts +39 -2
  84. package/elements/shared/text/text-state-element.js +242 -67
  85. package/elements/shared/text/text-state-element.metadata.json +1 -1
  86. package/elements/static-elements/hyperlink-element.d.ts +28 -2
  87. package/elements/static-elements/hyperlink-element.js +153 -4
  88. package/elements/static-elements/hyperlink-element.metadata.json +1 -1
  89. package/elements/static-elements/text-element.d.ts +28 -2
  90. package/elements/static-elements/text-element.js +162 -12
  91. package/elements/static-elements/text-element.metadata.json +1 -1
  92. package/elements/switch-indicator-light/bit-indicator-light-operator.d.ts +1 -0
  93. package/elements/switch-indicator-light/bit-indicator-light-operator.js +10 -3
  94. package/elements/switch-indicator-light/bit-indicator-light-operator.metadata.json +1 -1
  95. package/elements/switch-indicator-light/switch-indicator-light-element.d.ts +11 -2
  96. package/elements/switch-indicator-light/switch-indicator-light-element.js +70 -12
  97. package/elements/switch-indicator-light/switch-indicator-light-element.metadata.json +1 -1
  98. package/elements/switch-indicator-light/word-indicator-light-operator.d.ts +1 -0
  99. package/elements/switch-indicator-light/word-indicator-light-operator.js +10 -3
  100. package/elements/switch-indicator-light/word-indicator-light-operator.metadata.json +1 -1
  101. package/elements/video/video-element.d.ts +10 -0
  102. package/elements/video/video-element.js +119 -21
  103. package/elements/video/video-element.metadata.json +1 -1
  104. package/elements/view-operation/view-operation.element.d.ts +28 -2
  105. package/elements/view-operation/view-operation.element.js +163 -4
  106. package/elements/view-operation/view-operation.element.metadata.json +1 -1
  107. package/elements/weather/weater-element.js +0 -1
  108. package/gui/gui-context.d.ts +25 -2
  109. package/gui/gui-host.d.ts +1 -1
  110. package/gui/gui-view.d.ts +4 -1
  111. package/gui/gui-view.js +69 -8
  112. package/gui/gui-view.metadata.json +1 -1
  113. package/gui/gui.component.d.ts +3 -0
  114. package/gui/gui.component.js +15 -2
  115. package/gui/gui.component.metadata.json +1 -1
  116. package/localization/localization.service.d.ts +12 -0
  117. package/localization/localization.service.js +16 -4
  118. package/localization/localization.service.metadata.json +1 -1
  119. package/localization/localization.service.zh_CN.js +14 -2
  120. package/localization/localization.service.zh_CN.metadata.json +1 -1
  121. package/modal/write-character/write-character-modal.component.html +4 -4
  122. package/modal/write-character/write-character-modal.component.js +2 -2
  123. package/modal/write-character/write-character-modal.component.less +15 -0
  124. package/modal/write-character/write-character-modal.component.metadata.json +1 -1
  125. package/modal/write-value/write-value-modal-args.d.ts +5 -1
  126. package/modal/write-value/write-value-modal-args.js +3 -1
  127. package/modal/write-value/write-value-modal-args.metadata.json +1 -1
  128. package/modal/write-value/write-value-modal.component.d.ts +13 -7
  129. package/modal/write-value/write-value-modal.component.html +10 -5
  130. package/modal/write-value/write-value-modal.component.js +95 -20
  131. package/modal/write-value/write-value-modal.component.less +16 -1
  132. package/modal/write-value/write-value-modal.component.metadata.json +1 -1
  133. package/model/air-quality/air-quality-info.d.ts +23 -0
  134. package/model/air-quality/air-quality-info.js +4 -0
  135. package/model/air-quality/air-quality-info.metadata.json +1 -0
  136. package/model/air-quality/air-quality.model.d.ts +7 -0
  137. package/model/air-quality/air-quality.model.js +0 -0
  138. package/model/air-quality/air-quality.model.metadata.json +1 -0
  139. package/model/alarm/alarm.model.d.ts +13 -0
  140. package/model/alarm/alarm.model.js +0 -0
  141. package/model/alarm/alarm.model.metadata.json +1 -0
  142. package/model/bar-graph/bar-graph.d.ts +4 -0
  143. package/model/base/font-setting-model.d.ts +22 -1
  144. package/model/base/font-setting-model.metadata.json +1 -1
  145. package/model/base/readable-model.d.ts +4 -0
  146. package/model/datetime-display/datetime-display.d.ts +1 -0
  147. package/model/historical-curve/historical-curve-axis-settings.d.ts +11 -0
  148. package/model/historical-curve/historical-curve-axis-settings.js +5 -0
  149. package/model/historical-curve/historical-curve-axis-settings.metadata.json +1 -1
  150. package/model/historical-curve/historical-curve-chanel.model.d.ts +8 -0
  151. package/model/meter/meter.d.ts +4 -0
  152. package/model/numerical-display/numerical-operation.d.ts +10 -2
  153. package/model/ring-graph/ring-graph.model.d.ts +8 -0
  154. package/model/scroll-alarm/scroll-alarm.model.d.ts +21 -0
  155. package/model/scroll-alarm/scroll-alarm.model.js +0 -0
  156. package/model/scroll-alarm/scroll-alarm.model.metadata.json +1 -0
  157. package/model/shared/state/state.d.ts +1 -0
  158. package/model/shared/state/state.js +1 -0
  159. package/model/shared/state/state.metadata.json +1 -1
  160. package/model/shared/text/font.d.ts +1 -1
  161. package/model/shared/text/text.d.ts +3 -0
  162. package/model/switch-indicator-light/switch-indicator-light.d.ts +2 -0
  163. package/model/view-operation/view-operation-element.model.d.ts +7 -1
  164. package/package.json +1 -1
  165. package/public_api.js +1 -0
  166. package/remote/communication/variable/remote-variable-communicator.d.ts +30 -0
  167. package/remote/communication/variable/remote-variable-communicator.js +193 -3
  168. package/remote/communication/variable/remote-variable-communicator.metadata.json +1 -1
  169. package/remote/communication/variable/remote-variable-protocol.d.ts +8 -0
  170. package/service/index.d.ts +4 -0
  171. package/service/index.js +1 -0
  172. package/service/index.metadata.json +1 -1
  173. package/service/language.service.d.ts +37 -0
  174. package/service/language.service.js +0 -0
  175. package/service/language.service.metadata.json +1 -0
  176. package/service/released-variable/index.d.ts +1 -0
  177. package/service/released-variable/index.js +0 -0
  178. package/service/released-variable/index.metadata.json +1 -0
  179. package/service/released-variable/released-variable.service.d.ts +4 -0
  180. package/service/released-variable/released-variable.service.js +0 -0
  181. package/service/released-variable/released-variable.service.metadata.json +1 -0
  182. package/service/system-text-library.service.d.ts +77 -0
  183. package/service/system-text-library.service.js +29 -0
  184. package/service/system-text-library.service.metadata.json +1 -0
  185. package/service/text-library.service.d.ts +49 -0
  186. package/service/text-library.service.js +0 -0
  187. package/service/text-library.service.metadata.json +1 -0
  188. package/service/weather.service.d.ts +1 -0
  189. package/shared/gui-consts.d.ts +3 -0
  190. package/shared/gui-consts.js +3 -0
  191. package/shared/gui-consts.metadata.json +1 -1
  192. package/utils/data-type/fbox-data-type.service.js +40 -0
  193. package/utils/numerical-operation.service.js +28 -4
@@ -1 +1 @@
1
- [{"__symbolic":"module","version":4,"metadata":{"NumericalDisplayElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/readable-element","name":"ReadableElement","line":22,"character":45},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":39,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":40,"character":18},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":41,"character":39},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":42,"character":27},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":43,"character":30},{"__symbolic":"reference","module":"../../config","name":"GraphStore","line":44,"character":37},{"__symbolic":"reference","module":"../../service","name":"OperationRecordService","line":45,"character":49},{"__symbolic":"reference","module":"../../security","name":"SecurityChecker","line":46,"character":42},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":47,"character":23},{"__symbolic":"reference","module":"../../localization","name":"Localization","line":48,"character":22},{"__symbolic":"reference","name":"string"}]}],"dispose":[{"__symbolic":"method"}],"initElement":[{"__symbolic":"method"}],"checkElementPassword":[{"__symbolic":"method"}],"initVariableText":[{"__symbolic":"method"}],"initGraphAndText":[{"__symbolic":"method"}],"doWriteValue":[{"__symbolic":"method"}],"recordOperation":[{"__symbolic":"method"}],"changeStates":[{"__symbolic":"method"}],"updateVariableValue":[{"__symbolic":"method"}],"updateDisplayText":[{"__symbolic":"method"}],"rebuildTextElement":[{"__symbolic":"method"}],"formatNumericalDisplayText":[{"__symbolic":"method"}],"formatFloatDisplayText":[{"__symbolic":"method"}],"isNumeric":[{"__symbolic":"method"}],"formatDisplayTextUnit":[{"__symbolic":"method"}]}}}}]
1
+ [{"__symbolic":"module","version":4,"metadata":{"NumericalDisplayElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/readable-element","name":"ReadableElement","line":29,"character":45},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":73,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":74,"character":18},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":75,"character":39},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":76,"character":27},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":77,"character":30},{"__symbolic":"reference","module":"../../config","name":"GraphStore","line":78,"character":37},{"__symbolic":"reference","module":"../../service","name":"OperationRecordService","line":79,"character":49},{"__symbolic":"reference","module":"../../service","name":"ReleasedVariableService","line":80,"character":50},{"__symbolic":"reference","module":"../../security","name":"SecurityChecker","line":81,"character":42},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":82,"character":23},{"__symbolic":"reference","module":"../../localization","name":"Localization","line":83,"character":22},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","module":"../../gui/gui-context","name":"GuiContext","line":85,"character":38}]}],"dispose":[{"__symbolic":"method"}],"reportValueChanged":[{"__symbolic":"method"}],"initElement":[{"__symbolic":"method"}],"checkElementPassword":[{"__symbolic":"method"}],"initVariableText":[{"__symbolic":"method"}],"initGraphAndText":[{"__symbolic":"method"}],"doWriteValue":[{"__symbolic":"method"}],"recordOperation":[{"__symbolic":"method"}],"changeStates":[{"__symbolic":"method"}],"updateVariableValue":[{"__symbolic":"method"}],"updateDisplayText":[{"__symbolic":"method"}],"rebuildTextElement":[{"__symbolic":"method"}],"formatNumericalDisplayText":[{"__symbolic":"method"}],"formatFloatDisplayText":[{"__symbolic":"method"}],"isNumeric":[{"__symbolic":"method"}],"formatDisplayTextUnit":[{"__symbolic":"method"}]}}}}]
@@ -6,12 +6,16 @@ export declare class PerViewVariableCommunicator implements VariableCommunicator
6
6
  private observers;
7
7
  private variableValuesChangedSubscriptions;
8
8
  private variableStatesChangedSubscription;
9
+ private alarmSubscription;
9
10
  constructor(variableCommunicator: VariableCommunicator);
10
11
  openVariable(variableName: string, appId: string): Observable<VariableValue>;
11
12
  openVariables(variableNames: Array<string>, appId?: string): Observable<Array<VariableValue>>;
12
13
  write(variableName: string, value: any): Observable<VariableValue>;
13
14
  writeWordByBit(variableName: string, index: number, value: number): Observable<VariableValue>;
15
+ requestVirtualDeviceState(): Observable<void>;
14
16
  subscribeVariableState(variableName: string): Observable<VariableState>;
15
17
  subscribeVariableStates(variableNames: string[]): Observable<Array<VariableState>>;
18
+ subscribeUserDeviceAlarms(appId?: string): Observable<any[]>;
19
+ subscribeUserOneDeviceAlarms(appId?: string): Observable<any>;
16
20
  dispose(): void;
17
21
  }
@@ -6,6 +6,7 @@ export class PerViewVariableCommunicator {
6
6
  this.observers = new Map();
7
7
  this.variableValuesChangedSubscriptions = new Array();
8
8
  this.variableStatesChangedSubscription = new Array();
9
+ this.alarmSubscription = new Array();
9
10
  this._rawVariableCommunicator = variableCommunicator;
10
11
  }
11
12
  openVariable(variableName, appId) {
@@ -17,7 +18,10 @@ export class PerViewVariableCommunicator {
17
18
  if (!this.observers.has(variableName)) {
18
19
  this.observers.set(variableName, []);
19
20
  }
20
- this.observers.get(variableName).push(subscriber);
21
+ const obs = this.observers.get(variableName);
22
+ if (obs) {
23
+ obs.push(subscriber);
24
+ }
21
25
  });
22
26
  const subscription = this._rawVariableCommunicator.openVariables(variableNames, appId).subscribe(values => subscriber.next(values), error => subscriber.error(error), () => subscriber.complete());
23
27
  this.variableValuesChangedSubscriptions.push(subscription);
@@ -29,6 +33,9 @@ export class PerViewVariableCommunicator {
29
33
  writeWordByBit(variableName, index, value) {
30
34
  return this._rawVariableCommunicator.writeWordByBit(variableName, index, value);
31
35
  }
36
+ requestVirtualDeviceState() {
37
+ return this._rawVariableCommunicator.requestVirtualDeviceState();
38
+ }
32
39
  subscribeVariableState(variableName) {
33
40
  return this.subscribeVariableStates([variableName]).pipe(map(values => values[0]));
34
41
  }
@@ -38,8 +45,21 @@ export class PerViewVariableCommunicator {
38
45
  this.variableStatesChangedSubscription.push(subscription);
39
46
  });
40
47
  }
48
+ subscribeUserDeviceAlarms(appId = '') {
49
+ return new Observable(subscriber => {
50
+ const subscription = this._rawVariableCommunicator.subscribeUserDeviceAlarms(appId).subscribe((values) => subscriber.next(values), (error) => subscriber.error(error), () => subscriber.complete());
51
+ this.alarmSubscription.push(subscription);
52
+ });
53
+ }
54
+ subscribeUserOneDeviceAlarms(appId = '') {
55
+ return new Observable(subscriber => {
56
+ const subscription = this._rawVariableCommunicator.subscribeUserOneDeviceAlarms(appId).subscribe((value) => subscriber.next(value), (error) => subscriber.error(error), () => subscriber.complete());
57
+ this.alarmSubscription.push(subscription);
58
+ });
59
+ }
41
60
  dispose() {
42
61
  forEach(this.variableValuesChangedSubscriptions, s => s.unsubscribe());
43
62
  forEach(this.variableStatesChangedSubscription, s => s.unsubscribe());
63
+ forEach(this.alarmSubscription, s => s.unsubscribe());
44
64
  }
45
65
  }
@@ -1 +1 @@
1
- [{"__symbolic":"module","version":4,"metadata":{"PerViewVariableCommunicator":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"../communication","name":"VariableCommunicator","line":14,"character":38}]}],"openVariable":[{"__symbolic":"method"}],"openVariables":[{"__symbolic":"method"}],"write":[{"__symbolic":"method"}],"writeWordByBit":[{"__symbolic":"method"}],"subscribeVariableState":[{"__symbolic":"method"}],"subscribeVariableStates":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}]}}}}]
1
+ [{"__symbolic":"module","version":4,"metadata":{"PerViewVariableCommunicator":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"../communication","name":"VariableCommunicator","line":15,"character":38}]}],"openVariable":[{"__symbolic":"method"}],"openVariables":[{"__symbolic":"method"}],"write":[{"__symbolic":"method"}],"writeWordByBit":[{"__symbolic":"method"}],"requestVirtualDeviceState":[{"__symbolic":"method"}],"subscribeVariableState":[{"__symbolic":"method"}],"subscribeVariableStates":[{"__symbolic":"method"}],"subscribeUserDeviceAlarms":[{"__symbolic":"method"}],"subscribeUserOneDeviceAlarms":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}]}}}}]
@@ -5,13 +5,25 @@ import { ReadableElement } from '../base/readable-element';
5
5
  import { VariableStore } from '../../config';
6
6
  import { PermissionChecker } from '../../service';
7
7
  export declare class RingGraphElement extends ReadableElement {
8
+ private static DEFAULT_MIN_VALUE;
9
+ private static DEFAULT_MAX_VALUE;
8
10
  protected readonly model: RingGraphModel;
9
11
  private _barElement$;
10
12
  private _textElement$;
13
+ private valueObj;
14
+ private isNeedUpdateScale;
15
+ private initTransform;
16
+ private needAddNumber;
11
17
  get readVariableName(): string;
18
+ get minVariableName(): string;
19
+ get maxVariableName(): string;
12
20
  constructor(element: HTMLElement, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, localization: Localization, signalRAppId: string);
21
+ private initTransformFun;
13
22
  private initFrameNode;
14
- protected updateVariableValue(value: number): void;
23
+ init(variableName: string): void;
24
+ private updateValueObj;
25
+ private updateScale;
26
+ protected updateVariableValue(value: number, variableName: any): void;
15
27
  private updateBar;
16
28
  private getBarColor;
17
29
  private drawClockWiseArc;
@@ -4,31 +4,190 @@ import { RotationDirectionType } from '../../model/shared/rotation/rotation-dire
4
4
  import { calculatePercent, degreesToRadians } from '../shared/math-utils';
5
5
  import { VariableUtil } from '../../utils/variable-util';
6
6
  import { VariableDefinition } from '../../communication/variable/variable-definition';
7
+ import { forEach } from 'lodash';
8
+ import { VariableState } from '../../communication';
9
+ import { VariableValueType } from '../../model/shared/condition/variable-value-type';
7
10
  export class RingGraphElement extends ReadableElement {
8
11
  constructor(element, permissionChecker, variableCommunicator, variableStore, localization, signalRAppId) {
9
12
  super(element, permissionChecker, variableCommunicator, variableStore, localization, signalRAppId);
13
+ this.valueObj = {};
14
+ this.isNeedUpdateScale = false;
15
+ this.initTransform = false;
16
+ this.needAddNumber = 0;
17
+ if ((this.model.minValueType === VariableValueType.Constant && this.model.maxValueType === VariableValueType.Variable)
18
+ || this.model.maxValueType === VariableValueType.Constant && this.model.minValueType === VariableValueType.Variable) {
19
+ this.isNeedUpdateScale = true;
20
+ this.updateScale();
21
+ this.isNeedUpdateScale = false;
22
+ }
10
23
  const el$ = $(element);
11
24
  this._barElement$ = el$.find('path[data-id="barArc"]');
12
25
  this._textElement$ = el$.find('text[data-id="pText"]');
13
26
  setTimeout(() => {
14
27
  this.initFrameNode();
15
28
  this.changeStates();
16
- }, 0);
29
+ });
17
30
  }
18
31
  get readVariableName() {
19
32
  if (!this.model.variableId) {
20
33
  return '';
21
34
  }
35
+ if (!this.model.variableId.variableName || !this.model.variableId.variableName.name) {
36
+ return undefined;
37
+ }
22
38
  const variable = new VariableDefinition(this.model.variableId.variableName.name, this.model.variableId.variableName.groupName, this.model.variableId.dataSourceCode, this.model.variableId.variableName.variableVersion);
23
39
  return VariableUtil.getConvertedVariableName(this.variableStore, variable);
24
40
  }
41
+ get minVariableName() {
42
+ if (!this.model.minValueType) {
43
+ return undefined;
44
+ }
45
+ if (!this.model.minVariable || !this.model.minVariable.name) {
46
+ return undefined;
47
+ }
48
+ const variable = new VariableDefinition(this.model.minVariable.name, this.model.minVariable.groupName, this.model.minVariable.dataSourceCode, this.model.minVariable.variableVersion);
49
+ return VariableUtil.getConvertedVariableName(this.variableStore, variable);
50
+ }
51
+ get maxVariableName() {
52
+ if (!this.model.maxValueType) {
53
+ return undefined;
54
+ }
55
+ if (!this.model.maxVariable || !this.model.maxVariable.name) {
56
+ return undefined;
57
+ }
58
+ const variable = new VariableDefinition(this.model.maxVariable.name, this.model.maxVariable.groupName, this.model.maxVariable.dataSourceCode, this.model.maxVariable.variableVersion);
59
+ return VariableUtil.getConvertedVariableName(this.variableStore, variable);
60
+ }
61
+ initTransformFun(len) {
62
+ this.$element[0].childNodes.forEach((node) => {
63
+ if (!node.transform.baseVal[0])
64
+ return;
65
+ // const matrixE = node.transform.baseVal[0].matrix.e;
66
+ // node.transform.baseVal[0].matrix.e = matrixE + len * 5;
67
+ if (node.nodeName === 'g') {
68
+ const nodeValue = node.attributes['clip-path'].value.replace('url(#', '').replace(')', '');
69
+ const rootNode = node.parentNode.parentNode.parentElement;
70
+ const clipPath = $(rootNode).find(`clipPath[id="${nodeValue}"]`);
71
+ const demoPath = clipPath.find('path');
72
+ const dValues = demoPath.attr('d').split(',');
73
+ const retValues = [];
74
+ dValues.forEach((line, index) => {
75
+ const values = [];
76
+ line.split(' ').forEach((item) => {
77
+ const nItem = Number(item);
78
+ if (!isNaN(nItem) && (index === 1 || index === 2 || nItem === -1)) {
79
+ item = nItem > 0 ? (index === 1 || index === 2 ? nItem + (len + 2) * 8 : nItem + len * 8) : nItem - len * 8;
80
+ }
81
+ values.push(item);
82
+ });
83
+ retValues.push(values.join(' '));
84
+ });
85
+ demoPath.attr('d', retValues.join(','));
86
+ }
87
+ });
88
+ }
25
89
  initFrameNode() {
26
90
  const arcPath = Snap(this.$element[0]);
27
91
  const b = arcPath.getBBox(true);
28
92
  this.rootElement.append('rect').attr('id', 'StateFrame').attr('width', b.width).attr('height', b.height).attr('fill', 'transparent');
29
93
  }
30
- updateVariableValue(value) {
31
- const percent = calculatePercent(this.model.min, this.model.max, value);
94
+ init(variableName) {
95
+ if (variableName) {
96
+ let hasVariable = false;
97
+ forEach(this.elementStates, elementState => {
98
+ if (elementState.variableName === variableName) {
99
+ hasVariable = true;
100
+ }
101
+ });
102
+ if (!hasVariable && variableName === this.readVariableName) {
103
+ this.elementStates.push(new VariableState(variableName, undefined));
104
+ }
105
+ }
106
+ }
107
+ updateValueObj(value, variableName) {
108
+ var _a, _b, _c;
109
+ if (((_a = this.model.variableId) === null || _a === void 0 ? void 0 : _a.variableName.name) === variableName) {
110
+ this.isNeedUpdateScale = false;
111
+ this.valueObj.value = value;
112
+ }
113
+ if (((_b = this.model.minVariable) === null || _b === void 0 ? void 0 : _b.name) === variableName) {
114
+ this.isNeedUpdateScale = true;
115
+ this.valueObj.min = value;
116
+ }
117
+ if (((_c = this.model.maxVariable) === null || _c === void 0 ? void 0 : _c.name) === variableName) {
118
+ this.isNeedUpdateScale = true;
119
+ this.valueObj.max = value;
120
+ }
121
+ }
122
+ updateScale() {
123
+ // 刻度模糊问题
124
+ const matrix = this.$element[0].transform.baseVal[0].matrix;
125
+ if (!this.$element[0].style.transform) {
126
+ this.$element[0].style.transform = `translate3d(${matrix.e}px, ${matrix.f}px, 0)`;
127
+ }
128
+ if (!this.isNeedUpdateScale) {
129
+ return;
130
+ }
131
+ const textElements = this.$element.find('g:first > text');
132
+ let min = this.model.minValueType ? this.valueObj.min : this.model.min;
133
+ let max = this.model.maxValueType ? this.valueObj.max : this.model.max;
134
+ min = Number(min);
135
+ max = Number(max);
136
+ if (isNaN(min) || isNaN(max)) {
137
+ min = RingGraphElement.DEFAULT_MIN_VALUE;
138
+ max = RingGraphElement.DEFAULT_MAX_VALUE;
139
+ }
140
+ if (this.model.minValueType === VariableValueType.Variable || this.model.maxValueType === VariableValueType.Variable) {
141
+ const len = max.toString().length > min.toString().length ? max.toString().length : min.toString().length;
142
+ if (Math.abs(len - this.needAddNumber) > 2) {
143
+ const width = this.$element.find('rect').attr('width');
144
+ this.$element.find('rect').attr('width', Number(width) + (len - this.needAddNumber) * 8);
145
+ this.initTransformFun(Math.abs(len - this.needAddNumber));
146
+ this.needAddNumber = len;
147
+ }
148
+ }
149
+ const avgSacle = ((max - min) / this.model.masterDivisionNumber).toFixed(5);
150
+ for (let i = 0; i < textElements.length; i++) {
151
+ const text = textElements[i];
152
+ if (!text.innerHTML) {
153
+ continue;
154
+ }
155
+ let sacleValue = ((Number(avgSacle) * i) + min).toFixed(0);
156
+ // 整数位和小数位格式化;
157
+ if (this.model.fractionDigits > 0) {
158
+ sacleValue = (sacleValue / Math.pow(10, this.model.fractionDigits)).toFixed(this.model.fractionDigits);
159
+ }
160
+ if (!isNaN(sacleValue)) {
161
+ const oriValue = text.innerHTML;
162
+ text.innerHTML = sacleValue;
163
+ if (this.model.minValueType !== VariableValueType.Constant || this.model.maxValueType !== VariableValueType.Constant) {
164
+ // FLEXCLOUD-2619 刻度显示不全问题
165
+ const order = (i + 1) / textElements.length;
166
+ const len = oriValue.toString().length - sacleValue.toString().length;
167
+ if (order <= 0.7 && len > 1 && !this.initTransform) {
168
+ text.transform.baseVal[0].matrix.e += (len - 1) * 5;
169
+ }
170
+ if (order > 0.7 && Math.abs(len) > 0) {
171
+ text.transform.baseVal[0].matrix.e += len > 1 ? (len - 1) * 5 : len < -1 ? (len + 1) * 5 : len * 5;
172
+ text.transform.baseVal[0].matrix.e += len === -2 ? -3 : 0;
173
+ }
174
+ }
175
+ }
176
+ }
177
+ this.initTransform = true;
178
+ }
179
+ updateVariableValue(value, variableName) {
180
+ this.updateValueObj(value, variableName);
181
+ this.updateScale();
182
+ let min = this.model.minValueType ? this.valueObj.min : this.model.min;
183
+ let max = this.model.maxValueType ? this.valueObj.max : this.model.max;
184
+ min = Number(min);
185
+ max = Number(max);
186
+ if (isNaN(min) || isNaN(max)) {
187
+ min = RingGraphElement.DEFAULT_MIN_VALUE;
188
+ max = RingGraphElement.DEFAULT_MAX_VALUE;
189
+ }
190
+ const percent = calculatePercent(min, max, this.valueObj.value || 0);
32
191
  this.updateBar(percent);
33
192
  this._barElement$.attr('fill', this.getBarColor(value));
34
193
  if (this.model.showPercentage) {
@@ -87,3 +246,5 @@ export class RingGraphElement extends ReadableElement {
87
246
  arcPath.arc(outer, outer, inner, endRadians, startRadians);
88
247
  }
89
248
  }
249
+ RingGraphElement.DEFAULT_MIN_VALUE = 0;
250
+ RingGraphElement.DEFAULT_MAX_VALUE = 100;
@@ -1 +1 @@
1
- [{"__symbolic":"module","version":4,"metadata":{"RingGraphElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/readable-element","name":"ReadableElement","line":13,"character":38},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":27,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":27,"character":57},{"__symbolic":"reference","module":"../../communication/variable/variable-communicator","name":"VariableCommunicator","line":28,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":29,"character":23},{"__symbolic":"reference","module":"../../localization/localization.service","name":"Localization","line":30,"character":22},{"__symbolic":"reference","name":"string"}]}],"initFrameNode":[{"__symbolic":"method"}],"updateVariableValue":[{"__symbolic":"method"}],"updateBar":[{"__symbolic":"method"}],"getBarColor":[{"__symbolic":"method"}],"drawClockWiseArc":[{"__symbolic":"method"}],"drawAntiClockWiseArc":[{"__symbolic":"method"}]}}}}]
1
+ [{"__symbolic":"module","version":4,"metadata":{"RingGraphElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/readable-element","name":"ReadableElement","line":16,"character":38},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":62,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":62,"character":57},{"__symbolic":"reference","module":"../../communication/variable/variable-communicator","name":"VariableCommunicator","line":63,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":64,"character":23},{"__symbolic":"reference","module":"../../localization/localization.service","name":"Localization","line":65,"character":22},{"__symbolic":"reference","name":"string"}]}],"initTransformFun":[{"__symbolic":"method"}],"initFrameNode":[{"__symbolic":"method"}],"init":[{"__symbolic":"method"}],"updateValueObj":[{"__symbolic":"method"}],"updateScale":[{"__symbolic":"method"}],"updateVariableValue":[{"__symbolic":"method"}],"updateBar":[{"__symbolic":"method"}],"getBarColor":[{"__symbolic":"method"}],"drawClockWiseArc":[{"__symbolic":"method"}],"drawAntiClockWiseArc":[{"__symbolic":"method"}]},"statics":{"DEFAULT_MIN_VALUE":0,"DEFAULT_MAX_VALUE":100}}}}]
@@ -0,0 +1,78 @@
1
+ import { Injector } from '@angular/core';
2
+ import { PermissionChecker } from '../../service';
3
+ import { VariableCommunicator } from '../../communication';
4
+ import { ConditionalDynamicDisplayElement } from '../base/conditional-dynamic-display-element';
5
+ import { ScrollAlarmModel } from '../../model/scroll-alarm/scroll-alarm.model';
6
+ import { AlarmsStore, VariableStore } from '../../config';
7
+ export declare class ScrollAlarmElement extends ConditionalDynamicDisplayElement {
8
+ private readonly alarmsStore;
9
+ readonly model: ScrollAlarmModel;
10
+ private readonly logger;
11
+ readonly variableCommunicator: VariableCommunicator;
12
+ private elementStatus;
13
+ private element;
14
+ private scrollIntervalId;
15
+ private alarmNames;
16
+ private startTime;
17
+ private endTime;
18
+ private getAlarmDataId;
19
+ private alarmRefreshThrottleId;
20
+ private alarmRefreshSubscription;
21
+ private signalRSubscription;
22
+ private isReplacingContent;
23
+ private isScrolling;
24
+ private isDisposed;
25
+ private isRefreshingCurrentPage;
26
+ private currentPage;
27
+ private maxResultCount;
28
+ private displayedItems;
29
+ private pageWidths;
30
+ private totalWidth;
31
+ private bgRect;
32
+ private scrollGroup;
33
+ private allAlarmsContainer;
34
+ private currentLeft;
35
+ private autoCycle;
36
+ private hasMoreData;
37
+ private isLoadingNextPage;
38
+ private headerFont;
39
+ private hasTriedFirstPage;
40
+ private isSimulateMode;
41
+ private _canvasCtx;
42
+ constructor(element: HTMLElement, injector: Injector, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, alarmsStore: AlarmsStore, signalRAppId: string);
43
+ dispose(): void;
44
+ private getAlarmData;
45
+ private initDisplayContainer;
46
+ private _buildFontAttrs;
47
+ private _createSvgTextNode;
48
+ private _measureTextWithCanvas;
49
+ private _getSvgTextWidth;
50
+ private _updateUnderlineWidth;
51
+ private renderNewPage;
52
+ private _rebaseTextNodes;
53
+ private removeOldestPage;
54
+ private scrollContent;
55
+ private initScrolling;
56
+ private resetToFirstPage;
57
+ private updateQueryTimeRange;
58
+ private setStatusAsNormal;
59
+ private setStatusAsLoading;
60
+ private renderStatus;
61
+ private clearStatus;
62
+ /**
63
+ * 模拟运行时的静态显示逻辑:只显示字段标签,不查询数据
64
+ */
65
+ private renderStaticDisplay;
66
+ /**
67
+ * 模拟运行时的静态滚动逻辑
68
+ */
69
+ private initStaticScrolling;
70
+ /**
71
+ * 模拟运行时的静态内容滚动
72
+ */
73
+ private scrollStaticContent;
74
+ /**
75
+ * 实时替换当前滚动内容(用于告警数据变化时)
76
+ */
77
+ private replaceCurrentScrollingContent;
78
+ }