@fastcar/core 0.3.6 → 0.3.8

package/db.d.ts

@@ -245,6 +245,7 @@ export type MapperType = {
 	dbType: string; //数据类型
 	primaryKey?: boolean; //是否为主键 默认为false
 	serialize?: Function; //序列化对象方法
+	isSerial?: boolean; //是否递增
 };
 
 export enum DesignMeta {

package/package.json

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

package/src/db.ts

@@ -173,7 +173,7 @@ export enum DesignMeta {
 	mapping = "db:mapping", //映射描述
 	dbFields = "db:fields", //数据库名-ts名
 	sqlSession = "SqlSession",
-	isSerial = "isSerial", //sql会话
+	isSerial = "db:isSerial", //sql会话
 }
 
 export interface DataSourceManager {

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> {
@@ -32,22 +32,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;
 		});

package/target/db.js

@@ -46,5 +46,5 @@ var DesignMeta;
     DesignMeta["mapping"] = "db:mapping";
     DesignMeta["dbFields"] = "db:fields";
     DesignMeta["sqlSession"] = "SqlSession";
-    DesignMeta["isSerial"] = "isSerial";
+    DesignMeta["isSerial"] = "db:isSerial";
 })(DesignMeta || (exports.DesignMeta = DesignMeta = {}));

package/target/model/DataMap.js

@@ -23,20 +23,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;
         });