alighasami/vant
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch '2.x' into dev

Browse Source
This commit is contained in:
chenjiahan
2020-12-01 10:12:54 +08:00
parent d0c4c26d75 b57f7e9d98
commit 28afc8a521
48 changed files with 259 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/calendar/README.md
+1 -1
View File
@@ -112,7 +112,7 @@ Set `show-confirm` to `false` to hide the confirm button. In this case, the `con
Use `color` prop to custom calendar color.
```html
<van-calendar v-model:show="show" color="#07c160" />
<van-calendar v-model:show="show" color="#1989fa" />
```
### Custom Date Range
src/calendar/README.zh-CN.md
+1 -1
View File
@@ -114,7 +114,7 @@ export default {
通过 `color` 属性可以自定义日历的颜色，对选中日期和底部按钮生效。
```html
<van-calendar v-model:show="show" color="#07c160" />
<van-calendar v-model:show="show" color="#1989fa" />
```
### 自定义日期范围
src/calendar/demo/index.vue
+1 -3
View File
@@ -119,8 +119,6 @@
</template>
<script>
import { GREEN } from '../../utils/constant';
export default {
i18n: {
'zh-CN': {
@@ -233,7 +231,7 @@ export default {
this.showConfirm = false;
break;
case 'customColor':
this.color = GREEN;
this.color = '#1989fa';
break;
case 'customConfirm':
this.confirmText = this.t('confirmText');
src/calendar/test/__snapshots__/index.legacy.js.snap
+2 -2
View File
@@ -47,7 +47,7 @@ exports[`color prop when type is range 1`] = `
</div>
</div>
</div>
<div class="van-calendar__footer"><button type="button" class="van-button van-button--danger van-button--normal van-button--block van-button--round van-calendar__confirm" style="color: rgb(255, 255, 255); background: blue; border-color: blue;">
<div class="van-calendar__footer"><button type="button" class="van-button van-button--danger van-button--normal van-button--block van-button--round van-calendar__confirm" style="color: white; background: blue; border-color: blue;">
<div class="van-button__content"><span class="van-button__text">确定</span></div>
</button></div>
</div>
@@ -100,7 +100,7 @@ exports[`color prop when type is single 1`] = `
</div>
</div>
</div>
<div class="van-calendar__footer"><button type="button" class="van-button van-button--danger van-button--normal van-button--block van-button--round van-calendar__confirm" style="color: rgb(255, 255, 255); background: blue; border-color: blue;">
<div class="van-calendar__footer"><button type="button" class="van-button van-button--danger van-button--normal van-button--block van-button--round van-calendar__confirm" style="color: white; background: blue; border-color: blue;">
<div class="van-button__content"><span class="van-button__text">确定</span></div>
</button></div>
</div>