sard 1.0.17 → 1.0.18
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/components/form/Validator.js +22 -1
- package/package.json +1 -1
|
@@ -17,6 +17,27 @@ var CancelError = class extends Error {
|
|
|
17
17
|
function isCancelError(error) {
|
|
18
18
|
return error instanceof CancelError || error?.name === "CancelError";
|
|
19
19
|
}
|
|
20
|
+
/**
|
|
21
|
+
* 将 validator 返回的 promise 与 abort 信号竞速：
|
|
22
|
+
* 信号一旦 abort 就自动以 CancelError 结束，validator 无需手动 reject。
|
|
23
|
+
*/
|
|
24
|
+
function raceWithAbort(promise, signal) {
|
|
25
|
+
if (!signal) return promise;
|
|
26
|
+
if (signal.aborted) return Promise.reject(new CancelError());
|
|
27
|
+
return new Promise((resolve, reject) => {
|
|
28
|
+
const onAbort = () => {
|
|
29
|
+
reject(new CancelError());
|
|
30
|
+
};
|
|
31
|
+
signal.addEventListener("abort", onAbort, { once: true });
|
|
32
|
+
promise.then((value) => {
|
|
33
|
+
signal.removeEventListener("abort", onAbort);
|
|
34
|
+
resolve(value);
|
|
35
|
+
}, (error) => {
|
|
36
|
+
signal.removeEventListener("abort", onAbort);
|
|
37
|
+
reject(error);
|
|
38
|
+
});
|
|
39
|
+
});
|
|
40
|
+
}
|
|
20
41
|
function getMessage(message) {
|
|
21
42
|
return isFunction(message) ? message() : message;
|
|
22
43
|
}
|
|
@@ -154,7 +175,7 @@ var Validator = class {
|
|
|
154
175
|
rule,
|
|
155
176
|
signal: options.signal
|
|
156
177
|
});
|
|
157
|
-
if (result instanceof Promise) result.then(() => {
|
|
178
|
+
if (result instanceof Promise) raceWithAbort(result, options.signal).then(() => {
|
|
158
179
|
resolve();
|
|
159
180
|
}).catch((error) => {
|
|
160
181
|
if (isCancelError(error)) reject(error);
|