@fastcar/core 0.3.8 → 0.3.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/index.d.ts +3 -1
- package/package.json +1 -1
- package/src/model/DataMap.ts +9 -2
- package/target/model/DataMap.js +8 -2
package/index.d.ts
CHANGED
|
@@ -260,6 +260,8 @@ export class ValidError {
|
|
|
260
260
|
}
|
|
261
261
|
|
|
262
262
|
export class DataMap<K, V extends Object> extends Map<K, V> {
|
|
263
|
+
init(list: Array<V>, key: string): void;
|
|
264
|
+
|
|
263
265
|
toValues(): V[];
|
|
264
266
|
|
|
265
267
|
toKeys(): K[];
|
|
@@ -275,5 +277,5 @@ export class DataMap<K, V extends Object> extends Map<K, V> {
|
|
|
275
277
|
* @params atts代表属性键值对匹配
|
|
276
278
|
*
|
|
277
279
|
*/
|
|
278
|
-
findByAtts(atts: { [key: string]: any }): V[];
|
|
280
|
+
findByAtts(atts: { [key: string]: any | any[] }): V[];
|
|
279
281
|
}
|
package/package.json
CHANGED
package/src/model/DataMap.ts
CHANGED
|
@@ -9,6 +9,13 @@ export default class DataMap<K, V extends Object> extends Map<K, V> {
|
|
|
9
9
|
super();
|
|
10
10
|
}
|
|
11
11
|
|
|
12
|
+
init(list: Array<V>, key: string) {
|
|
13
|
+
this.clear();
|
|
14
|
+
list.forEach((item) => {
|
|
15
|
+
this.set(Reflect.get(item, key) as K, item);
|
|
16
|
+
});
|
|
17
|
+
}
|
|
18
|
+
|
|
12
19
|
toValues(): V[] {
|
|
13
20
|
return [...this.values()];
|
|
14
21
|
}
|
|
@@ -83,7 +90,7 @@ export default class DataMap<K, V extends Object> extends Map<K, V> {
|
|
|
83
90
|
//这边判断 是不是一个复合属性
|
|
84
91
|
if (Reflect.has(item, key)) {
|
|
85
92
|
let itemV = Reflect.get(item, key);
|
|
86
|
-
return itemV == v;
|
|
93
|
+
return Array.isArray(v) ? v.includes(itemV) : itemV == v;
|
|
87
94
|
} else {
|
|
88
95
|
let keyList = key.split(".");
|
|
89
96
|
if (keyList.length > 1) {
|
|
@@ -100,7 +107,7 @@ export default class DataMap<K, V extends Object> extends Map<K, V> {
|
|
|
100
107
|
return false;
|
|
101
108
|
}
|
|
102
109
|
|
|
103
|
-
return tmpV == v;
|
|
110
|
+
return Array.isArray(v) ? v.includes(tmpV) : tmpV == v;
|
|
104
111
|
}
|
|
105
112
|
}
|
|
106
113
|
|
package/target/model/DataMap.js
CHANGED
|
@@ -4,6 +4,12 @@ class DataMap extends Map {
|
|
|
4
4
|
constructor() {
|
|
5
5
|
super();
|
|
6
6
|
}
|
|
7
|
+
init(list, key) {
|
|
8
|
+
this.clear();
|
|
9
|
+
list.forEach((item) => {
|
|
10
|
+
this.set(Reflect.get(item, key), item);
|
|
11
|
+
});
|
|
12
|
+
}
|
|
7
13
|
toValues() {
|
|
8
14
|
return [...this.values()];
|
|
9
15
|
}
|
|
@@ -67,7 +73,7 @@ class DataMap extends Map {
|
|
|
67
73
|
//这边判断 是不是一个复合属性
|
|
68
74
|
if (Reflect.has(item, key)) {
|
|
69
75
|
let itemV = Reflect.get(item, key);
|
|
70
|
-
return itemV == v;
|
|
76
|
+
return Array.isArray(v) ? v.includes(itemV) : itemV == v;
|
|
71
77
|
}
|
|
72
78
|
else {
|
|
73
79
|
let keyList = key.split(".");
|
|
@@ -83,7 +89,7 @@ class DataMap extends Map {
|
|
|
83
89
|
if (!f) {
|
|
84
90
|
return false;
|
|
85
91
|
}
|
|
86
|
-
return tmpV == v;
|
|
92
|
+
return Array.isArray(v) ? v.includes(tmpV) : tmpV == v;
|
|
87
93
|
}
|
|
88
94
|
}
|
|
89
95
|
return false;
|