@flexem/fc-gui 3.0.0-alpha.15 → 3.0.0-alpha.151

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 (172) hide show
  1. package/CHANGELOG.md +429 -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/bundles/@flexem/fc-gui.umd.js +24059 -19951
  7. package/bundles/@flexem/fc-gui.umd.js.map +1 -1
  8. package/bundles/@flexem/fc-gui.umd.min.js +5 -5
  9. package/bundles/@flexem/fc-gui.umd.min.js.map +1 -1
  10. package/communication/variable/variable-communicator.d.ts +4 -0
  11. package/communication/variable/variable-value.d.ts +4 -1
  12. package/communication/variable/variable-value.js +4 -1
  13. package/communication/variable/variable-value.metadata.json +1 -1
  14. package/config/alarm/alarm.store.d.ts +6 -0
  15. package/config/alarm/alarm.store.js +0 -0
  16. package/config/alarm/alarm.store.metadata.json +1 -0
  17. package/config/alarm/get-alarms-args.d.ts +12 -0
  18. package/config/alarm/get-alarms-args.js +13 -0
  19. package/config/alarm/get-alarms-args.metadata.json +1 -0
  20. package/config/alarm/index.d.ts +2 -0
  21. package/config/alarm/index.js +1 -0
  22. package/config/alarm/index.metadata.json +1 -0
  23. package/config/config-store.d.ts +2 -0
  24. package/config/index.d.ts +1 -0
  25. package/config/index.js +1 -0
  26. package/config/index.metadata.json +1 -1
  27. package/elements/air-quality/air-quality-element.d.ts +31 -0
  28. package/elements/air-quality/air-quality-element.js +194 -0
  29. package/elements/air-quality/air-quality-element.metadata.json +1 -0
  30. package/elements/alarm/alarm-element.d.ts +69 -0
  31. package/elements/alarm/alarm-element.js +497 -0
  32. package/elements/alarm/alarm-element.metadata.json +1 -0
  33. package/elements/bar-graph-element.d.ts +10 -2
  34. package/elements/bar-graph-element.js +135 -5
  35. package/elements/bar-graph-element.metadata.json +1 -1
  36. package/elements/base/readable-element.d.ts +6 -1
  37. package/elements/base/readable-element.js +65 -2
  38. package/elements/base/readable-element.metadata.json +1 -1
  39. package/elements/base/state-control-element.d.ts +3 -1
  40. package/elements/base/state-control-element.js +3 -0
  41. package/elements/datetime-display/datetime-display-element.d.ts +1 -0
  42. package/elements/datetime-display/datetime-display-element.js +10 -2
  43. package/elements/datetime-display/datetime-display-element.metadata.json +1 -1
  44. package/elements/datetime-display/time-zone-select-json.d.ts +8 -0
  45. package/elements/datetime-display/time-zone-select-json.js +558 -0
  46. package/elements/historical-curve/historical-curve.element.d.ts +33 -3
  47. package/elements/historical-curve/historical-curve.element.js +368 -26
  48. package/elements/historical-curve/historical-curve.element.metadata.json +1 -1
  49. package/elements/main-element.d.ts +1 -0
  50. package/elements/main-element.js +59 -9
  51. package/elements/main-element.metadata.json +1 -1
  52. package/elements/meter-element.d.ts +7 -1
  53. package/elements/meter-element.js +76 -7
  54. package/elements/meter-element.metadata.json +1 -1
  55. package/elements/numerical-display/numerical-display-element.d.ts +16 -3
  56. package/elements/numerical-display/numerical-display-element.js +83 -11
  57. package/elements/numerical-display/numerical-display-element.metadata.json +1 -1
  58. package/elements/per-view-variable-communicator.d.ts +3 -0
  59. package/elements/per-view-variable-communicator.js +15 -1
  60. package/elements/per-view-variable-communicator.metadata.json +1 -1
  61. package/elements/ring-graph/ring-graph-element.d.ts +13 -1
  62. package/elements/ring-graph/ring-graph-element.js +164 -3
  63. package/elements/ring-graph/ring-graph-element.metadata.json +1 -1
  64. package/elements/scroll-alarm/scroll-alarm-element.d.ts +74 -0
  65. package/elements/scroll-alarm/scroll-alarm-element.js +761 -0
  66. package/elements/scroll-alarm/scroll-alarm-element.metadata.json +1 -0
  67. package/elements/shared/graph/graph-state-element.d.ts +1 -0
  68. package/elements/shared/graph/graph-state-element.js +30 -4
  69. package/elements/shared/graph/graph-state-element.metadata.json +1 -1
  70. package/elements/shared/text/text-element.d.ts +9 -0
  71. package/elements/shared/text/text-element.js +34 -3
  72. package/elements/shared/text/text-element.metadata.json +1 -1
  73. package/elements/shared/text/text-state-element.d.ts +28 -2
  74. package/elements/shared/text/text-state-element.js +188 -65
  75. package/elements/shared/text/text-state-element.metadata.json +1 -1
  76. package/elements/static-elements/hyperlink-element.d.ts +24 -2
  77. package/elements/static-elements/hyperlink-element.js +124 -3
  78. package/elements/static-elements/hyperlink-element.metadata.json +1 -1
  79. package/elements/static-elements/text-element.d.ts +24 -2
  80. package/elements/static-elements/text-element.js +120 -3
  81. package/elements/static-elements/text-element.metadata.json +1 -1
  82. package/elements/switch-indicator-light/bit-indicator-light-operator.d.ts +1 -0
  83. package/elements/switch-indicator-light/bit-indicator-light-operator.js +5 -2
  84. package/elements/switch-indicator-light/bit-indicator-light-operator.metadata.json +1 -1
  85. package/elements/switch-indicator-light/switch-indicator-light-element.d.ts +11 -2
  86. package/elements/switch-indicator-light/switch-indicator-light-element.js +55 -11
  87. package/elements/switch-indicator-light/switch-indicator-light-element.metadata.json +1 -1
  88. package/elements/switch-indicator-light/word-indicator-light-operator.d.ts +1 -0
  89. package/elements/switch-indicator-light/word-indicator-light-operator.js +5 -2
  90. package/elements/switch-indicator-light/word-indicator-light-operator.metadata.json +1 -1
  91. package/elements/video/video-element.d.ts +10 -0
  92. package/elements/video/video-element.js +119 -21
  93. package/elements/video/video-element.metadata.json +1 -1
  94. package/elements/view-operation/view-operation.element.d.ts +24 -2
  95. package/elements/view-operation/view-operation.element.js +128 -4
  96. package/elements/view-operation/view-operation.element.metadata.json +1 -1
  97. package/elements/weather/weater-element.js +0 -1
  98. package/gui/gui-context.d.ts +12 -2
  99. package/gui/gui-host.d.ts +1 -1
  100. package/gui/gui-view.d.ts +4 -1
  101. package/gui/gui-view.js +51 -7
  102. package/gui/gui-view.metadata.json +1 -1
  103. package/gui/gui.component.d.ts +3 -0
  104. package/gui/gui.component.js +15 -2
  105. package/gui/gui.component.metadata.json +1 -1
  106. package/localization/localization.service.d.ts +7 -0
  107. package/localization/localization.service.js +10 -3
  108. package/localization/localization.service.metadata.json +1 -1
  109. package/localization/localization.service.zh_CN.js +8 -1
  110. package/localization/localization.service.zh_CN.metadata.json +1 -1
  111. package/modal/write-value/write-value-modal-args.d.ts +5 -1
  112. package/modal/write-value/write-value-modal-args.js +3 -1
  113. package/modal/write-value/write-value-modal-args.metadata.json +1 -1
  114. package/modal/write-value/write-value-modal.component.d.ts +13 -7
  115. package/modal/write-value/write-value-modal.component.html +10 -5
  116. package/modal/write-value/write-value-modal.component.js +87 -15
  117. package/modal/write-value/write-value-modal.component.metadata.json +1 -1
  118. package/model/air-quality/air-quality-info.d.ts +23 -0
  119. package/model/air-quality/air-quality-info.js +4 -0
  120. package/model/air-quality/air-quality-info.metadata.json +1 -0
  121. package/model/air-quality/air-quality.model.d.ts +7 -0
  122. package/model/air-quality/air-quality.model.js +0 -0
  123. package/model/air-quality/air-quality.model.metadata.json +1 -0
  124. package/model/alarm/alarm.model.d.ts +13 -0
  125. package/model/alarm/alarm.model.js +0 -0
  126. package/model/alarm/alarm.model.metadata.json +1 -0
  127. package/model/bar-graph/bar-graph.d.ts +4 -0
  128. package/model/base/font-setting-model.d.ts +12 -1
  129. package/model/base/font-setting-model.metadata.json +1 -1
  130. package/model/base/readable-model.d.ts +4 -0
  131. package/model/datetime-display/datetime-display.d.ts +1 -0
  132. package/model/historical-curve/historical-curve-axis-settings.d.ts +11 -0
  133. package/model/historical-curve/historical-curve-axis-settings.js +5 -0
  134. package/model/historical-curve/historical-curve-axis-settings.metadata.json +1 -1
  135. package/model/historical-curve/historical-curve-chanel.model.d.ts +8 -0
  136. package/model/meter/meter.d.ts +4 -0
  137. package/model/ring-graph/ring-graph.model.d.ts +8 -0
  138. package/model/scroll-alarm/scroll-alarm.model.d.ts +21 -0
  139. package/model/scroll-alarm/scroll-alarm.model.js +0 -0
  140. package/model/scroll-alarm/scroll-alarm.model.metadata.json +1 -0
  141. package/model/shared/text/text.d.ts +3 -0
  142. package/model/switch-indicator-light/switch-indicator-light.d.ts +2 -0
  143. package/model/view-operation/view-operation-element.model.d.ts +7 -1
  144. package/package.json +1 -1
  145. package/public_api.js +1 -0
  146. package/remote/communication/variable/remote-variable-communicator.d.ts +27 -0
  147. package/remote/communication/variable/remote-variable-communicator.js +148 -3
  148. package/remote/communication/variable/remote-variable-communicator.metadata.json +1 -1
  149. package/remote/communication/variable/remote-variable-protocol.d.ts +5 -0
  150. package/service/index.d.ts +4 -0
  151. package/service/index.js +1 -0
  152. package/service/index.metadata.json +1 -1
  153. package/service/language.service.d.ts +37 -0
  154. package/service/language.service.js +0 -0
  155. package/service/language.service.metadata.json +1 -0
  156. package/service/released-variable/index.d.ts +1 -0
  157. package/service/released-variable/index.js +0 -0
  158. package/service/released-variable/index.metadata.json +1 -0
  159. package/service/released-variable/released-variable.service.d.ts +4 -0
  160. package/service/released-variable/released-variable.service.js +0 -0
  161. package/service/released-variable/released-variable.service.metadata.json +1 -0
  162. package/service/system-text-library.service.d.ts +76 -0
  163. package/service/system-text-library.service.js +28 -0
  164. package/service/system-text-library.service.metadata.json +1 -0
  165. package/service/text-library.service.d.ts +49 -0
  166. package/service/text-library.service.js +0 -0
  167. package/service/text-library.service.metadata.json +1 -0
  168. package/service/weather.service.d.ts +1 -0
  169. package/shared/gui-consts.d.ts +3 -0
  170. package/shared/gui-consts.js +3 -0
  171. package/shared/gui-consts.metadata.json +1 -1
  172. package/utils/data-type/fbox-data-type.service.js +40 -0
@@ -0,0 +1 @@
1
+ [{"__symbolic":"module","version":4,"metadata":{"ScrollAlarmElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-dynamic-display-element","name":"ConditionalDynamicDisplayElement","line":17,"character":40},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":52,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":53,"character":18},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":54,"character":27},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":55,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":56,"character":23},{"__symbolic":"reference","module":"../../config","name":"AlarmsStore","line":57,"character":38},{"__symbolic":"reference","name":"string"}]}],"dispose":[{"__symbolic":"method"}],"getAlarmData":[{"__symbolic":"method"}],"initDisplayContainer":[{"__symbolic":"method"}],"_buildFontAttrs":[{"__symbolic":"method"}],"_createSvgTextNode":[{"__symbolic":"method"}],"_getSvgTextWidth":[{"__symbolic":"method"}],"_updateUnderlineWidth":[{"__symbolic":"method"}],"renderNewPage":[{"__symbolic":"method"}],"_rebaseTextNodes":[{"__symbolic":"method"}],"removeOldestPage":[{"__symbolic":"method"}],"scrollContent":[{"__symbolic":"method"}],"initScrolling":[{"__symbolic":"method"}],"resetToFirstPage":[{"__symbolic":"method"}],"updateQueryTimeRange":[{"__symbolic":"method"}],"setStatusAsNormal":[{"__symbolic":"method"}],"setStatusAsLoading":[{"__symbolic":"method"}],"renderStatus":[{"__symbolic":"method"}],"clearStatus":[{"__symbolic":"method"}],"renderStaticDisplay":[{"__symbolic":"method"}],"initStaticScrolling":[{"__symbolic":"method"}],"scrollStaticContent":[{"__symbolic":"method"}],"replaceCurrentScrollingContent":[{"__symbolic":"method"}]}}}}]
@@ -24,4 +24,5 @@ export declare class GraphStateElement {
24
24
  private removeImageElement;
25
25
  private doFaultFlicker;
26
26
  private clearFlickerInterval;
27
+ dispose(): void;
27
28
  }
@@ -42,12 +42,19 @@ export class GraphStateElement {
42
42
  }
43
43
  }
44
44
  changeGraph(stateId, graphResult) {
45
+ // 检查元素是否已被销毁
46
+ if (!this._element) {
47
+ return;
48
+ }
45
49
  if (!graphResult.failed) {
46
50
  const graph = graphResult.graph;
47
51
  switch (graph.graphType) {
48
52
  case GraphType.Image:
49
53
  case GraphType.SVG:
50
54
  const imageElement = this.getImageElement();
55
+ if (!imageElement) {
56
+ return;
57
+ }
51
58
  imageElement.setAttributeNS('http://www.w3.org/1999/xlink', 'href', graph.source);
52
59
  this.doFaultFlicker(imageElement, stateId);
53
60
  break;
@@ -62,10 +69,11 @@ export class GraphStateElement {
62
69
  }
63
70
  }
64
71
  getImageElement() {
65
- if (this.imageElement && /iPhone|iPod/i.test(navigator.userAgent)) {
66
- this.removeImageElement();
67
- }
68
72
  if (!this.imageElement) {
73
+ // 检查 _element 是否已被销毁
74
+ if (!this._element) {
75
+ return null;
76
+ }
69
77
  this.imageElement = document.createElementNS('http://www.w3.org/2000/svg', 'image');
70
78
  this.imageElement.setAttribute('width', this.width + '');
71
79
  this.imageElement.setAttribute('height', this.height + '');
@@ -77,7 +85,7 @@ export class GraphStateElement {
77
85
  return this.imageElement;
78
86
  }
79
87
  removeImageElement() {
80
- if (this.imageElement) {
88
+ if (this.imageElement && this._element) {
81
89
  this._element.removeChild(this.imageElement);
82
90
  delete this.imageElement;
83
91
  }
@@ -110,4 +118,22 @@ export class GraphStateElement {
110
118
  }
111
119
  }
112
120
  }
121
+ dispose() {
122
+ // 清理定时器
123
+ if (this.faultFlickerInterval) {
124
+ clearInterval(this.faultFlickerInterval);
125
+ this.faultFlickerInterval = undefined;
126
+ }
127
+ // 移除图片元素
128
+ this.removeImageElement();
129
+ // 清理图形缓存
130
+ if (this.graphs) {
131
+ this.graphs.clear();
132
+ }
133
+ // 清理 SVG 元素
134
+ if (this._element && this._element.parentNode) {
135
+ this._element.parentNode.removeChild(this._element);
136
+ }
137
+ this._element = null;
138
+ }
113
139
  }
@@ -1 +1 @@
1
- [{"__symbolic":"module","version":4,"metadata":{"GraphStateElement":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"../../../model","name":"GraphSetting","line":21,"character":47},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","module":"../../../config","name":"GraphStore","line":24,"character":37},{"__symbolic":"reference","module":"../../../logger","name":"LoggerService","line":25,"character":33},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","module":"../../../model/switch-indicator-light/indicator-light-fault-flicker","name":"IndicatorLightFaultFlicker","line":27,"character":41}]}]}],"switchToState":[{"__symbolic":"method"}],"changeGraph":[{"__symbolic":"method"}],"getImageElement":[{"__symbolic":"method"}],"removeImageElement":[{"__symbolic":"method"}],"doFaultFlicker":[{"__symbolic":"method"}],"clearFlickerInterval":[{"__symbolic":"method"}]}}}}]
1
+ [{"__symbolic":"module","version":4,"metadata":{"GraphStateElement":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","module":"../../../model","name":"GraphSetting","line":21,"character":47},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","module":"../../../config","name":"GraphStore","line":24,"character":37},{"__symbolic":"reference","module":"../../../logger","name":"LoggerService","line":25,"character":33},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","module":"../../../model/switch-indicator-light/indicator-light-fault-flicker","name":"IndicatorLightFaultFlicker","line":27,"character":41}]}]}],"switchToState":[{"__symbolic":"method"}],"changeGraph":[{"__symbolic":"method"}],"getImageElement":[{"__symbolic":"method"}],"removeImageElement":[{"__symbolic":"method"}],"doFaultFlicker":[{"__symbolic":"method"}],"clearFlickerInterval":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}]}}}}]
@@ -1,8 +1,17 @@
1
1
  import { Font } from '../../../model';
2
2
  export declare class TextElementModal {
3
3
  private _element;
4
+ private font;
5
+ private width;
6
+ private height;
7
+ private isVariableText?;
4
8
  get Element(): SVGElement;
5
9
  constructor(content: string, font: Font, width: number, height: number, isVariableText?: boolean);
10
+ /**
11
+ * 更新文本内容
12
+ * @param content 新的文本内容
13
+ */
14
+ updateText(content: string): void;
6
15
  private getforeignObjectElement;
7
16
  private createNewForeignObjectText;
8
17
  }
@@ -1,6 +1,11 @@
1
1
  import { isNil } from 'lodash';
2
2
  export class TextElementModal {
3
3
  constructor(content, font, width, height, isVariableText) {
4
+ // 保存参数以便后续更新文本
5
+ this.font = font;
6
+ this.width = width;
7
+ this.height = height;
8
+ this.isVariableText = isVariableText;
4
9
  if (/iPhone|iPod/i.test(navigator.userAgent)) {
5
10
  width += 10;
6
11
  }
@@ -12,6 +17,21 @@ export class TextElementModal {
12
17
  get Element() {
13
18
  return this._element;
14
19
  }
20
+ /**
21
+ * 更新文本内容
22
+ * @param content 新的文本内容
23
+ */
24
+ updateText(content) {
25
+ // 清空现有内容
26
+ this._element.innerHTML = '';
27
+ // 创建新的文本元素
28
+ let width = this.width;
29
+ if (/iPhone|iPod/i.test(navigator.userAgent)) {
30
+ width += 10;
31
+ }
32
+ const text = this.createNewForeignObjectText(content, this.font, width, this.height, this.isVariableText);
33
+ this._element.appendChild(text);
34
+ }
15
35
  getforeignObjectElement(width, height) {
16
36
  const textElement = document.createElementNS('http://www.w3.org/2000/svg', 'foreignObject');
17
37
  textElement.setAttribute('width', width.toString());
@@ -19,7 +39,7 @@ export class TextElementModal {
19
39
  return textElement;
20
40
  }
21
41
  createNewForeignObjectText(content, font, width, height, isVariableText) {
22
- if (font) {
42
+ if (font && !font.fontFamily.includes(',msyh')) {
23
43
  font.fontFamily += ',msyh';
24
44
  }
25
45
  const bodyDiv = document.createElement('div');
@@ -36,7 +56,7 @@ export class TextElementModal {
36
56
  for (let index = 0; index < textArray.length; index++) {
37
57
  const textDiv = document.createElement('div');
38
58
  textDiv.className = 'text-list';
39
- textDiv.innerHTML = textArray[index] ? textArray[index] : '&nbsp;';
59
+ const innerHTML = textArray[index] ? textArray[index] : '&nbsp;';
40
60
  let fontString = '';
41
61
  if (font.isItalic) {
42
62
  fontString += 'italic ';
@@ -45,12 +65,23 @@ export class TextElementModal {
45
65
  fontString += 'bold ';
46
66
  }
47
67
  let lineHeight = 0;
68
+ // chrome支持可显示最小字体大小为12px, 更小字体通过缩放实现
69
+ const minFontSize = 12;
48
70
  lineHeight = parseInt(font.fontSize, 10) + 5;
49
71
  fontString += font.fontSize + '/' + lineHeight.toString() + 'px ' + font.fontFamily;
50
- textDiv.style.cssText = `color: ${font.color};word-break: break-all;font: ${fontString};`;
72
+ textDiv.style.cssText = `color: ${font.color};word-break: break-all;font: ${fontString};text-align: ${textAlign};`;
51
73
  if (font.isUnderline) {
52
74
  textDiv.style.textDecoration = 'underline';
53
75
  }
76
+ const spanText = document.createElement('span');
77
+ spanText.style.cssText = `
78
+ display: contents;
79
+ transform: scale(${parseInt(font.fontSize, 10) > minFontSize ? 1 : parseInt(font.fontSize, 10) / minFontSize});
80
+ width: 100%;
81
+ height: 100%;
82
+ `;
83
+ spanText.innerHTML = innerHTML;
84
+ textDiv.appendChild(spanText);
54
85
  fragment.appendChild(textDiv);
55
86
  }
56
87
  bodyDiv.appendChild(fragment);
@@ -1 +1 @@
1
- [{"__symbolic":"module","version":4,"metadata":{"TextElementModal":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","module":"../../../model","name":"Font","line":11,"character":39},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"boolean"}]}],"getforeignObjectElement":[{"__symbolic":"method"}],"createNewForeignObjectText":[{"__symbolic":"method"}]}}}}]
1
+ [{"__symbolic":"module","version":4,"metadata":{"TextElementModal":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","module":"../../../model","name":"Font","line":15,"character":39},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"boolean"}]}],"updateText":[{"__symbolic":"method"}],"getforeignObjectElement":[{"__symbolic":"method"}],"createNewForeignObjectText":[{"__symbolic":"method"}]}}}}]
@@ -1,6 +1,9 @@
1
1
  import { LoggerService } from '../../../logger';
2
+ import { TextLibrarySetting } from '../../../model/base/font-setting-model';
2
3
  import { IndicatorLightFaultFlicker } from '../../../model/switch-indicator-light/indicator-light-fault-flicker';
4
+ import { TextLibraryService, LanguageService } from '../../../service';
3
5
  import { TextState } from './text-state.model';
6
+ import { GuiContext } from '../../../gui/gui-context';
4
7
  export declare class TextStateElement {
5
8
  private readonly textStates;
6
9
  private width;
@@ -8,16 +11,39 @@ export declare class TextStateElement {
8
11
  private readonly logger;
9
12
  private readonly version?;
10
13
  private readonly faultFlickers?;
14
+ private readonly textLibrarySetting?;
15
+ private readonly textLibraryService?;
16
+ private readonly languageService?;
17
+ private readonly guiContext?;
18
+ private readonly allowEmpty;
11
19
  private textElement;
12
20
  private _element;
13
21
  get Element(): SVGElement;
14
22
  private faultFlickerStatus;
15
23
  private faultFlickerInterval;
16
- constructor(textStates: TextState[], width: number, height: number, logger: LoggerService, version?: number, faultFlickers?: IndicatorLightFaultFlicker[]);
24
+ private currentStateId;
25
+ private languageChangeSubscription?;
26
+ constructor(textStates: TextState[], width: number, height: number, logger: LoggerService, version?: number, faultFlickers?: IndicatorLightFaultFlicker[], textLibrarySetting?: TextLibrarySetting, textLibraryService?: TextLibraryService, languageService?: LanguageService, guiContext?: GuiContext, allowEmpty?: boolean);
17
27
  switchToState(stateId: number): void;
28
+ /**
29
+ * 订阅语种变化事件
30
+ * 当设备的语种ID改变时,重新渲染当前状态的文本
31
+ */
32
+ private subscribeLanguageChange;
33
+ /**
34
+ * 释放资源
35
+ */
36
+ dispose(): void;
18
37
  private getforeignObjectElement;
19
- private createNewForeignObjectText;
20
38
  private removeForeignObjectlement;
21
39
  private doFaultFlicker;
22
40
  private clearFlickerInterval;
41
+ /**
42
+ * 获取显示文本
43
+ * 支持三种格式:
44
+ * 1. 新格式:textData.cultures 在顶层(与 content 并列)
45
+ * 2. 中间格式:textData.content 为 { cultures: {...} }(已废弃,向下兼容)
46
+ * 3. 旧格式:textData.content 为字符串
47
+ */
48
+ private getDisplayText;
23
49
  }
@@ -1,29 +1,38 @@
1
1
  import { Flicker } from '../../../model';
2
- import { isNil } from 'lodash';
3
2
  export class TextStateElement {
4
- constructor(textStates, width, height, logger, version, faultFlickers) {
3
+ constructor(textStates, width, height, logger, version, faultFlickers, textLibrarySetting, textLibraryService, languageService, guiContext, allowEmpty = false) {
5
4
  this.textStates = textStates;
6
5
  this.width = width;
7
6
  this.height = height;
8
7
  this.logger = logger;
9
8
  this.version = version;
10
9
  this.faultFlickers = faultFlickers;
10
+ this.textLibrarySetting = textLibrarySetting;
11
+ this.textLibraryService = textLibraryService;
12
+ this.languageService = languageService;
13
+ this.guiContext = guiContext;
14
+ this.allowEmpty = allowEmpty;
11
15
  this.faultFlickerStatus = false;
12
16
  this.faultFlickerInterval = undefined;
13
17
  this._element = document.createElementNS('http://www.w3.org/2000/svg', 'g');
18
+ // 订阅语种变化事件
19
+ this.subscribeLanguageChange();
14
20
  }
15
21
  get Element() {
16
22
  return this._element;
17
23
  }
18
24
  switchToState(stateId) {
25
+ // 保存当前状态ID,用于语种切换时重新渲染
26
+ this.currentStateId = stateId;
19
27
  const textState = this.textStates.find(t => t.id === stateId);
20
28
  if (textState === undefined) {
21
29
  this.removeForeignObjectlement();
22
30
  this.logger.debug(`Can not find text state:${stateId}.`);
23
31
  return;
24
32
  }
25
- const content = textState.text.content;
26
- if (content === '') {
33
+ // 获取显示文本(支持文本库)
34
+ const content = this.getDisplayText(stateId, textState.text);
35
+ if (content === '' || content == null) {
27
36
  this.removeForeignObjectlement();
28
37
  return;
29
38
  }
@@ -33,76 +42,92 @@ export class TextStateElement {
33
42
  this.logger.debug('The font is undefined.');
34
43
  return;
35
44
  }
36
- const foreignObjectElement = this.getforeignObjectElement();
37
- foreignObjectElement.innerHTML = '';
38
- const text = this.createNewForeignObjectText(content, font);
39
- foreignObjectElement.appendChild(text);
40
- this.doFaultFlicker(foreignObjectElement, stateId);
45
+ const textElement = this.getforeignObjectElement();
46
+ // 设置 text-anchor 和 dominant-baseline
47
+ textElement.setAttribute('text-anchor', 'middle');
48
+ textElement.setAttribute('dominant-baseline', 'middle');
49
+ textElement.setAttribute('pointer-events', 'auto');
50
+ // 拆分换行
51
+ const lines = content.split('\n');
52
+ const fontSize = parseInt(font.fontSize, 10);
53
+ const lineHeight = fontSize + 4;
54
+ // 总高度 = 行数 * 行高
55
+ const totalHeight = lines.length * lineHeight;
56
+ // 调整文本整体垂直居中(通过 dy)
57
+ const startY = (this.height / 2) - (totalHeight / 2) + (lineHeight / 2);
58
+ // 复用已有 tspan,不足则新建,多余则隐藏——避免删除 touch 目标节点导致 touchend 丢失
59
+ const existingTspans = Array.from(textElement.children);
60
+ for (let i = 0; i < lines.length; i++) {
61
+ let tspan = existingTspans[i];
62
+ if (!tspan) {
63
+ tspan = document.createElementNS('http://www.w3.org/2000/svg', 'tspan');
64
+ textElement.appendChild(tspan);
65
+ }
66
+ tspan.setAttribute('display', 'inline');
67
+ tspan.setAttribute('x', (this.width / 2).toString());
68
+ tspan.setAttribute('y', startY + i * lineHeight + 'px');
69
+ tspan.textContent = lines[i].replace(/ /g, '\u00A0');
70
+ tspan.setAttribute('font-size', font.fontSize);
71
+ tspan.setAttribute('fill', font.color);
72
+ tspan.setAttribute('font-family', font.fontFamily);
73
+ tspan.setAttribute('font-weight', font.isBold ? 'bold' : 'normal');
74
+ tspan.setAttribute('font-style', font.isItalic ? 'italic' : 'normal');
75
+ tspan.setAttribute('text-decoration', font.isUnderline ? 'underline' : 'none');
76
+ tspan.setAttribute('text-anchor', 'middle');
77
+ tspan.setAttribute('dominant-baseline', 'middle');
78
+ }
79
+ // 隐藏多余的 tspan(不删除)
80
+ for (let i = lines.length; i < existingTspans.length; i++) {
81
+ existingTspans[i].setAttribute('display', 'none');
82
+ }
83
+ this.doFaultFlicker(textElement, stateId);
84
+ }
85
+ /**
86
+ * 订阅语种变化事件
87
+ * 当设备的语种ID改变时,重新渲染当前状态的文本
88
+ */
89
+ subscribeLanguageChange() {
90
+ if (this.guiContext && this.guiContext.languageChanged$) {
91
+ this.languageChangeSubscription = this.guiContext.languageChanged$.subscribe(() => {
92
+ // 如果当前有状态,重新渲染
93
+ if (this.currentStateId !== undefined) {
94
+ this.switchToState(this.currentStateId);
95
+ }
96
+ });
97
+ }
98
+ }
99
+ /**
100
+ * 释放资源
101
+ */
102
+ dispose() {
103
+ // 取消语种变化订阅
104
+ if (this.languageChangeSubscription) {
105
+ this.languageChangeSubscription.unsubscribe();
106
+ this.languageChangeSubscription = undefined;
107
+ }
108
+ // 清除闪烁定时器
109
+ if (this.faultFlickerInterval) {
110
+ clearInterval(this.faultFlickerInterval);
111
+ this.faultFlickerInterval = undefined;
112
+ }
41
113
  }
42
114
  getforeignObjectElement() {
43
115
  if (!this.textElement) {
44
- this.textElement = document.createElementNS('http://www.w3.org/2000/svg', 'foreignObject');
45
- this.textElement.setAttribute('width', this.width.toString());
46
- this.textElement.setAttribute('height', this.height.toString());
116
+ this.textElement = document.createElementNS('http://www.w3.org/2000/svg', 'text');
117
+ this.textElement.setAttribute('x', (this.width / 2).toString());
118
+ this.textElement.setAttribute('y', (this.height / 2).toString());
119
+ this.textElement.setAttribute('text-anchor', 'middle');
120
+ this.textElement.setAttribute('dominant-baseline', 'middle');
121
+ this.textElement.setAttribute('pointer-events', 'auto'); // 确保能接收事件
47
122
  this._element.appendChild(this.textElement);
48
123
  }
124
+ this.textElement.setAttribute('display', 'block');
49
125
  return this.textElement;
50
126
  }
51
- createNewForeignObjectText(content, font) {
52
- if (font) {
53
- font.fontFamily += ',msyh';
54
- }
55
- const bodyDiv = document.createElement('div');
56
- bodyDiv.style.textAlign = font.textAlign ? font.textAlign : 'center';
57
- bodyDiv.style.userSelect = 'none';
58
- bodyDiv.style.display = 'table-cell';
59
- bodyDiv.style.verticalAlign = 'middle';
60
- if (isNil(content)) {
61
- content = '';
62
- }
63
- let textArray = content.toString().split('\n');
64
- textArray = textArray.map(item => {
65
- return item.toString().replace(/\s/g, '&nbsp;');
66
- });
67
- const fragment = document.createDocumentFragment();
68
- for (let index = 0; index < textArray.length; index++) {
69
- const textDiv = document.createElement('div');
70
- textDiv.innerHTML = textArray[index] ? textArray[index] : '&nbsp;';
71
- let fontString = '';
72
- if (font.isItalic) {
73
- fontString += 'italic ';
74
- }
75
- if (font.isBold) {
76
- fontString += 'bold ';
77
- }
78
- textDiv.style.wordBreak = 'break-word';
79
- textDiv.style.color = font.color;
80
- let lineHeight = 0;
81
- lineHeight = parseInt(font.fontSize, 10) + 5;
82
- fontString += font.fontSize + 'px/' + lineHeight + 'px ' + font.fontFamily;
83
- textDiv.style.font = fontString;
84
- if (font.isUnderline) {
85
- textDiv.style.textDecoration = 'underline';
86
- }
87
- fragment.appendChild(textDiv);
88
- }
89
- bodyDiv.appendChild(fragment);
90
- const contentDiv = document.createElement('div');
91
- contentDiv.style.display = 'table';
92
- contentDiv.style.width = '100%';
93
- contentDiv.style.height = '100%';
94
- contentDiv.appendChild(bodyDiv);
95
- const containerDiv = document.createElement('div');
96
- containerDiv.style.overflow = 'hidden';
97
- containerDiv.style.width = this.width.toString() + 'px';
98
- containerDiv.style.height = this.height.toString() + 'px';
99
- containerDiv.appendChild(contentDiv);
100
- return containerDiv;
101
- }
102
127
  removeForeignObjectlement() {
103
128
  if (this.textElement) {
104
- this._element.removeChild(this.textElement);
105
- delete this.textElement;
129
+ this.textElement.setAttribute('display', 'none');
130
+ this.textElement.textContent = '';
106
131
  }
107
132
  }
108
133
  doFaultFlicker(textElement, stateId) {
@@ -133,4 +158,102 @@ export class TextStateElement {
133
158
  }
134
159
  }
135
160
  }
161
+ /**
162
+ * 获取显示文本
163
+ * 支持三种格式:
164
+ * 1. 新格式:textData.cultures 在顶层(与 content 并列)
165
+ * 2. 中间格式:textData.content 为 { cultures: {...} }(已废弃,向下兼容)
166
+ * 3. 旧格式:textData.content 为字符串
167
+ */
168
+ getDisplayText(stateId, textData) {
169
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
170
+ const getTargetLanguage = () => {
171
+ var _a, _b, _c, _d, _e, _f;
172
+ const currentLanguageId = (_c = (_b = (_a = this.guiContext) === null || _a === void 0 ? void 0 : _a.getCurrentLanguageId) === null || _b === void 0 ? void 0 : _b.call(_a)) !== null && _c !== void 0 ? _c : null;
173
+ const defaultLanguage = ((_d = this.languageService) === null || _d === void 0 ? void 0 : _d.getDefaultLanguage()) || 'zh-CN';
174
+ if (currentLanguageId === null || currentLanguageId === undefined) {
175
+ return defaultLanguage;
176
+ }
177
+ return ((_f = (_e = this.guiContext) === null || _e === void 0 ? void 0 : _e.getLanguageCultureById) === null || _f === void 0 ? void 0 : _f.call(_e, currentLanguageId)) || defaultLanguage;
178
+ };
179
+ const defaultContent = textData === null || textData === void 0 ? void 0 : textData.content;
180
+ // 新格式:cultures 在 text 顶层
181
+ if (textData && textData.cultures && typeof textData.cultures === 'object') {
182
+ const targetLanguage = getTargetLanguage();
183
+ if (textData.cultures[targetLanguage]) {
184
+ return textData.cultures[targetLanguage];
185
+ }
186
+ else if (this.allowEmpty) {
187
+ return '';
188
+ }
189
+ else {
190
+ const language = ((_c = (_b = (_a = window.abp) === null || _a === void 0 ? void 0 : _a.localization) === null || _b === void 0 ? void 0 : _b.currentLanguage) === null || _c === void 0 ? void 0 : _c.name) || 'zh-Hans';
191
+ const isChinese = language === 'zh-Hans' || language === 'zh';
192
+ return isChinese ? '文本' : 'Text';
193
+ }
194
+ }
195
+ // 中间格式(兼容):content 为 { cultures: {...} }
196
+ if (defaultContent && typeof defaultContent === 'object' && defaultContent.cultures) {
197
+ const targetLanguage = getTargetLanguage();
198
+ if (defaultContent.cultures[targetLanguage]) {
199
+ return defaultContent.cultures[targetLanguage];
200
+ }
201
+ else if (this.allowEmpty) {
202
+ return '';
203
+ }
204
+ else {
205
+ const language = ((_f = (_e = (_d = window.abp) === null || _d === void 0 ? void 0 : _d.localization) === null || _e === void 0 ? void 0 : _e.currentLanguage) === null || _f === void 0 ? void 0 : _f.name) || 'zh-Hans';
206
+ const isChinese = language === 'zh-Hans' || language === 'zh';
207
+ return isChinese ? '文本' : 'Text';
208
+ }
209
+ }
210
+ // 检查是否使用文本库
211
+ if (this.textLibrarySetting && this.textLibrarySetting.labelType === 'textLibrary') {
212
+ const textLibraryId = this.textLibrarySetting.selectedTextLibraryItem;
213
+ if (textLibraryId && this.textLibraryService) {
214
+ // 获取文本库数据
215
+ const textLibraryData = this.textLibraryService.getTextLibraryById(typeof textLibraryId === 'string' ? parseInt(textLibraryId, 10) : textLibraryId);
216
+ if (textLibraryData && textLibraryData.data) {
217
+ // 使用状态ID作为value查找对应的文本条目
218
+ const textEntry = textLibraryData.data.find(entry => entry.value === stateId.toString());
219
+ if (textEntry) {
220
+ // 获取当前语种ID
221
+ const currentLanguageId = (_j = (_h = (_g = this.guiContext) === null || _g === void 0 ? void 0 : _g.getCurrentLanguageId) === null || _h === void 0 ? void 0 : _h.call(_g)) !== null && _j !== void 0 ? _j : null;
222
+ // 确定要使用的语种代码(culture)
223
+ let targetLanguage;
224
+ const defaultLanguage = ((_k = this.languageService) === null || _k === void 0 ? void 0 : _k.getDefaultLanguage()) || 'zh-CN';
225
+ if (currentLanguageId === null || currentLanguageId === undefined) {
226
+ // 设备未设置当前语种,使用默认语种
227
+ targetLanguage = defaultLanguage;
228
+ }
229
+ else {
230
+ // 设备已设置当前语种,获取对应的语种代码
231
+ const currentLanguage = (_m = (_l = this.guiContext) === null || _l === void 0 ? void 0 : _l.getLanguageCultureById) === null || _m === void 0 ? void 0 : _m.call(_l, currentLanguageId);
232
+ if (currentLanguage) {
233
+ // 直接使用设备设置的语种,不再fallback
234
+ targetLanguage = currentLanguage;
235
+ }
236
+ else {
237
+ targetLanguage = defaultLanguage;
238
+ }
239
+ }
240
+ // 返回对应语种的文本,如果没有则返回空字符串
241
+ if (textEntry.cultures && textEntry.cultures[targetLanguage]) {
242
+ const text = textEntry.cultures[targetLanguage];
243
+ return text;
244
+ }
245
+ else {
246
+ // 对应语种没有文本,返回空字符串
247
+ return '';
248
+ }
249
+ }
250
+ }
251
+ }
252
+ }
253
+ // 处理字符串格式的 defaultContent
254
+ if (typeof defaultContent === 'string') {
255
+ return defaultContent;
256
+ }
257
+ return '';
258
+ }
136
259
  }
@@ -1 +1 @@
1
- [{"__symbolic":"module","version":4,"metadata":{"TextStateElement":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","module":"./text-state.model","name":"TextState","line":18,"character":45}]},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","module":"../../../logger","name":"LoggerService","line":21,"character":33},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","module":"../../../model/switch-indicator-light/indicator-light-fault-flicker","name":"IndicatorLightFaultFlicker","line":23,"character":41}]}]}],"switchToState":[{"__symbolic":"method"}],"getforeignObjectElement":[{"__symbolic":"method"}],"createNewForeignObjectText":[{"__symbolic":"method"}],"removeForeignObjectlement":[{"__symbolic":"method"}],"doFaultFlicker":[{"__symbolic":"method"}],"clearFlickerInterval":[{"__symbolic":"method"}]}}}}]
1
+ [{"__symbolic":"module","version":4,"metadata":{"TextStateElement":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","module":"./text-state.model","name":"TextState","line":23,"character":45}]},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","module":"../../../logger","name":"LoggerService","line":26,"character":33},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"Array","arguments":[{"__symbolic":"reference","module":"../../../model/switch-indicator-light/indicator-light-fault-flicker","name":"IndicatorLightFaultFlicker","line":28,"character":41}]},{"__symbolic":"reference","module":"../../../model/base/font-setting-model","name":"TextLibrarySetting","line":29,"character":46},{"__symbolic":"reference","module":"../../../service","name":"TextLibraryService","line":30,"character":46},{"__symbolic":"reference","module":"../../../service","name":"LanguageService","line":31,"character":43},{"__symbolic":"reference","module":"../../../gui/gui-context","name":"GuiContext","line":32,"character":38},{"__symbolic":"reference","name":"boolean"}]}],"switchToState":[{"__symbolic":"method"}],"subscribeLanguageChange":[{"__symbolic":"method"}],"dispose":[{"__symbolic":"method"}],"getforeignObjectElement":[{"__symbolic":"method"}],"removeForeignObjectlement":[{"__symbolic":"method"}],"doFaultFlicker":[{"__symbolic":"method"}],"clearFlickerInterval":[{"__symbolic":"method"}],"getDisplayText":[{"__symbolic":"method"}]}}}}]
@@ -1,14 +1,36 @@
1
- import { PermissionChecker } from '../../service';
1
+ import { PermissionChecker, TextLibraryService, LanguageService } from '../../service';
2
2
  import { VariableCommunicator } from '../../communication';
3
3
  import { ConditionalDynamicDisplayElement } from '../base/conditional-dynamic-display-element';
4
4
  import { GraphStore, VariableStore } from '../../config';
5
5
  import { LoggerService } from '../../logger';
6
6
  import { Injector } from '@angular/core';
7
7
  import { HyperlinkModel } from '../../model/hyperlink/hyperlink.model';
8
+ import { GuiContext } from '../../gui/gui-context';
8
9
  export declare class HyperlinkElement extends ConditionalDynamicDisplayElement {
9
10
  private readonly graphStore;
11
+ private readonly textLibraryService?;
12
+ private readonly languageService?;
13
+ private readonly guiContext?;
10
14
  protected readonly model: HyperlinkModel;
11
15
  protected readonly logger: LoggerService;
12
- constructor(element: HTMLElement, injector: Injector, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, graphStore: GraphStore, signalRAppId: string);
16
+ private languageChangeSubscription?;
17
+ private textElementModal?;
18
+ constructor(element: HTMLElement, injector: Injector, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, variableStore: VariableStore, graphStore: GraphStore, signalRAppId: string, textLibraryService?: TextLibraryService, languageService?: LanguageService, guiContext?: GuiContext);
19
+ dispose(): void;
20
+ /**
21
+ * 订阅语种变化事件
22
+ * 当设备的语种ID改变时,重新渲染文本
23
+ */
24
+ private subscribeLanguageChange;
25
+ /**
26
+ * 重新渲染文本
27
+ */
28
+ private reRenderText;
13
29
  private initGraphAndText;
30
+ /**
31
+ * 获取显示文本
32
+ * 如果配置了文本库,则从文本库中获取对应语种的文本
33
+ * 否则返回默认文本
34
+ */
35
+ private getDisplayText;
14
36
  }