Merge pull request #207 from yaob421123/master

fix(ProForm): 调整效验规则
uiwjs · Apr 8, 2023 · dd933da · dd933da
2 parents 40c51f2 + 736c3a1
commit dd933da
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/packages/components/src/ProForm/utils/index.tsx b/packages/components/src/ProForm/utils/index.tsx
@@ -173,3 +173,15 @@ export const fromValidate = (rules: FromValidateProps[] = []) => {
   });
   return errorObj;
 };
+
+/**
+ * 判断rules 里面是 required 是否存在
+ */
+export const isRequired = (rules: any[] = []): boolean => {
+  if (rules.length === 0) return false;
+  const requireds = rules.find((item) => item.required) || [];
+  if (requireds && requireds.length > 0) {
+    return true;
+  }
+  return false;
+};
diff --git a/packages/components/src/ProForm/widgets/index.tsx b/packages/components/src/ProForm/widgets/index.tsx
@@ -15,6 +15,7 @@ import CheckBox from './CheckBox';
 import SelectMultiple from './SelectMultiple';
 import Upload from './Upload';
 import SearchTree from './SearchTree';
+import { isRequired } from '../utils';
 
 /**
  *
@@ -62,12 +63,11 @@ export function getFormFields(
         const name = key;
         const Widget = widgetsList[widget];
         fields[name] = {
-          label:
-            otherProps.rules && otherProps.rules.length > 0 ? (
-              <span className="w-proform-label">{label}</span>
-            ) : (
-              label
-            ),
+          label: isRequired(otherProps.rules) ? (
+            <span className="w-proform-label">{label}</span>
+          ) : (
+            label
+          ),
           children: <Widget {...widgetProps} />,
           ...otherProps,
           initialValue,