@flexem/fc-gui 3.0.0-alpha.52 → 3.0.0-alpha.54

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -209,4 +209,15 @@
209
209
  ## 3.0.0-alpha.52(2022-10-31)
210
210
  ### Web端
211
211
  #### Features
212
- 1. FLEXCLOUD-2331: android切换时间后,不显示时间筛选组件,ios切换筛选时间大于24小时,时间格式为增加年月日
212
+ 1. FLEXCLOUD-2331: android切换时间后,不显示时间筛选组件,ios切换筛选时间大于24小时,时间格式为增加年月日
213
+
214
+ ## 3.0.0-alpha.53(2022-11-04)
215
+ ### Web端
216
+ #### Features
217
+ 1. FLEXCLOUD-2347【Web端】组态页面:组态页面监控点比较多,导致组态页面切换不生效问题
218
+
219
+ ## 3.0.0-alpha.54(2022-11-07)
220
+ ### Web端
221
+ #### Features
222
+ 1. FLEXCLOUD-2347【Web端】组态页面:组态页面监控点比较多,导致组态页面切换不生效问题
223
+ -- 接口变更,请求变量是否缩放使用另外一个接口
@@ -27347,7 +27347,7 @@ meter_element_MeterElement.DEFAULT_MAX_VALUE = 100;
27347
27347
 
27348
27348
  // CONCATENATED MODULE: ./.tmp/modal/write-value/write-value-modal-args.ts
27349
27349
  class WriteValueModalArgs {
27350
- constructor(variableName, dataType, fBoxDataType, integerDigits, fractionDigits, numericalOperation, version, enableDataParsed) {
27350
+ constructor(variableName, dataType, fBoxDataType, integerDigits, fractionDigits, numericalOperation, version, enableDataParsed, releasedVariableService) {
27351
27351
  this.variableName = variableName;
27352
27352
  this.dataType = dataType;
27353
27353
  this.fBoxDataType = fBoxDataType;
@@ -27356,6 +27356,7 @@ class WriteValueModalArgs {
27356
27356
  this.numericalOperation = numericalOperation;
27357
27357
  this.version = version;
27358
27358
  this.enableDataParsed = enableDataParsed;
27359
+ this.releasedVariableService = releasedVariableService;
27359
27360
  }
27360
27361
  }
27361
27362
 
@@ -27420,12 +27421,6 @@ class numerical_display_element_NumericalDisplayElement extends readable_element
27420
27421
  }
27421
27422
  }
27422
27423
  initElement() {
27423
- this.releasedVariableService.getVariablesWithValueTransform().subscribe(result => {
27424
- const variablesTransform = result.filter(item => item.name === this.writeVariableName);
27425
- if (variablesTransform && variablesTransform.length && JSON.parse(variablesTransform[0].valueTransform).Type !== 0) {
27426
- this.numericalOperation = true;
27427
- }
27428
- });
27429
27424
  const { rootElement } = this;
27430
27425
  rootElement.selectAll('*').remove();
27431
27426
  let width = null, height = null;
@@ -27548,7 +27543,7 @@ class numerical_display_element_NumericalDisplayElement extends readable_element
27548
27543
  if (null == this.writeVariableName) {
27549
27544
  return;
27550
27545
  }
27551
- const args = new WriteValueModalArgs(this.writeVariableName, this.model.dataType, this.model.fBoxDataType, this.model.integerDigits, this.model.fractionDigits, this.numericalOperationService.getNumericalOperations(this.model), this.model.version, this.enableDataParsed);
27546
+ const args = new WriteValueModalArgs(this.writeVariableName, this.model.dataType, this.model.fBoxDataType, this.model.integerDigits, this.model.fractionDigits, this.numericalOperationService.getNumericalOperations(this.model), this.model.version, this.enableDataParsed, this.releasedVariableService);
27552
27547
  this.writeValueMmodalRef = this.modalService.show(write_value_modal_component["a" /* WriteValueModalComponent */], {
27553
27548
  initialState: { args: args }, backdrop: 'static', class: 'gui-modal-dialog-position', animated: false
27554
27549
  });
@@ -27562,7 +27557,7 @@ class numerical_display_element_NumericalDisplayElement extends readable_element
27562
27557
  this.writeValue = writeValue;
27563
27558
  this.showValue = result.showValue;
27564
27559
  if (+this.displayText !== +this.showValue) {
27565
- if (this.numericalOperation || result.enableNumericalOperation) {
27560
+ if (this.numericalOperation || result.enableNumericalOperation || result.isNumericalOperation) {
27566
27561
  this.writeValueMmodalRef.hide();
27567
27562
  }
27568
27563
  else {
@@ -41215,7 +41210,12 @@ let WriteValueModalComponent = class WriteValueModalComponent {
41215
41210
  value = this.formatWriteValue();
41216
41211
  }
41217
41212
  }
41218
- this.onClosed({ value, showValue, enableNumericalOperation: this.enableNumericalOperation });
41213
+ this.args.releasedVariableService.getVariableWithValueTransform(this.variableName).subscribe(result => {
41214
+ if (JSON.parse(result).Type !== 0) {
41215
+ this.isNumericalOperation = true;
41216
+ }
41217
+ this.onClosed({ value, showValue, enableNumericalOperation: this.enableNumericalOperation, isNumericalOperation: this.isNumericalOperation });
41218
+ });
41219
41219
  }
41220
41220
  close() {
41221
41221
  this.bsModalRef.hide();