@form-create/element-ui 3.1.4 → 3.1.7

package/src/core/manager.js

@@ -137,8 +137,8 @@ export default {
         return !((!title.title && !title.native) || isFalse(title.show))
     },
     makeInfo(rule, uni) {
-        const titleProp = rule.title;
-        const infoProp = rule.info;
+        const titleProp = {...rule.title};
+        const infoProp = {...rule.info};
         const isTip = isTooltip(infoProp);
         const form = this.options.form;
         const children = [(titleProp.title || '') + (form.labelSuffix || form['label-suffix'] || '')];
@@ -153,6 +153,8 @@ export default {
             delete prop.props.icon;
             delete prop.props.show;
             delete prop.props.info;
+            delete prop.props.align;
+            delete prop.props.native;
 
             const field = 'content';
             if (infoProp.info && !hasProperty(prop.props, field)) {
@@ -171,12 +173,17 @@ export default {
                 }, true)
             }));
         }
-
-        return this.$r(mergeProps([titleProp, {
+        const _prop = mergeProps([titleProp, {
             props: titleProp,
             key: `${uni}tit`,
             type: titleProp.type || 'span',
-        }]), children);
+        }]);
+
+        delete _prop.props.show;
+        delete _prop.props.title;
+        delete _prop.props.native;
+
+        return this.$r(_prop, children);
     },
     makeCol(rule, uni, children) {
         const col = rule.col;
@@ -225,6 +232,9 @@ export default {
         const resetBtn = {...this.options.resetBtn};
         const innerText = resetBtn.innerText;
         delete resetBtn.innerText;
+        delete resetBtn.click;
+        delete resetBtn.col;
+        delete resetBtn.show;
         return this.$r({
             type: 'button',
             props: resetBtn,
@@ -232,8 +242,8 @@ export default {
             on: {
                 click: () => {
                     const fApi = this.$handle.api;
-                    resetBtn.click
-                        ? resetBtn.click(fApi)
+                    this.options.resetBtn.click
+                        ? this.options.resetBtn.click(fApi)
                         : fApi.resetFields();
                 }
             },
@@ -244,6 +254,9 @@ export default {
         const submitBtn = {...this.options.submitBtn};
         const innerText = submitBtn.innerText;
         delete submitBtn.innerText;
+        delete submitBtn.click;
+        delete submitBtn.col;
+        delete submitBtn.show;
         return this.$r({
             type: 'button',
             props: submitBtn,
@@ -251,8 +264,8 @@ export default {
             on: {
                 click: () => {
                     const fApi = this.$handle.api;
-                    submitBtn.click
-                        ? submitBtn.click(fApi)
+                    this.options.submitBtn.click
+                        ? this.options.submitBtn.click(fApi)
                         : fApi.submit();
                 }
             },

package/src/core/provider.js

@@ -3,16 +3,16 @@ import is from '@form-create/utils/lib/type';
 const required = {
     name: 'required',
     load(inject, rule, api) {
-        const val = parseVa(inject.getValue());
+        const val = parseVal(inject.getValue());
         if (val.required === false) {
             inject.clearProp();
         } else {
             const validate = {
-                ...val,
                 required: true,
                 validator(_, v, call) {
                     is.empty(v) ? call(validate.message) : call();
-                }
+                },
+                ...val,
             };
             if (!validate.message) {
                 validate.message = rule.title + ' is required';
@@ -26,11 +26,13 @@ const required = {
     }
 }
 
-function parseVa(val) {
+function parseVal(val) {
     if (is.Boolean(val)) {
         return {required: val}
     } else if (is.String(val)) {
         return {message: val};
+    } else if (is.Function(val)) {
+        return {validator: val};
     } else if (!is.Object(val)) {
         return {};
     } else {
@@ -38,4 +40,5 @@ function parseVa(val) {
     }
 }
 
+
 export default required