fix: 修复 required 合并问题

crazyair · Aug 24, 2020 · a889e6d · a889e6d
1 parent 23ed514
commit a889e6d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/packages/yforms/package.json b/packages/yforms/package.json
@@ -1,6 +1,6 @@
 {
   "name": "yforms",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "description": "自定义表单组件",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",

diff --git a/packages/yforms/src/YForm/scenes.tsx b/packages/yforms/src/YForm/scenes.tsx
@@ -48,7 +48,9 @@ const scenes: YFormConfig = {
         if (itemProps.name && typeProps.type && typeProps.type !== 'list') {
           let hasRequired = false;
           forEach(rules, (item) => {
-            hasRequired = 'required' in item;
+            if ('required' in item) {
+              hasRequired = true;
+            }
           });
           if (!hasRequired) {
             _itemProps.rules = [
@@ -58,7 +60,7 @@ const scenes: YFormConfig = {
           }
         }
         return {
-          itemProps: { ..._itemProps, ...itemProps },
+          itemProps: { ...itemProps, ..._itemProps },
         };
       },
     },