@fastcar/core 0.3.7 → 0.3.9

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.7",
+	"version": "0.3.9",
 	"homepage": "https://github.com/williamDazhangyu/fast-car",
 	"main": "target/index.js",
 	"author": "william_zhong",

package/src/model/DataMap.ts

@@ -1,7 +1,7 @@
 export type FIELDTYPE = {
 	field: string;
 	order?: boolean; //是否为倒序 order true为倒序
-	compare?: (a: any, b: any) => boolean;
+	compare?: (a: any, b: any) => -1 | 0 | 1; // -1 0 1 //-1为小 0为相等  1为大
 };
 
 export default class DataMap<K, V extends Object> extends Map<K, V> {
@@ -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()];
 	}
@@ -32,22 +39,35 @@ export default class DataMap<K, V extends Object> extends Map<K, V> {
 		if (!sorts || sorts?.length == 0) {
 			return list;
 		}
-		let total = sorts.length;
+
 		list.sort((a, b) => {
 			let resultNum = 0;
 			sorts.some((f, index) => {
+				let cindex = index + 1;
 				let field = f.field;
 				let aValue = Reflect.get(a, field);
 				let bValue = Reflect.get(b, field);
-				let flag = f.compare ? f.compare(aValue, bValue) : aValue > bValue;
-				resultNum = flag ? total - index : index - total;
+
+				if (f.compare) {
+					let flag = f.compare(aValue, bValue);
+					if (flag == 0) {
+						return false;
+					}
+					resultNum = flag > 0 ? cindex : -cindex;
+				} else {
+					if (aValue == bValue) {
+						return false;
+					}
+
+					resultNum = aValue > bValue ? cindex : -cindex;
+				}
 
 				//降序则倒着
 				if (f.order) {
 					resultNum = -resultNum;
 				}
 
-				return !!flag;
+				return true;
 			});
 			return resultNum;
 		});
@@ -70,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) {
@@ -87,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/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()];
     }
@@ -23,20 +29,31 @@ class DataMap extends Map {
         if (!sorts || sorts?.length == 0) {
             return list;
         }
-        let total = sorts.length;
         list.sort((a, b) => {
             let resultNum = 0;
             sorts.some((f, index) => {
+                let cindex = index + 1;
                 let field = f.field;
                 let aValue = Reflect.get(a, field);
                 let bValue = Reflect.get(b, field);
-                let flag = f.compare ? f.compare(aValue, bValue) : aValue > bValue;
-                resultNum = flag ? total - index : index - total;
+                if (f.compare) {
+                    let flag = f.compare(aValue, bValue);
+                    if (flag == 0) {
+                        return false;
+                    }
+                    resultNum = flag > 0 ? cindex : -cindex;
+                }
+                else {
+                    if (aValue == bValue) {
+                        return false;
+                    }
+                    resultNum = aValue > bValue ? cindex : -cindex;
+                }
                 //降序则倒着
                 if (f.order) {
                     resultNum = -resultNum;
                 }
-                return !!flag;
+                return true;
             });
             return resultNum;
         });
@@ -56,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(".");
@@ -72,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;