From 54fab50c3c37f4e8bf1a25b305af756b3ccde96e Mon Sep 17 00:00:00 2001 From: chenjiahan Date: Tue, 15 Dec 2020 17:01:55 +0800 Subject: [PATCH] docs: remove legacy locale mixin --- docs/site/demo-locale.js | 34 --------- src/badge/demo/index.vue | 35 ++++++---- src/button/demo/index.vue | 127 ++++++++++++++++++---------------- src/cell/demo/index.vue | 67 ++++++++++-------- src/checkbox/demo/index.vue | 67 +++++++++--------- src/col/demo/index.vue | 35 +++++----- src/divider/demo/index.vue | 39 ++++++----- src/grid/demo/index.vue | 59 +++++++++------- src/index-bar/demo/index.vue | 27 ++++---- src/loading/demo/index.vue | 39 ++++++----- src/notice-bar/demo/index.vue | 51 ++++++++------ src/overlay/demo/index.vue | 31 +++++---- src/popup/demo/index.vue | 67 +++++++++--------- src/progress/demo/index.vue | 31 +++++---- src/radio/demo/index.vue | 59 ++++++++-------- src/stepper/demo/index.vue | 47 +++++++------ src/sticky/demo/index.vue | 32 +++++---- src/tag/demo/index.vue | 73 +++++++++---------- 18 files changed, 488 insertions(+), 432 deletions(-) diff --git a/docs/site/demo-locale.js b/docs/site/demo-locale.js index e83d8ec51..e9df61e0e 100644 --- a/docs/site/demo-locale.js +++ b/docs/site/demo-locale.js @@ -1,51 +1,17 @@ import Locale from '../../src/locale'; import enUS from '../../src/locale/lang/en-US'; -import { get } from '../../src/utils'; -import { camelize } from '../../src/utils/format/string'; Locale.add({ 'en-US': enUS, }); -let demoUid = 0; - export const DemoLocaleMixin = { computed: { - t() { - const { name } = this.$options; - const prefix = name ? camelize(name) + '.' : ''; - const messages = Locale.messages(); - - return (path, ...args) => { - const message = get(messages, prefix + path) || get(messages, path); - return typeof message === 'function' ? message(...args) : message; - }; - }, - // flag for vant-weapp demos isWeapp() { return location.search.indexOf('weapp=1') !== -1; }, }, - - beforeCreate() { - if (!this.$options.name) { - this.$options.name = `demo-${demoUid++}`; - } - - const { i18n, name } = this.$options; - - if (i18n && name) { - const locales = {}; - const camelizedName = camelize(name); - - Object.keys(i18n).forEach((key) => { - locales[key] = { [camelizedName]: i18n[key] }; - }); - - Locale.add(locales); - } - }, }; // switch lang after routing diff --git a/src/badge/demo/index.vue b/src/badge/demo/index.vue index c5e8be9b1..8fb338850 100644 --- a/src/badge/demo/index.vue +++ b/src/badge/demo/index.vue @@ -31,21 +31,28 @@ - diff --git a/src/button/demo/index.vue b/src/button/demo/index.vue index 3f8651384..8d0ebd226 100644 --- a/src/button/demo/index.vue +++ b/src/button/demo/index.vue @@ -72,67 +72,74 @@ - diff --git a/src/cell/demo/index.vue b/src/cell/demo/index.vue index 77678dce1..9f0b950b1 100644 --- a/src/cell/demo/index.vue +++ b/src/cell/demo/index.vue @@ -74,37 +74,44 @@ - diff --git a/src/checkbox/demo/index.vue b/src/checkbox/demo/index.vue index 8cee21388..6123c97fa 100644 --- a/src/checkbox/demo/index.vue +++ b/src/checkbox/demo/index.vue @@ -105,43 +105,45 @@ diff --git a/src/divider/demo/index.vue b/src/divider/demo/index.vue index 841dc1a1c..e6c06caa2 100644 --- a/src/divider/demo/index.vue +++ b/src/divider/demo/index.vue @@ -34,23 +34,30 @@ - diff --git a/src/grid/demo/index.vue b/src/grid/demo/index.vue index c9bea75a0..8882e827a 100644 --- a/src/grid/demo/index.vue +++ b/src/grid/demo/index.vue @@ -64,33 +64,40 @@ - diff --git a/src/index-bar/demo/index.vue b/src/index-bar/demo/index.vue index d7476a69c..117f7fcdd 100644 --- a/src/index-bar/demo/index.vue +++ b/src/index-bar/demo/index.vue @@ -26,22 +26,24 @@ - diff --git a/src/notice-bar/demo/index.vue b/src/notice-bar/demo/index.vue index 0e4154384..a25782004 100644 --- a/src/notice-bar/demo/index.vue +++ b/src/notice-bar/demo/index.vue @@ -42,29 +42,36 @@ - diff --git a/src/overlay/demo/index.vue b/src/overlay/demo/index.vue index 60225c58d..4c55ab286 100644 --- a/src/overlay/demo/index.vue +++ b/src/overlay/demo/index.vue @@ -24,28 +24,33 @@ - diff --git a/src/popup/demo/index.vue b/src/popup/demo/index.vue index 0c10c6d05..edae7ec1f 100644 --- a/src/popup/demo/index.vue +++ b/src/popup/demo/index.vue @@ -93,40 +93,42 @@ - diff --git a/src/progress/demo/index.vue b/src/progress/demo/index.vue index e6f0498f7..0986dd226 100644 --- a/src/progress/demo/index.vue +++ b/src/progress/demo/index.vue @@ -23,19 +23,26 @@ - diff --git a/src/radio/demo/index.vue b/src/radio/demo/index.vue index c43f02433..f12392d21 100644 --- a/src/radio/demo/index.vue +++ b/src/radio/demo/index.vue @@ -91,38 +91,40 @@ - diff --git a/src/tag/demo/index.vue b/src/tag/demo/index.vue index 7e7adacbc..7cedb27b4 100644 --- a/src/tag/demo/index.vue +++ b/src/tag/demo/index.vue @@ -62,51 +62,54 @@ -