chore: resolve conflict

TDesignOteam · Nov 13, 2024 · 7e450fa · 7e450fa
2 parents 6320a45 + 29cfe4d
commit 7e450fa
Show file tree

Hide file tree

Showing 45 changed files with 889 additions and 75 deletions.
diff --git a/db/TDesign.db b/db/TDesign.db
diff --git a/packages/products/tdesign-miniprogram/src/calendar/README.en-US.md b/packages/products/tdesign-miniprogram/src/calendar/README.en-US.md
@@ -12,9 +12,10 @@ auto-close | Boolean | true | `0.34.0` | N
 confirm-btn | String / Object / Slot | '' | [see more ts definition](https://github.com/Tencent/tdesign-miniprogram/blob/develop/src/common/common.ts)。[see more ts definition](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/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/tree/develop/src/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/tree/develop/src/calendar/type.ts) | N
 max-date | Number | - | \- | N
 min-date | Number | - | \- | N
-title | String / Slot | '请选择日期' | [see more ts definition](https://github.com/Tencent/tdesign-miniprogram/blob/develop/src/common/common.ts) | N
+title | String / Slot | - | [see more ts definition](https://github.com/Tencent/tdesign-miniprogram/blob/develop/src/common/common.ts) | N
 type | String | 'single' | options: single/multiple/range | N
 use-popup | Boolean | true | `0.32.0` | N
 using-custom-navbar | Boolean | false | \- | N
@@ -29,4 +30,5 @@ name | params | description
 change | `(value: timestamp)` | `0.28.0`
 close | `(trigger: CalendarTrigger)` | `0.34.0`。[see more ts definition](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/calendar/type.ts)。<br/>`type CalendarTrigger = 'close-btn' \| 'confirm-btn' \| 'overlay'`<br/>
 confirm | `(value: timestamp)` | \-
+scroll | `({scrollLeft, scrollTop, scrollHeight, scrollWidth, deltaX, deltaY})` | `1.4.6`。triggered when scrolling
 select | `(value: timestamp)` | `0.28.0`
diff --git a/packages/products/tdesign-miniprogram/src/calendar/README.md b/packages/products/tdesign-miniprogram/src/calendar/README.md
@@ -12,9 +12,10 @@ auto-close | Boolean | true | `0.34.0`。自动关闭；在点击关闭按钮、
 confirm-btn | String / Object / Slot | '' | 确认按钮。值为 null 则不显示确认按钮。值类型为字符串，则表示自定义按钮文本，值类型为 Object 则表示透传 Button 组件属性。[通用类型定义](https://github.com/Tencent/tdesign-miniprogram/blob/develop/src/common/common.ts)。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/calendar/type.ts) | N
 first-day-of-week | Number | 0 | 第一天从星期几开始，默认 0 = 周日 | N
 format | Function | - | 用于格式化日期的函数。TS 类型：`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;}`。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/calendar/type.ts) | N
+locale-text | Object | - | 国际化文案。TS 类型：`CalendarLocaleText` `interface CalendarLocaleText {title?: string; weekdays?: string[]; monthTitle?: string; months?: string[]; confirm?: string;}`。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/calendar/type.ts) | N
 max-date | Number | - | 最大可选的日期，不传则默认半年后 | N
 min-date | Number | - | 最小可选的日期，不传则默认今天 | N
-title | String / Slot | '请选择日期' | 标题。[通用类型定义](https://github.com/Tencent/tdesign-miniprogram/blob/develop/src/common/common.ts) | N
+title | String / Slot | - | 标题，不传默认为“请选择日期”。[通用类型定义](https://github.com/Tencent/tdesign-miniprogram/blob/develop/src/common/common.ts) | 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
@@ -29,4 +30,5 @@ visible | Boolean | false | 是否显示日历；`usePopup` 为 true 时有效 |
 change | `(value: timestamp)` | `0.28.0`。不显示 confirm-btn 时，完成选择时触发（暂不支持 type = multiple）
 close | `(trigger: CalendarTrigger)` | `0.34.0`。关闭按钮时触发。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/calendar/type.ts)。<br/>`type CalendarTrigger = 'close-btn' \| 'confirm-btn' \| 'overlay'`<br/>
 confirm | `(value: timestamp)` | 点击确认按钮时触发
+scroll | `({scrollLeft, scrollTop, scrollHeight, scrollWidth, deltaX, deltaY})` | `1.4.6`。滚动时触发
 select | `(value: timestamp)` | `0.28.0`。点击日期时触发
diff --git a/packages/products/tdesign-miniprogram/src/calendar/props.ts b/packages/products/tdesign-miniprogram/src/calendar/props.ts
@@ -25,6 +25,10 @@ const props: TdCalendarProps = {
   format: {
     type: null,
   },
+  /** 国际化文案 */
+  localeText: {
+    type: Object,
+  },
   /** 最大可选的日期，不传则默认半年后 */
   maxDate: {
     type: Number,
@@ -33,10 +37,9 @@ const props: TdCalendarProps = {
   minDate: {
     type: Number,
   },
-  /** 标题 */
+  /** 标题，不传默认为“请选择日期” */
   title: {
     type: String,
-    value: '',
   },
   /** 日历的选择类型，single = 单选；multiple = 多选; range = 区间选择 */
   type: {

diff --git a/packages/products/tdesign-miniprogram/src/calendar/type.ts b/packages/products/tdesign-miniprogram/src/calendar/type.ts
@@ -38,6 +38,13 @@ export interface TdCalendarProps {
     type: undefined;
     value?: CalendarFormatType;
   };
+  /**
+   * 国际化文案
+   */
+  localeText?: {
+    type: ObjectConstructor;
+    value?: CalendarLocaleText;
+  };
   /**
    * 最大可选的日期，不传则默认半年后
    */
@@ -53,8 +60,7 @@ export interface TdCalendarProps {
     value?: number;
   };
   /**
-   * 标题
-   * @default '请选择日期'
+   * 标题，不传默认为“请选择日期”
    */
   title?: {
     type: StringConstructor;
@@ -120,3 +126,11 @@ export interface TDate {
   prefix?: string;
   suffix?: string;
 }
+
+export interface CalendarLocaleText {
+  title?: string;
+  weekdays?: string[];
+  monthTitle?: string;
+  months?: string[];
+  confirm?: string;
+}
diff --git a/packages/products/tdesign-mobile-react/src/dialog/defaultProps.ts b/packages/products/tdesign-mobile-react/src/dialog/defaultProps.ts
@@ -6,10 +6,10 @@ import { TdDialogProps } from './type';
 
 export const dialogDefaultProps: TdDialogProps = {
   buttonLayout: 'horizontal',
-  closeOnOverlayClick: undefined,
+  closeOnOverlayClick: false,
+  confirmLoading: undefined,
   destroyOnClose: false,
   overlayProps: {},
   preventScrollThrough: true,
   showOverlay: true,
-  visible: false,
 };
diff --git a/packages/products/tdesign-mobile-react/src/dialog/dialog.en-US.md b/packages/products/tdesign-mobile-react/src/dialog/dialog.en-US.md
@@ -1,28 +1,30 @@
 :: BASE_DOC ::
 
 ## API
-
 ### Dialog Props
 
 name | type | default | description | required
 -- | -- | -- | -- | --
-className | String | - | 类名 | N
-style | Object | - | 样式，Typescript：`React.CSSProperties` | N
-actions | TNode | - | Typescript：`Array<ButtonProps>`，[Button API Documents](./button?tab=api)。[see more ts definition](https://github.com/TDesignOteam/tdesign-mobile-react/tree/develop/src/dialog/type.ts) | N
-buttonLayout | String | horizontal | options：horizontal/vertical | N
-cancelBtn | TNode | - | Typescript：`string \| ButtonProps \| TNode \| null`，[Button API Documents](./button?tab=api)。[see more ts definition](https://github.com/TDesignOteam/tdesign-mobile-react/blob/develop/src/common.ts)。[see more ts definition](https://github.com/TDesignOteam/tdesign-mobile-react/tree/develop/src/dialog/type.ts) | N
-closeOnOverlayClick | Boolean | undefined | \- | N
-confirmBtn | TNode | - | Typescript：`string \| ButtonProps \| TNode \| null`。[see more ts definition](https://github.com/TDesignOteam/tdesign-mobile-react/blob/develop/src/common.ts) | N
-content | TNode | - | Typescript：`string \| TNode`。[see more ts definition](https://github.com/TDesignOteam/tdesign-mobile-react/blob/develop/src/common.ts) | N
+className | String | - | className of component | N
+style | Object | - | CSS(Cascading Style Sheets)，Typescript：`React.CSSProperties` | N
+actions | TNode | - | Typescript：`Array<ButtonProps>`，[Button API Documents](./button?tab=api)。[see more ts definition](https://github.com/Tencent/tdesign-mobile-react/tree/develop/src/dialog/type.ts) | N
+buttonLayout | String | horizontal | options: horizontal/vertical | N
+cancelBtn | TNode | - | Typescript：`string \| ButtonProps \| TNode \| null`，[Button API Documents](./button?tab=api)。[see more ts definition](https://github.com/Tencent/tdesign-mobile-react/blob/develop/src/common.ts)。[see more ts definition](https://github.com/Tencent/tdesign-mobile-react/tree/develop/src/dialog/type.ts) | N
+closeOnOverlayClick | Boolean | false | \- | N
+confirmBtn | TNode | - | Typescript：`string \| ButtonProps \| TNode \| null`。[see more ts definition](https://github.com/Tencent/tdesign-mobile-react/blob/develop/src/common.ts) | N
+confirmLoading | Boolean | undefined | confirm button loading status | N
+content | TNode | - | Typescript：`string \| TNode`。[see more ts definition](https://github.com/Tencent/tdesign-mobile-react/blob/develop/src/common.ts) | N
 destroyOnClose | Boolean | false | \- | N
-overlayProps | Object | {} | \- | N
+overlayProps | Object | {} | Typescript：`OverlayProps`，[Overlay API Documents](./overlay?tab=api)。[see more ts definition](https://github.com/Tencent/tdesign-mobile-react/tree/develop/src/dialog/type.ts) | N
 preventScrollThrough | Boolean | true | \- | N
 showOverlay | Boolean | true | \- | N
-title | TNode | - | Typescript：`string \| TNode`。[see more ts definition](https://github.com/TDesignOteam/tdesign-mobile-react/blob/develop/src/common.ts) | N
-visible | Boolean | false | \- | N
+title | TNode | - | Typescript：`string \| TNode`。[see more ts definition](https://github.com/Tencent/tdesign-mobile-react/blob/develop/src/common.ts) | N
+visible | Boolean | - | \- | N
 zIndex | Number | - | \- | N
+onBeforeClose | Function |  | Typescript：`() => void`<br/> | N
+onBeforeOpen | Function |  | Typescript：`() => void`<br/> | N
 onCancel | Function |  | Typescript：`(context: { e: MouseEvent }) => void`<br/> | N
-onClose | Function |  | Typescript：`(context: DialogCloseContext) => void`<br/>[see more ts definition](https://github.com/TDesignOteam/tdesign-mobile-react/tree/develop/src/dialog/type.ts)。<br/>`type DialogEventSource = 'cancel' \| 'overlay'`<br/><br/>`interface DialogCloseContext { trigger: DialogEventSource; e: MouseEvent }`<br/> | N
+onClose | Function |  | Typescript：`(context: DialogCloseContext) => void`<br/>[see more ts definition](https://github.com/Tencent/tdesign-mobile-react/tree/develop/src/dialog/type.ts)。<br/>`type DialogEventSource = 'cancel' \| 'overlay'`<br/><br/>`interface DialogCloseContext { trigger: DialogEventSource; e: MouseEvent }`<br/> | N
 onClosed | Function |  | Typescript：`() => void`<br/> | N
 onConfirm | Function |  | Typescript：`(context: { e: MouseEvent }) => void`<br/> | N
 onOverlayClick | Function |  | Typescript：`(context: { e: MouseEvent }) => void`<br/> | N
@@ -32,17 +34,18 @@ onOverlayClick | Function |  | Typescript：`(context: { e: MouseEvent }) => voi
 name | type | default | description | required
 -- | -- | -- | -- | --
 className | String | - | \- | N
-style | Object | - | Typescript：`Styles`。[see more ts definition](https://github.com/TDesignOteam/tdesign-mobile-react/blob/develop/src/common.ts) | N
-`Omit<DialogProps, 'attach'>` | \- | - | \- | N
+style | Object | - | Typescript：`Styles`。[see more ts definition](https://github.com/Tencent/tdesign-mobile-react/blob/develop/src/common.ts) | N
+`Omit<DialogProps, 'attach'>` | \- | - | extends `Omit<DialogProps, 'attach'>` | N
 
 ### DialogInstance
 
 name | params | return | description
 -- | -- | -- | --
-destroy | \- | \- | \-
-hide | \- | \- | \-
-show | \- | \- | \-
-update | `(props: DialogOptions)` | \- | \-
+destroy | \- | \- | required
+hide | \- | \- | required
+setConfirmLoading | `(loading: boolean)` | \- | required。set confirm button loading status
+show | \- | \- | required
+update | `(props: DialogOptions)` | \- | required
 
 ### dialog 或 DialogPlugin