color validation allow “” as value

alibaba · Sep 27, 2020 · 384bb2b · 384bb2b
1 parent 9e8179b
commit 384bb2b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/docs/demo/FR2/index.jsx b/docs/demo/FR2/index.jsx
@@ -7,7 +7,7 @@ import { Button } from 'antd';
 const Demo = ({ schema = {} }) => {
   const [formData, setFormData] = useState(() => schema.formData);
   const [valid, setValid] = useState([]);
-  const [showValid, setShowValid] = useState(false);
+  const [showValid, setShowValid] = useState(true);
 
   // useEffect(() => {
   //   setTimeout(() => setFormData({ crowd: { upfIdList: 'sdfsdf' } }), 1500);

diff --git a/docs/demo/new-feature/test.json b/docs/demo/new-feature/test.json
@@ -10,6 +10,11 @@
         "title": "测试效验",
         "type": "string",
         "ui:hidden": "{{formData.string!=='2'}}"
+      },
+      "color": {
+        "title": "颜色选择",
+        "type": "string",
+        "format": "color"
       }
     },
     "required": ["string22"]

diff --git a/src/base/validate.js b/src/base/validate.js
@@ -88,8 +88,7 @@ export const getValidateText = (obj = {}) => {
     // TODO: 为了一个Color引入了一个挺大的包，可以优化
     if (format === 'color' || widget === 'color') {
       try {
-        // if (!finalValue) return '请填写正确的颜色格式';
-        Color(finalValue);
+        Color(finalValue || null); // 空字符串无法解析会报错，出现空的情况传 null
       } catch (e) {
         return '请填写正确的颜色格式';
       }