@form-create/iview 2.7.1 → 2.7.3

package/src/core/config.js

@@ -30,7 +30,7 @@ export default function getConfig() {
         submitBtn: {
             type: 'primary',
             disabled: false,
-            innerText: '提交',
+            innerText: '',
             loading: false,
             show: true,
             click: undefined,
@@ -39,7 +39,7 @@ export default function getConfig() {
             type: iviewConfig.resetBtnType,
             disabled: false,
             icon: iviewConfig.resetBtnIcon,
-            innerText: '重置',
+            innerText: '',
             loading: false,
             show: false,
             click: undefined,

package/src/core/manager.js

@@ -146,10 +146,10 @@ export default {
         const form = this.options.form;
         const titleSlot = this.getSlot('title');
         const children = [titleSlot ? titleSlot({
-            title: ctx.refRule.__$title.value,
+            title: ctx.refRule?.__$title.value,
             rule: ctx.rule,
             options: this.options
-        }) : ((ctx.refRule.__$title.value) + (form.labelSuffix || form['label-suffix'] || ''))];
+        }) : ((ctx.refRule?.__$title.value) + (form.labelSuffix || form['label-suffix'] || ''))];
 
         if (!isFalse(infoProp.show) && (infoProp.info || infoProp.native) && !isFalse(infoProp.icon)) {
             const prop = {
@@ -167,7 +167,7 @@ export default {
 
             const field = 'content';
             if (infoProp.info && !hasProperty(prop.props, field)) {
-                prop.props[field] = ctx.refRule.__$info.value;
+                prop.props[field] = ctx.refRule?.__$info.value;
             }
             children[infoProp.align !== 'left' ? 'unshift' : 'push'](this.$r(mergeProps([infoProp, prop]), [
                 this.$r({
@@ -239,7 +239,7 @@ export default {
 
     makeResetBtn() {
         const resetBtn = {...this.options.resetBtn};
-        const innerText = resetBtn.innerText;
+        const innerText = resetBtn.innerText || this.$handle.api.t('reset') || '重置';
         delete resetBtn.innerText;
         delete resetBtn.click;
         delete resetBtn.col;
@@ -262,7 +262,7 @@ export default {
     },
     makeSubmitBtn() {
         const submitBtn = {...this.options.submitBtn};
-        const innerText = submitBtn.innerText;
+        const innerText = submitBtn.innerText || this.$handle.api.t('submit') || '提交';
         delete submitBtn.innerText;
         delete submitBtn.click;
         delete submitBtn.col;

package/src/core/provider.js

@@ -15,12 +15,13 @@ const required = {
                 },
                 ...val,
             };
+            const title = rule.__fc__.refRule.__$title.value;
             if (!validate.message) {
-                validate.message = rule.__fc__.refRule.__$title.value + (api.getLocale() === 'en' ? ' is required' : '不能为空');
+                validate.message = api.t('required', {title}) || (title + (api.getLocale() === 'en' ? ' is required' : '不能为空'));
             } else {
                 const match = validate.message.match(/^\{\{\s*\$t\.(.+)\s*\}\}$/);
                 if (match) {
-                    validate.message = api.t(match[1], {title: rule.__fc__.refRule.__$title.value});
+                    validate.message = api.t(match[1], {title});
                 }
             }
             inject.getProp().validate = [validate];