@cloudtower/eagle 490.0.3 → 490.0.4

package/dist/cjs/core/TableForm/TableFormBodyCell.js

@@ -42,24 +42,16 @@ const TableFormBodyCell = (props) => {
     disabled,
     onChange,
     onBlur,
-    validateAll,
+    validateAllCount,
     error,
     onValidate
   } = props;
   const [validateResult, setValidateResult] = React.useState();
   const [isTouched, setIsTouched] = React.useState(false);
   const width = typeof column.width === "number" ? column.width + "px" : column.width;
-  const isCellErrorStyle = Boolean((validateResult == null ? void 0 : validateResult.isError) || isRowError);
-  React.useEffect(() => {
-    if (isTouched) {
-      setValidateResult(
-        error ? {
-          msg: error,
-          isError: true
-        } : void 0
-      );
-    }
-  }, [error, isTouched]);
+  const isCellErrorStyle = Boolean(
+    isTouched && error || (validateResult == null ? void 0 : validateResult.isError) || isRowError
+  );
   const triggerValidate = React.useCallback(
     (currentValue) => {
       var _a;
@@ -84,11 +76,11 @@ const TableFormBodyCell = (props) => {
     [data, rowIndex, column, getRowValidateResult, onValidate]
   );
   React.useEffect(() => {
-    if (validateAll) {
+    if (validateAllCount > 0) {
       setIsTouched(true);
       triggerValidate();
     }
-  }, [validateAll, triggerValidate, setIsTouched]);
+  }, [validateAllCount, triggerValidate, setIsTouched]);
   const _onChange = (value, data2) => {
     const newData = data2.map(
       (row, i) => i === rowIndex ? __spreadProps(__spreadValues({}, row), { [column.key]: value }) : row
@@ -162,7 +154,7 @@ const TableFormBodyCell = (props) => {
       FormItem.FormItem,
       {
         validateStatus: isCellErrorStyle ? "error" : "",
-        message: isRowError ? "" : validateResult == null ? void 0 : validateResult.msg
+        message: isRowError ? "" : (isTouched ? error : void 0) || (validateResult == null ? void 0 : validateResult.msg)
       },
       Cell
     ),

package/dist/cjs/core/TableForm/TableFormBodyRows.js

@@ -84,7 +84,7 @@ const TableFormRow = (props) => {
     updateData,
     onBodyBlur,
     renderRowDescription,
-    validateAll,
+    validateAllCount,
     onValidate
   } = props;
   const rowData = data[rowIndex];
@@ -127,7 +127,7 @@ const TableFormRow = (props) => {
         validateTriggerType,
         isRowError: !!rowError,
         getRowValidateResult,
-        validateAll,
+        validateAllCount,
         error: cellError,
         onValidate
       }

package/dist/cjs/core/TableForm/index.js

@@ -61,7 +61,7 @@ const TableForm = React__default.default.forwardRef(
     const [data, setData] = React.useState(defaultData || []);
     const [passwordVisible, setPasswordVisible] = React.useState(false);
     const [latestData, setLatestData] = React.useState(defaultData || []);
-    const [validateAll, setValidateAll] = React.useState(false);
+    const [validateAllCount, setValidateAllCount] = React.useState(0);
     const rowSplitType = (row == null ? void 0 : row.splitType) || props.rowSplitType || "border";
     const draggable = (_b = (_a = row == null ? void 0 : row.draggable) != null ? _a : props.draggable) != null ? _b : false;
     const formValidMapRef = React.useRef({});
@@ -124,7 +124,7 @@ const TableForm = React__default.default.forwardRef(
         },
         validateWholeFields() {
           formValidMapRef.current = {};
-          setValidateAll(true);
+          setValidateAllCount((c) => c + 1);
         },
         isValid() {
           return Object.values(formValidMapRef.current).every(
@@ -191,7 +191,7 @@ const TableForm = React__default.default.forwardRef(
           updateData,
           renderRowDescription,
           rowValidator,
-          validateAll,
+          validateAllCount,
           errors,
           onValidate
         }