@flexem/fc-gui 3.0.0-alpha.82 → 3.0.0-alpha.84
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 +11 -1
- package/bundles/@flexem/fc-gui.umd.js +43 -3
- package/bundles/@flexem/fc-gui.umd.js.map +1 -1
- package/bundles/@flexem/fc-gui.umd.min.js +4 -4
- package/bundles/@flexem/fc-gui.umd.min.js.map +1 -1
- package/elements/numerical-display/numerical-display-element.js +3 -3
- package/package.json +1 -1
- package/utils/data-type/fbox-data-type.service.js +40 -0
|
@@ -193,14 +193,14 @@ export class NumericalDisplayElement extends ReadableElement {
|
|
|
193
193
|
this.recordValue = result.value;
|
|
194
194
|
const writeValue = this.dataTypeService.formatToDecimal(this.model.version, result.value, this.model.dataType);
|
|
195
195
|
this.showValue = result.showValue;
|
|
196
|
-
if (
|
|
196
|
+
if (this.displayText.toString().toUpperCase() !== this.showValue.toString().toUpperCase() || result.variableRwType === variableRwTypeEnum.witer) {
|
|
197
197
|
if (this.numericalOperation || result.enableNumericalOperation || result.isNumericalOperation || result.variableRwType === variableRwTypeEnum.witer) {
|
|
198
198
|
this.recordOperation(result.value);
|
|
199
199
|
this.writeValueMmodalRef.hide();
|
|
200
200
|
}
|
|
201
201
|
else {
|
|
202
202
|
this.restorationTimer = setTimeout(() => {
|
|
203
|
-
if (
|
|
203
|
+
if (this.displayText.toString().toUpperCase() !== this.showValue.toString().toUpperCase()) {
|
|
204
204
|
this.writeValueMmodalRef.content.isSubmitting = false;
|
|
205
205
|
this.writeValueMmodalRef.content.showValidationErrorInfo(this.localization.writeValueTimeout);
|
|
206
206
|
}
|
|
@@ -240,7 +240,7 @@ export class NumericalDisplayElement extends ReadableElement {
|
|
|
240
240
|
updateVariableValue(value) {
|
|
241
241
|
var _a;
|
|
242
242
|
const displayText = this.formatNumericalDisplayText(this.model.dataType, this.model.fractionDigits, value);
|
|
243
|
-
if (((_a = this.writeValueMmodalRef) === null || _a === void 0 ? void 0 : _a.content) &&
|
|
243
|
+
if (((_a = this.writeValueMmodalRef) === null || _a === void 0 ? void 0 : _a.content) && displayText.toString().toUpperCase() === this.showValue.toString().toUpperCase()) {
|
|
244
244
|
if (this.restorationTimer) {
|
|
245
245
|
clearTimeout(this.restorationTimer);
|
|
246
246
|
this.restorationTimer = undefined;
|
package/package.json
CHANGED
|
@@ -109,6 +109,16 @@ let FBoxDataTypeService = class FBoxDataTypeService {
|
|
|
109
109
|
return 8;
|
|
110
110
|
case 15: // Binary32
|
|
111
111
|
return 32;
|
|
112
|
+
case 21: // UInt64
|
|
113
|
+
return 16;
|
|
114
|
+
case 22: // Int64
|
|
115
|
+
return 16;
|
|
116
|
+
case 23: // Bcd64
|
|
117
|
+
return 16;
|
|
118
|
+
case 24: // Hex64
|
|
119
|
+
return 8;
|
|
120
|
+
case 25: // Binary64
|
|
121
|
+
return 32;
|
|
112
122
|
default:
|
|
113
123
|
return 0;
|
|
114
124
|
}
|
|
@@ -165,6 +175,12 @@ let FBoxDataTypeService = class FBoxDataTypeService {
|
|
|
165
175
|
case 13: // Bcd32
|
|
166
176
|
case 14: // Hex32
|
|
167
177
|
case 15: // Binary32
|
|
178
|
+
case 21: // UInt64
|
|
179
|
+
case 23: // Bcd64
|
|
180
|
+
case 14: // Hex32
|
|
181
|
+
case 15: // Binary32
|
|
182
|
+
case 24: // Hex64
|
|
183
|
+
case 25: // Binary64
|
|
168
184
|
minValue = 0;
|
|
169
185
|
break;
|
|
170
186
|
case 2: // Int16
|
|
@@ -176,6 +192,13 @@ let FBoxDataTypeService = class FBoxDataTypeService {
|
|
|
176
192
|
case 16: // Single
|
|
177
193
|
minValue = -1000000000;
|
|
178
194
|
break;
|
|
195
|
+
case 22: // Int64
|
|
196
|
+
// minValue = -9223372036854775808;
|
|
197
|
+
minValue = Number.MIN_SAFE_INTEGER;
|
|
198
|
+
break;
|
|
199
|
+
case 26: // Double
|
|
200
|
+
minValue = -Number.MAX_VALUE;
|
|
201
|
+
break;
|
|
179
202
|
}
|
|
180
203
|
if (integerDigits) {
|
|
181
204
|
let digitsLength = integerDigits;
|
|
@@ -227,6 +250,23 @@ let FBoxDataTypeService = class FBoxDataTypeService {
|
|
|
227
250
|
case 16: // Single
|
|
228
251
|
maxValue = 1000000000;
|
|
229
252
|
break;
|
|
253
|
+
case 21: // UInt64
|
|
254
|
+
case 24: // Hex64
|
|
255
|
+
case 25: // Binary64
|
|
256
|
+
// maxValue = 18446744073709551615;
|
|
257
|
+
maxValue = Number.MAX_SAFE_INTEGER;
|
|
258
|
+
break;
|
|
259
|
+
case 22: // Int64
|
|
260
|
+
// maxValue = 9223372036854775807;
|
|
261
|
+
maxValue = Number.MAX_SAFE_INTEGER;
|
|
262
|
+
break;
|
|
263
|
+
case 23: // Bcd64
|
|
264
|
+
// maxValue = 9999999999999999;
|
|
265
|
+
maxValue = Number.MAX_SAFE_INTEGER;
|
|
266
|
+
break;
|
|
267
|
+
case 26: // Double
|
|
268
|
+
maxValue = Number.MAX_VALUE;
|
|
269
|
+
break;
|
|
230
270
|
}
|
|
231
271
|
if (integerDigits) {
|
|
232
272
|
let digitsLength = integerDigits;
|