From 307a233a88f245ab927f88499844e6e67cae4aee Mon Sep 17 00:00:00 2001
From: rex <rexkaneki@gmail.com>
Date: Thu, 2 Jan 2020 16:10:49 +0800
Subject: [PATCH] feat(ContactEdit): show error message in field (#5437)
---
src/contact-edit/index.js | 16 +++++++---------
src/locale/lang/en-US.ts | 1 +
src/locale/lang/es-ES.ts | 1 +
src/locale/lang/tr-TR.ts | 1 +
src/locale/lang/zh-CN.ts | 3 ++-
src/locale/lang/zh-HK.ts | 1 +
src/locale/lang/zh-TW.ts | 1 +
7 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/contact-edit/index.js b/src/contact-edit/index.js
index 26c8f760e..f82a22af6 100644
--- a/src/contact-edit/index.js
+++ b/src/contact-edit/index.js
@@ -1,7 +1,6 @@
import { createNamespace } from '../utils';
import Button from '../button';
import Field from '../field';
-import Toast from '../toast';
import Dialog from '../dialog';
import Switch from '../switch';
import Cell from '../cell';
@@ -38,8 +37,8 @@ export default createComponent({
...this.contactInfo
},
errorInfo: {
- name: false,
- tel: false
+ name: '',
+ tel: ''
}
};
},
@@ -55,14 +54,14 @@ export default createComponent({
methods: {
onFocus(key) {
- this.errorInfo[key] = false;
+ this.errorInfo[key] = '';
},
getErrorMessageByKey(key) {
const value = this.data[key].trim();
switch (key) {
case 'name':
- return value ? '' : t('nameEmpty');
+ return value ? '' : t('nameInvalid');
case 'tel':
return this.telValidator(value) ? '' : t('telInvalid');
}
@@ -72,8 +71,7 @@ export default createComponent({
const isValid = ['name', 'tel'].every(item => {
const msg = this.getErrorMessageByKey(item);
if (msg) {
- this.errorInfo[item] = true;
- Toast(msg);
+ this.errorInfo[item] = msg;
}
return !msg;
});
@@ -105,7 +103,7 @@ export default createComponent({
maxlength="30"
label={t('name')}
placeholder={t('nameEmpty')}
- error={errorInfo.name}
+ errorMessage={errorInfo.name}
onFocus={onFocus('name')}
/>
<Field
@@ -114,7 +112,7 @@ export default createComponent({
type="tel"
label={t('tel')}
placeholder={t('telEmpty')}
- error={errorInfo.tel}
+ errorMessage={errorInfo.tel}
onFocus={onFocus('tel')}
/>
</div>
diff --git a/src/locale/lang/en-US.ts b/src/locale/lang/en-US.ts
index 0e53a4627..df72c17cf 100644
--- a/src/locale/lang/en-US.ts
+++ b/src/locale/lang/en-US.ts
@@ -9,6 +9,7 @@ export default {
loading: 'Loading...',
telEmpty: 'Please fill in the tel',
nameEmpty: 'Please fill in the name',
+ nameInvalid: 'Malformed name',
confirmDelete: 'Are you sure you want to delete?',
telInvalid: 'Malformed phone number',
vanCalendar: {
diff --git a/src/locale/lang/es-ES.ts b/src/locale/lang/es-ES.ts
index 334f9af27..36c5d8e3d 100644
--- a/src/locale/lang/es-ES.ts
+++ b/src/locale/lang/es-ES.ts
@@ -9,6 +9,7 @@ export default {
loading: 'Cargando...',
telEmpty: 'Por favor rellena el teléfono',
nameEmpty: 'Por favor rellena el nombre',
+ nameInvalid: 'nombre inválido',
confirmDelete: 'Estás seguro de eliminarlo?',
telInvalid: 'Teléfono inválido',
vanCalendar: {
diff --git a/src/locale/lang/tr-TR.ts b/src/locale/lang/tr-TR.ts
index 5750a1b0a..ff847409b 100644
--- a/src/locale/lang/tr-TR.ts
+++ b/src/locale/lang/tr-TR.ts
@@ -9,6 +9,7 @@ export default {
loading: 'Yükleniyor...',
telEmpty: 'Lütfen tel. no giriniz',
nameEmpty: 'Lütfen isim giriniz',
+ nameInvalid: 'Geçersiz isim',
confirmDelete: 'Silmek istediğinize emin misiniz?',
telInvalid: 'Geçersiz tel. numarası',
vanCalendar: {
diff --git a/src/locale/lang/zh-CN.ts b/src/locale/lang/zh-CN.ts
index 69b9300ee..4fdfa3c24 100644
--- a/src/locale/lang/zh-CN.ts
+++ b/src/locale/lang/zh-CN.ts
@@ -9,8 +9,9 @@ export default {
loading: '加载中...',
telEmpty: '请填写电话',
nameEmpty: '请填写姓名',
+ nameInvalid: '请输入正确的姓名',
confirmDelete: '确定要删除么',
- telInvalid: '请填写正确的电话',
+ telInvalid: '请输入正确的手机号',
vanCalendar: {
end: '结束',
start: '开始',
diff --git a/src/locale/lang/zh-HK.ts b/src/locale/lang/zh-HK.ts
index d8ad6956d..8f3bd734d 100644
--- a/src/locale/lang/zh-HK.ts
+++ b/src/locale/lang/zh-HK.ts
@@ -9,6 +9,7 @@ export default {
loading: '加載中...',
telEmpty: '請填寫電話',
nameEmpty: '請填寫姓名',
+ nameInvalid: '請輸入正確的姓名',
confirmDelete: '確定要刪除麽',
telInvalid: '請填寫正確的電話',
vanCalendar: {
diff --git a/src/locale/lang/zh-TW.ts b/src/locale/lang/zh-TW.ts
index 4c28e7757..c2d1919cd 100644
--- a/src/locale/lang/zh-TW.ts
+++ b/src/locale/lang/zh-TW.ts
@@ -9,6 +9,7 @@ export default {
loading: '載入中...',
telEmpty: '請填寫電話',
nameEmpty: '請填寫姓名',
+ nameInvalid: '請輸入正確的姓名',
confirmDelete: '確定要刪除嗎',
telInvalid: '請填寫正確的電話',
vanCalendar: {