Merge branch 'develop' into feature/chat

Author: anlyyao

.github/workflows/tag-push.yml

@@ -55,5 +55,5 @@ jobs:
           git config --local user.name "github-actions[bot]"
           git status
           git fetch origin
-          git merge origin/develop
+          git merge origin/develop -X theirs
           git push origin main

packages/common

@@ -8,21 +8,22 @@ name | type | default | description | required
 -- | -- | -- | -- | --
 style | Object | - | CSS(Cascading Style Sheets) | N
 custom-style | Object | - | CSS(Cascading Style Sheets)，used to set style on virtual component | N
+allow-same-day | Boolean | false | `1.11.2` | N
 auto-close | Boolean | true | `0.34.0` | N
 confirm-btn | String / Object | '' | [see more ts definition](https://github.com/Tencent/tdesign-miniprogram/blob/develop/packages/components/calendar/type.ts) | N
 first-day-of-week | Number | 0 | \- | N
-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
-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
+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
+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
 max-date | Number | - | \- | N
 min-date | Number | - | \- | N
 readonly | Boolean | - | `1.9.7` | N
 switch-mode | String | none | `1.8.2`。options: none/month/year-month | N
 title | String | - | \- | N
-type | String | 'single' | options: single/multiple/range | N
+type | String | single | options: single/multiple/range | N
 use-popup | Boolean | true | `0.32.0` | N
 using-custom-navbar | Boolean | false | \- | N
-value | Number / Array | - | Typescript：`number \| number[]` | N
-default-value | Number / Array | undefined | uncontrolled property。Typescript：`number \| number[]` | N
+value | Number / Array | - | Typescript: `number \| number[]` | N
+default-value | Number / Array | undefined | uncontrolled property。Typescript: `number \| number[]` | N
 visible | Boolean | false | \- | N
 
 ### Calendar Events

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

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

packages/components/calendar/README.md

@@ -139,6 +139,7 @@
       }
 
       &--selected,
+      &--start-end,
       &--start,
       &--end {
         background: @calendar-active-color;

packages/components/calendar/calendar.less

@@ -86,6 +86,10 @@ export default class Calendar extends SuperComponent {
       this.base.type = v;
     },
 
+    allowSameDay(v) {
+      this.base.allowSameDay = v;
+    },
+
     confirmBtn(v) {
       if (typeof v === 'string') {
         this.setData({ innerConfirmBtn: v === 'slot' ? 'slot' : { content: v } });

packages/components/calendar/calendar.ts

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

packages/components/calendar/props.ts

@@ -7,6 +7,14 @@
 import { ButtonProps } from '../button/index';
 
 export interface TdCalendarProps {
+  /**
+   * 是否允许区间选择日历的起止时间相同，仅当 `type='range'` 时有效
+   * @default false
+   */
+  allowSameDay?: {
+    type: BooleanConstructor;
+    value?: boolean;
+  };
   /**
    * 自动关闭；在点击关闭按钮、确认按钮、遮罩层时自动关闭，不需要手动设置 visible
    * @default true
@@ -83,7 +91,7 @@ export interface TdCalendarProps {
   };
   /**
    * 日历的选择类型，single = 单选；multiple = 多选; range = 区间选择
-   * @default 'single'
+   * @default single
    */
   type?: {
     type: StringConstructor;

packages/components/calendar/type.ts

@@ -10,10 +10,10 @@ style | Object | - | CSS(Cascading Style Sheets) | N
 custom-style | Object | - | CSS(Cascading Style Sheets)，used to set style on virtual component | N
 check-strictly | Boolean | false | \- | N
 close-btn | Boolean | true | \- | N
-keys | Object | - | Typescript：`KeysType`。[see more ts definition](https://github.com/Tencent/tdesign-miniprogram/blob/develop/packages/components/common/common.ts) | N
-options | Array | [] | Typescript：`Array<CascaderOption>` | N
+keys | Object | - | Typescript: `CascaderKeysType` `type CascaderKeysType = TreeKeysType`。[see more ts definition](https://github.com/Tencent/tdesign-miniprogram/blob/develop/packages/components/common/common.ts)。[see more ts definition](https://github.com/Tencent/tdesign-miniprogram/blob/develop/packages/components/cascader/type.ts) | N
+options | Array | [] | Typescript: `Array<CascaderOption>` | N
 placeholder | String | 选择选项 | \- | N
-sub-titles | Array | [] | Typescript：`Array<string>` | N
+sub-titles | Array | [] | Typescript: `Array<string>` | N
 theme | String | step | options: step/tab | N
 title | String | - | \- | N
 value | String / Number | null | \- | N

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

@@ -67,7 +67,7 @@ style | Object | - | 样式 | N
 custom-style | Object | - | 样式，一般用于开启虚拟化组件节点场景 | N
 check-strictly | Boolean | false | 父子节点选中状态不再关联，可各自选中或取消 | N
 close-btn | Boolean | true | 关闭按钮 | N
-keys | Object | - | 用来定义 value / label 在 `options` 中对应的字段别名。TS 类型：`KeysType`。[通用类型定义](https://github.com/Tencent/tdesign-miniprogram/blob/develop/packages/components/common/common.ts) | N
+keys | Object | - | 用来定义 value / label / children / disabled 在 `options` 中对应的字段别名。TS 类型：`CascaderKeysType` `type CascaderKeysType = TreeKeysType`。[通用类型定义](https://github.com/Tencent/tdesign-miniprogram/blob/develop/packages/components/common/common.ts)。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/blob/develop/packages/components/cascader/type.ts) | N
 options | Array | [] | 可选项数据源。TS 类型：`Array<CascaderOption>` | N
 placeholder | String | 选择选项 | 未选中时的提示文案 | N
 sub-titles | Array | [] | 每级展示的次标题。TS 类型：`Array<string>` | N