@magic-xpa/gui 4.900.0-dev490.46 → 4.900.0-dev490.49
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/esm2020/src/Commands.mjs +2 -4
- package/esm2020/src/management/gui/FieldValidator.mjs +2 -2
- package/esm2020/src/management/gui/MgControlBase.mjs +3 -7
- package/fesm2015/magic-xpa-gui.mjs +4 -10
- package/fesm2015/magic-xpa-gui.mjs.map +1 -1
- package/fesm2020/magic-xpa-gui.mjs +4 -10
- package/fesm2020/magic-xpa-gui.mjs.map +1 -1
- package/package.json +2 -2
- package/src/Commands.d.ts +1 -1
|
@@ -1235,13 +1235,11 @@ class Commands {
|
|
|
1235
1235
|
guiCommand.number = num;
|
|
1236
1236
|
GuiCommandQueue.getInstance().addCommand(guiCommand);
|
|
1237
1237
|
}
|
|
1238
|
-
static addValueWithLine(commandType, obj, line, value
|
|
1238
|
+
static addValueWithLine(commandType, obj, line, value) {
|
|
1239
1239
|
let guiCommand = new GuiCommand(obj, commandType);
|
|
1240
1240
|
guiCommand.value = value;
|
|
1241
1241
|
guiCommand.line = line;
|
|
1242
1242
|
if (commandType === CommandType.SET_VALUE) {
|
|
1243
|
-
if (reset)
|
|
1244
|
-
guiCommand.Bool1 = reset;
|
|
1245
1243
|
if (obj instanceof GuiMgControl && obj.isChoiceControl()) {
|
|
1246
1244
|
if (value < 0)
|
|
1247
1245
|
guiCommand.value = '';
|
|
@@ -10379,7 +10377,7 @@ class FieldValidator {
|
|
|
10379
10377
|
return valDet;
|
|
10380
10378
|
}
|
|
10381
10379
|
if (ctrl.DataType !== StorageAttribute.ALPHA && ctrl.DataType !== StorageAttribute.UNICODE && ctrl.DataType !== StorageAttribute.BLOB) {
|
|
10382
|
-
if ((typeof this._newvalue === 'string' && this._newvalue.trim().length === 0) || (ctrl.DataType === StorageAttribute.DATE && (ctrl.isDateZero(this._newvalue) || this.isNullDisplayVal()))) {
|
|
10380
|
+
if ((typeof this._newvalue === 'string' && this._newvalue.trim().length === 0) || (ctrl.DataType == StorageAttribute.NUMERIC && this._newvalue == null) || (ctrl.DataType === StorageAttribute.DATE && (ctrl.isDateZero(this._newvalue) || this.isNullDisplayVal()))) {
|
|
10383
10381
|
let field = ctrl.getField();
|
|
10384
10382
|
let defaultValue = field.getDefaultValue();
|
|
10385
10383
|
let text = null;
|
|
@@ -12377,12 +12375,8 @@ class MgControlBase extends GuiControlPropertyAdapter {
|
|
|
12377
12375
|
if (super.isButton()) {
|
|
12378
12376
|
mlsTranslatedValue = Events.Translate(this.Value);
|
|
12379
12377
|
}
|
|
12380
|
-
if (this.isTextControl() || this.isButton())
|
|
12381
|
-
|
|
12382
|
-
Commands.addValueWithLine(CommandType.SET_VALUE, this, displayLine, mlsTranslatedValue, true);
|
|
12383
|
-
else
|
|
12384
|
-
Commands.addValueWithLine(CommandType.SET_VALUE, this, displayLine, mlsTranslatedValue);
|
|
12385
|
-
}
|
|
12378
|
+
if (this.isTextControl() || this.isButton())
|
|
12379
|
+
Commands.addValueWithLine(CommandType.SET_VALUE, this, displayLine, mlsTranslatedValue);
|
|
12386
12380
|
else
|
|
12387
12381
|
Commands.addOperationWithLine(CommandType.SET_PROPERTY, this, displayLine, HtmlProperties.Text, mlsTranslatedValue);
|
|
12388
12382
|
}
|