@flexem/fc-gui 3.0.0-alpha.13 → 3.0.0-alpha.131

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 (184) hide show
  1. package/CHANGELOG.md +439 -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 +38522 -34542
  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/history-data/get-history-data-args.d.ts +14 -3
  25. package/config/history-data/get-history-data-args.js +5 -3
  26. package/config/history-data/get-history-data-args.metadata.json +1 -1
  27. package/config/history-data/history-data.model.d.ts +7 -1
  28. package/config/history-data/history-data.model.js +9 -1
  29. package/config/history-data/history-data.model.metadata.json +1 -1
  30. package/config/history-data/index.d.ts +1 -1
  31. package/config/history-data/index.js +1 -1
  32. package/config/history-data/index.metadata.json +1 -1
  33. package/config/index.d.ts +1 -0
  34. package/config/index.js +1 -0
  35. package/config/index.metadata.json +1 -1
  36. package/elements/air-quality/air-quality-element.d.ts +31 -0
  37. package/elements/air-quality/air-quality-element.js +194 -0
  38. package/elements/air-quality/air-quality-element.metadata.json +1 -0
  39. package/elements/alarm/alarm-element.d.ts +69 -0
  40. package/elements/alarm/alarm-element.js +497 -0
  41. package/elements/alarm/alarm-element.metadata.json +1 -0
  42. package/elements/bar-graph-element.d.ts +10 -2
  43. package/elements/bar-graph-element.js +135 -5
  44. package/elements/bar-graph-element.metadata.json +1 -1
  45. package/elements/base/readable-element.d.ts +6 -1
  46. package/elements/base/readable-element.js +64 -2
  47. package/elements/base/readable-element.metadata.json +1 -1
  48. package/elements/base/state-control-element.d.ts +3 -1
  49. package/elements/base/state-control-element.js +3 -0
  50. package/elements/datetime-display/datetime-display-element.d.ts +1 -0
  51. package/elements/datetime-display/datetime-display-element.js +10 -2
  52. package/elements/datetime-display/datetime-display-element.metadata.json +1 -1
  53. package/elements/datetime-display/time-zone-select-json.d.ts +8 -0
  54. package/elements/datetime-display/time-zone-select-json.js +558 -0
  55. package/elements/historical-curve/historical-curve.element.d.ts +39 -3
  56. package/elements/historical-curve/historical-curve.element.js +509 -43
  57. package/elements/historical-curve/historical-curve.element.metadata.json +1 -1
  58. package/elements/main-element.d.ts +1 -0
  59. package/elements/main-element.js +59 -9
  60. package/elements/main-element.metadata.json +1 -1
  61. package/elements/meter-element.d.ts +7 -1
  62. package/elements/meter-element.js +76 -7
  63. package/elements/meter-element.metadata.json +1 -1
  64. package/elements/numerical-display/numerical-display-element.d.ts +16 -3
  65. package/elements/numerical-display/numerical-display-element.js +83 -11
  66. package/elements/numerical-display/numerical-display-element.metadata.json +1 -1
  67. package/elements/per-view-variable-communicator.d.ts +3 -0
  68. package/elements/per-view-variable-communicator.js +11 -0
  69. package/elements/per-view-variable-communicator.metadata.json +1 -1
  70. package/elements/ring-graph/ring-graph-element.d.ts +13 -1
  71. package/elements/ring-graph/ring-graph-element.js +164 -3
  72. package/elements/ring-graph/ring-graph-element.metadata.json +1 -1
  73. package/elements/scroll-alarm/scroll-alarm-element.d.ts +67 -0
  74. package/elements/scroll-alarm/scroll-alarm-element.js +663 -0
  75. package/elements/scroll-alarm/scroll-alarm-element.metadata.json +1 -0
  76. package/elements/shared/graph/graph-state-element.js +0 -3
  77. package/elements/shared/text/text-element.d.ts +9 -0
  78. package/elements/shared/text/text-element.js +33 -2
  79. package/elements/shared/text/text-element.metadata.json +1 -1
  80. package/elements/shared/text/text-state-element.d.ts +25 -2
  81. package/elements/shared/text/text-state-element.js +138 -63
  82. package/elements/shared/text/text-state-element.metadata.json +1 -1
  83. package/elements/static-elements/hyperlink-element.d.ts +24 -2
  84. package/elements/static-elements/hyperlink-element.js +101 -3
  85. package/elements/static-elements/hyperlink-element.metadata.json +1 -1
  86. package/elements/static-elements/text-element.d.ts +23 -2
  87. package/elements/static-elements/text-element.js +96 -3
  88. package/elements/static-elements/text-element.metadata.json +1 -1
  89. package/elements/switch-indicator-light/bit-switch-operator.d.ts +1 -0
  90. package/elements/switch-indicator-light/bit-switch-operator.js +19 -0
  91. package/elements/switch-indicator-light/bit-switch-operator.metadata.json +1 -1
  92. package/elements/switch-indicator-light/switch-indicator-light-element.d.ts +18 -2
  93. package/elements/switch-indicator-light/switch-indicator-light-element.js +120 -25
  94. package/elements/switch-indicator-light/switch-indicator-light-element.metadata.json +1 -1
  95. package/elements/switch-indicator-light/switch-operator.d.ts +1 -0
  96. package/elements/switch-indicator-light/word-switch-operator.d.ts +1 -0
  97. package/elements/switch-indicator-light/word-switch-operator.js +6 -0
  98. package/elements/switch-indicator-light/word-switch-operator.metadata.json +1 -1
  99. package/elements/video/video-element.d.ts +4 -0
  100. package/elements/video/video-element.js +81 -21
  101. package/elements/video/video-element.metadata.json +1 -1
  102. package/elements/view-operation/view-operation.element.d.ts +23 -2
  103. package/elements/view-operation/view-operation.element.js +103 -1
  104. package/elements/view-operation/view-operation.element.metadata.json +1 -1
  105. package/elements/weather/weater-element.js +0 -1
  106. package/gui/gui-context.d.ts +12 -2
  107. package/gui/gui-host.d.ts +1 -1
  108. package/gui/gui-view.d.ts +2 -0
  109. package/gui/gui-view.js +38 -2
  110. package/gui/gui-view.metadata.json +1 -1
  111. package/gui/gui.component.d.ts +3 -0
  112. package/gui/gui.component.js +15 -2
  113. package/gui/gui.component.metadata.json +1 -1
  114. package/localization/localization.service.d.ts +7 -0
  115. package/localization/localization.service.js +10 -3
  116. package/localization/localization.service.metadata.json +1 -1
  117. package/localization/localization.service.zh_CN.js +8 -1
  118. package/localization/localization.service.zh_CN.metadata.json +1 -1
  119. package/modal/write-value/write-value-modal-args.d.ts +5 -1
  120. package/modal/write-value/write-value-modal-args.js +3 -1
  121. package/modal/write-value/write-value-modal-args.metadata.json +1 -1
  122. package/modal/write-value/write-value-modal.component.d.ts +12 -7
  123. package/modal/write-value/write-value-modal.component.html +9 -4
  124. package/modal/write-value/write-value-modal.component.js +73 -15
  125. package/modal/write-value/write-value-modal.component.metadata.json +1 -1
  126. package/model/air-quality/air-quality-info.d.ts +23 -0
  127. package/model/air-quality/air-quality-info.js +4 -0
  128. package/model/air-quality/air-quality-info.metadata.json +1 -0
  129. package/model/air-quality/air-quality.model.d.ts +7 -0
  130. package/model/air-quality/air-quality.model.js +0 -0
  131. package/model/air-quality/air-quality.model.metadata.json +1 -0
  132. package/model/alarm/alarm.model.d.ts +13 -0
  133. package/model/alarm/alarm.model.js +0 -0
  134. package/model/alarm/alarm.model.metadata.json +1 -0
  135. package/model/bar-graph/bar-graph.d.ts +4 -0
  136. package/model/base/font-setting-model.d.ts +6 -0
  137. package/model/base/font-setting-model.metadata.json +1 -1
  138. package/model/base/readable-model.d.ts +4 -0
  139. package/model/datetime-display/datetime-display.d.ts +1 -0
  140. package/model/historical-curve/historical-curve-axis-settings.d.ts +11 -0
  141. package/model/historical-curve/historical-curve-axis-settings.js +5 -0
  142. package/model/historical-curve/historical-curve-axis-settings.metadata.json +1 -1
  143. package/model/historical-curve/historical-curve-chanel.model.d.ts +8 -0
  144. package/model/historical-curve/historical-curve.data-settings.d.ts +18 -1
  145. package/model/historical-curve/historical-curve.data-settings.metadata.json +1 -1
  146. package/model/meter/meter.d.ts +4 -0
  147. package/model/ring-graph/ring-graph.model.d.ts +8 -0
  148. package/model/scroll-alarm/scroll-alarm.model.d.ts +21 -0
  149. package/model/scroll-alarm/scroll-alarm.model.js +0 -0
  150. package/model/scroll-alarm/scroll-alarm.model.metadata.json +1 -0
  151. package/model/switch-indicator-light/bit-switch-operation.d.ts +2 -1
  152. package/model/switch-indicator-light/bit-switch-operation.js +1 -0
  153. package/model/switch-indicator-light/bit-switch-operation.metadata.json +1 -1
  154. package/model/switch-indicator-light/switch-indicator-light.d.ts +2 -0
  155. package/model/view-operation/view-operation-element.model.d.ts +7 -1
  156. package/package.json +1 -1
  157. package/public_api.js +1 -0
  158. package/remote/communication/variable/remote-variable-communicator.d.ts +22 -0
  159. package/remote/communication/variable/remote-variable-communicator.js +122 -2
  160. package/remote/communication/variable/remote-variable-communicator.metadata.json +1 -1
  161. package/remote/communication/variable/remote-variable-protocol.d.ts +5 -0
  162. package/service/index.d.ts +4 -0
  163. package/service/index.js +1 -0
  164. package/service/index.metadata.json +1 -1
  165. package/service/language.service.d.ts +37 -0
  166. package/service/language.service.js +0 -0
  167. package/service/language.service.metadata.json +1 -0
  168. package/service/released-variable/index.d.ts +1 -0
  169. package/service/released-variable/index.js +0 -0
  170. package/service/released-variable/index.metadata.json +1 -0
  171. package/service/released-variable/released-variable.service.d.ts +4 -0
  172. package/service/released-variable/released-variable.service.js +0 -0
  173. package/service/released-variable/released-variable.service.metadata.json +1 -0
  174. package/service/system-text-library.service.d.ts +76 -0
  175. package/service/system-text-library.service.js +28 -0
  176. package/service/system-text-library.service.metadata.json +1 -0
  177. package/service/text-library.service.d.ts +49 -0
  178. package/service/text-library.service.js +0 -0
  179. package/service/text-library.service.metadata.json +1 -0
  180. package/service/weather.service.d.ts +1 -0
  181. package/shared/gui-consts.d.ts +3 -0
  182. package/shared/gui-consts.js +3 -0
  183. package/shared/gui-consts.metadata.json +1 -1
  184. package/utils/data-type/fbox-data-type.service.js +40 -0
@@ -62,9 +62,6 @@ export class GraphStateElement {
62
62
  }
63
63
  }
64
64
  getImageElement() {
65
- if (this.imageElement && /iPhone|iPod/i.test(navigator.userAgent)) {
66
- this.removeImageElement();
67
- }
68
65
  if (!this.imageElement) {
69
66
  this.imageElement = document.createElementNS('http://www.w3.org/2000/svg', 'image');
70
67
  this.imageElement.setAttribute('width', this.width + '');
@@ -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
72
  textDiv.style.cssText = `color: ${font.color};word-break: break-all;font: ${fontString};`;
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,36 @@ 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?;
11
18
  private textElement;
12
19
  private _element;
13
20
  get Element(): SVGElement;
14
21
  private faultFlickerStatus;
15
22
  private faultFlickerInterval;
16
- constructor(textStates: TextState[], width: number, height: number, logger: LoggerService, version?: number, faultFlickers?: IndicatorLightFaultFlicker[]);
23
+ private currentStateId;
24
+ private languageChangeSubscription?;
25
+ constructor(textStates: TextState[], width: number, height: number, logger: LoggerService, version?: number, faultFlickers?: IndicatorLightFaultFlicker[], textLibrarySetting?: TextLibrarySetting, textLibraryService?: TextLibraryService, languageService?: LanguageService, guiContext?: GuiContext);
17
26
  switchToState(stateId: number): void;
27
+ /**
28
+ * 订阅语种变化事件
29
+ * 当设备的语种ID改变时,重新渲染当前状态的文本
30
+ */
31
+ private subscribeLanguageChange;
32
+ /**
33
+ * 释放资源
34
+ */
35
+ dispose(): void;
18
36
  private getforeignObjectElement;
19
- private createNewForeignObjectText;
20
37
  private removeForeignObjectlement;
21
38
  private doFaultFlicker;
22
39
  private clearFlickerInterval;
40
+ /**
41
+ * 获取显示文本
42
+ * 如果配置了文本库,则根据状态ID和当前语种ID从文本库中获取对应语种的文本
43
+ * 否则返回默认文本
44
+ */
45
+ private getDisplayText;
23
46
  }
@@ -1,29 +1,37 @@
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) {
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;
11
14
  this.faultFlickerStatus = false;
12
15
  this.faultFlickerInterval = undefined;
13
16
  this._element = document.createElementNS('http://www.w3.org/2000/svg', 'g');
17
+ // 订阅语种变化事件
18
+ this.subscribeLanguageChange();
14
19
  }
15
20
  get Element() {
16
21
  return this._element;
17
22
  }
18
23
  switchToState(stateId) {
24
+ // 保存当前状态ID,用于语种切换时重新渲染
25
+ this.currentStateId = stateId;
19
26
  const textState = this.textStates.find(t => t.id === stateId);
20
27
  if (textState === undefined) {
21
28
  this.removeForeignObjectlement();
22
29
  this.logger.debug(`Can not find text state:${stateId}.`);
23
30
  return;
24
31
  }
25
- const content = textState.text.content;
26
- if (content === '') {
32
+ // 获取显示文本(支持文本库)
33
+ const content = this.getDisplayText(stateId, textState.text.content);
34
+ if (content === '' || content == null) {
27
35
  this.removeForeignObjectlement();
28
36
  return;
29
37
  }
@@ -33,71 +41,83 @@ export class TextStateElement {
33
41
  this.logger.debug('The font is undefined.');
34
42
  return;
35
43
  }
36
- const foreignObjectElement = this.getforeignObjectElement();
37
- foreignObjectElement.innerHTML = '';
38
- const text = this.createNewForeignObjectText(content, font);
39
- foreignObjectElement.appendChild(text);
40
- this.doFaultFlicker(foreignObjectElement, stateId);
44
+ const textElement = this.getforeignObjectElement();
45
+ // 清空旧内容
46
+ textElement.textContent = '';
47
+ // 设置 text-anchor 和 dominant-baseline
48
+ textElement.setAttribute('text-anchor', 'middle');
49
+ textElement.setAttribute('dominant-baseline', 'middle');
50
+ textElement.setAttribute('pointer-events', 'auto');
51
+ // 拆分换行
52
+ const lines = content.split('\n');
53
+ const fontSize = parseInt(font.fontSize, 10);
54
+ const lineHeight = fontSize + 4;
55
+ // 总高度 = 行数 * 行高
56
+ const totalHeight = lines.length * lineHeight;
57
+ // 调整文本整体垂直居中(通过 dy)
58
+ const startY = (this.height / 2) - (totalHeight / 2) + (lineHeight / 2);
59
+ // 添加每行文本
60
+ for (let i = 0; i < lines.length; i++) {
61
+ const tspan = document.createElementNS('http://www.w3.org/2000/svg', 'tspan');
62
+ tspan.setAttribute('x', (this.width / 2).toString());
63
+ tspan.setAttribute('y', startY + i * lineHeight + 'px');
64
+ tspan.textContent = lines[i].replace(/ /g, '\u00A0');
65
+ tspan.setAttribute('font-size', font.fontSize);
66
+ tspan.setAttribute('fill', font.color);
67
+ tspan.setAttribute('font-family', font.fontFamily);
68
+ tspan.setAttribute('font-weight', font.isBold ? 'bold' : 'normal');
69
+ tspan.setAttribute('font-style', font.isItalic ? 'italic' : 'normal');
70
+ tspan.setAttribute('text-decoration', font.isUnderline ? 'underline' : 'none');
71
+ tspan.setAttribute('text-anchor', 'middle');
72
+ tspan.setAttribute('dominant-baseline', 'middle');
73
+ textElement.appendChild(tspan);
74
+ }
75
+ this.doFaultFlicker(textElement, stateId);
41
76
  }
42
- getforeignObjectElement() {
43
- 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());
47
- this._element.appendChild(this.textElement);
77
+ /**
78
+ * 订阅语种变化事件
79
+ * 当设备的语种ID改变时,重新渲染当前状态的文本
80
+ */
81
+ subscribeLanguageChange() {
82
+ // 只有使用文本库时才需要订阅语种变化
83
+ if (!this.textLibrarySetting || this.textLibrarySetting.labelType !== 'textLibrary') {
84
+ return;
85
+ }
86
+ if (this.guiContext && this.guiContext.languageChanged$) {
87
+ this.languageChangeSubscription = this.guiContext.languageChanged$.subscribe(() => {
88
+ // 如果当前有状态,重新渲染
89
+ if (this.currentStateId !== undefined) {
90
+ this.switchToState(this.currentStateId);
91
+ }
92
+ });
48
93
  }
49
- return this.textElement;
50
94
  }
51
- createNewForeignObjectText(content, font) {
52
- if (font) {
53
- font.fontFamily += ',msyh';
95
+ /**
96
+ * 释放资源
97
+ */
98
+ dispose() {
99
+ // 取消语种变化订阅
100
+ if (this.languageChangeSubscription) {
101
+ this.languageChangeSubscription.unsubscribe();
102
+ this.languageChangeSubscription = undefined;
54
103
  }
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 = '';
104
+ // 清除闪烁定时器
105
+ if (this.faultFlickerInterval) {
106
+ clearInterval(this.faultFlickerInterval);
107
+ this.faultFlickerInterval = undefined;
62
108
  }
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);
109
+ }
110
+ getforeignObjectElement() {
111
+ if (!this.textElement) {
112
+ this.textElement = document.createElementNS('http://www.w3.org/2000/svg', 'text');
113
+ this.textElement.setAttribute('x', (this.width / 2).toString());
114
+ this.textElement.setAttribute('y', (this.height / 2).toString());
115
+ this.textElement.setAttribute('text-anchor', 'middle');
116
+ this.textElement.setAttribute('dominant-baseline', 'middle');
117
+ this.textElement.setAttribute('pointer-events', 'auto'); // 确保能接收事件
118
+ this._element.appendChild(this.textElement);
88
119
  }
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;
120
+ return this.textElement;
101
121
  }
102
122
  removeForeignObjectlement() {
103
123
  if (this.textElement) {
@@ -133,4 +153,59 @@ export class TextStateElement {
133
153
  }
134
154
  }
135
155
  }
156
+ /**
157
+ * 获取显示文本
158
+ * 如果配置了文本库,则根据状态ID和当前语种ID从文本库中获取对应语种的文本
159
+ * 否则返回默认文本
160
+ */
161
+ getDisplayText(stateId, defaultContent) {
162
+ var _a, _b, _c, _d, _e, _f;
163
+ // 检查是否使用文本库
164
+ if (this.textLibrarySetting && this.textLibrarySetting.labelType === 'textLibrary') {
165
+ const textLibraryId = this.textLibrarySetting.selectedTextLibraryItem;
166
+ if (textLibraryId && this.textLibraryService) {
167
+ // 获取文本库数据
168
+ const textLibraryData = this.textLibraryService.getTextLibraryById(typeof textLibraryId === 'string' ? parseInt(textLibraryId, 10) : textLibraryId);
169
+ if (textLibraryData && textLibraryData.data) {
170
+ // 使用状态ID作为value查找对应的文本条目
171
+ const textEntry = textLibraryData.data.find(entry => entry.value === stateId.toString());
172
+ if (textEntry) {
173
+ // 获取当前语种ID
174
+ 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;
175
+ // 确定要使用的语种代码(culture)
176
+ let targetLanguage;
177
+ const defaultLanguage = ((_d = this.languageService) === null || _d === void 0 ? void 0 : _d.getDefaultLanguage()) || 'zh-CN';
178
+ if (currentLanguageId === null || currentLanguageId === undefined) {
179
+ // 设备未设置当前语种,使用默认语种
180
+ targetLanguage = defaultLanguage;
181
+ }
182
+ else {
183
+ // 设备已设置当前语种,获取对应的语种代码
184
+ const currentLanguage = (_f = (_e = this.guiContext) === null || _e === void 0 ? void 0 : _e.getLanguageCultureById) === null || _f === void 0 ? void 0 : _f.call(_e, currentLanguageId);
185
+ if (currentLanguage) {
186
+ // 直接使用设备设置的语种,不再fallback
187
+ targetLanguage = currentLanguage;
188
+ }
189
+ else {
190
+ targetLanguage = defaultLanguage;
191
+ }
192
+ }
193
+ // 返回对应语种的文本,如果没有则返回空字符串
194
+ if (textEntry.cultures && textEntry.cultures[targetLanguage]) {
195
+ const text = textEntry.cultures[targetLanguage];
196
+ return text;
197
+ }
198
+ else {
199
+ // 对应语种没有文本,返回空字符串
200
+ return '';
201
+ }
202
+ }
203
+ }
204
+ }
205
+ // 文本库配置但未找到数据,返回空字符串
206
+ return '';
207
+ }
208
+ // 默认返回文本内容
209
+ return defaultContent || '';
210
+ }
136
211
  }
@@ -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}]}],"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
  }
@@ -3,12 +3,17 @@ import { GraphStateElement } from '../shared/graph/graph-state-element';
3
3
  import { LOGGER_SERVICE_TOKEN } from '../../logger';
4
4
  import { TextElementModal } from '../shared/text/text-element';
5
5
  export class HyperlinkElement extends ConditionalDynamicDisplayElement {
6
- constructor(element, injector, permissionChecker, variableCommunicator, variableStore, graphStore, signalRAppId) {
6
+ constructor(element, injector, permissionChecker, variableCommunicator, variableStore, graphStore, signalRAppId, textLibraryService, languageService, guiContext) {
7
7
  super(element, permissionChecker, variableCommunicator, variableStore, signalRAppId);
8
8
  this.graphStore = graphStore;
9
+ this.textLibraryService = textLibraryService;
10
+ this.languageService = languageService;
11
+ this.guiContext = guiContext;
9
12
  this.logger = injector.get(LOGGER_SERVICE_TOKEN);
10
13
  if (this.model.size) {
11
14
  this.initGraphAndText();
15
+ // 订阅语种变化
16
+ this.subscribeLanguageChange();
12
17
  }
13
18
  if (this.model && this.model.linkAddress) {
14
19
  this.rootElement.style('cursor', 'hand');
@@ -22,6 +27,44 @@ export class HyperlinkElement extends ConditionalDynamicDisplayElement {
22
27
  });
23
28
  }
24
29
  }
30
+ dispose() {
31
+ // 取消语种变化订阅
32
+ if (this.languageChangeSubscription) {
33
+ this.languageChangeSubscription.unsubscribe();
34
+ this.languageChangeSubscription = undefined;
35
+ }
36
+ if (this.$element) {
37
+ this.$element.remove();
38
+ }
39
+ }
40
+ /**
41
+ * 订阅语种变化事件
42
+ * 当设备的语种ID改变时,重新渲染文本
43
+ */
44
+ subscribeLanguageChange() {
45
+ // 只有使用文本库时才需要订阅语种变化
46
+ if (!this.model.textLibrary || this.model.textLibrary.labelType !== 'textLibrary') {
47
+ return;
48
+ }
49
+ if (this.guiContext && this.guiContext.languageChanged$) {
50
+ this.languageChangeSubscription = this.guiContext.languageChanged$.subscribe(() => {
51
+ // 重新渲染文本
52
+ this.reRenderText();
53
+ });
54
+ }
55
+ }
56
+ /**
57
+ * 重新渲染文本
58
+ */
59
+ reRenderText() {
60
+ if (!this.textElementModal || !this.model.size) {
61
+ return;
62
+ }
63
+ // 获取新的显示文本
64
+ const displayText = this.getDisplayText();
65
+ // 直接更新文本内容,而不是重新创建元素
66
+ this.textElementModal.updateText(displayText);
67
+ }
25
68
  initGraphAndText() {
26
69
  this.rootElement.selectAll('*').remove();
27
70
  const size = this.model.size;
@@ -42,7 +85,62 @@ export class HyperlinkElement extends ConditionalDynamicDisplayElement {
42
85
  color: this.model.stroke,
43
86
  textAlign: this.model.textAlign
44
87
  };
45
- const textElement = new TextElementModal(this.model.text, font, width, height);
46
- this.$element.append(textElement.Element);
88
+ // 获取显示文本(支持文本库)
89
+ const displayText = this.getDisplayText();
90
+ this.textElementModal = new TextElementModal(displayText, font, width, height);
91
+ this.$element.append(this.textElementModal.Element);
92
+ }
93
+ /**
94
+ * 获取显示文本
95
+ * 如果配置了文本库,则从文本库中获取对应语种的文本
96
+ * 否则返回默认文本
97
+ */
98
+ getDisplayText() {
99
+ var _a, _b, _c, _d, _e, _f;
100
+ // 检查是否使用文本库
101
+ if (this.model.textLibrary && this.model.textLibrary.labelType === 'textLibrary') {
102
+ const textLibraryId = this.model.textLibrary.selectedTextLibraryItem;
103
+ const textItem = this.model.textLibrary.selectedTextItem;
104
+ if (textLibraryId && textItem && this.textLibraryService) {
105
+ // 获取文本库数据
106
+ const textLibraryData = this.textLibraryService.getTextLibraryById(typeof textLibraryId === 'string' ? parseInt(textLibraryId, 10) : textLibraryId);
107
+ if (textLibraryData && textLibraryData.data) {
108
+ // 查找对应的文本条目
109
+ const textEntry = textLibraryData.data.find(entry => entry.key === textItem.toString());
110
+ if (textEntry) {
111
+ // 获取当前语种ID
112
+ 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;
113
+ // 确定要使用的语种代码(culture)
114
+ let targetLanguage;
115
+ const defaultLanguage = ((_d = this.languageService) === null || _d === void 0 ? void 0 : _d.getDefaultLanguage()) || 'zh-CN';
116
+ if (currentLanguageId === null || currentLanguageId === undefined) {
117
+ // 设备未设置当前语种,使用默认语种
118
+ targetLanguage = defaultLanguage;
119
+ }
120
+ else {
121
+ // 设备已设置当前语种,获取对应的语种代码
122
+ const currentLanguage = (_f = (_e = this.guiContext) === null || _e === void 0 ? void 0 : _e.getLanguageCultureById) === null || _f === void 0 ? void 0 : _f.call(_e, currentLanguageId);
123
+ if (currentLanguage) {
124
+ targetLanguage = currentLanguage;
125
+ }
126
+ else {
127
+ // 无法获取语种代码,使用默认语种
128
+ targetLanguage = defaultLanguage;
129
+ }
130
+ }
131
+ // 返回对应语种的文本
132
+ if (textEntry.cultures && textEntry.cultures[targetLanguage]) {
133
+ return textEntry.cultures[targetLanguage];
134
+ }
135
+ // 如果没有对应语种,返回空字符串
136
+ return '';
137
+ }
138
+ }
139
+ }
140
+ // 文本库配置但未找到数据,返回空字符串
141
+ return '';
142
+ }
143
+ // 默认返回文本内容
144
+ return this.model.text || '';
47
145
  }
48
146
  }
@@ -1 +1 @@
1
- [{"__symbolic":"module","version":4,"metadata":{"HyperlinkElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-dynamic-display-element","name":"ConditionalDynamicDisplayElement","line":12,"character":38},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":17,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":17,"character":48},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":17,"character":77},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":18,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":18,"character":67},{"__symbolic":"reference","module":"../../config","name":"GraphStore","line":18,"character":111},{"__symbolic":"reference","name":"string"}]}],"initGraphAndText":[{"__symbolic":"method"}]}}}}]
1
+ [{"__symbolic":"module","version":4,"metadata":{"HyperlinkElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/conditional-dynamic-display-element","name":"ConditionalDynamicDisplayElement","line":14,"character":38},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":21,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":21,"character":48},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":21,"character":77},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":22,"character":30},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":22,"character":67},{"__symbolic":"reference","module":"../../config","name":"GraphStore","line":22,"character":111},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","module":"../../service","name":"TextLibraryService","line":24,"character":46},{"__symbolic":"reference","module":"../../service","name":"LanguageService","line":25,"character":43},{"__symbolic":"reference","module":"../../gui/gui-context","name":"GuiContext","line":26,"character":38}]}],"dispose":[{"__symbolic":"method"}],"subscribeLanguageChange":[{"__symbolic":"method"}],"reRenderText":[{"__symbolic":"method"}],"initGraphAndText":[{"__symbolic":"method"}],"getDisplayText":[{"__symbolic":"method"}]}}}}]
@@ -4,13 +4,34 @@ import { ConditionalDynamicDisplayElement } from '../base/conditional-dynamic-di
4
4
  import { GraphStore, VariableStore } from '../../config';
5
5
  import { LoggerService } from '../../logger';
6
6
  import { Injector } from '@angular/core';
7
- import { PermissionChecker } from '../../service';
7
+ import { PermissionChecker, TextLibraryService, LanguageService } from '../../service';
8
+ import { GuiContext } from '../../gui/gui-context';
8
9
  export declare class TextElement extends ConditionalDynamicDisplayElement {
9
10
  private readonly graphStore;
11
+ private readonly textLibraryService?;
12
+ private readonly languageService?;
13
+ private readonly guiContext?;
10
14
  protected readonly model: TextModel;
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);
13
19
  dispose(): void;
20
+ /**
21
+ * 订阅语种变化事件
22
+ * 当设备的语种ID改变时,重新渲染文本
23
+ */
24
+ private subscribeLanguageChange;
25
+ /**
26
+ * 重新渲染文本
27
+ */
28
+ private reRenderText;
29
+ /**
30
+ * 获取显示文本
31
+ * 如果配置了文本库,则从文本库中获取对应语种的文本
32
+ * 否则返回默认文本
33
+ */
34
+ private getDisplayText;
14
35
  private handleTextValue;
15
36
  private initGraph;
16
37
  }