From 267390212bfe79a69bf2d26fc3f20bcfad6e2214 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Thu, 8 Feb 2018 15:58:27 +0800
Subject: [PATCH] [Doc] optimzie demo display (#626)

---
 docs/demos/views/cell-swipe.vue   |  2 +-
 docs/demos/views/checkbox.vue     |  2 -
 docs/demos/views/pull-refresh.vue | 15 ++++--
 docs/demos/views/radio.vue        |  2 -
 docs/src/WapApp.vue               | 42 ++++++++++++++-
 docs/src/examples.js              |  7 +++
 docs/src/utils/iframe-router.js   | 24 +++++----
 docs/src/utils/lang.js            |  6 +++
 package.json                      |  8 +--
 yarn.lock                         | 86 ++++++++++++++++++++-----------
 10 files changed, 139 insertions(+), 55 deletions(-)

diff --git a/docs/demos/views/cell-swipe.vue b/docs/demos/views/cell-swipe.vue
index 05c21e685..992cffe1a 100644
--- a/docs/demos/views/cell-swipe.vue
+++ b/docs/demos/views/cell-swipe.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
-    <van-notice-bar>{{ $t('tips') }}</van-notice-bar>
     <demo-section>
+      <van-notice-bar>{{ $t('tips') }}</van-notice-bar>
       <demo-block :title="$t('basicUsage')">
         <van-cell-swipe :right-width="65" :left-width="65">
           <span slot="left">{{ $t('button1') }}</span>
diff --git a/docs/demos/views/checkbox.vue b/docs/demos/views/checkbox.vue
index 392ff29fa..0365eda15 100644
--- a/docs/demos/views/checkbox.vue
+++ b/docs/demos/views/checkbox.vue
@@ -65,8 +65,6 @@ export default {
 
 <style lang="postcss">
 .demo-checkbox {
-  background: #fff;
-
   .van-checkbox {
     margin: 10px 0 0 20px;
   }
diff --git a/docs/demos/views/pull-refresh.vue b/docs/demos/views/pull-refresh.vue
index b28a10dc8..f63c6c214 100644
--- a/docs/demos/views/pull-refresh.vue
+++ b/docs/demos/views/pull-refresh.vue
@@ -1,11 +1,11 @@
 <template>
-  <van-pull-refresh v-model="isLoading" @refresh="onRefresh">
-    <demo-section name="pull-refresh" background="#fff">
+  <demo-section name="pull-refresh">
+    <van-pull-refresh v-model="isLoading" @refresh="onRefresh">
       <demo-block :title="$t('basicUsage')">
         <p>{{ $t('text') }}: {{ count }}</p>
       </demo-block>
-    </demo-section>
-  </van-pull-refresh>
+    </van-pull-refresh>
+  </demo-section>
 </template>
 
 <script>
@@ -42,6 +42,13 @@ export default {
 
 <style lang="postcss">
 .demo-pull-refresh {
+  .van-pull-refresh {
+    &,
+    &__track {
+      height: 100%;
+    }
+  }
+
   p {
     margin: 10px 0 0 15px;
   }
diff --git a/docs/demos/views/radio.vue b/docs/demos/views/radio.vue
index ce0fa9d91..6a852cf28 100644
--- a/docs/demos/views/radio.vue
+++ b/docs/demos/views/radio.vue
@@ -66,8 +66,6 @@ export default {
 
 <style lang="postcss">
 .demo-radio {
-  background: #fff;
-
   .van-radios {
     padding: 0 20px;
 
diff --git a/docs/src/WapApp.vue b/docs/src/WapApp.vue
index 4a27dfa68..a8ac5faa2 100644
--- a/docs/src/WapApp.vue
+++ b/docs/src/WapApp.vue
@@ -1,7 +1,37 @@
 <template>
-  <router-view />
+  <div>
+    <van-nav-bar
+      v-show="title"
+      fixed
+      class="van-doc-nav-bar"
+      :title="title"
+      left-arrow
+      :left-text="$t('back')"
+      @click-left="onBack"
+    />
+    <router-view />
+  </div>
 </template>
 
+<script>
+import { camelize } from 'packages/utils';
+
+export default {
+  computed: {
+    title() {
+      const name = this.$route.name;
+      return name ? camelize(name.split('/').pop()) : '';
+    }
+  },
+
+  methods: {
+    onBack() {
+      history.back();
+    }
+  }
+};
+</script>
+
 <style lang="postcss">
 body {
   color: #333;
@@ -10,4 +40,14 @@ body {
   font-family: Arial, Helvetica, "STHeiti STXihei", "Microsoft YaHei", Tohoma, sans-serif;
   -webkit-font-smoothing: antialiased;
 }
+
+.van-doc-nav-bar {
+  .van-nav-bar__title {
+    text-transform: capitalize;
+  }
+}
+
+.van-doc-demo-section {
+  padding-top: 46px;
+}
 </style>
diff --git a/docs/src/examples.js b/docs/src/examples.js
index 5f1448dd3..f3b3d17eb 100644
--- a/docs/src/examples.js
+++ b/docs/src/examples.js
@@ -24,6 +24,13 @@ const router = new VueRouter({
   routes: routesConfig
 });
 
+router.afterEach(() => {
+  if (router.currentRoute.name) {
+    window.scrollTo(0, 0);
+  }
+  Vue.nextTick(() => window.syncPath());
+});
+
 window.vueRouter = router;
 
 new Vue({ // eslint-disable-line
diff --git a/docs/src/utils/iframe-router.js b/docs/src/utils/iframe-router.js
index 458045e2e..5d45298a6 100644
--- a/docs/src/utils/iframe-router.js
+++ b/docs/src/utils/iframe-router.js
@@ -10,19 +10,21 @@ window.syncPath = function(dir) {
   const router = window.vueRouter;
   const isInIframe = window !== window.top;
   const currentDir = router.history.current.path;
-  const iframe = document.querySelector('iframe');
+  const pathParts = currentDir.split('/');
+  let lang = pathParts[0];
+  if (currentDir[0] === '/') {
+    lang = pathParts[1];
+  }
 
-  if (!isInIframe && !isMobile && iframe) {
-    const pathParts = currentDir.split('/');
-    let lang = pathParts[0];
-    if (currentDir[0] === '/') {
-      lang = pathParts[1];
+  if (!isInIframe && !isMobile) {
+    const iframe = document.querySelector('iframe');
+    if (iframe) {
+      iframeReady(iframe, () => {
+        iframe.contentWindow.changePath(lang, currentDir);
+      });
     }
-    setLang(lang);
-
-    iframeReady(iframe, () => {
-      iframe.contentWindow.changePath(lang, currentDir);
-    });
+  } else if (isInIframe) {
+    window.top.changePath(lang, currentDir);
   }
 };
 
diff --git a/docs/src/utils/lang.js b/docs/src/utils/lang.js
index 871808154..9eaf41d9f 100644
--- a/docs/src/utils/lang.js
+++ b/docs/src/utils/lang.js
@@ -12,6 +12,7 @@ const langMap = {
     messages: zhCN
   }
 };
+let currentLang = '';
 
 setLang(getDefaultLang());
 
@@ -30,6 +31,11 @@ function getDefaultLang() {
 }
 
 export function setLang(lang) {
+  if (currentLang === lang) {
+    return;
+  }
+
+  currentLang = lang;
   if (window.localStorage) {
     localStorage.setItem('VANT_LANGUAGE', lang);
   }
diff --git a/package.json b/package.json
index 35c435e61..4decfb7b5 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
     "cross-env": "^5.1.3",
     "css-loader": "^0.28.9",
     "dependency-tree": "^6.0.0",
-    "eslint": "^4.16.0",
+    "eslint": "^4.17.0",
     "eslint-plugin-vue": "^4.2.2",
     "extract-text-webpack-plugin": "3.0.2",
     "fast-vue-md-loader": "^1.0.3",
@@ -95,16 +95,16 @@
     "style-loader": "^0.20.1",
     "uppercamelcase": "^3.0.0",
     "url-loader": "^0.6.2",
-    "vant-doc": "1.0.2",
+    "vant-doc": "1.0.3",
     "vue": "^2.5.13",
-    "vue-loader": "^14.1.0",
+    "vue-loader": "^14.1.1",
     "vue-router": "^3.0.1",
     "vue-sfc-compiler": "^0.0.8",
     "vue-style-loader": "^3.1.2",
     "vue-template-compiler": "^2.5.13",
     "vue-template-es2015-compiler": "^1.6.0",
     "webpack": "^3.10.0",
-    "webpack-bundle-analyzer": "^2.9.2",
+    "webpack-bundle-analyzer": "^2.10.0",
     "webpack-dev-server": "2.11.1",
     "webpack-merge": "^4.1.1"
   }
diff --git a/yarn.lock b/yarn.lock
index 9173ef502..5ecff5042 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -44,10 +44,14 @@ acorn@^4.0.3:
   version "4.0.13"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
 
-acorn@^5.0.0, acorn@^5.1.1, acorn@^5.2.1:
+acorn@^5.0.0, acorn@^5.2.1:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.3.0.tgz#7446d39459c54fb49a80e6ee6478149b940ec822"
 
+acorn@^5.3.0:
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.4.1.tgz#fdc58d9d17f4a4e98d102ded826a9b9759125102"
+
 after@0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
@@ -910,6 +914,14 @@ better-assert@~1.0.0:
   dependencies:
     callsite "1.0.0"
 
+bfj-node4@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/bfj-node4/-/bfj-node4-5.2.0.tgz#bd08350353f81d808d6a8352a15f5d9fb74ddec6"
+  dependencies:
+    bluebird "^3.5.1"
+    check-types "^7.3.0"
+    tryer "^1.0.0"
+
 big.js@^3.1.3:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
@@ -928,7 +940,7 @@ block-stream@*:
   dependencies:
     inherits "~2.0.0"
 
-bluebird@^3.1.1, bluebird@^3.3.0, bluebird@^3.4.7:
+bluebird@^3.1.1, bluebird@^3.3.0, bluebird@^3.4.7, bluebird@^3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
 
@@ -1267,6 +1279,10 @@ check-error@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
 
+check-types@^7.3.0:
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/check-types/-/check-types-7.3.0.tgz#468f571a4435c24248f5fd0cb0e8d87c3c341e7d"
+
 cheerio@0.22.0:
   version "0.22.0"
   resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-0.22.0.tgz#a9baa860a3f9b595a6b81b1a86873121ed3a269e"
@@ -1467,10 +1483,14 @@ commander@2.12.x:
   version "2.12.2"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555"
 
-commander@^2.11.0, commander@^2.6.0, commander@^2.8.1, commander@^2.9.0, commander@~2.13.0:
+commander@^2.11.0, commander@^2.6.0, commander@^2.8.1, commander@~2.13.0:
   version "2.13.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
 
+commander@^2.13.0:
+  version "2.14.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.14.1.tgz#2235123e37af8ca3c65df45b026dbd357b01b9aa"
+
 commander@~2.8.1:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
@@ -2143,7 +2163,7 @@ ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
 
-ejs@^2.5.6:
+ejs@^2.5.7:
   version "2.5.7"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a"
 
@@ -2375,9 +2395,9 @@ eslint-visitor-keys@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
 
-eslint@^4.16.0:
-  version "4.16.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.16.0.tgz#934ada9e98715e1d7bbfd6f6f0519ed2fab35cc1"
+eslint@^4.17.0:
+  version "4.17.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.17.0.tgz#dc24bb51ede48df629be7031c71d9dc0ee4f3ddf"
   dependencies:
     ajv "^5.3.0"
     babel-code-frame "^6.22.0"
@@ -2548,7 +2568,7 @@ expand-range@^1.8.1:
   dependencies:
     fill-range "^2.1.0"
 
-express@^4.15.2, express@^4.16.2:
+express@^4.16.2:
   version "4.16.2"
   resolved "https://registry.yarnpkg.com/express/-/express-4.16.2.tgz#e35c6dfe2d64b7dca0a5cd4f21781be3299e076c"
   dependencies:
@@ -2715,9 +2735,9 @@ filename-regex@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
 
-filesize@^3.5.9:
-  version "3.5.11"
-  resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.5.11.tgz#1919326749433bb3cf77368bd158caabcc19e9ee"
+filesize@^3.5.11:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.0.tgz#22d079615624bb6fd3c04026120628a41b3f4efa"
 
 filing-cabinet@^1.13.0:
   version "1.13.1"
@@ -3098,11 +3118,12 @@ growl@1.10.3:
   version "1.10.3"
   resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.3.tgz#1926ba90cf3edfe2adb4927f5880bc22c66c790f"
 
-gzip-size@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-3.0.0.tgz#546188e9bdc337f673772f81660464b389dce520"
+gzip-size@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-4.1.0.tgz#8ae096257eabe7d69c45be2b67c448124ffb517c"
   dependencies:
     duplexer "^0.1.1"
+    pify "^3.0.0"
 
 handle-thing@^1.2.5:
   version "1.2.5"
@@ -6829,6 +6850,10 @@ trim-right@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
 
+tryer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.0.tgz#027b69fa823225e551cace3ef03b11f6ab37c1d7"
+
 tty-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
@@ -7066,9 +7091,9 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "~1.0.0"
     spdx-expression-parse "~1.0.0"
 
-vant-doc@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/vant-doc/-/vant-doc-1.0.2.tgz#abf5e17a53cae03475095c370500dec7a245d54a"
+vant-doc@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/vant-doc/-/vant-doc-1.0.3.tgz#b66727676d115e2345b89f1424c0976bfa1e4551"
   dependencies:
     cheerio "0.22.0"
     decamelize "^1.2.0"
@@ -7127,9 +7152,9 @@ vue-lazyload@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/vue-lazyload/-/vue-lazyload-1.1.4.tgz#94dbb3fcb047f147f37900c0e22ad4fd478e31c4"
 
-vue-loader@^14.1.0:
-  version "14.1.0"
-  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-14.1.0.tgz#ae31d62a11421061fca8bac30cbc15875df886d3"
+vue-loader@^14.1.1:
+  version "14.1.1"
+  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-14.1.1.tgz#331f197fcea790d6b8662c29b850806e7eb29342"
   dependencies:
     consolidate "^0.14.0"
     hash-sum "^1.0.2"
@@ -7198,17 +7223,18 @@ wbuf@^1.1.0, wbuf@^1.7.2:
   dependencies:
     minimalistic-assert "^1.0.0"
 
-webpack-bundle-analyzer@^2.9.2:
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.9.2.tgz#63ed86eb71cc4cda86f68e685a84530ba0126449"
+webpack-bundle-analyzer@^2.10.0:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.10.0.tgz#d0646cda342939f6f05eb632a090abbd90317446"
   dependencies:
-    acorn "^5.1.1"
-    chalk "^1.1.3"
-    commander "^2.9.0"
-    ejs "^2.5.6"
-    express "^4.15.2"
-    filesize "^3.5.9"
-    gzip-size "^3.0.0"
+    acorn "^5.3.0"
+    bfj-node4 "^5.2.0"
+    chalk "^2.3.0"
+    commander "^2.13.0"
+    ejs "^2.5.7"
+    express "^4.16.2"
+    filesize "^3.5.11"
+    gzip-size "^4.1.0"
     lodash "^4.17.4"
     mkdirp "^0.5.1"
     opener "^1.4.3"