check-data
Advanced tools
Comparing version 1.1.5 to 1.1.6
34
index.js
@@ -27,16 +27,15 @@ let validator = require('validator') | ||
// 数据导出容器 | ||
let exportData = { | ||
let Output = { | ||
error: null,//错误信息 | ||
data: {},//验证容器 | ||
group: {},//分组容器 | ||
} | ||
// 递归验证 | ||
let result = recursionVerify(null, data, options, exportData.data, exportData.group, data) | ||
let result = recursionVerify(null, data, options, Output.data, Output, data) | ||
if (result) { | ||
exportData.error = result | ||
Output.error = result | ||
} | ||
return exportData | ||
return Output | ||
} | ||
@@ -50,6 +49,6 @@ | ||
* @param {*} clone 克隆容器 | ||
* @param {*} group 分组容器 | ||
* @param {*} output 数据导出容器 | ||
* @param {*} origin 原始数据 | ||
*/ | ||
function recursionVerify(key, data, options, clone, group, origin) { | ||
function recursionVerify(key, data, options, clone, output, origin) { | ||
@@ -75,3 +74,3 @@ // 选项为对象(引用型数据) | ||
let itemOptions = options[0] | ||
let result = recursionVerify(subKey, itemData, itemOptions, clone, group, origin) | ||
let result = recursionVerify(subKey, itemData, itemOptions, clone, output, origin) | ||
if (result) return `${key}数组Key:${result}` | ||
@@ -254,3 +253,3 @@ } | ||
else if (typeof options.type === 'object') { | ||
let result = recursionVerify(key, data, options.type, clone, group, origin) | ||
let result = recursionVerify(key, data, options.type, clone, output, origin) | ||
if (result) { | ||
@@ -276,4 +275,4 @@ if (Array.isArray(data)) { | ||
if (options.group) { | ||
if (!group[options.group]) { | ||
group[options.group] = {} | ||
if (!output[options.group]) { | ||
output[options.group] = {} | ||
} | ||
@@ -285,11 +284,8 @@ } | ||
// 是否导出 | ||
if (options.export === undefined || options.export) { | ||
// 导出验证数据 | ||
clone[key] = data | ||
} | ||
// 导出验证数据 | ||
clone[key] = data | ||
// 导出分组数据 | ||
if (options.group) { | ||
group[options.group][key] = data | ||
output[options.group][key] = data | ||
} | ||
@@ -319,3 +315,3 @@ | ||
let itemOptions = options.$ | ||
let result = recursionVerify(subKey, itemData, itemOptions, clone, group, origin) | ||
let result = recursionVerify(subKey, itemData, itemOptions, clone, output, origin) | ||
if (result) return result | ||
@@ -330,3 +326,3 @@ } | ||
let itemOptions = options[subKey] | ||
let result = recursionVerify(subKey, itemData, itemOptions, clone, group, origin) | ||
let result = recursionVerify(subKey, itemData, itemOptions, clone, output, origin) | ||
if (result) return result | ||
@@ -333,0 +329,0 @@ } |
{ | ||
"name": "check-data", | ||
"version": "1.1.5", | ||
"version": "1.1.6", | ||
"description": "JS数据验证器", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
@@ -65,3 +65,4 @@ let Verify = require('../index') | ||
console.log(verify.data) | ||
// console.log(verify.group) | ||
console.log(verify.filter) | ||
} |
16996
387