tuain-ng-forms-lib 12.0.84 → 12.0.87

package/bundles/tuain-ng-forms-lib.umd.js

@@ -1162,11 +1162,21 @@
             if (fieldCurrentValue === undefined || fieldCurrentValue === null) {
                 return true;
             }
-            if ((this.fieldType === this._formConfig.fieldTypes.array || this.fieldType === this._formConfig.fieldTypes.phone)
+            if (this.fieldType === this._formConfig.fieldTypes.array
                 && Array.isArray(fieldCurrentValue) && fieldCurrentValue.length === 0) {
                 return true;
             }
             ;
+            if (this.fieldType === this._formConfig.fieldTypes.phone) {
+                if (!Array.isArray(fieldCurrentValue)) {
+                    return true;
+                }
+                if (fieldCurrentValue.length !== 2 || !fieldCurrentValue[0] || !fieldCurrentValue[1]) {
+                    return true;
+                }
+                return false;
+            }
+            ;
             return fieldCurrentValue === '';
         };
         FieldDescriptor.prototype.getValue = function () {
@@ -3423,17 +3433,18 @@
             return (name) ? ((_b = (_a = this.extraData) === null || _a === void 0 ? void 0 : _a[name]) !== null && _b !== void 0 ? _b : null) : null;
         };
         BasicFormComponent.prototype.preocessInputParams = function (params) {
-            var _a, _b, _c;
+            var _a, _b, _c, _d;
             this._controlToken = (_a = params === null || params === void 0 ? void 0 : params[TOKEN]) !== null && _a !== void 0 ? _a : null;
-            var _j = this.formManagerService.getFormInfo(this._controlToken), token = _j.token, subject = _j.subject, state = _j.state, fields = _j.fields, extra = _j.extra, originToken = _j.originToken;
-            if (!this._controlToken || this._controlToken !== token) {
-                return null;
+            this.formSubject = (_b = params === null || params === void 0 ? void 0 : params[SUBJECT]) !== null && _b !== void 0 ? _b : null;
+            var tokenInfo = (this._controlToken) ? this.formManagerService.getFormInfo(this._controlToken) : {};
+            var token = tokenInfo.token, subject = tokenInfo.subject, state = tokenInfo.state, fields = tokenInfo.fields, extra = tokenInfo.extra, originToken = tokenInfo.originToken;
+            if (token && this._controlToken === token) {
+                this.formSubject = (_d = (_c = this.formSubject) !== null && _c !== void 0 ? _c : subject) !== null && _d !== void 0 ? _d : null;
+                this.inputDataFields = fields;
+                this.extraData = extra;
+                this._originToken = originToken;
+                return state;
             }
-            this.formSubject = (_c = (_b = params === null || params === void 0 ? void 0 : params[SUBJECT]) !== null && _b !== void 0 ? _b : subject) !== null && _c !== void 0 ? _c : null;
-            this.inputDataFields = fields;
-            this.extraData = extra;
-            this._originToken = originToken;
-            return state;
         };
         BasicFormComponent.prototype.subscribeSectionActivation = function () {
             var _this = this;