@fastcar/core 0.3.8 → 0.3.10

package/index.d.ts

@@ -260,6 +260,8 @@ export class ValidError {
 }
 
 export class DataMap<K, V extends Object> extends Map<K, V> {
+	init(list: Array<V>, key: string): void;
+
 	toValues(): V[];
 
 	toKeys(): K[];
@@ -275,5 +277,5 @@ export class DataMap<K, V extends Object> extends Map<K, V> {
 	 * @params atts代表属性键值对匹配
 	 *
 	 */
-	findByAtts(atts: { [key: string]: any }): V[];
+	findByAtts(atts: { [key: string]: any | any[] }): V[];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@fastcar/core",
-	"version": "0.3.8",
+	"version": "0.3.10",
 	"homepage": "https://github.com/williamDazhangyu/fast-car",
 	"main": "target/index.js",
 	"author": "william_zhong",

package/src/annotation/valid/ValidForm.ts

@@ -32,6 +32,11 @@ function getFormValue(value: any, prop: string, defaultValue?: any) {
 		return defaultValue;
 	}
 
+	//默认值为空字符串的情况
+	if (typeof defaultValue == "string" && defaultValue == "") {
+		return defaultValue;
+	}
+
 	return null;
 }
 
@@ -96,7 +101,7 @@ export default function ValidForm(target: any, methodName: string, descriptor: P
 						if (rule.required) {
 							throwErrMsg(rule, prop, rule.nullMessage);
 						} else {
-							if(TypeUtil.isObject(currObj) && !Reflect.has(currObj, prop)) {
+							if (TypeUtil.isObject(currObj) && !Reflect.has(currObj, prop)) {
 								delFormValue(currObj, prop);
 							}
 						}

package/src/model/DataMap.ts

@@ -9,6 +9,13 @@ export default class DataMap<K, V extends Object> extends Map<K, V> {
 		super();
 	}
 
+	init(list: Array<V>, key: string) {
+		this.clear();
+		list.forEach((item) => {
+			this.set(Reflect.get(item, key) as K, item);
+		});
+	}
+
 	toValues(): V[] {
 		return [...this.values()];
 	}
@@ -83,7 +90,7 @@ export default class DataMap<K, V extends Object> extends Map<K, V> {
 				//这边判断 是不是一个复合属性
 				if (Reflect.has(item, key)) {
 					let itemV = Reflect.get(item, key);
-					return itemV == v;
+					return Array.isArray(v) ? v.includes(itemV) : itemV == v;
 				} else {
 					let keyList = key.split(".");
 					if (keyList.length > 1) {
@@ -100,7 +107,7 @@ export default class DataMap<K, V extends Object> extends Map<K, V> {
 							return false;
 						}
 
-						return tmpV == v;
+						return Array.isArray(v) ? v.includes(tmpV) : tmpV == v;
 					}
 				}
 

package/target/annotation/valid/ValidForm.js

@@ -31,6 +31,10 @@ function getFormValue(value, prop, defaultValue) {
     if (ValidationUtil_1.default.isNotNull(defaultValue)) {
         return defaultValue;
     }
+    //默认值为空字符串的情况
+    if (typeof defaultValue == "string" && defaultValue == "") {
+        return defaultValue;
+    }
     return null;
 }
 function setFormValue(obj, prop, val) {

package/target/model/DataMap.js

@@ -4,6 +4,12 @@ class DataMap extends Map {
     constructor() {
         super();
     }
+    init(list, key) {
+        this.clear();
+        list.forEach((item) => {
+            this.set(Reflect.get(item, key), item);
+        });
+    }
     toValues() {
         return [...this.values()];
     }
@@ -67,7 +73,7 @@ class DataMap extends Map {
                 //这边判断 是不是一个复合属性
                 if (Reflect.has(item, key)) {
                     let itemV = Reflect.get(item, key);
-                    return itemV == v;
+                    return Array.isArray(v) ? v.includes(itemV) : itemV == v;
                 }
                 else {
                     let keyList = key.split(".");
@@ -83,7 +89,7 @@ class DataMap extends Map {
                         if (!f) {
                             return false;
                         }
-                        return tmpV == v;
+                        return Array.isArray(v) ? v.includes(tmpV) : tmpV == v;
                     }
                 }
                 return false;