@a-a-game-studio/aa-components - npm Package Compare versions

Comparing version 1.0.29 to 1.0.30

lib/ModelValidatorSys/ModelValidatorTaskS.js

@@ -176,20 +176,26 @@ "use strict";
             // Проверка на массив
-            if (Object(vJsonValue)) {
+            if (Array.isArray(vJsonValue) || vJsonValue === Object(vJsonValue)) {
                 sJsonValue = JSON.stringify(vJsonValue);
             }
             else {
-                sJsonValue = vJsonValue;
+                if (!Number(vJsonValue)) {
+                    sJsonValue = vJsonValue;
+                }
             }
+            sJsonValue = String(sJsonValue);
             // Проверка строки на корректный JSON
-            try {
-                let obj = null;
-                obj = JSON.parse(sJsonValue);
-                if (obj) {
-                    this.vValidatorSys.aResult[sKey] = sJsonValue;
-                    bSuccess = true;
+            if (sJsonValue !== '') {
+                try {
+                    let obj = null;
+                    obj = JSON.parse(sJsonValue);
+                    console.log('===value>', obj);
+                    if (obj) {
+                        this.vValidatorSys.aResult[sKey] = sJsonValue;
+                        bSuccess = true;
+                    }
                 }
+                catch (e) {
+                    this.vValidatorSys.errorSys.errorEx(e, sKey + '_json_parse', sKey + ' - неверный формат json поля');
+                }
             }
-            catch (e) {
-                this.vValidatorSys.errorSys.errorEx(e, sKey + '_json_parse', sKey + ' - неверный формат json поля');
-            }
         }
@@ -196,0 +202,0 @@ return bSuccess;

package.json

 {
   "name": "@a-a-game-studio/aa-components",
-  "version": "1.0.29",
+  "version": "1.0.30",
   "description": "node typescript base class",
@@ -5,0 +5,0 @@ "main": "lib/src/index.js",

src/ModelValidatorSys/ModelValidatorTaskS.ts

@@ -223,21 +223,29 @@ import { ModelValidatorSys } from "..";
             // Проверка на массив
-            if (Object(vJsonValue)) {
-                sJsonValue = JSON.stringify(vJsonValue);
+            if (Array.isArray(vJsonValue) || vJsonValue === Object(vJsonValue)) {
+				sJsonValue = JSON.stringify(vJsonValue);
             } else {
-                sJsonValue = vJsonValue;
-            }
+				if(!Number(vJsonValue)){
+					sJsonValue = vJsonValue;
+				}
+			}
+			
+			sJsonValue = String(sJsonValue);
 
-            // Проверка строки на корректный JSON
-            try {
-                let obj = null;
-                obj = JSON.parse(sJsonValue);
+			// Проверка строки на корректный JSON
+			
+			if(sJsonValue !== ''){
+				try {
+					let obj = null;
+					obj = JSON.parse(sJsonValue);
+					console.log('===value>',obj);
 
-                if (obj) {
-                    this.vValidatorSys.aResult[sKey] = sJsonValue;
+					if (obj) {
+						this.vValidatorSys.aResult[sKey] = sJsonValue;
 
-                    bSuccess = true;
-                }
-            } catch (e) {
-                this.vValidatorSys.errorSys.errorEx(e, sKey + '_json_parse', sKey + ' - неверный формат json поля');
-            }
+						bSuccess = true;
+					}
+				} catch (e) {
+					this.vValidatorSys.errorSys.errorEx(e, sKey + '_json_parse', sKey + ' - неверный формат json поля');
+				}
+			}
 
@@ -244,0 +252,0 @@ }

No alert changes

Improved metrics

Total package byte prevSize

367327

increased by1.28%

Number of package files

84

increased by1.2%

Lines of code

8210

increased by1.51%

No dependency changes