ps-toolkit-ui 1.3.66 → 1.3.67

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

@@ -4816,13 +4816,8 @@
         };
         FormPlaqueComponent.prototype.onFocusIn = function (e) {
             if (e === void 0) { e = null; }
-            console.log(111);
             if (e == null || !(e.screenX && e.screenX !== 0 && e.screenY && e.screenY !== 0)) {
-                console.log(222);
-                setTimeout(function () {
-                    console.log($('#Part1Input .control'));
-                    $('#Part1Input .control').focus();
-                }, 100);
+                this.part1.focus();
             }
         };
         FormPlaqueComponent.prototype.onKeyDown = function (e) {
@@ -6624,12 +6619,18 @@
             this.car.displayLabel = this.carF.displayLabel = this.motor.displayLabel = false;
             this.inp.setValue = function (v) {
                 if (v != null) {
-                    if (v.split('_').length === 2) {
+                    if (v.split('_').length === 2 && v.split('_').some(function (x) { return !isNaN(parseInt(x, 10)); })) {
                         _this.type = exports.VehicleType.Motorcycle;
                         setTimeout(function () {
                             _this.motor.setValue(v, false);
                         });
                     }
+                    else if (v.split('_').length === 2) {
+                        _this.type = exports.VehicleType.CarF;
+                        setTimeout(function () {
+                            _this.carF.setValue(v, false);
+                        });
+                    }
                     else if (v.split('_').length === 4) {
                         _this.type = exports.VehicleType.Car;
                         setTimeout(function () {
@@ -6651,6 +6652,10 @@
                     _this.inp.error = exports.InputError.Required;
                     return false;
                 }
+                if (_this.inp.required && _this.type === exports.VehicleType.CarF && !_this.carF.isValid()) {
+                    _this.inp.error = exports.InputError.Required;
+                    return false;
+                }
                 return true;
             };
             this.inp.clear = function () {
@@ -6659,9 +6664,10 @@
                 _this.type = exports.VehicleType.Car;
                 _this.car.clear();
                 _this.motor.clear();
+                _this.carF.clear();
             };
             this.inp.data = function () {
-                return _this.type === exports.VehicleType.Car ? _this.car.data() : _this.type === exports.VehicleType.Motorcycle ? _this.motor.data() : null;
+                return _this.type === exports.VehicleType.Car ? _this.car.data() : _this.type === exports.VehicleType.Motorcycle ? _this.motor.data() : _this.type === exports.VehicleType.CarF ? _this.carF.data() : null;
             };
         };
         FormCarComponent.prototype.changeType = function (t) {
@@ -6672,15 +6678,9 @@
             this.onFocusIn();
         };
         FormCarComponent.prototype.onFocusIn = function () {
-            if (this.type === exports.VehicleType.Car) {
-                this.car.focus();
-            }
-            else if (this.type === exports.VehicleType.CarF) {
-                this.carF.focus();
-            }
-            else if (this.type === exports.VehicleType.Motorcycle) {
-                this.motor.focus();
-            }
+            setTimeout(function () {
+                $('#Part1Input .control').focus();
+            }, 100);
         };
         return FormCarComponent;
     }());