ps-toolkit-ui 1.5.0 → 1.5.3

package/bundles/ps-toolkit-ui.umd.js

@@ -3080,11 +3080,13 @@
                 this.table.searchForm.inputs.forEach(function (x) {
                     x.required = false;
                     x.displayLabel = false;
-                    x.withClear = !_this.table.searchForm.inputs.some(function (s) { return s.type === exports.InputType.Submit; });
-                    x.class = x.class + ' h-30 search-form-inp';
-                    x.onChange = function () {
-                        _this.table.load();
-                    };
+                    x.class = x.class + ' search-form-inp';
+                    if (!_this.table.searchForm.inputs.some(function (s) { return s.type === exports.InputType.Submit; })) {
+                        x.onChange = function () {
+                            _this.table.load();
+                        };
+                        x.withClear = true;
+                    }
                     if (x.type === exports.InputType.Submit) {
                         x.onClick = function () {
                             _this.table.load(x);
@@ -4839,20 +4841,7 @@
                 }
             };
             this.inp.isValid = function () {
-                _this.inp.value = _this.getValue();
-                if (_this.inp.required && !_this.inp.value) {
-                    _this.inp.error = exports.InputError.Required;
-                    return false;
-                }
-                if (!_this.inp.required && !_this.inp.value) {
-                    return true;
-                }
-                if (_this.inp.required && _this.inp.type === exports.InputType.Plaque &&
-                    (!_this.part1.isValid() || !_this.part2.isValid() || !_this.part3.isValid() || !_this.part4.isValid())) {
-                    _this.inp.error = exports.InputError.Invalid;
-                    return false;
-                }
-                if (_this.inp.required && (_this.inp.type === exports.InputType.PlaqueM || _this.inp.type === exports.InputType.PlaqueF) && (!_this.part1.isValid() || !_this.part3.isValid())) {
+                if (!_this.isValid()) {
                     _this.inp.error = exports.InputError.Invalid;
                     return false;
                 }
@@ -4871,6 +4860,13 @@
                 _this.onFocusIn();
             };
         };
+        FormPlaqueComponent.prototype.isValid = function () {
+            if (this.inp.required && this.inp.type === exports.InputType.Plaque &&
+                (!this.part1.isValid() || !this.part2.isValid() || !this.part3.isValid() || !this.part4.isValid())) {
+                return false;
+            }
+            return !(this.inp.required && (this.inp.type === exports.InputType.PlaqueM || this.inp.type === exports.InputType.PlaqueF) && (!this.part1.isValid() || !this.part3.isValid()));
+        };
         FormPlaqueComponent.prototype.changeFocus = function (p, a) {
             if (this.inp.type === exports.InputType.Plaque) {
                 if (p === 'Part1') {
@@ -4950,9 +4946,9 @@
             }
         };
         FormPlaqueComponent.prototype.getValue = function () {
-            return this.inp.type === exports.InputType.Plaque ?
+            return this.isValid() ? (this.inp.type === exports.InputType.Plaque ?
                 (this.part1.value ? this.part1.value : '') + "_" + (this.part2.value ? this.part2.value : '') + "_" + (this.part3.value ? this.part3.value : '') + "_" + (this.part4.value ? this.part4.value : '') :
-                (this.part1.value ? this.part1.value : '') + "_" + (this.part3.value ? this.part3.value : '');
+                (this.part1.value ? this.part1.value : '') + "_" + (this.part3.value ? this.part3.value : '')) : null;
         };
         return FormPlaqueComponent;
     }());