Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(calendar): demo样式修改,文档修改 #2052

Merged
merged 43 commits into from
Jan 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
d2ffd0a
fix: backtop add ts interface
Dec 12, 2022
4641ac5
fix: ts类型修改
Dec 12, 2022
459b31e
feat: 添加*.d.ts文件
Dec 12, 2022
f4bcda0
Merge branch 'v4' into V4
szg2008 Dec 12, 2022
5985fb0
Merge branch 'upstream_v4' into V4
Dec 15, 2022
6a2e206
fix: ts类型修改
Dec 15, 2022
13264d3
fix: toast类型修改
Dec 15, 2022
85b4fce
Merge branch 'upstream_v4' into V4
Dec 15, 2022
2362ac5
fix: input组件修改,结合form
Dec 21, 2022
6f7a6a1
Merge branch 'upstream_v4' into V4
Dec 21, 2022
378c6e7
fix: input组件showlimit 调整,样式修改,icon修改
Dec 21, 2022
e1b3ea4
Merge branch 'upstream_v4' into V4
Dec 22, 2022
e1c3a8c
fix: input 修改
Dec 23, 2022
b25bed1
Merge branch 'upstream_v4' into V4
Dec 23, 2022
1393fc3
fix: input icon 修改
Dec 23, 2022
a392aa5
Merge branch 'upstream_v4' into V4
Dec 23, 2022
c3f43e0
Merge branch 'v4' into V4
richard1015 Dec 23, 2022
dc2aba8
Merge branch 'upstream_v4' into V4
Dec 23, 2022
a0c67d5
fix: form demo修改,文档调整,input调整
Dec 23, 2022
d57acc2
Merge branch 'upstream_v4' into V4
Dec 26, 2022
d53df3d
Merge branch 'upstream_v4' into V4
Dec 28, 2022
c9e9ec3
fix: 水印组件修改
Dec 28, 2022
e0430a1
Merge branch 'upstream_v4' into V4
Dec 30, 2022
1bca260
fix: button taro demo修改
Jan 3, 2023
6ace591
Merge branch 'upstream_v4' into V4
Jan 3, 2023
39788e1
fix: range 组件修改,taro 转h5问题修复
Jan 3, 2023
38c4f5f
fix: 文档修改
Jan 3, 2023
4abfa8c
Merge branch 'upstream_v4' into V4
Jan 3, 2023
8d2da14
fix: 文档格式调整
Jan 3, 2023
6bd2661
fix: 日历组件问题修复
Jan 3, 2023
a25eabe
fix: 日历组件,放大系数改为依赖于fontsize
Jan 3, 2023
94b26e4
Merge branch 'upstream_v4' into V4
Jan 3, 2023
f4eab09
fix: 样式调整,taro类型判断修改
Jan 3, 2023
7aa05e6
Merge branch 'upstream_v4' into V4
Jan 4, 2023
e7d417f
Merge branch 'upstream_v4' into V4
Jan 11, 2023
b385043
fix: 文档修改
Jan 11, 2023
b8184ac
fix: 日历组件slots修改
Jan 11, 2023
71f00d3
Merge branch 'upstream_v4' into V4
Jan 11, 2023
1e65361
fix: 去除console
Jan 11, 2023
2d6ab21
fix: demo样式修改
Jan 13, 2023
0a0c5e8
Merge branch 'upstream_v4' into V4
Jan 13, 2023
a8f4ff7
fix: 文档样式修改
Jan 13, 2023
a44ed20
fix: 样式修改
Jan 17, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/packages/__VUE/calendar/demo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,11 @@ export default createDemo({
</script>

<style lang="scss" scoped>
.demo {
::v-deep(.nut-cell__value) {
flex: initial;
}
}
.test-calendar-wrapper {
display: flex;
width: 100%;
Expand Down
21 changes: 19 additions & 2 deletions src/packages/__VUE/calendar/doc.en-US.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,11 @@ export default {
}
};
</script>
<style lang="scss">
.nut-cell__value {
flex: initial;
}
</style>
```
:::

Expand Down Expand Up @@ -280,6 +285,11 @@ export default {
}
}
</script>
<style lang="scss">
.nut-cell__value {
flex: initial;
}
</style>
```
:::

Expand Down Expand Up @@ -405,7 +415,10 @@ export default {
}
}
</script>
<style lang="scss" scoped>
<style lang="scss">
.nut-cell__value {
flex: initial;
}
.wrapper {
display: flex;
padding: 0 40px;
Expand Down Expand Up @@ -487,7 +500,11 @@ export default {
}
}
</script>

<style lang="scss">
.nut-cell__value {
flex: initial;
}
</style>
```
:::

Expand Down
26 changes: 24 additions & 2 deletions src/packages/__VUE/calendar/doc.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,11 @@ export default {
}
};
</script>
<style lang="scss">
.nut-cell__value {
flex: initial;
}
</style>
```
:::

Expand Down Expand Up @@ -279,6 +284,11 @@ export default {
}
}
</script>
<style lang="scss">
.nut-cell__value {
flex: initial;
}
</style>
```
:::

Expand Down Expand Up @@ -412,7 +422,10 @@ export default {
}
}
</script>
<style lang="scss" scoped>
<style lang="scss">
.nut-cell__value {
flex: initial;
}
.wrapper {
display: flex;
padding: 0 40px;
Expand Down Expand Up @@ -494,7 +507,11 @@ export default {
}
}
</script>

<style lang="scss">
.nut-cell__value {
flex: initial;
}
</style>
```
:::

Expand Down Expand Up @@ -545,6 +562,11 @@ export default {
}
};
</script>
<style lang="scss">
.nut-cell__value {
flex: initial;
}
</style>
```

:::
Expand Down
23 changes: 20 additions & 3 deletions src/packages/__VUE/calendar/doc.taro.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,11 @@ export default {
}
};
</script>
<style lang="scss">
.nut-cell__value {
flex: initial;
}
</style>
```
:::

Expand Down Expand Up @@ -279,6 +284,11 @@ export default {
}
}
</script>
<style lang="scss">
.nut-cell__value {
flex: initial;
}
</style>
```
:::

Expand Down Expand Up @@ -408,7 +418,10 @@ export default {
}
}
</script>
<style lang="scss" scoped>
<style lang="scss" >
.nut-cell__value {
flex: initial;
}
.wrapper {
display: flex;
padding: 0 40px;
Expand Down Expand Up @@ -490,7 +503,11 @@ export default {
}
}
</script>

<style lang="scss">
.nut-cell__value {
flex: initial;
}
</style>
```
:::

Expand Down Expand Up @@ -577,7 +594,7 @@ export default {
}
}
</script>
<style lang="scss" scoped>
<style lang="scss" >
.test-calendar-wrapper {
display: flex;
width: 100%;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="demo" :class="{ web: env === 'WEB' }">
<div class="demo calendar_demo" :class="{ web: env === 'WEB' }">
<Header v-if="env === 'WEB'" />
<h2>基础用法</h2>
<div>
Expand Down Expand Up @@ -342,6 +342,11 @@ export default {
</script>

<style lang="scss">
.calendar_demo {
.nut-cell__value {
flex: initial;
}
}
.test-calendar-wrapper {
display: flex;
width: 100%;
Expand Down