mirror of
https://gitee.com/vant-contrib/vant.git
synced 2025-04-06 03:57:59 +08:00
fix(AddressEdit): remove unused finish button (#9364)
This commit is contained in:
parent
bcd4ddfbe4
commit
f37fb01c4d
@ -1,7 +1,7 @@
|
|||||||
import { PropType, ref, defineComponent } from 'vue';
|
import { PropType, ref, defineComponent } from 'vue';
|
||||||
|
|
||||||
// Utils
|
// Utils
|
||||||
import { isAndroid, createNamespace } from '../utils';
|
import { createNamespace } from '../utils';
|
||||||
|
|
||||||
// Components
|
// Components
|
||||||
import { Cell } from '../cell';
|
import { Cell } from '../cell';
|
||||||
@ -12,7 +12,6 @@ import type { AddressEditSearchItem } from './types';
|
|||||||
import type { FieldInstance } from '../field/types';
|
import type { FieldInstance } from '../field/types';
|
||||||
|
|
||||||
const [name, bem, t] = createNamespace('address-edit-detail');
|
const [name, bem, t] = createNamespace('address-edit-detail');
|
||||||
const android = isAndroid();
|
|
||||||
|
|
||||||
export default defineComponent({
|
export default defineComponent({
|
||||||
name,
|
name,
|
||||||
@ -41,18 +40,6 @@ export default defineComponent({
|
|||||||
emit('input', `${express.address || ''} ${express.name || ''}`.trim());
|
emit('input', `${express.address || ''} ${express.name || ''}`.trim());
|
||||||
};
|
};
|
||||||
|
|
||||||
const onFinish = () => field.value?.blur();
|
|
||||||
|
|
||||||
const renderFinish = () => {
|
|
||||||
if (props.value && props.focused && android) {
|
|
||||||
return (
|
|
||||||
<div class={bem('finish')} onClick={onFinish}>
|
|
||||||
{t('complete')}
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const renderSearchTitle = (express: AddressEditSearchItem) => {
|
const renderSearchTitle = (express: AddressEditSearchItem) => {
|
||||||
if (express.name) {
|
if (express.name) {
|
||||||
const text = express.name.replace(
|
const text = express.name.replace(
|
||||||
@ -95,15 +82,14 @@ export default defineComponent({
|
|||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Field
|
<Field
|
||||||
v-slots={{ icon: renderFinish }}
|
|
||||||
autosize
|
autosize
|
||||||
|
clearable
|
||||||
ref={field}
|
ref={field}
|
||||||
class={bem()}
|
class={bem()}
|
||||||
rows={props.detailRows}
|
rows={props.detailRows}
|
||||||
type="textarea"
|
type="textarea"
|
||||||
label={t('label')}
|
label={t('label')}
|
||||||
border={!showSearchResult()}
|
border={!showSearchResult()}
|
||||||
clearable={!android}
|
|
||||||
maxlength={props.detailMaxlength}
|
maxlength={props.detailMaxlength}
|
||||||
modelValue={props.value}
|
modelValue={props.value}
|
||||||
placeholder={t('placeholder')}
|
placeholder={t('placeholder')}
|
||||||
|
@ -186,5 +186,3 @@ The component provides the following CSS variables, which can be used to customi
|
|||||||
| --van-address-edit-buttons-padding | _var(--van-padding-xl) var(--van-padding-base)_ | - |
|
| --van-address-edit-buttons-padding | _var(--van-padding-xl) var(--van-padding-base)_ | - |
|
||||||
| --van-address-edit-button-margin-bottom | _var(--van-padding-sm)_ | - |
|
| --van-address-edit-button-margin-bottom | _var(--van-padding-sm)_ | - |
|
||||||
| --van-address-edit-button-font-size | _var(--van-font-size-lg)_ | - |
|
| --van-address-edit-button-font-size | _var(--van-font-size-lg)_ | - |
|
||||||
| --van-address-edit-detail-finish-color | _var(--van-primary-color)_ | - |
|
|
||||||
| --van-address-edit-detail-finish-font-size | _var(--van-font-size-sm)_ | - |
|
|
||||||
|
@ -188,5 +188,3 @@ addressEditRef.value?.setAddressDetail('');
|
|||||||
| --van-address-edit-buttons-padding | _var(--van-padding-xl) var(--van-padding-base)_ | - |
|
| --van-address-edit-buttons-padding | _var(--van-padding-xl) var(--van-padding-base)_ | - |
|
||||||
| --van-address-edit-button-margin-bottom | _var(--van-padding-sm)_ | - |
|
| --van-address-edit-button-margin-bottom | _var(--van-padding-sm)_ | - |
|
||||||
| --van-address-edit-button-font-size | _var(--van-font-size-lg)_ | - |
|
| --van-address-edit-button-font-size | _var(--van-font-size-lg)_ | - |
|
||||||
| --van-address-edit-detail-finish-color | _var(--van-primary-color)_ | - |
|
|
||||||
| --van-address-edit-detail-finish-font-size | _var(--van-font-size-sm)_ | - |
|
|
||||||
|
@ -5,8 +5,6 @@
|
|||||||
--van-address-edit-buttons-padding: @address-edit-buttons-padding;
|
--van-address-edit-buttons-padding: @address-edit-buttons-padding;
|
||||||
--van-address-edit-button-margin-bottom: @address-edit-button-margin-bottom;
|
--van-address-edit-button-margin-bottom: @address-edit-button-margin-bottom;
|
||||||
--van-contact-edit-button-font-size: @address-edit-button-font-size;
|
--van-contact-edit-button-font-size: @address-edit-button-font-size;
|
||||||
--van-address-edit-detail-finish-color: @address-edit-detail-finish-color;
|
|
||||||
--van-address-edit-detail-finish-font-size: @address-edit-detail-finish-font-size;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.van-address-edit {
|
.van-address-edit {
|
||||||
@ -44,10 +42,5 @@
|
|||||||
&__keyword {
|
&__keyword {
|
||||||
color: var(--van-danger-color);
|
color: var(--van-danger-color);
|
||||||
}
|
}
|
||||||
|
|
||||||
&__finish {
|
|
||||||
color: var(--van-address-edit-detail-finish-color);
|
|
||||||
font-size: var(--van-address-edit-detail-finish-font-size);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -4,5 +4,3 @@
|
|||||||
@address-edit-buttons-padding: var(--van-padding-xl) var(--van-padding-base);
|
@address-edit-buttons-padding: var(--van-padding-xl) var(--van-padding-base);
|
||||||
@address-edit-button-margin-bottom: var(--van-padding-sm);
|
@address-edit-button-margin-bottom: var(--van-padding-sm);
|
||||||
@address-edit-button-font-size: var(--van-font-size-lg);
|
@address-edit-button-font-size: var(--van-font-size-lg);
|
||||||
@address-edit-detail-finish-color: var(--van-primary-color);
|
|
||||||
@address-edit-detail-finish-font-size: var(--van-font-size-sm);
|
|
||||||
|
@ -5,7 +5,6 @@ export default {
|
|||||||
confirm: 'Bestätigen',
|
confirm: 'Bestätigen',
|
||||||
cancel: 'Abbrechen',
|
cancel: 'Abbrechen',
|
||||||
delete: 'Löschen',
|
delete: 'Löschen',
|
||||||
complete: 'Complete',
|
|
||||||
loading: 'Laden...',
|
loading: 'Laden...',
|
||||||
nameEmpty: 'Bitte geben Sie den Name an',
|
nameEmpty: 'Bitte geben Sie den Name an',
|
||||||
confirmDelete: 'Sind Sie sicher, dass Sie löschen möchten?',
|
confirmDelete: 'Sind Sie sicher, dass Sie löschen möchten?',
|
||||||
|
@ -5,7 +5,6 @@ export default {
|
|||||||
confirm: 'Bestätigen',
|
confirm: 'Bestätigen',
|
||||||
cancel: 'Abbrechen',
|
cancel: 'Abbrechen',
|
||||||
delete: 'Löschen',
|
delete: 'Löschen',
|
||||||
complete: 'Complete',
|
|
||||||
loading: 'Laden...',
|
loading: 'Laden...',
|
||||||
nameEmpty: 'Bitte den Name angeben',
|
nameEmpty: 'Bitte den Name angeben',
|
||||||
confirmDelete: 'Bist du sicher, dass du löschen möchtest?',
|
confirmDelete: 'Bist du sicher, dass du löschen möchtest?',
|
||||||
|
@ -5,7 +5,6 @@ export default {
|
|||||||
confirm: 'Confirm',
|
confirm: 'Confirm',
|
||||||
cancel: 'Cancel',
|
cancel: 'Cancel',
|
||||||
delete: 'Delete',
|
delete: 'Delete',
|
||||||
complete: 'Complete',
|
|
||||||
loading: 'Loading...',
|
loading: 'Loading...',
|
||||||
nameEmpty: 'Please fill in the name',
|
nameEmpty: 'Please fill in the name',
|
||||||
confirmDelete: 'Are you sure you want to delete?',
|
confirmDelete: 'Are you sure you want to delete?',
|
||||||
|
@ -5,7 +5,6 @@ export default {
|
|||||||
confirm: 'Confirmar',
|
confirm: 'Confirmar',
|
||||||
cancel: 'Cancelar',
|
cancel: 'Cancelar',
|
||||||
delete: 'Eliminar',
|
delete: 'Eliminar',
|
||||||
complete: 'Completado',
|
|
||||||
loading: 'Cargando...',
|
loading: 'Cargando...',
|
||||||
nameEmpty: 'Por favor rellena el nombre',
|
nameEmpty: 'Por favor rellena el nombre',
|
||||||
confirmDelete: 'Estás seguro de eliminarlo?',
|
confirmDelete: 'Estás seguro de eliminarlo?',
|
||||||
|
@ -5,7 +5,6 @@ export default {
|
|||||||
confirm: 'Confirmer',
|
confirm: 'Confirmer',
|
||||||
cancel: 'Annuler',
|
cancel: 'Annuler',
|
||||||
delete: 'Suprimer',
|
delete: 'Suprimer',
|
||||||
complete: 'Terminé',
|
|
||||||
loading: 'Chargement...',
|
loading: 'Chargement...',
|
||||||
nameEmpty: 'Veuillez remplir le nom',
|
nameEmpty: 'Veuillez remplir le nom',
|
||||||
confirmDelete: 'Êtes-vous sûr de vouloir supprimer?',
|
confirmDelete: 'Êtes-vous sûr de vouloir supprimer?',
|
||||||
|
@ -5,7 +5,6 @@ export default {
|
|||||||
confirm: '確認',
|
confirm: '確認',
|
||||||
cancel: 'キャンセル',
|
cancel: 'キャンセル',
|
||||||
delete: '削除',
|
delete: '削除',
|
||||||
complete: '完了',
|
|
||||||
loading: '読み込み中...',
|
loading: '読み込み中...',
|
||||||
nameEmpty: '名前を入力してください',
|
nameEmpty: '名前を入力してください',
|
||||||
confirmDelete: '本当に削除しますか',
|
confirmDelete: '本当に削除しますか',
|
||||||
|
@ -5,7 +5,6 @@ export default {
|
|||||||
confirm: 'Bekreft',
|
confirm: 'Bekreft',
|
||||||
cancel: 'Avbryt',
|
cancel: 'Avbryt',
|
||||||
delete: 'Slett',
|
delete: 'Slett',
|
||||||
complete: 'Fullfør',
|
|
||||||
loading: 'Laster...',
|
loading: 'Laster...',
|
||||||
nameEmpty: 'Vennligst fyll inn navn',
|
nameEmpty: 'Vennligst fyll inn navn',
|
||||||
confirmDelete: 'Er du sikker på at du vil slette?',
|
confirmDelete: 'Er du sikker på at du vil slette?',
|
||||||
|
@ -5,7 +5,6 @@ export default {
|
|||||||
confirm: 'Confirmă',
|
confirm: 'Confirmă',
|
||||||
cancel: 'Anulează',
|
cancel: 'Anulează',
|
||||||
delete: 'Șterge',
|
delete: 'Șterge',
|
||||||
complete: 'Finalizează',
|
|
||||||
loading: 'Încărcare...',
|
loading: 'Încărcare...',
|
||||||
nameEmpty: 'Te rugăm să completezi numele',
|
nameEmpty: 'Te rugăm să completezi numele',
|
||||||
confirmDelete: 'Ești sigur ca vrei sa stergi?',
|
confirmDelete: 'Ești sigur ca vrei sa stergi?',
|
||||||
|
@ -5,7 +5,6 @@ export default {
|
|||||||
confirm: 'Подтвердить',
|
confirm: 'Подтвердить',
|
||||||
cancel: 'Отмена',
|
cancel: 'Отмена',
|
||||||
delete: 'Удалить',
|
delete: 'Удалить',
|
||||||
complete: 'Завершить',
|
|
||||||
loading: 'Загрузка...',
|
loading: 'Загрузка...',
|
||||||
nameEmpty: 'Пожалуйста укажите имя',
|
nameEmpty: 'Пожалуйста укажите имя',
|
||||||
confirmDelete: 'Вы уверены, что хотите удалить?',
|
confirmDelete: 'Вы уверены, что хотите удалить?',
|
||||||
|
@ -5,7 +5,6 @@ export default {
|
|||||||
confirm: 'ยืนยัน',
|
confirm: 'ยืนยัน',
|
||||||
cancel: 'ยกเลิก',
|
cancel: 'ยกเลิก',
|
||||||
delete: 'ลบ',
|
delete: 'ลบ',
|
||||||
complete: 'ดำเนินการ',
|
|
||||||
loading: 'กำลังโหลด...',
|
loading: 'กำลังโหลด...',
|
||||||
nameEmpty: 'กรุณากรอกชื่อของคุณ',
|
nameEmpty: 'กรุณากรอกชื่อของคุณ',
|
||||||
confirmDelete: 'คุณแน่ใจว่าต้องการลบ',
|
confirmDelete: 'คุณแน่ใจว่าต้องการลบ',
|
||||||
|
@ -5,7 +5,6 @@ export default {
|
|||||||
confirm: 'Onayla',
|
confirm: 'Onayla',
|
||||||
cancel: 'İptal',
|
cancel: 'İptal',
|
||||||
delete: 'Sil',
|
delete: 'Sil',
|
||||||
complete: 'Tamamla',
|
|
||||||
loading: 'Yükleniyor...',
|
loading: 'Yükleniyor...',
|
||||||
nameEmpty: 'Lütfen isim giriniz',
|
nameEmpty: 'Lütfen isim giriniz',
|
||||||
confirmDelete: 'Silmek istediğinize emin misiniz?',
|
confirmDelete: 'Silmek istediğinize emin misiniz?',
|
||||||
|
@ -5,7 +5,6 @@ export default {
|
|||||||
confirm: '确认',
|
confirm: '确认',
|
||||||
cancel: '取消',
|
cancel: '取消',
|
||||||
delete: '删除',
|
delete: '删除',
|
||||||
complete: '完成',
|
|
||||||
loading: '加载中...',
|
loading: '加载中...',
|
||||||
nameEmpty: '请填写姓名',
|
nameEmpty: '请填写姓名',
|
||||||
confirmDelete: '确定要删除吗',
|
confirmDelete: '确定要删除吗',
|
||||||
|
@ -5,7 +5,6 @@ export default {
|
|||||||
confirm: '確認',
|
confirm: '確認',
|
||||||
cancel: '取消',
|
cancel: '取消',
|
||||||
delete: '刪除',
|
delete: '刪除',
|
||||||
complete: '完成',
|
|
||||||
loading: '加載中...',
|
loading: '加載中...',
|
||||||
nameEmpty: '請填寫姓名',
|
nameEmpty: '請填寫姓名',
|
||||||
confirmDelete: '確定要刪除嗎',
|
confirmDelete: '確定要刪除嗎',
|
||||||
|
@ -5,7 +5,6 @@ export default {
|
|||||||
confirm: '確認',
|
confirm: '確認',
|
||||||
cancel: '取消',
|
cancel: '取消',
|
||||||
delete: '刪除',
|
delete: '刪除',
|
||||||
complete: '完成',
|
|
||||||
loading: '載入中...',
|
loading: '載入中...',
|
||||||
nameEmpty: '請填寫姓名',
|
nameEmpty: '請填寫姓名',
|
||||||
confirmDelete: '確定要刪除嗎',
|
confirmDelete: '確定要刪除嗎',
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import { deepClone } from '../deep-clone';
|
import { deepClone } from '../deep-clone';
|
||||||
import { deepAssign } from '../deep-assign';
|
import { deepAssign } from '../deep-assign';
|
||||||
import { get, noop } from '..';
|
import { get, noop } from '..';
|
||||||
import { isDef, isMobile, isNumeric, isAndroid } from '../validate';
|
import { isDef, isMobile, isNumeric } from '../validate';
|
||||||
import { camelize } from '../format/string';
|
import { camelize } from '../format/string';
|
||||||
import { formatNumber } from '../format/number';
|
import { formatNumber } from '../format/number';
|
||||||
import { addUnit, unitToPx } from '../format/unit';
|
import { addUnit, unitToPx } from '../format/unit';
|
||||||
@ -57,10 +57,6 @@ test('get', () => {
|
|||||||
expect(get({ a: { b: 2 } }, 'a.b.c')).toEqual('');
|
expect(get({ a: { b: 2 } }, 'a.b.c')).toEqual('');
|
||||||
});
|
});
|
||||||
|
|
||||||
test('isAndroid', () => {
|
|
||||||
expect(isAndroid()).toBeFalsy();
|
|
||||||
});
|
|
||||||
|
|
||||||
test('isMobile', () => {
|
test('isMobile', () => {
|
||||||
expect(isMobile('13000000000')).toBeTruthy();
|
expect(isMobile('13000000000')).toBeTruthy();
|
||||||
expect(isMobile('+8613000000000')).toBeTruthy();
|
expect(isMobile('+8613000000000')).toBeTruthy();
|
||||||
|
@ -35,10 +35,6 @@ export function isNumeric(val: string | number): val is string {
|
|||||||
return typeof val === 'number' || /^\d+(\.\d+)?$/.test(val);
|
return typeof val === 'number' || /^\d+(\.\d+)?$/.test(val);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function isAndroid(): boolean {
|
|
||||||
return inBrowser ? /android/.test(navigator.userAgent.toLowerCase()) : false;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function isIOS(): boolean {
|
export function isIOS(): boolean {
|
||||||
return inBrowser
|
return inBrowser
|
||||||
? /ios|iphone|ipad|ipod/.test(navigator.userAgent.toLowerCase())
|
? /ios|iphone|ipad|ipod/.test(navigator.userAgent.toLowerCase())
|
||||||
|
Loading…
x
Reference in New Issue
Block a user