@whitesev/domutils 1.8.5 → 1.8.6
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/dist/index.amd.js +22 -22
- package/dist/index.amd.js.map +1 -1
- package/dist/index.amd.min.js +1 -1
- package/dist/index.amd.min.js.map +1 -1
- package/dist/index.cjs.js +22 -22
- package/dist/index.cjs.js.map +1 -1
- package/dist/index.cjs.min.js +1 -1
- package/dist/index.cjs.min.js.map +1 -1
- package/dist/index.esm.js +22 -22
- package/dist/index.esm.js.map +1 -1
- package/dist/index.esm.min.js +1 -1
- package/dist/index.esm.min.js.map +1 -1
- package/dist/index.iife.js +22 -22
- package/dist/index.iife.js.map +1 -1
- package/dist/index.iife.min.js +1 -1
- package/dist/index.iife.min.js.map +1 -1
- package/dist/index.system.js +22 -22
- package/dist/index.system.js.map +1 -1
- package/dist/index.system.min.js +1 -1
- package/dist/index.system.min.js.map +1 -1
- package/dist/index.umd.js +22 -22
- package/dist/index.umd.js.map +1 -1
- package/dist/index.umd.min.js +1 -1
- package/dist/index.umd.min.js.map +1 -1
- package/dist/types/src/ElementWait.d.ts +49 -27
- package/package.json +2 -2
- package/src/ElementWait.ts +73 -47
- package/src/index.ts +1 -1
|
@@ -12,7 +12,7 @@ declare class ElementWait extends ElementSelector {
|
|
|
12
12
|
* @param timeout 超时时间,默认0
|
|
13
13
|
* @param parent (可选)父元素,默认document
|
|
14
14
|
* @example
|
|
15
|
-
*
|
|
15
|
+
* DOMUtils.wait(()=> {
|
|
16
16
|
* let $test = document.querySelector("#test");
|
|
17
17
|
* return {
|
|
18
18
|
* success: $test !== null,
|
|
@@ -40,26 +40,48 @@ declare class ElementWait extends ElementSelector {
|
|
|
40
40
|
*/
|
|
41
41
|
data: T;
|
|
42
42
|
}, timeout?: number, parent?: Node | Element | Document | HTMLElement): Promise<T | null>;
|
|
43
|
+
/**
|
|
44
|
+
* 等待元素出现
|
|
45
|
+
* @param selectorFn 获取元素的函数
|
|
46
|
+
* @example
|
|
47
|
+
* DOMUtils.waitNode(()=>document.querySelector("div")).then( $div =>{
|
|
48
|
+
* console.log($div); // $div => HTMLDivELement
|
|
49
|
+
* })
|
|
50
|
+
*/
|
|
51
|
+
waitNode<K>(selectorFn: () => K | null | undefined): Promise<K>;
|
|
43
52
|
/**
|
|
44
53
|
* 等待元素出现
|
|
45
54
|
* @param selectorFn 获取元素的函数
|
|
46
55
|
* @param timeout 超时时间,默认0
|
|
47
56
|
* @example
|
|
48
|
-
*
|
|
57
|
+
* DOMUtils.waitNode(()=>document.querySelector("div"), 1000).then( $div =>{
|
|
49
58
|
* console.log($div); // $div => HTMLDivELement | null
|
|
50
59
|
* })
|
|
51
60
|
*/
|
|
52
|
-
waitNode<K>(selectorFn: () => K | null | undefined): Promise<K>;
|
|
53
61
|
waitNode<K>(selectorFn: () => K | null | undefined, timeout: number): Promise<K | null | undefined>;
|
|
62
|
+
/**
|
|
63
|
+
* 等待元素出现
|
|
64
|
+
* @param selectorFn 获取元素的函数
|
|
65
|
+
* @param parent 父元素
|
|
66
|
+
* @param timeout 超时时间,默认0
|
|
67
|
+
* @example
|
|
68
|
+
* DOMUtils.waitNode(()=>document.querySelector("div"), document).then( $div =>{
|
|
69
|
+
* console.log($div); // $div => HTMLDivELement
|
|
70
|
+
* })
|
|
71
|
+
* DOMUtils.waitNode(()=>document.querySelector("div"), document, 1000).then( $div =>{
|
|
72
|
+
* console.log($div); // $div => HTMLDivELement | null
|
|
73
|
+
* })
|
|
74
|
+
*/
|
|
75
|
+
waitNode<K>(selectorFn: () => K | null | undefined, parent: Node | Element | Document | HTMLElement, timeout?: number): Promise<K | null | undefined>;
|
|
54
76
|
/**
|
|
55
77
|
* 等待元素出现
|
|
56
78
|
* @param selector CSS选择器
|
|
57
79
|
* @param parent (可选)父元素,默认document
|
|
58
80
|
* @example
|
|
59
|
-
*
|
|
81
|
+
* DOMUtils.waitNode("div").then( $div =>{
|
|
60
82
|
* console.log($div); // div => HTMLDivELement
|
|
61
83
|
* })
|
|
62
|
-
*
|
|
84
|
+
* DOMUtils.waitNode("div", document).then( $div =>{
|
|
63
85
|
* console.log($div); // div => HTMLDivELement
|
|
64
86
|
* })
|
|
65
87
|
*/
|
|
@@ -70,10 +92,10 @@ declare class ElementWait extends ElementSelector {
|
|
|
70
92
|
* @param selectorList CSS选择器数组
|
|
71
93
|
* @param parent (可选)父元素,默认document
|
|
72
94
|
* @example
|
|
73
|
-
*
|
|
95
|
+
* DOMUtils.waitNode(["div"]).then( ([$div]) =>{
|
|
74
96
|
* console.log($div); // div => HTMLDivELement[]
|
|
75
97
|
* })
|
|
76
|
-
*
|
|
98
|
+
* DOMUtils.waitNode(["div"], document).then( ([$div]) =>{
|
|
77
99
|
* console.log($div); // div => HTMLDivELement[]
|
|
78
100
|
* })
|
|
79
101
|
*/
|
|
@@ -85,7 +107,7 @@ declare class ElementWait extends ElementSelector {
|
|
|
85
107
|
* @param parent 父元素,默认document
|
|
86
108
|
* @param timeout 超时时间,默认0
|
|
87
109
|
* @example
|
|
88
|
-
*
|
|
110
|
+
* DOMUtils.waitNode("div", document, 1000).then( $div =>{
|
|
89
111
|
* console.log($div); // $div => HTMLDivELement | null
|
|
90
112
|
* })
|
|
91
113
|
*/
|
|
@@ -97,7 +119,7 @@ declare class ElementWait extends ElementSelector {
|
|
|
97
119
|
* @param parent 父元素,默认document
|
|
98
120
|
* @param timeout 超时时间,默认0
|
|
99
121
|
* @example
|
|
100
|
-
*
|
|
122
|
+
* DOMUtils.waitNode(["div"], document, 1000).then( ([$div]) =>{
|
|
101
123
|
* console.log($div); // $div => HTMLDivELement[] | null
|
|
102
124
|
* })
|
|
103
125
|
*/
|
|
@@ -108,7 +130,7 @@ declare class ElementWait extends ElementSelector {
|
|
|
108
130
|
* @param selector CSS选择器
|
|
109
131
|
* @param timeout 超时时间,默认0
|
|
110
132
|
* @example
|
|
111
|
-
*
|
|
133
|
+
* DOMUtils.waitNode("div", 1000).then( $div =>{
|
|
112
134
|
* console.log($div); // $div => HTMLDivELement | null
|
|
113
135
|
* })
|
|
114
136
|
*/
|
|
@@ -119,7 +141,7 @@ declare class ElementWait extends ElementSelector {
|
|
|
119
141
|
* @param selectorList CSS选择器数组
|
|
120
142
|
* @param timeout 超时时间,默认0
|
|
121
143
|
* @example
|
|
122
|
-
*
|
|
144
|
+
* DOMUtils.waitNode(["div"], 1000).then( [$div] =>{
|
|
123
145
|
* console.log($div); // $div => HTMLDivELement[] | null
|
|
124
146
|
* })
|
|
125
147
|
*/
|
|
@@ -130,10 +152,10 @@ declare class ElementWait extends ElementSelector {
|
|
|
130
152
|
* @param selectorList CSS选择器数组
|
|
131
153
|
* @param parent (可选)监听的父元素
|
|
132
154
|
* @example
|
|
133
|
-
*
|
|
155
|
+
* DOMUtils.waitAnyNode(["div","div"]).then( $div =>{
|
|
134
156
|
* console.log($div); // $div => HTMLDivELement 这里是第一个
|
|
135
157
|
* })
|
|
136
|
-
*
|
|
158
|
+
* DOMUtils.waitAnyNode(["a","div"], document).then( $a =>{
|
|
137
159
|
* console.log($a); // $a => HTMLAnchorElement 这里是第一个
|
|
138
160
|
* })
|
|
139
161
|
*/
|
|
@@ -145,7 +167,7 @@ declare class ElementWait extends ElementSelector {
|
|
|
145
167
|
* @param parent 父元素,默认document
|
|
146
168
|
* @param timeout 超时时间,默认0
|
|
147
169
|
* @example
|
|
148
|
-
*
|
|
170
|
+
* DOMUtils.waitAnyNode(["div","div"], document, 10000).then( $div =>{
|
|
149
171
|
* console.log($div); // $div => HTMLDivELement | null
|
|
150
172
|
* })
|
|
151
173
|
*/
|
|
@@ -156,7 +178,7 @@ declare class ElementWait extends ElementSelector {
|
|
|
156
178
|
* @param selectorList CSS选择器数组
|
|
157
179
|
* @param timeout 超时时间,默认0
|
|
158
180
|
* @example
|
|
159
|
-
*
|
|
181
|
+
* DOMUtils.waitAnyNode(["div","div"], 10000).then( $div =>{
|
|
160
182
|
* console.log($div); // $div => HTMLDivELement | null
|
|
161
183
|
* })
|
|
162
184
|
*/
|
|
@@ -167,10 +189,10 @@ declare class ElementWait extends ElementSelector {
|
|
|
167
189
|
* @param selector CSS选择器
|
|
168
190
|
* @param parent (可选)监听的父元素
|
|
169
191
|
* @example
|
|
170
|
-
*
|
|
192
|
+
* DOMUtils.waitNodeList("div").then( $result =>{
|
|
171
193
|
* console.log($result); // $result => NodeListOf<HTMLDivElement>
|
|
172
194
|
* })
|
|
173
|
-
*
|
|
195
|
+
* DOMUtils.waitNodeList("div", document).then( $result =>{
|
|
174
196
|
* console.log($result); // $result => NodeListOf<HTMLDivElement>
|
|
175
197
|
* })
|
|
176
198
|
*/
|
|
@@ -181,10 +203,10 @@ declare class ElementWait extends ElementSelector {
|
|
|
181
203
|
* @param selectorList CSS选择器数组
|
|
182
204
|
* @param parent (可选)监听的父元素
|
|
183
205
|
* @example
|
|
184
|
-
*
|
|
206
|
+
* DOMUtils.waitNodeList(["div"]).then( $result =>{
|
|
185
207
|
* console.log($result); // $result => NodeListOf<HTMLDivElement>[]
|
|
186
208
|
* })
|
|
187
|
-
*
|
|
209
|
+
* DOMUtils.waitNodeList(["div"], document).then( $result =>{
|
|
188
210
|
* console.log($result); // $result => NodeListOf<HTMLDivElement>[]
|
|
189
211
|
* })
|
|
190
212
|
*/
|
|
@@ -196,7 +218,7 @@ declare class ElementWait extends ElementSelector {
|
|
|
196
218
|
* @param parent 监听的父元素
|
|
197
219
|
* @param timeout 超时时间,默认0
|
|
198
220
|
* @example
|
|
199
|
-
*
|
|
221
|
+
* DOMUtils.waitNodeList("div", document, 10000).then( $result =>{
|
|
200
222
|
* console.log($result); // $result => NodeListOf<HTMLDivElement> | null
|
|
201
223
|
* })
|
|
202
224
|
*/
|
|
@@ -208,7 +230,7 @@ declare class ElementWait extends ElementSelector {
|
|
|
208
230
|
* @param parent 监听的父元素
|
|
209
231
|
* @param timeout 超时时间,默认0
|
|
210
232
|
* @example
|
|
211
|
-
*
|
|
233
|
+
* DOMUtils.waitNodeList(["div"], document, 10000).then( $result =>{
|
|
212
234
|
* console.log($result); // $result => NodeListOf<HTMLDivElement>[] | null
|
|
213
235
|
* })
|
|
214
236
|
*/
|
|
@@ -219,7 +241,7 @@ declare class ElementWait extends ElementSelector {
|
|
|
219
241
|
* @param selector CSS选择器数组
|
|
220
242
|
* @param timeout 超时时间,默认0
|
|
221
243
|
* @example
|
|
222
|
-
*
|
|
244
|
+
* DOMUtils.waitNodeList("div", 10000).then( $result =>{
|
|
223
245
|
* console.log($result); // $result => NodeListOf<HTMLDivElement> | null
|
|
224
246
|
* })
|
|
225
247
|
*/
|
|
@@ -230,7 +252,7 @@ declare class ElementWait extends ElementSelector {
|
|
|
230
252
|
* @param selectorList CSS选择器数组
|
|
231
253
|
* @param timeout 超时时间,默认0
|
|
232
254
|
* @example
|
|
233
|
-
*
|
|
255
|
+
* DOMUtils.waitNodeList(["div"], 10000).then( $result =>{
|
|
234
256
|
* console.log($result); // $result => NodeListOf<HTMLDivElement>[] | null
|
|
235
257
|
* })
|
|
236
258
|
*/
|
|
@@ -241,10 +263,10 @@ declare class ElementWait extends ElementSelector {
|
|
|
241
263
|
* @param selectorList CSS选择器数组
|
|
242
264
|
* @param parent (可选)监听的父元素
|
|
243
265
|
* @example
|
|
244
|
-
*
|
|
266
|
+
* DOMUtils.waitAnyNodeList(["div","a"]).then( $result =>{
|
|
245
267
|
* console.log($result); // $result => NodeListOf<HTMLDivElement>
|
|
246
268
|
* })
|
|
247
|
-
*
|
|
269
|
+
* DOMUtils.waitAnyNodeList(["div","a"], document).then( $result =>{
|
|
248
270
|
* console.log($result); // $result => NodeListOf<HTMLDivElement>
|
|
249
271
|
* })
|
|
250
272
|
*/
|
|
@@ -256,7 +278,7 @@ declare class ElementWait extends ElementSelector {
|
|
|
256
278
|
* @param parent 父元素,默认document
|
|
257
279
|
* @param timeout 超时时间,默认0
|
|
258
280
|
* @example
|
|
259
|
-
*
|
|
281
|
+
* DOMUtils.waitAnyNodeList(["div","a"], document, 10000).then( $result =>{
|
|
260
282
|
* console.log($result); // $result => NodeListOf<HTMLDivElement> | null
|
|
261
283
|
* })
|
|
262
284
|
*/
|
|
@@ -267,7 +289,7 @@ declare class ElementWait extends ElementSelector {
|
|
|
267
289
|
* @param selectorList CSS选择器数组
|
|
268
290
|
* @param timeout 超时时间,默认0
|
|
269
291
|
* @example
|
|
270
|
-
*
|
|
292
|
+
* DOMUtils.waitAnyNodeList(["div","div"], 10000).then( $result =>{
|
|
271
293
|
* console.log($result); // $result => NodeListOf<HTMLDivElement> | null
|
|
272
294
|
* })
|
|
273
295
|
*/
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"$schema": "https://json.schemastore.org/package.json",
|
|
3
3
|
"name": "@whitesev/domutils",
|
|
4
|
-
"version": "1.8.
|
|
4
|
+
"version": "1.8.6",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"description": "适合在浏览器中操作DOM的常用工具类",
|
|
7
7
|
"main": "dist/index.cjs.js",
|
|
@@ -52,7 +52,7 @@
|
|
|
52
52
|
"rollup-plugin-clear": "^2.0.7",
|
|
53
53
|
"tslib": "^2.8.1",
|
|
54
54
|
"typescript": "^5.9.3",
|
|
55
|
-
"typescript-eslint": "^8.50.
|
|
55
|
+
"typescript-eslint": "^8.50.1"
|
|
56
56
|
},
|
|
57
57
|
"scripts": {
|
|
58
58
|
"lint": "eslint .",
|
package/src/ElementWait.ts
CHANGED
|
@@ -18,7 +18,7 @@ class ElementWait extends ElementSelector {
|
|
|
18
18
|
* @param timeout 超时时间,默认0
|
|
19
19
|
* @param parent (可选)父元素,默认document
|
|
20
20
|
* @example
|
|
21
|
-
*
|
|
21
|
+
* DOMUtils.wait(()=> {
|
|
22
22
|
* let $test = document.querySelector("#test");
|
|
23
23
|
* return {
|
|
24
24
|
* success: $test !== null,
|
|
@@ -100,26 +100,52 @@ class ElementWait extends ElementSelector {
|
|
|
100
100
|
}
|
|
101
101
|
});
|
|
102
102
|
}
|
|
103
|
+
/**
|
|
104
|
+
* 等待元素出现
|
|
105
|
+
* @param selectorFn 获取元素的函数
|
|
106
|
+
* @example
|
|
107
|
+
* DOMUtils.waitNode(()=>document.querySelector("div")).then( $div =>{
|
|
108
|
+
* console.log($div); // $div => HTMLDivELement
|
|
109
|
+
* })
|
|
110
|
+
*/
|
|
111
|
+
waitNode<K>(selectorFn: () => K | null | undefined): Promise<K>;
|
|
103
112
|
/**
|
|
104
113
|
* 等待元素出现
|
|
105
114
|
* @param selectorFn 获取元素的函数
|
|
106
115
|
* @param timeout 超时时间,默认0
|
|
107
116
|
* @example
|
|
108
|
-
*
|
|
117
|
+
* DOMUtils.waitNode(()=>document.querySelector("div"), 1000).then( $div =>{
|
|
109
118
|
* console.log($div); // $div => HTMLDivELement | null
|
|
110
119
|
* })
|
|
111
120
|
*/
|
|
112
|
-
waitNode<K>(selectorFn: () => K | null | undefined): Promise<K>;
|
|
113
121
|
waitNode<K>(selectorFn: () => K | null | undefined, timeout: number): Promise<K | null | undefined>;
|
|
122
|
+
/**
|
|
123
|
+
* 等待元素出现
|
|
124
|
+
* @param selectorFn 获取元素的函数
|
|
125
|
+
* @param parent 父元素
|
|
126
|
+
* @param timeout 超时时间,默认0
|
|
127
|
+
* @example
|
|
128
|
+
* DOMUtils.waitNode(()=>document.querySelector("div"), document).then( $div =>{
|
|
129
|
+
* console.log($div); // $div => HTMLDivELement
|
|
130
|
+
* })
|
|
131
|
+
* DOMUtils.waitNode(()=>document.querySelector("div"), document, 1000).then( $div =>{
|
|
132
|
+
* console.log($div); // $div => HTMLDivELement | null
|
|
133
|
+
* })
|
|
134
|
+
*/
|
|
135
|
+
waitNode<K>(
|
|
136
|
+
selectorFn: () => K | null | undefined,
|
|
137
|
+
parent: Node | Element | Document | HTMLElement,
|
|
138
|
+
timeout?: number
|
|
139
|
+
): Promise<K | null | undefined>;
|
|
114
140
|
/**
|
|
115
141
|
* 等待元素出现
|
|
116
142
|
* @param selector CSS选择器
|
|
117
143
|
* @param parent (可选)父元素,默认document
|
|
118
144
|
* @example
|
|
119
|
-
*
|
|
145
|
+
* DOMUtils.waitNode("div").then( $div =>{
|
|
120
146
|
* console.log($div); // div => HTMLDivELement
|
|
121
147
|
* })
|
|
122
|
-
*
|
|
148
|
+
* DOMUtils.waitNode("div", document).then( $div =>{
|
|
123
149
|
* console.log($div); // div => HTMLDivELement
|
|
124
150
|
* })
|
|
125
151
|
*/
|
|
@@ -133,10 +159,10 @@ class ElementWait extends ElementSelector {
|
|
|
133
159
|
* @param selectorList CSS选择器数组
|
|
134
160
|
* @param parent (可选)父元素,默认document
|
|
135
161
|
* @example
|
|
136
|
-
*
|
|
162
|
+
* DOMUtils.waitNode(["div"]).then( ([$div]) =>{
|
|
137
163
|
* console.log($div); // div => HTMLDivELement[]
|
|
138
164
|
* })
|
|
139
|
-
*
|
|
165
|
+
* DOMUtils.waitNode(["div"], document).then( ([$div]) =>{
|
|
140
166
|
* console.log($div); // div => HTMLDivELement[]
|
|
141
167
|
* })
|
|
142
168
|
*/
|
|
@@ -151,7 +177,7 @@ class ElementWait extends ElementSelector {
|
|
|
151
177
|
* @param parent 父元素,默认document
|
|
152
178
|
* @param timeout 超时时间,默认0
|
|
153
179
|
* @example
|
|
154
|
-
*
|
|
180
|
+
* DOMUtils.waitNode("div", document, 1000).then( $div =>{
|
|
155
181
|
* console.log($div); // $div => HTMLDivELement | null
|
|
156
182
|
* })
|
|
157
183
|
*/
|
|
@@ -171,7 +197,7 @@ class ElementWait extends ElementSelector {
|
|
|
171
197
|
* @param parent 父元素,默认document
|
|
172
198
|
* @param timeout 超时时间,默认0
|
|
173
199
|
* @example
|
|
174
|
-
*
|
|
200
|
+
* DOMUtils.waitNode(["div"], document, 1000).then( ([$div]) =>{
|
|
175
201
|
* console.log($div); // $div => HTMLDivELement[] | null
|
|
176
202
|
* })
|
|
177
203
|
*/
|
|
@@ -190,7 +216,7 @@ class ElementWait extends ElementSelector {
|
|
|
190
216
|
* @param selector CSS选择器
|
|
191
217
|
* @param timeout 超时时间,默认0
|
|
192
218
|
* @example
|
|
193
|
-
*
|
|
219
|
+
* DOMUtils.waitNode("div", 1000).then( $div =>{
|
|
194
220
|
* console.log($div); // $div => HTMLDivELement | null
|
|
195
221
|
* })
|
|
196
222
|
*/
|
|
@@ -204,7 +230,7 @@ class ElementWait extends ElementSelector {
|
|
|
204
230
|
* @param selectorList CSS选择器数组
|
|
205
231
|
* @param timeout 超时时间,默认0
|
|
206
232
|
* @example
|
|
207
|
-
*
|
|
233
|
+
* DOMUtils.waitNode(["div"], 1000).then( [$div] =>{
|
|
208
234
|
* console.log($div); // $div => HTMLDivELement[] | null
|
|
209
235
|
* })
|
|
210
236
|
*/
|
|
@@ -224,7 +250,7 @@ class ElementWait extends ElementSelector {
|
|
|
224
250
|
// 超时时间
|
|
225
251
|
let timeout = 0;
|
|
226
252
|
if (typeof args[0] !== "string" && !Array.isArray(args[0]) && typeof args[0] !== "function") {
|
|
227
|
-
throw new TypeError("
|
|
253
|
+
throw new TypeError("DOMUtils.waitNode 第一个参数必须是string|string[]|Function");
|
|
228
254
|
}
|
|
229
255
|
if (args.length === 1) {
|
|
230
256
|
// 上面已做处理
|
|
@@ -237,7 +263,7 @@ class ElementWait extends ElementSelector {
|
|
|
237
263
|
// "div",document
|
|
238
264
|
parent = secondParam as any as Element;
|
|
239
265
|
} else {
|
|
240
|
-
throw new TypeError("
|
|
266
|
+
throw new TypeError("DOMUtils.waitNode 第二个参数必须是number|Node");
|
|
241
267
|
}
|
|
242
268
|
} else if (args.length === 3) {
|
|
243
269
|
// "div",document,10000
|
|
@@ -250,13 +276,13 @@ class ElementWait extends ElementSelector {
|
|
|
250
276
|
if (typeof thirdParam === "number") {
|
|
251
277
|
timeout = thirdParam;
|
|
252
278
|
} else {
|
|
253
|
-
throw new TypeError("
|
|
279
|
+
throw new TypeError("DOMUtils.waitNode 第三个参数必须是number");
|
|
254
280
|
}
|
|
255
281
|
} else {
|
|
256
|
-
throw new TypeError("
|
|
282
|
+
throw new TypeError("DOMUtils.waitNode 第二个参数必须是Node");
|
|
257
283
|
}
|
|
258
284
|
} else {
|
|
259
|
-
throw new TypeError("
|
|
285
|
+
throw new TypeError("DOMUtils.waitNode 参数个数错误");
|
|
260
286
|
}
|
|
261
287
|
function getNode() {
|
|
262
288
|
if (Array.isArray(selector)) {
|
|
@@ -300,10 +326,10 @@ class ElementWait extends ElementSelector {
|
|
|
300
326
|
* @param selectorList CSS选择器数组
|
|
301
327
|
* @param parent (可选)监听的父元素
|
|
302
328
|
* @example
|
|
303
|
-
*
|
|
329
|
+
* DOMUtils.waitAnyNode(["div","div"]).then( $div =>{
|
|
304
330
|
* console.log($div); // $div => HTMLDivELement 这里是第一个
|
|
305
331
|
* })
|
|
306
|
-
*
|
|
332
|
+
* DOMUtils.waitAnyNode(["a","div"], document).then( $a =>{
|
|
307
333
|
* console.log($a); // $a => HTMLAnchorElement 这里是第一个
|
|
308
334
|
* })
|
|
309
335
|
*/
|
|
@@ -318,7 +344,7 @@ class ElementWait extends ElementSelector {
|
|
|
318
344
|
* @param parent 父元素,默认document
|
|
319
345
|
* @param timeout 超时时间,默认0
|
|
320
346
|
* @example
|
|
321
|
-
*
|
|
347
|
+
* DOMUtils.waitAnyNode(["div","div"], document, 10000).then( $div =>{
|
|
322
348
|
* console.log($div); // $div => HTMLDivELement | null
|
|
323
349
|
* })
|
|
324
350
|
*/
|
|
@@ -337,7 +363,7 @@ class ElementWait extends ElementSelector {
|
|
|
337
363
|
* @param selectorList CSS选择器数组
|
|
338
364
|
* @param timeout 超时时间,默认0
|
|
339
365
|
* @example
|
|
340
|
-
*
|
|
366
|
+
* DOMUtils.waitAnyNode(["div","div"], 10000).then( $div =>{
|
|
341
367
|
* console.log($div); // $div => HTMLDivELement | null
|
|
342
368
|
* })
|
|
343
369
|
*/
|
|
@@ -357,7 +383,7 @@ class ElementWait extends ElementSelector {
|
|
|
357
383
|
// 超时时间
|
|
358
384
|
let timeout = 0;
|
|
359
385
|
if (typeof args[0] !== "object" && !Array.isArray(args[0])) {
|
|
360
|
-
throw new TypeError("
|
|
386
|
+
throw new TypeError("DOMUtils.waitAnyNode 第一个参数必须是string[]");
|
|
361
387
|
}
|
|
362
388
|
if (args.length === 1) {
|
|
363
389
|
// 上面已做处理
|
|
@@ -370,7 +396,7 @@ class ElementWait extends ElementSelector {
|
|
|
370
396
|
// "div",document
|
|
371
397
|
parent = secondParam as any as Element;
|
|
372
398
|
} else {
|
|
373
|
-
throw new TypeError("
|
|
399
|
+
throw new TypeError("DOMUtils.waitAnyNode 第二个参数必须是number|Node");
|
|
374
400
|
}
|
|
375
401
|
} else if (args.length === 3) {
|
|
376
402
|
// "div",document,10000
|
|
@@ -383,13 +409,13 @@ class ElementWait extends ElementSelector {
|
|
|
383
409
|
if (typeof thirdParam === "number") {
|
|
384
410
|
timeout = thirdParam;
|
|
385
411
|
} else {
|
|
386
|
-
throw new TypeError("
|
|
412
|
+
throw new TypeError("DOMUtils.waitAnyNode 第三个参数必须是number");
|
|
387
413
|
}
|
|
388
414
|
} else {
|
|
389
|
-
throw new TypeError("
|
|
415
|
+
throw new TypeError("DOMUtils.waitAnyNode 第二个参数必须是Node");
|
|
390
416
|
}
|
|
391
417
|
} else {
|
|
392
|
-
throw new TypeError("
|
|
418
|
+
throw new TypeError("DOMUtils.waitAnyNode 参数个数错误");
|
|
393
419
|
}
|
|
394
420
|
const promiseList = selectorList.map((selector) => {
|
|
395
421
|
return UtilsContext.waitNode<T>(selector, parent, timeout);
|
|
@@ -401,10 +427,10 @@ class ElementWait extends ElementSelector {
|
|
|
401
427
|
* @param selector CSS选择器
|
|
402
428
|
* @param parent (可选)监听的父元素
|
|
403
429
|
* @example
|
|
404
|
-
*
|
|
430
|
+
* DOMUtils.waitNodeList("div").then( $result =>{
|
|
405
431
|
* console.log($result); // $result => NodeListOf<HTMLDivElement>
|
|
406
432
|
* })
|
|
407
|
-
*
|
|
433
|
+
* DOMUtils.waitNodeList("div", document).then( $result =>{
|
|
408
434
|
* console.log($result); // $result => NodeListOf<HTMLDivElement>
|
|
409
435
|
* })
|
|
410
436
|
*/
|
|
@@ -421,10 +447,10 @@ class ElementWait extends ElementSelector {
|
|
|
421
447
|
* @param selectorList CSS选择器数组
|
|
422
448
|
* @param parent (可选)监听的父元素
|
|
423
449
|
* @example
|
|
424
|
-
*
|
|
450
|
+
* DOMUtils.waitNodeList(["div"]).then( $result =>{
|
|
425
451
|
* console.log($result); // $result => NodeListOf<HTMLDivElement>[]
|
|
426
452
|
* })
|
|
427
|
-
*
|
|
453
|
+
* DOMUtils.waitNodeList(["div"], document).then( $result =>{
|
|
428
454
|
* console.log($result); // $result => NodeListOf<HTMLDivElement>[]
|
|
429
455
|
* })
|
|
430
456
|
*/
|
|
@@ -442,7 +468,7 @@ class ElementWait extends ElementSelector {
|
|
|
442
468
|
* @param parent 监听的父元素
|
|
443
469
|
* @param timeout 超时时间,默认0
|
|
444
470
|
* @example
|
|
445
|
-
*
|
|
471
|
+
* DOMUtils.waitNodeList("div", document, 10000).then( $result =>{
|
|
446
472
|
* console.log($result); // $result => NodeListOf<HTMLDivElement> | null
|
|
447
473
|
* })
|
|
448
474
|
*/
|
|
@@ -462,7 +488,7 @@ class ElementWait extends ElementSelector {
|
|
|
462
488
|
* @param parent 监听的父元素
|
|
463
489
|
* @param timeout 超时时间,默认0
|
|
464
490
|
* @example
|
|
465
|
-
*
|
|
491
|
+
* DOMUtils.waitNodeList(["div"], document, 10000).then( $result =>{
|
|
466
492
|
* console.log($result); // $result => NodeListOf<HTMLDivElement>[] | null
|
|
467
493
|
* })
|
|
468
494
|
*/
|
|
@@ -481,7 +507,7 @@ class ElementWait extends ElementSelector {
|
|
|
481
507
|
* @param selector CSS选择器数组
|
|
482
508
|
* @param timeout 超时时间,默认0
|
|
483
509
|
* @example
|
|
484
|
-
*
|
|
510
|
+
* DOMUtils.waitNodeList("div", 10000).then( $result =>{
|
|
485
511
|
* console.log($result); // $result => NodeListOf<HTMLDivElement> | null
|
|
486
512
|
* })
|
|
487
513
|
*/
|
|
@@ -495,7 +521,7 @@ class ElementWait extends ElementSelector {
|
|
|
495
521
|
* @param selectorList CSS选择器数组
|
|
496
522
|
* @param timeout 超时时间,默认0
|
|
497
523
|
* @example
|
|
498
|
-
*
|
|
524
|
+
* DOMUtils.waitNodeList(["div"], 10000).then( $result =>{
|
|
499
525
|
* console.log($result); // $result => NodeListOf<HTMLDivElement>[] | null
|
|
500
526
|
* })
|
|
501
527
|
*/
|
|
@@ -515,7 +541,7 @@ class ElementWait extends ElementSelector {
|
|
|
515
541
|
// 超时时间
|
|
516
542
|
let timeout = 0;
|
|
517
543
|
if (typeof args[0] !== "string" && !Array.isArray(args[0])) {
|
|
518
|
-
throw new TypeError("
|
|
544
|
+
throw new TypeError("DOMUtils.waitNodeList 第一个参数必须是string|string[]");
|
|
519
545
|
}
|
|
520
546
|
if (args.length === 1) {
|
|
521
547
|
// 上面已做处理
|
|
@@ -528,7 +554,7 @@ class ElementWait extends ElementSelector {
|
|
|
528
554
|
// "div",document
|
|
529
555
|
parent = secondParam as any as Element;
|
|
530
556
|
} else {
|
|
531
|
-
throw new TypeError("
|
|
557
|
+
throw new TypeError("DOMUtils.waitNodeList 第二个参数必须是number|Node");
|
|
532
558
|
}
|
|
533
559
|
} else if (args.length === 3) {
|
|
534
560
|
// "div",document,10000
|
|
@@ -541,13 +567,13 @@ class ElementWait extends ElementSelector {
|
|
|
541
567
|
if (typeof thirdParam === "number") {
|
|
542
568
|
timeout = thirdParam;
|
|
543
569
|
} else {
|
|
544
|
-
throw new TypeError("
|
|
570
|
+
throw new TypeError("DOMUtils.waitNodeList 第三个参数必须是number");
|
|
545
571
|
}
|
|
546
572
|
} else {
|
|
547
|
-
throw new TypeError("
|
|
573
|
+
throw new TypeError("DOMUtils.waitNodeList 第二个参数必须是Node");
|
|
548
574
|
}
|
|
549
575
|
} else {
|
|
550
|
-
throw new TypeError("
|
|
576
|
+
throw new TypeError("DOMUtils.waitNodeList 参数个数错误");
|
|
551
577
|
}
|
|
552
578
|
function getNodeList() {
|
|
553
579
|
if (Array.isArray(selector)) {
|
|
@@ -592,10 +618,10 @@ class ElementWait extends ElementSelector {
|
|
|
592
618
|
* @param selectorList CSS选择器数组
|
|
593
619
|
* @param parent (可选)监听的父元素
|
|
594
620
|
* @example
|
|
595
|
-
*
|
|
621
|
+
* DOMUtils.waitAnyNodeList(["div","a"]).then( $result =>{
|
|
596
622
|
* console.log($result); // $result => NodeListOf<HTMLDivElement>
|
|
597
623
|
* })
|
|
598
|
-
*
|
|
624
|
+
* DOMUtils.waitAnyNodeList(["div","a"], document).then( $result =>{
|
|
599
625
|
* console.log($result); // $result => NodeListOf<HTMLDivElement>
|
|
600
626
|
* })
|
|
601
627
|
*/
|
|
@@ -613,7 +639,7 @@ class ElementWait extends ElementSelector {
|
|
|
613
639
|
* @param parent 父元素,默认document
|
|
614
640
|
* @param timeout 超时时间,默认0
|
|
615
641
|
* @example
|
|
616
|
-
*
|
|
642
|
+
* DOMUtils.waitAnyNodeList(["div","a"], document, 10000).then( $result =>{
|
|
617
643
|
* console.log($result); // $result => NodeListOf<HTMLDivElement> | null
|
|
618
644
|
* })
|
|
619
645
|
*/
|
|
@@ -632,7 +658,7 @@ class ElementWait extends ElementSelector {
|
|
|
632
658
|
* @param selectorList CSS选择器数组
|
|
633
659
|
* @param timeout 超时时间,默认0
|
|
634
660
|
* @example
|
|
635
|
-
*
|
|
661
|
+
* DOMUtils.waitAnyNodeList(["div","div"], 10000).then( $result =>{
|
|
636
662
|
* console.log($result); // $result => NodeListOf<HTMLDivElement> | null
|
|
637
663
|
* })
|
|
638
664
|
*/
|
|
@@ -652,7 +678,7 @@ class ElementWait extends ElementSelector {
|
|
|
652
678
|
// 超时时间
|
|
653
679
|
let timeout = 0;
|
|
654
680
|
if (!Array.isArray(args[0])) {
|
|
655
|
-
throw new TypeError("
|
|
681
|
+
throw new TypeError("DOMUtils.waitAnyNodeList 第一个参数必须是string[]");
|
|
656
682
|
}
|
|
657
683
|
if (args.length === 1) {
|
|
658
684
|
// 上面已做处理
|
|
@@ -665,7 +691,7 @@ class ElementWait extends ElementSelector {
|
|
|
665
691
|
// "div",document
|
|
666
692
|
parent = secondParam as any as Element;
|
|
667
693
|
} else {
|
|
668
|
-
throw new TypeError("
|
|
694
|
+
throw new TypeError("DOMUtils.waitAnyNodeList 第二个参数必须是number|Node");
|
|
669
695
|
}
|
|
670
696
|
} else if (args.length === 3) {
|
|
671
697
|
// "div",document,10000
|
|
@@ -678,13 +704,13 @@ class ElementWait extends ElementSelector {
|
|
|
678
704
|
if (typeof thirdParam === "number") {
|
|
679
705
|
timeout = thirdParam;
|
|
680
706
|
} else {
|
|
681
|
-
throw new TypeError("
|
|
707
|
+
throw new TypeError("DOMUtils.waitAnyNodeList 第三个参数必须是number");
|
|
682
708
|
}
|
|
683
709
|
} else {
|
|
684
|
-
throw new TypeError("
|
|
710
|
+
throw new TypeError("DOMUtils.waitAnyNodeList 第二个参数必须是Node");
|
|
685
711
|
}
|
|
686
712
|
} else {
|
|
687
|
-
throw new TypeError("
|
|
713
|
+
throw new TypeError("DOMUtils.waitAnyNodeList 参数个数错误");
|
|
688
714
|
}
|
|
689
715
|
|
|
690
716
|
const promiseList = selectorList.map((selector) => {
|
package/src/index.ts
CHANGED
|
@@ -1750,7 +1750,7 @@ class DOMUtils extends ElementHandler {
|
|
|
1750
1750
|
checkUserClickInNode($el: Element | Node | HTMLElement) {
|
|
1751
1751
|
const that = this;
|
|
1752
1752
|
if (!CommonUtils.isDOM($el)) {
|
|
1753
|
-
throw new Error("
|
|
1753
|
+
throw new Error("DOMUtils.checkUserClickInNode 参数 targetNode 必须为 Element|Node 类型");
|
|
1754
1754
|
}
|
|
1755
1755
|
const clickEvent = that.windowApi.window.event as PointerEvent;
|
|
1756
1756
|
const touchEvent = that.windowApi.window.event as TouchEvent;
|