[Doc] optimzie router & remove unused code (#640)

This commit is contained in:
neverland 2018-02-12 17:23:37 +08:00 committed by GitHub
parent e1123c4116
commit 3991ec3bc9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
28 changed files with 154 additions and 230 deletions

View File

@ -14,9 +14,8 @@ const cache = {
module.exports = {
entry: {
vendor: ['packages'],
'vant-docs': './docs/src/index.js',
'vant-examples': './docs/src/examples.js'
'vant-mobile': './docs/src/mobile.js'
},
output: {
path: path.join(__dirname, '../docs/dist'),
@ -28,7 +27,7 @@ module.exports = {
host: '0.0.0.0',
historyApiFallback: {
rewrites: [
{ from: /^\/zanui\/vant\/examples/, to: '/examples.html' },
{ from: /^\/zanui\/vant\/mobile/, to: '/mobile.html' },
{ from: /^\/zanui\/vant/, to: '/index.html' }
]
},
@ -99,9 +98,9 @@ module.exports = {
inject: true
}),
new HtmlWebpackPlugin({
chunks: ['vendor', 'vant-examples'],
chunks: ['vendor', 'vant-mobile'],
template: 'docs/src/index.tpl',
filename: 'examples.html',
filename: 'mobile.html',
inject: true
}),
new webpack.optimize.CommonsChunkPlugin({

View File

@ -12,14 +12,14 @@ import docConfig from './doc.config';
export default {
data() {
return {
simulators: [`/zanui/vant/examples${location.hash}`],
simulators: [`/zanui/vant/mobile${location.hash}`],
demoURL: ''
};
},
computed: {
base() {
return `/${this.$vantLang}/component`;
return `/${this.$vantLang}`;
},
config() {

View File

@ -11,7 +11,7 @@
<h2 class="zanui-desc">{{ description }}</h2>
<div class="mobile-navs">
<div class="mobile-nav-item" v-for="(item, index) in navList" v-if="item.showInMobile" :key="index">
<mobile-nav v-for="(group, index) in item.groups" :group="group" :base="base" :nav-key="index" :key="index" />
<mobile-nav v-for="(group, index) in item.groups" :group="group" :base="$vantLang" :nav-key="index" :key="index" />
</div>
</div>
</div>
@ -34,10 +34,6 @@ export default {
},
computed: {
base() {
return `${this.$vantLang}/component`;
},
navList() {
return this.docConfig[this.$vantLang].nav || [];
},
@ -64,8 +60,6 @@ export default {
width: 100%;
box-sizing: border-box;
padding: 60px 15px 20px;
position: relative;
z-index: 1;
.zanui-title,
.zanui-desc {

View File

@ -3,22 +3,20 @@ import VueRouter from 'vue-router';
import App from './DocsApp';
import routes from './router';
import VantDoc from 'vant-doc';
import isMobile from './utils/is-mobile';
import { isMobile } from './utils';
import './components/nprogress.css';
Vue.use(VueRouter).use(VantDoc);
const routesConfig = routes();
const router = new VueRouter({
mode: 'hash',
base: '/zanui/vant/',
routes: routesConfig
routes: routes()
});
router.beforeEach((route, redirect, next) => {
if (isMobile) {
location.replace('/zanui/vant/examples' + location.hash);
location.replace('/zanui/vant/mobile' + location.hash);
}
document.title = route.meta.title || document.title;
next();
@ -34,5 +32,5 @@ window.vueRouter = router;
new Vue({ // eslint-disable-line
render: h => h(App),
router,
el: '#app-container'
el: '#app'
});

View File

@ -12,9 +12,7 @@
</head>
<body ontouchstart>
<div id="app-container">
<app></app>
</div>
<div id="app"></div>
</body>
</html>

View File

@ -17,11 +17,10 @@ Vue
lazyComponent: true
});
const routesConfig = routes(true);
const router = new VueRouter({
mode: 'hash',
base: '/zanui/vant/examples',
routes: routesConfig
base: '/zanui/vant/mobile',
routes: routes(true)
});
router.afterEach(() => {
@ -38,5 +37,5 @@ window.vueRouter = router;
new Vue({ // eslint-disable-line
render: h => h(App),
router,
el: '#app-container'
el: '#app'
});

View File

@ -22,7 +22,7 @@ const registerRoute = (isExample) => {
} else {
route.push({
path: `/${lang}`,
redirect: `/${lang}/component/intro`
redirect: `/${lang}/intro`
});
}
@ -56,7 +56,7 @@ const registerRoute = (isExample) => {
route.push({
name,
component,
path: `/${lang}/component${path}`,
path: `/${lang}${path}`,
meta: {
lang,
name: page.title

View File

@ -2,9 +2,8 @@
* 同步父窗口和 iframe vue-router 状态
*/
import isMobile from './is-mobile';
import { setLang } from './lang';
import { iframeReady } from './iframe';
import { iframeReady, isMobile } from './';
window.syncPath = function(dir) {
const router = window.vueRouter;

View File

@ -1,4 +1,4 @@
export function iframeReady(iframe, callback) {
function iframeReady(iframe, callback) {
const doc = iframe.contentDocument || iframe.contentWindow.document;
const interval = () => {
if (iframe.contentWindow.changePath) {
@ -16,3 +16,11 @@ export function iframeReady(iframe, callback) {
iframe.onload = interval;
}
}
const ua = navigator.userAgent.toLowerCase();
const isMobile = /ios|iphone|ipod|ipad|android/.test(ua);
export {
isMobile,
iframeReady
};

View File

@ -1,7 +0,0 @@
const isMobile = (function() {
var platform = navigator.userAgent.toLowerCase();
return (/(android|bb\d+|meego).+mobile|kdtunion|weibo|m2oapp|micromessenger|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i).test(platform) ||
(/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i).test(platform.substr(0, 4));
})();
export default isMobile;

View File

@ -1,22 +1,6 @@
<template>
<van-badge-group>
<van-badge title="热销榜" info="8" @click="onItemClick"></van-badge>
<van-badge title="手握寿司" info="199" @click="onItemClick"></van-badge>
<van-badge title="热销榜" info="8" />
<van-badge title="手握寿司" info="199" />
</van-badge-group>
</template>
<script>
import Badge from 'packages/badge';
import BadgeGroup from 'packages/badge-group';
export default {
components: {
'van-badge': Badge,
'van-badge-group': BadgeGroup
},
methods: {
onItemClick() {}
}
};
</script>

View File

@ -1,19 +1,11 @@
<template>
<van-checkbox-group v-model="result" :max="max">
<van-checkbox v-for="(item, index) in list" :key="index" :name="item" :disabled="index === 2">复选框{{item}}</van-checkbox>
<van-checkbox v-for="(item, index) in list" :key="index" :name="item" :disabled="index === 2">复选框{{ item }}</van-checkbox>
</van-checkbox-group>
</template>
<script>
import Checkbox from 'packages/checkbox';
import CheckboxGroup from 'packages/checkbox-group';
export default {
components: {
'van-checkbox': Checkbox,
'van-checkbox-group': CheckboxGroup
},
data() {
return {
list: [

View File

@ -1,18 +1,16 @@
<template>
<van-field :onIconClick="onIconClick" @blur="$emit('blur')">
<van-field @click-icon="onIconClick" @blur="$emit('blur')">
<div slot="icon">icon</div>
</van-field>
</template>
<script>
import Field from 'packages/field';
export default {
components: {
[Field.name]: Field
},
props: ['onIconClick']
props: {
onIconClick: {
type: Function,
default: () => {}
}
}
};
</script>

View File

@ -1,37 +1,16 @@
<template>
<van-goods-action>
<van-goods-action-mini-btn icon="chat" @click="onClickMiniBtn">
<van-goods-action-mini-btn icon="chat">
客服
</van-goods-action-mini-btn>
<van-goods-action-mini-btn icon="cart" url="http://www.youzan.com" @click="onClickMiniBtn">
<van-goods-action-mini-btn icon="cart" url="http://www.youzan.com">
购物车
</van-goods-action-mini-btn>
<van-goods-action-big-btn @click="onClickBigBtn">
<van-goods-action-big-btn>
加入购物车
</van-goods-action-big-btn>
<van-goods-action-big-btn @click="onClickBigBtn" primary url="http://www.youzan.com">
<van-goods-action-big-btn primary url="http://www.youzan.com">
立即购买
</van-goods-action-big-btn>
</van-goods-action>
</template>
<script>
import GoodsAction from 'packages/goods-action';
import GoodsActionBigBtn from 'packages/goods-action-big-btn';
import GoodsActionMiniBtn from 'packages/goods-action-mini-btn';
export default {
components: {
[GoodsAction.name]: GoodsAction,
[GoodsActionBigBtn.name]: GoodsActionBigBtn,
[GoodsActionMiniBtn.name]: GoodsActionMiniBtn
},
methods: {
onClickMiniBtn() {
},
onClickBigBtn() {
}
}
};
</script>

View File

@ -12,15 +12,7 @@
</template>
<script>
import Tab from 'packages/tab';
import Tabs from 'packages/tabs';
export default {
components: {
'van-tab': Tab,
'van-tabs': Tabs
},
props: {
active: [String, Number]
}

View File

@ -5,12 +5,12 @@
</template>
<script>
import NoticeBar from 'packages/notice-bar';
export default {
components: {
[NoticeBar.name]: NoticeBar
},
props: ['speed', 'text', 'mode', 'delay']
props: {
speed: Number,
text: String,
mode: String,
delay: Number
}
};
</script>

View File

@ -5,15 +5,9 @@
</template>
<script>
import NumberKeyboard from 'packages/number-keyboard';
export default {
name: 'number-keyboard-test',
components: {
[NumberKeyboard.name]: NumberKeyboard
},
props: ['showKeyboard']
props: {
showKeyboard: Boolean
}
};
</script>

View File

@ -4,17 +4,9 @@
<van-radio name="2">单选框2</van-radio>
</van-radio-group>
</template>
<script>
import Radio from 'packages/radio';
import RadioGroup from 'packages/radio-group';
export default {
components: {
'van-radio': Radio,
'van-radio-group': RadioGroup
},
data() {
return {
radio: '1'

View File

@ -11,15 +11,3 @@
</van-col>
</van-row>
</template>
<script>
import Row from 'packages/row';
import Col from 'packages/col';
export default {
components: {
'van-row': Row,
'van-col': Col
}
};
</script>

View File

@ -8,15 +8,7 @@
</template>
<script>
import Steps from 'packages/steps';
import Step from 'packages/step';
export default {
components: {
'van-step': Step,
'van-steps': Steps
},
data() {
return {
active: 1

View File

@ -2,7 +2,7 @@
<van-tabbar v-model="active" @change="onChange">
<van-tabbar-item icon="shop">
<span>自定义</span>
<img slot="icon" :src="active === 0 ? icon.active : icon.normal" />
<img slot="icon" :src="active === 0 ? icon.active : icon.normal" >
</van-tabbar-item>
<van-tabbar-item icon="chat">标签</van-tabbar-item>
<van-tabbar-item icon="chat">标签</van-tabbar-item>
@ -11,15 +11,7 @@
</template>
<script>
import Tabbar from 'packages/tabbar';
import TabbarItem from 'packages/tabbar-item';
export default {
components: {
[Tabbar.name]: Tabbar,
[TabbarItem.name]: TabbarItem
},
data() {
return {
active: 0,

View File

@ -8,15 +8,7 @@
</template>
<script>
import Tab from 'packages/tab';
import Tabs from 'packages/tabs';
export default {
components: {
'van-tab': Tab,
'van-tabs': Tabs
},
props: {
firstTabTitle: {
type: String,

View File

@ -1,28 +1,3 @@
<script>
import Waterfall from 'packages/waterfall';
export default {
props: {
disabled: Boolean,
list: Array,
onWaterfallLower: {
type: Function,
default() {
return function() {};
}
}
},
directives: {
WaterfallLower: Waterfall('lower')
},
methods: {
triggerWaterfallLower() {
this.onWaterfallLower();
}
}
};
</script>
<template>
<div
v-waterfall-lower="triggerWaterfallLower"
@ -36,6 +11,31 @@
</div>
</template>
<script>
import Waterfall from 'packages/waterfall';
export default {
props: {
disabled: Boolean,
list: Array,
onWaterfallLower: {
type: Function,
default() {
return function() {};
}
}
},
directives: {
WaterfallLower: Waterfall('lower')
},
methods: {
triggerWaterfallLower() {
this.onWaterfallLower();
}
}
};
</script>
<style>
.waterfall--hidden {
overflow: scroll;

View File

@ -1,38 +1,3 @@
<script>
import Waterfall from 'packages/waterfall';
export default {
props: {
disabled: Boolean,
list: Array,
onWaterfallLower: {
type: Function,
default() {
return function() {};
}
},
onWaterfallUpper: {
type: Function,
default() {
return function() {};
}
}
},
directives: {
WaterfallLower: Waterfall('lower'),
WaterfallUpper: Waterfall('upper')
},
methods: {
triggerWaterfallLower() {
this.onWaterfallLower();
},
triggerWaterfallUpper() {
this.onWaterfallUpper();
}
}
};
</script>
<template>
<div
v-waterfall-lower="triggerWaterfallLower"
@ -45,3 +10,38 @@
>{{ item.id }}</div>
</div>
</template>
<script>
import Waterfall from 'packages/waterfall';
export default {
props: {
disabled: Boolean,
list: Array,
onWaterfallLower: {
type: Function,
default() {
return function() {};
}
},
onWaterfallUpper: {
type: Function,
default() {
return function() {};
}
}
},
directives: {
WaterfallLower: Waterfall('lower'),
WaterfallUpper: Waterfall('upper')
},
methods: {
triggerWaterfallLower() {
this.onWaterfallLower();
},
triggerWaterfallUpper() {
this.onWaterfallUpper();
}
}
};
</script>

View File

@ -39,7 +39,6 @@ function getWebpackConfig(testFileName) {
alias: {
src: path.resolve(process.cwd(), 'src'),
packages: path.resolve(process.cwd(), 'packages'),
examples: path.resolve(process.cwd(), 'examples'),
vue$: 'vue/dist/vue.common.js'
}
},

View File

@ -1,5 +1,9 @@
import Vue from 'vue';
import Vant from 'packages';
require('packages/vant-css/src/index.css');
Vue.use(Vant);
// hack for test touch event
window.ontouchstart = {};

View File

@ -43,6 +43,17 @@ describe('ContactCard', () => {
expect(wrapper.hasClass('van-contact-card')).to.be.true;
expect(wrapper.find('.van-contact-card__text div')[0].text()).to.equal('联系人:测试姓名');
expect(wrapper.find('.van-contact-card__text div')[1].text()).to.equal('联系电话13000000000');
const spy = sinon.spy();
wrapper.vm.$on('click', spy);
wrapper.trigger('click');
expect(spy.calledOnce).to.be.true;
wrapper.vm.editable = false;
const spy2 = sinon.spy();
wrapper.vm.$on('click', spy2);
wrapper.trigger('click');
expect(spy2.calledOnce).to.be.false;
});
});

View File

@ -121,6 +121,33 @@ describe('Field', () => {
expect(wrapper.find('.van-field__icon').length).to.equal(1);
});
it('keypress event', () => {
wrapper = mount(Field, {
propsData: {
value: '',
type: 'number'
}
});
const spy1 = sinon.spy();
wrapper.vm.onKeypress({ keyCode: 0, preventDefault: spy1 });
expect(spy1.calledOnce).to.be.true;
const spy2 = sinon.spy();
wrapper.vm.onKeypress({ keyCode: 50, preventDefault: spy2 });
expect(spy2.calledOnce).to.be.false;
const spy3 = sinon.spy();
wrapper.vm.value = '0.1';
wrapper.vm.onKeypress({ keyCode: 46, preventDefault: spy3 });
expect(spy3.calledOnce).to.be.true;
wrapper.vm.type = 'text';
const spy4 = sinon.spy();
wrapper.vm.onKeypress({ keyCode: 0, preventDefault: spy4 });
expect(spy4.calledOnce).to.be.false;
});
it('create a field with icon slot', () => {
const fn = sinon.spy();