indicator-ui 0.0.101 → 0.0.103
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.js
CHANGED
|
@@ -6416,14 +6416,15 @@ const comp = (a, b) => {
|
|
|
6416
6416
|
};
|
|
6417
6417
|
function useIsErrorField({ additionIsErrorFields = [], sensitiveSearch = true, } = {}) {
|
|
6418
6418
|
const [isError, setIsError] = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)([]);
|
|
6419
|
+
const [additionIsError, setAdditionIsError] = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(additionIsErrorFields || []);
|
|
6419
6420
|
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(() => {
|
|
6420
6421
|
if (additionIsErrorFields && additionIsErrorFields.length > 0)
|
|
6421
|
-
|
|
6422
|
+
setAdditionIsError(prevState => [...prevState, ...additionIsErrorFields]);
|
|
6422
6423
|
}, [JSON.stringify(additionIsErrorFields)]);
|
|
6423
6424
|
// }, [additionIsErrorFields])
|
|
6424
6425
|
const isErrorField = (name) => {
|
|
6425
6426
|
const criterion = (value) => sensitiveSearch ? checkNameField(value.name, name) : notSensitiveCheckNameField(value.name, name);
|
|
6426
|
-
return isError.some(criterion);
|
|
6427
|
+
return additionIsError.some(criterion) || isError.some(criterion);
|
|
6427
6428
|
};
|
|
6428
6429
|
const addErrorField = (name, errorMessage) => {
|
|
6429
6430
|
setIsError(prevState => {
|
|
@@ -6436,13 +6437,18 @@ function useIsErrorField({ additionIsErrorFields = [], sensitiveSearch = true, }
|
|
|
6436
6437
|
const newSet = [...prevState];
|
|
6437
6438
|
return newSet.filter(value => !comp(name, value.name));
|
|
6438
6439
|
});
|
|
6440
|
+
setAdditionIsError(prevState => {
|
|
6441
|
+
const newSet = [...prevState];
|
|
6442
|
+
return newSet.filter(value => !comp(name, value.name));
|
|
6443
|
+
});
|
|
6439
6444
|
};
|
|
6440
6445
|
const getErrorMessage = (name) => {
|
|
6441
6446
|
const criterion = (value) => checkNameField(value.name, name);
|
|
6442
|
-
return isError.find(criterion)?.errorMessage;
|
|
6447
|
+
return additionIsError.find(criterion)?.errorMessage || isError.find(criterion)?.errorMessage;
|
|
6443
6448
|
};
|
|
6444
6449
|
const clearErrors = () => {
|
|
6445
6450
|
setIsError([]);
|
|
6451
|
+
setAdditionIsError([]);
|
|
6446
6452
|
};
|
|
6447
6453
|
return {
|
|
6448
6454
|
isErrorField: isErrorField,
|
|
@@ -8532,7 +8538,11 @@ const getValidateFun = ({ validationProps, keyWay, getValue, schemeRequired, add
|
|
|
8532
8538
|
removeError(keyWay);
|
|
8533
8539
|
}
|
|
8534
8540
|
else {
|
|
8535
|
-
|
|
8541
|
+
let message = funRes.message;
|
|
8542
|
+
if (message == null && typeof required === 'string') {
|
|
8543
|
+
message = required;
|
|
8544
|
+
}
|
|
8545
|
+
addError(keyWay, message);
|
|
8536
8546
|
}
|
|
8537
8547
|
};
|
|
8538
8548
|
};
|