blackteay/vant
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant.git synced 2025-04-06 03:57:59 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch '2.x' into dev

Browse Source
This commit is contained in:
chenjiahan 2020-12-21 17:15:26 +08:00
commit d00fce3f61
5 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/vant-cli/src/compiler/compile-package.ts
View File

@ -6,8 +6,8 @@ export async function compilePackage(isMinify: boolean) {
const config = getPackageConfig(isMinify); const config = getPackageConfig(isMinify);
webpack(config, (err, stats) => { webpack(config, (err, stats) => {
if (err || (stats && stats.hasErrors())) { if (err || (stats?.hasErrors())) {
reject(); reject(err || stats?.toString());
} else { } else {
resolve(); resolve();
} }

4
src/cascader/README.md
View File

@ -15,10 +15,10 @@ Vue.use(Cascader);
```html ```html
<van-field <van-field
v-model="fieldValue"
is-link is-link
readonly readonly
label="Area" label="Area"
:value="fieldValue"
placeholder="Select Area" placeholder="Select Area"
@click="show = true" @click="show = true"
/> />
@ -78,10 +78,10 @@ export default {
```html ```html
<van-field <van-field
v-model="fieldValue"
is-link is-link
readonly readonly
label="Area" label="Area"
:value="fieldValue"
placeholder="Select Area" placeholder="Select Area"
@click="show = true" @click="show = true"
/> />

14
src/cascader/README.zh-CN.md
View File

@ -21,17 +21,17 @@ Vue.use(Cascader);
```html ```html
<van-field <van-field
v-model="fieldValue"
is-link is-link
readonly readonly
label="地区" label="地区"
:value="fieldValue" placeholder="请选择所在地区"
placeholder="请选择地区"
@click="show = true" @click="show = true"
/> />
<van-popup v-model:show="show" round position="bottom"> <van-popup v-model:show="show" round position="bottom">
<van-cascader <van-cascader
v-model="cascaderValue" v-model="cascaderValue"
title="请选择地区" title="请选择所在地区"
@close="show = false" @close="show = false"
@finish="onFinish" @finish="onFinish"
/> />
@ -77,7 +77,7 @@ export default {
```html ```html
<van-cascader <van-cascader
v-model="cascaderValue" v-model="cascaderValue"
title="请选择地区" title="请选择所在地区"
active-color="#1989fa" active-color="#1989fa"
@close="show = false" @close="show = false"
@finish="onFinish" @finish="onFinish"
@ -90,17 +90,17 @@ export default {
```html ```html
<van-field <van-field
v-model="fieldValue"
is-link is-link
readonly readonly
label="地区" label="地区"
:value="fieldValue" placeholder="请选择所在地区"
placeholder="请选择地区"
@click="show = true" @click="show = true"
/> />
<van-popup v-model:show="show" round position="bottom"> <van-popup v-model:show="show" round position="bottom">
<van-cascader <van-cascader
v-model="cascaderValue" v-model="cascaderValue"
title="请选择地区" title="请选择所在地区"
@close="show = false" @close="show = false"
@change="onChange" @change="onChange"
@finish="onFinish" @finish="onFinish"

10
src/cascader/index.less
View File

@ -17,7 +17,7 @@
&__close-icon { &__close-icon {
color: @cascader-close-icon-color; color: @cascader-close-icon-color;
font-size: @cascader-close-icon-color; font-size: @cascader-close-icon-size;
&:active { &:active {
color: @cascader-close-icon-active-color; color: @cascader-close-icon-active-color;
@ -32,7 +32,11 @@
&.van-tabs--line .van-tabs__wrap { &.van-tabs--line .van-tabs__wrap {
height: @cascader-tabs-height; height: @cascader-tabs-height;
padding: 0 6px; }
.van-tabs__nav--complete {
padding-right: 6px;
padding-left: 6px;
} }
} }
@ -42,6 +46,7 @@
&--unselected { &--unselected {
color: @cascader-unselected-tab-color; color: @cascader-unselected-tab-color;
font-weight: normal;
} }
} }
@ -59,6 +64,7 @@
&--selected { &--selected {
color: @cascader-active-color; color: @cascader-active-color;
font-weight: @font-weight-bold;
} }
} }

10
src/tabs/index.less
View File

@ -62,11 +62,6 @@
&::-webkit-scrollbar { &::-webkit-scrollbar {
display: none; display: none;
} }
&--complete {
padding-right: 8px;
padding-left: 8px;
}
} }
} }
} }
@ -83,6 +78,11 @@
padding-bottom: 15px; /* 15px padding to hide scrollbar in mobile safari */ padding-bottom: 15px; /* 15px padding to hide scrollbar in mobile safari */
} }
&--complete {
padding-right: @padding-xs;
padding-left: @padding-xs;
}
&--card { &--card {
box-sizing: border-box; box-sizing: border-box;
height: @tabs-card-height; height: @tabs-card-height;