From 7ec76929181b62349bd273748f7c02367844d490 Mon Sep 17 00:00:00 2001 From: neverland Date: Fri, 8 Nov 2019 14:29:04 +0800 Subject: [PATCH] docs: simplify seciton name (#4961) --- docs/site/mobile/App.vue | 3 +- docs/site/mobile/demo-common.js | 4 +- docs/site/router.js | 6 +-- package.json | 2 +- packages/vant-doc/package.json | 7 ++- packages/vant-doc/src/component/Block.vue | 29 ----------- packages/vant-doc/src/component/DemoBlock.vue | 2 +- .../vant-doc/src/component/DemoSection.vue | 48 ++++--------------- packages/vant-doc/src/index.js | 3 -- packages/vant-doc/yarn.lock | 35 ++++++++++++++ src/card/demo/index.vue | 10 +++- yarn.lock | 8 ++-- 12 files changed, 69 insertions(+), 88 deletions(-) delete mode 100644 packages/vant-doc/src/component/Block.vue create mode 100644 packages/vant-doc/yarn.lock diff --git a/docs/site/mobile/App.vue b/docs/site/mobile/App.vue index 5722a8178..3a0d2915b 100644 --- a/docs/site/mobile/App.vue +++ b/docs/site/mobile/App.vue @@ -38,8 +38,7 @@ function getQueryString(name) { export default { computed: { title() { - const { name } = this.$route.meta; - return name ? name.replace(/-/g, '') : ''; + return this.$route.meta.title || ''; }, showNav() { diff --git a/docs/site/mobile/demo-common.js b/docs/site/mobile/demo-common.js index f50129c76..de0338c1f 100644 --- a/docs/site/mobile/demo-common.js +++ b/docs/site/mobile/demo-common.js @@ -4,7 +4,7 @@ import Vue from 'vue'; import VueRouter from 'vue-router'; -import VantDoc, { DemoBlock, DemoSection } from '@vant/doc'; +import VantDoc from '@vant/doc'; import i18n from '../utils/i18n'; import Vant, { Lazyload, Locale } from '../../../src'; import { camelize } from '../../../src/utils/format/string'; @@ -18,8 +18,6 @@ Vue }); Vue.mixin(i18n); -Vue.component('demo-block', DemoBlock); -Vue.component('demo-section', DemoSection); Locale.add({ 'zh-CN': { diff --git a/docs/site/router.js b/docs/site/router.js index 6637ea31e..1c8ee0456 100644 --- a/docs/site/router.js +++ b/docs/site/router.js @@ -57,13 +57,13 @@ const registerRoute = ({ mobile, componentMap }) => { } route.push({ - name: lang + '/' + path, component, + name: `${lang}/${path}`, path: `/${lang}/${path}`, meta: { lang, - path, - name: page.title + name: path, + title: page.title } }); } diff --git a/package.json b/package.json index 984a45ea4..bd12c9dcd 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "@babel/preset-typescript": "^7.6.0", "@types/jest": "^24.0.16", "@vant/cli": "^1.0.6", - "@vant/doc": "^2.5.7", + "@vant/doc": "^2.6.1", "@vant/eslint-config": "^1.4.0", "@vant/markdown-loader": "^2.2.0", "@vant/markdown-vetur": "^1.0.0", diff --git a/packages/vant-doc/package.json b/packages/vant-doc/package.json index b937c4060..b7becdf43 100644 --- a/packages/vant-doc/package.json +++ b/packages/vant-doc/package.json @@ -1,6 +1,6 @@ { "name": "@vant/doc", - "version": "2.5.7", + "version": "2.6.1", "description": "vant document template", "main": "./lib/index.js", "publishConfig": { @@ -14,5 +14,8 @@ "release": "npm run build && npm publish" }, "license": "MIT", - "repository": "https://github.com/youzan/vant/tree/dev/packages/vant-doc" + "repository": "https://github.com/youzan/vant/tree/dev/packages/vant-doc", + "devDependencies": { + "decamelize": "^3.2.0" + } } diff --git a/packages/vant-doc/src/component/Block.vue b/packages/vant-doc/src/component/Block.vue deleted file mode 100644 index 9c1a53044..000000000 --- a/packages/vant-doc/src/component/Block.vue +++ /dev/null @@ -1,29 +0,0 @@ - - - - - diff --git a/packages/vant-doc/src/component/DemoBlock.vue b/packages/vant-doc/src/component/DemoBlock.vue index ac75e9854..ebc569d1a 100644 --- a/packages/vant-doc/src/component/DemoBlock.vue +++ b/packages/vant-doc/src/component/DemoBlock.vue @@ -7,7 +7,7 @@ diff --git a/packages/vant-doc/src/index.js b/packages/vant-doc/src/index.js index 8272f8e56..8ace9eda3 100644 --- a/packages/vant-doc/src/index.js +++ b/packages/vant-doc/src/index.js @@ -1,7 +1,6 @@ import Vue from 'vue'; import VanDoc from './VanDoc'; import Nav from './component/Nav'; -import Block from './component/Block'; import Header from './component/Header'; import Content from './component/Content'; import Container from './component/Container'; @@ -13,7 +12,6 @@ const components = [ Nav, Header, VanDoc, - Block, Content, Container, Simulator, @@ -31,7 +29,6 @@ export { Nav, Header, VanDoc, - Block, Content, Container, Simulator, diff --git a/packages/vant-doc/yarn.lock b/packages/vant-doc/yarn.lock new file mode 100644 index 000000000..35eeb47a2 --- /dev/null +++ b/packages/vant-doc/yarn.lock @@ -0,0 +1,35 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@babel/runtime-corejs2@^7.2.0": + version "7.7.2" + resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.7.2.tgz#5a8c4e2f8688ce58adc9eb1d8320b6e7341f96ce" + integrity sha512-GfVnHchOBvIMsweQ13l4jd9lT4brkevnavnVOej5g2y7PpTRY+R4pcQlCjWMZoUla5rMLFzaS/Ll2s59cB1TqQ== + dependencies: + core-js "^2.6.5" + regenerator-runtime "^0.13.2" + +core-js@^2.6.5: + version "2.6.10" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.10.tgz#8a5b8391f8cc7013da703411ce5b585706300d7f" + integrity sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA== + +decamelize@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-3.2.0.tgz#84b8e8f4f8c579f938e35e2cc7024907e0090851" + integrity sha512-4TgkVUsmmu7oCSyGBm5FvfMoACuoh9EOidm7V5/J2X2djAwwt57qb3F2KMP2ITqODTCSwb+YRV+0Zqrv18k/hw== + dependencies: + xregexp "^4.2.4" + +regenerator-runtime@^0.13.2: + version "0.13.3" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5" + integrity sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw== + +xregexp@^4.2.4: + version "4.2.4" + resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.2.4.tgz#02a4aea056d65a42632c02f0233eab8e4d7e57ed" + integrity sha512-sO0bYdYeJAJBcJA8g7MJJX7UrOZIfJPd8U2SC7B2Dd/J24U0aQNoGp33shCaBSWeb0rD5rh6VBUIXOkGal1TZA== + dependencies: + "@babel/runtime-corejs2" "^7.2.0" diff --git a/src/card/demo/index.vue b/src/card/demo/index.vue index 72cdf35f2..1f0e5ef6a 100644 --- a/src/card/demo/index.vue +++ b/src/card/demo/index.vue @@ -1,5 +1,5 @@