Skip to content

Commit 5657719

Browse files
anlyyaoliweijie0812novlan1Wesley-0808uyarn
authored
chore: update site by 1.11.2 (#4055)
* chore: merge deploy mode (#3965) * chore: merge deploy mode * chore: rename * chore: pin [email protected] --------- Co-authored-by: 黎伟杰 <[email protected]> * chore: update build package name (#3974) * chore: update build package name * chore: fix typos * chore(indexes): fix sidebar click error in demo (#3980) * chore(indexes): fix sidebar click error in demo * chore: retain controlled usage --------- Co-authored-by: anlyyao <[email protected]> * fix(sidebar): fix color of disabled sidebar (#3982) * fix(sidebar): fix color of disabled sidebar * chore: optimize active state logic --------- Co-authored-by: anlyyao <[email protected]> * chore: update site (#3984) * chore: update site * chore: update image link --------- Co-authored-by: anlyyao <[email protected]> * feat(Drawer): add overlayProps attr (#3978) * feat(Drawer): add overlayProps attr * chore: unified code standard * feat(Watermark): support layout API (#3976) * fix: mini..._npm path * feat: api * feat: function * feat: layout demo * chore: docs * chore: typo * fix(Watermark): fix demo --------- Co-authored-by: anlyyao <[email protected]> * fix(SideBarItem): min-height is set to auto (#3985) * fix(SideBarItem): min-height is set to auto * docs: update css vars * chore(deploy): add static prefix (#3987) * chore: static * chore: add static prefix * 【DOC】修复文档错误、优化脚本 (#3993) * chore: update css generation script * chore: update script * fix(Calendar): fix action button status error (#3996) * chore: publish v1.11.0 (#3999) * chore: publish v1.11.0 * chore: changelog's changes --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> * chore: fix typo (#4002) * feat: add qrcode to page watermark (#4004) * docs: generate slots documents for all components (#4008) * docs: generate slots documents for all components * fix: fix test * docs: format * fix(Calendar): fixed initialization error when value[] is combined with switch-mode (#4005) * chore: trusted publisher (#4020) * chore: trusted publisher * chore: 提权 * chore: publishConfig * fix: form提交时能正确获取checkbox-group的值 (#4017) * fix(tabbar): 修复自定义tabbar颜色叠加问题 (#4019) * fix: 修复自定义tabbar颜色叠加问题 * fix: 移 除tabbar-item的背景颜色 * fix(types): type definition error (#4021) * fix(types): type definition error * chore: update common.ts --------- Co-authored-by: anlyyao <[email protected]> * refactor: improve the verification number function (#4015) * fix(action-sheet): exception caused by repeated modification of component initialization data (#4013) * fix(Toast): fix radius error (#4031) * fix(Upload): fixed component display error when changing draggable (#4030) * fix(DateTimePicker): 修复了 DateTimePicker 即使设置了 autoClose 为 false,点击遮罩层也会重置选项为拨动前的 Bug (#3874) * fix: resolve merge conflicts * chore: update ISSUE TEMPLATE --------- Co-authored-by: anlyyao <[email protected]> * chore: publish v1.11.1 (#4034) * chore: publish v1.11.1 * chore: changelog's changes --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> * ci: reuse TDesignOteam spell-check (#4043) * fix(Picker): optimize scrolling performance when large data (#4014) * fix: 修复大量数据picker卡顿问题 * fix(picker): 使用虚拟滚动优化性能 * fix(picker): 完善使用虚拟滚动优化性能 * fix(picker): 去掉日志 * fix(picker): 移除css * docs: update css vars --------- Co-authored-by: Boomkaa <[email protected]> Co-authored-by: anlyyao <[email protected]> * feat(Calendar): support allowSameDay prop (#4045) * feat(Cascader): enhance the capabilities of the keys property (#4044) * feat(Cascader): enhance the capabilities of the keys property * chore(Radio): root node supplements the disabled state classname * test: update snapshots * chore(git): main 分支合并 develop 分支,冲突时优先使用develop 分支代码 (#4036) * chore(site): added miniprogram-chat entry (#4050) * feat(Picker): support visibleItemCount prop (#4052) * feat(Picker): support visibleItemCount prop * test: update snapshots * chore(site): support ai-search (#4048) * chore(site): support ai-search * chore: update common * docs(site): remove changelog for miniprogram-chat (#4054) * chore: publish v1.11.2 (#4053) * chore: publish v1.11.2 * chore: changelog's changes * fix: fix lint --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: 黎伟杰 <[email protected]> Co-authored-by: novlan1 <[email protected]> Co-authored-by: Wesley <[email protected]> Co-authored-by: wū yāng <[email protected]> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Boomkaa <[email protected]> Co-authored-by: betavs <[email protected]> Co-authored-by: composable-tu <[email protected]> Co-authored-by: jarmywang <[email protected]> Co-authored-by: Boomkaa <[email protected]>
1 parent dde481a commit 5657719

File tree

42 files changed

+495
-226
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+495
-226
lines changed

.github/workflows/auto-release.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,7 @@ jobs:
6464
BODY: ${{ github.event.comment.body }}
6565
run: |
6666
txt=$(cat packages/tdesign-miniprogram/CHANGELOG.md)
67-
chat_txt=$(cat packages/tdesign-miniprogram-chat/CHANGELOG.md)
6867
echo "${txt%%##*}$BODY${txt##*---}" > packages/tdesign-miniprogram/CHANGELOG.md
69-
echo "${chat_txt%%##*}$BODY${chat_txt##*---}" > packages/tdesign-miniprogram-chat/CHANGELOG.md
7068
git add .
7169
git config --local user.email "github-actions[bot]@users.noreply.github.com"
7270
git config --local user.name "github-actions[bot]"
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
name: pr-spell-check
2+
on: [pull_request]
3+
4+
jobs:
5+
run:
6+
uses: TDesignOteam/workflows/.github/workflows/spell-check.yml@main

.github/workflows/pr-spelling.template.yml

Lines changed: 0 additions & 13 deletions
This file was deleted.

.github/workflows/tag-push.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,5 @@ jobs:
5555
git config --local user.name "github-actions[bot]"
5656
git status
5757
git fetch origin
58-
git merge origin/develop
58+
git merge origin/develop -X theirs
5959
git push origin main

packages/common

Submodule common updated 488 files

packages/components/calendar/README.en-US.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,22 @@ name | type | default | description | required
88
-- | -- | -- | -- | --
99
style | Object | - | CSS(Cascading Style Sheets) | N
1010
custom-style | Object | - | CSS(Cascading Style Sheets),used to set style on virtual component | N
11+
allow-same-day | Boolean | false | `1.11.2` | N
1112
auto-close | Boolean | true | `0.34.0` | N
1213
confirm-btn | String / Object | '' | [see more ts definition](https://github.com/Tencent/tdesign-miniprogram/blob/develop/packages/components/calendar/type.ts) | N
1314
first-day-of-week | Number | 0 | \- | N
14-
format | Function | - | Typescript`CalendarFormatType ` `type CalendarFormatType = (day: TDate) => TDate` `type TDateType = 'selected' \| 'disabled' \| 'start' \| 'centre' \| 'end' \| ''` `interface TDate { date: Date; day: number; type: TDateType; className?: string; prefix?: string; suffix?: string;}`[see more ts definition](https://github.com/Tencent/tdesign-miniprogram/blob/develop/packages/components/calendar/type.ts) | N
15-
locale-text | Object | - | Typescript`CalendarLocaleText` `interface CalendarLocaleText {title?: string; weekdays?: string[]; monthTitle?: string; months?: string[]; confirm?: string;}`[see more ts definition](https://github.com/Tencent/tdesign-miniprogram/blob/develop/packages/components/calendar/type.ts) | N
15+
format | Function | - | Typescript: `CalendarFormatType ` `type CalendarFormatType = (day: TDate) => TDate` `type TDateType = 'selected' \| 'disabled' \| 'start' \| 'centre' \| 'end' \| ''` `interface TDate { date: Date; day: number; type: TDateType; className?: string; prefix?: string; suffix?: string;}`[see more ts definition](https://github.com/Tencent/tdesign-miniprogram/blob/develop/packages/components/calendar/type.ts) | N
16+
locale-text | Object | - | Typescript: `CalendarLocaleText` `interface CalendarLocaleText {title?: string; weekdays?: string[]; monthTitle?: string; months?: string[]; confirm?: string;}`[see more ts definition](https://github.com/Tencent/tdesign-miniprogram/blob/develop/packages/components/calendar/type.ts) | N
1617
max-date | Number | - | \- | N
1718
min-date | Number | - | \- | N
1819
readonly | Boolean | - | `1.9.7` | N
1920
switch-mode | String | none | `1.8.2`。options: none/month/year-month | N
2021
title | String | - | \- | N
21-
type | String | 'single' | options: single/multiple/range | N
22+
type | String | single | options: single/multiple/range | N
2223
use-popup | Boolean | true | `0.32.0` | N
2324
using-custom-navbar | Boolean | false | \- | N
24-
value | Number / Array | - | Typescript`number \| number[]` | N
25-
default-value | Number / Array | undefined | uncontrolled property。Typescript`number \| number[]` | N
25+
value | Number / Array | - | Typescript: `number \| number[]` | N
26+
default-value | Number / Array | undefined | uncontrolled property。Typescript: `number \| number[]` | N
2627
visible | Boolean | false | \- | N
2728

2829
### Calendar Events

packages/components/calendar/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ isComponent: true
7474
-- | -- | -- | -- | --
7575
style | Object | - | 样式 | N
7676
custom-style | Object | - | 样式,一般用于开启虚拟化组件节点场景 | N
77+
allow-same-day | Boolean | false | `1.11.2`。是否允许区间选择日历的起止时间相同,仅当 `type='range'` 时有效 | N
7778
auto-close | Boolean | true | `0.34.0`。自动关闭;在点击关闭按钮、确认按钮、遮罩层时自动关闭,不需要手动设置 visible | N
7879
confirm-btn | String / Object | '' | 确认按钮。值为 null 则不显示确认按钮。值类型为字符串,则表示自定义按钮文本,值类型为 Object 则表示透传 Button 组件属性。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/blob/develop/packages/components/calendar/type.ts) | N
7980
first-day-of-week | Number | 0 | 第一天从星期几开始,默认 0 = 周日 | N
@@ -84,7 +85,7 @@ min-date | Number | - | 最小可选的日期,不传则默认今天 | N
8485
readonly | Boolean | - | `1.9.7`。是否只读,只读状态下不能选择日期 | N
8586
switch-mode | String | none | `1.8.2`。切换模式。 `none` 表示平铺展示所有月份; `month` 表示支持按月切换, `year-month` 表示既按年切换,也支持按月切换。可选项:none/month/year-month | N
8687
title | String | - | 标题,不传默认为“请选择日期” | N
87-
type | String | 'single' | 日历的选择类型,single = 单选;multiple = 多选; range = 区间选择。可选项:single/multiple/range | N
88+
type | String | single | 日历的选择类型,single = 单选;multiple = 多选; range = 区间选择。可选项:single/multiple/range | N
8889
use-popup | Boolean | true | `0.32.0`。是否使用弹出层包裹日历 | N
8990
using-custom-navbar | Boolean | false | 是否使用了自定义导航栏 | N
9091
value | Number / Array | - | 当前选择的日期,不传则选用 minDate 属性值或今天,优先级:minDate > today。当 type = multiple 或 range 时传入数组。TS 类型:`number \| number[]` | N

packages/components/calendar/calendar.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@
139139
}
140140

141141
&--selected,
142+
&--start-end,
142143
&--start,
143144
&--end {
144145
background: @calendar-active-color;

packages/components/calendar/calendar.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@ export default class Calendar extends SuperComponent {
8686
this.base.type = v;
8787
},
8888

89+
allowSameDay(v) {
90+
this.base.allowSameDay = v;
91+
},
92+
8993
confirmBtn(v) {
9094
if (typeof v === 'string') {
9195
this.setData({ innerConfirmBtn: v === 'slot' ? 'slot' : { content: v } });

packages/components/calendar/props.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66

77
import { TdCalendarProps } from './type';
88
const props: TdCalendarProps = {
9+
/** 是否允许区间选择日历的起止时间相同,仅当 `type='range'` 时有效 */
10+
allowSameDay: {
11+
type: Boolean,
12+
value: false,
13+
},
914
/** 自动关闭;在点击关闭按钮、确认按钮、遮罩层时自动关闭,不需要手动设置 visible */
1015
autoClose: {
1116
type: Boolean,

0 commit comments

Comments
 (0)