diff --git a/docs/src/demo-common.js b/docs/src/demo-common.js index 08f33523f..ad9528273 100644 --- a/docs/src/demo-common.js +++ b/docs/src/demo-common.js @@ -42,11 +42,11 @@ Locale.add({ custom: '自定义', username: '用户名', password: '密码', - loading: '加载状态', disabled: '禁用状态', uneditable: '不可编辑', basicUsage: '基础用法', advancedUsage: '高级用法', + loadingStatus: '加载状态', usernamePlaceholder: '请输入用户名', passwordPlaceholder: '请输入密码' }, @@ -70,7 +70,7 @@ Locale.add({ custom: 'Custom', username: 'Username', password: 'Password', - loading: 'Loading', + loadingStatus: 'Loading', disabled: 'Disabled', uneditable: 'Uneditable', basicUsage: 'Basic Usage', diff --git a/packages/button/demo/index.vue b/packages/button/demo/index.vue index 32512d818..bfc9171c3 100644 --- a/packages/button/demo/index.vue +++ b/packages/button/demo/index.vue @@ -39,7 +39,7 @@ - + diff --git a/packages/list/test/__snapshots__/demo.spec.js.snap b/packages/list/test/__snapshots__/demo.spec.js.snap index 5a3ece653..4723337e6 100644 --- a/packages/list/test/__snapshots__/demo.spec.js.snap +++ b/packages/list/test/__snapshots__/demo.spec.js.snap @@ -9,7 +9,6 @@ exports[`renders demo correctly 1`] = `
-
diff --git a/packages/locale/lang/en-US.js b/packages/locale/lang/en-US.js index 8fd7e7151..32cdb3e5a 100644 --- a/packages/locale/lang/en-US.js +++ b/packages/locale/lang/en-US.js @@ -6,7 +6,7 @@ export default { cancel: 'Cancel', delete: 'Delete', complete: 'Complete', - loadingTip: 'Loading...', + loading: 'Loading...', telEmpty: 'Please fill in the tel', nameEmpty: 'Please fill in the name', confirmDelete: 'Are you sure you want to delete?', diff --git a/packages/locale/lang/tr-TR.js b/packages/locale/lang/tr-TR.js index 01dc8ecde..e27e5c849 100644 --- a/packages/locale/lang/tr-TR.js +++ b/packages/locale/lang/tr-TR.js @@ -6,7 +6,7 @@ export default { cancel: 'İptal', delete: 'Sil', complete: 'Tamamla', - loadingTip: 'Yükleniyor...', + loading: 'Yükleniyor...', telEmpty: 'Lütfen tel. no giriniz', nameEmpty: 'Lütfen isim giriniz', confirmDelete: 'Silmek istediğinize emin misiniz?', diff --git a/packages/locale/lang/zh-CN.js b/packages/locale/lang/zh-CN.js index 8f93f2bca..b2c3c03d6 100644 --- a/packages/locale/lang/zh-CN.js +++ b/packages/locale/lang/zh-CN.js @@ -6,7 +6,7 @@ export default { cancel: '取消', delete: '删除', complete: '完成', - loadingTip: '加载中...', + loading: '加载中...', telEmpty: '请填写电话', nameEmpty: '请填写姓名', confirmDelete: '确定要删除么', diff --git a/packages/locale/lang/zh-HK.js b/packages/locale/lang/zh-HK.js index 1f62c9fdc..88d18146c 100644 --- a/packages/locale/lang/zh-HK.js +++ b/packages/locale/lang/zh-HK.js @@ -6,7 +6,7 @@ export default { cancel: '取消', delete: '刪除', complete: '完成', - loadingTip: '加載中...', + loading: '加載中...', telEmpty: '請填寫電話', nameEmpty: '請填寫姓名', confirmDelete: '確定要刪除麽', diff --git a/packages/locale/lang/zh-TW.js b/packages/locale/lang/zh-TW.js index 27b85da05..71fe92857 100644 --- a/packages/locale/lang/zh-TW.js +++ b/packages/locale/lang/zh-TW.js @@ -6,7 +6,7 @@ export default { cancel: '取消', delete: '刪除', complete: '完成', - loadingTip: '載入中...', + loading: '載入中...', telEmpty: '請填寫電話', nameEmpty: '請填寫姓名', confirmDelete: '確定要刪除嗎', diff --git a/packages/picker/demo/index.vue b/packages/picker/demo/index.vue index 904dfc153..efd4b3206 100644 --- a/packages/picker/demo/index.vue +++ b/packages/picker/demo/index.vue @@ -28,7 +28,7 @@ /> - +
- - +
- -
- - -
+ v-if="status === 'loading'" + :class="b('loading')" + > - +
@@ -93,11 +76,11 @@ export default create({ untouchable() { return this.status === 'loading' || this.disabled; - } - }, + }, - mounted() { - this.scrollEl = scrollUtils.getScrollEventTarget(this.$el); + text() { + return this[`${this.status}Text`] || this.$t(this.status); + } }, watch: { @@ -107,12 +90,13 @@ export default create({ } }, + mounted() { + this.scrollEl = scrollUtils.getScrollEventTarget(this.$el); + }, + methods: { onTouchStart(event) { - if (this.untouchable) { - return; - } - if (this.getCeiling()) { + if (!this.untouchable && this.getCeiling()) { this.duration = 0; this.touchStart(event); } @@ -140,11 +124,7 @@ export default create({ }, onTouchEnd() { - if (this.untouchable) { - return; - } - - if (this.ceiling && this.deltaY) { + if (!this.untouchable && this.ceiling && this.deltaY) { this.duration = this.animationDuration; if (this.status === 'loosing') { this.getStatus(this.headHeight, true); diff --git a/packages/pull-refresh/test/__snapshots__/demo.spec.js.snap b/packages/pull-refresh/test/__snapshots__/demo.spec.js.snap index 6225e53d3..b6a95bb25 100644 --- a/packages/pull-refresh/test/__snapshots__/demo.spec.js.snap +++ b/packages/pull-refresh/test/__snapshots__/demo.spec.js.snap @@ -7,7 +7,6 @@ exports[`renders demo correctly 1`] = `
-

刷新次数: 0

diff --git a/packages/pull-refresh/test/__snapshots__/index.spec.js.snap b/packages/pull-refresh/test/__snapshots__/index.spec.js.snap index a9f7f1864..62cd4f6a8 100644 --- a/packages/pull-refresh/test/__snapshots__/index.spec.js.snap +++ b/packages/pull-refresh/test/__snapshots__/index.spec.js.snap @@ -4,10 +4,8 @@ exports[`change head content when pulling down 1`] = `
-
下拉即可刷新...
-
@@ -17,9 +15,7 @@ exports[`change head content when pulling down 2`] = `
- - -
释放即可刷新...
+
下拉即可刷新...
@@ -30,11 +26,9 @@ exports[`change head content when pulling down 3`] = `
- -
-
加载中... +
释放即可刷新...
@@ -45,11 +39,9 @@ exports[`change head content when pulling down 4`] = `
- -
-
加载中... +
释放即可刷新...
@@ -62,7 +54,6 @@ exports[`change head content when pulling down 5`] = `
-
@@ -74,7 +65,6 @@ exports[`not in page top 1`] = `
-
diff --git a/packages/submit-bar/demo/index.vue b/packages/submit-bar/demo/index.vue index 16cccadb8..b620e2c91 100644 --- a/packages/submit-bar/demo/index.vue +++ b/packages/submit-bar/demo/index.vue @@ -18,7 +18,7 @@ /> - + - + - +