chore: resolve conflict

TDesignOteam · Jan 8, 2025 · 1dbdc56 · 1dbdc56
2 parents e0fa461 + 86911b0
commit 1dbdc56
Show file tree

Hide file tree

Showing 270 changed files with 1,358 additions and 2,560 deletions.
diff --git a/db/TDesign.db b/db/TDesign.db
diff --git a/packages/products/tdesign-miniprogram/src/action-sheet/README.md b/packages/products/tdesign-miniprogram/src/action-sheet/README.md
@@ -13,7 +13,7 @@ cancel-text | String | - | 设置取消按钮的文本 | N
 count | Number | 8 | 设置每页展示菜单的数量，仅当 type=grid 时有效 | N
 description | String | - | `0.29.0`。动作面板描述文字 | N
 items | Array | - | 必需。菜单项。TS 类型：`Array<string \| ActionSheetItem>` `interface ActionSheetItem { label: string; color?: string; disabled?: boolean; icon?: string; suffixIcon?: string }`。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/action-sheet/type.ts) | Y
-popup-props | Object | {} | popupProps透传。TS 类型：`PopupProps`，[Popup API Documents](./popup?tab=api)。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/action-sheet/type.ts) | N
+popup-props | Object | {} | 透传 Popup 组件全部属性。TS 类型：`PopupProps`，[Popup API Documents](./popup?tab=api)。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/action-sheet/type.ts) | N
 show-cancel | Boolean | true | 是否显示取消按钮 | N
 show-overlay | Boolean | true | 是否显示遮罩层 | N
 theme | String | list | 展示类型，列表和表格形式展示。可选项：list/grid | N

diff --git a/packages/products/tdesign-miniprogram/src/action-sheet/props.ts b/packages/products/tdesign-miniprogram/src/action-sheet/props.ts
@@ -31,7 +31,7 @@ const props: TdActionSheetProps = {
     type: Array,
     required: true,
   },
-  /** popupProps透传 */
+  /** 透传 Popup 组件全部属性 */
   popupProps: {
     type: Object,
     value: {},

diff --git a/packages/products/tdesign-miniprogram/src/action-sheet/type.ts b/packages/products/tdesign-miniprogram/src/action-sheet/type.ts
@@ -48,7 +48,7 @@ export interface TdActionSheetProps {
     required?: boolean;
   };
   /**
-   * popupProps透传
+   * 透传 Popup 组件全部属性
    * @default {}
    */
   popupProps?: {

diff --git a/packages/products/tdesign-miniprogram/src/alert/README.en-US.md b/packages/products/tdesign-miniprogram/src/alert/README.en-US.md
diff --git a/packages/products/tdesign-miniprogram/src/alert/README.md b/packages/products/tdesign-miniprogram/src/alert/README.md
diff --git a/packages/products/tdesign-miniprogram/src/avatar/avatar-group-props.ts b/packages/products/tdesign-miniprogram/src/avatar/avatar-group-props.ts
diff --git a/packages/products/tdesign-miniprogram/src/back-top/README.en-US.md b/packages/products/tdesign-miniprogram/src/back-top/README.en-US.md
@@ -20,6 +20,7 @@ visibility-height | Number | 200 | \- | N
 name | params | description
 -- | -- | --
 to-top | \- | \-
+
 ### BackTop External Classes
 
 className | Description

diff --git a/packages/products/tdesign-miniprogram/src/back-top/README.md b/packages/products/tdesign-miniprogram/src/back-top/README.md
@@ -20,6 +20,7 @@ visibility-height | Number | 200 | 滚动高度达到此参数值才出现 | N
 名称 | 参数 | 描述
 -- | -- | --
 to-top | \- | 点击触发
+
 ### BackTop External Classes
 
 类名 | 描述

diff --git a/packages/products/tdesign-miniprogram/src/back-top/props.ts b/packages/products/tdesign-miniprogram/src/back-top/props.ts
@@ -21,11 +21,6 @@ const props: TdBackTopProps = {
     type: Number,
     value: 0,
   },
-  /** 自定义组件样式 */
-  style: {
-    type: String,
-    value: '',
-  },
   /** 文案 */
   text: {
     type: String,

diff --git a/packages/products/tdesign-miniprogram/src/back-top/type.ts b/packages/products/tdesign-miniprogram/src/back-top/type.ts
@@ -29,14 +29,6 @@ export interface TdBackTopProps {
     type: NumberConstructor;
     value?: number;
   };
-  /**
-   * 自定义组件样式
-   * @default ''
-   */
-  style?: {
-    type: StringConstructor;
-    value?: string;
-  };
   /**
    * 文案
    * @default ''

diff --git a/packages/products/tdesign-miniprogram/src/badge/README.en-US.md b/packages/products/tdesign-miniprogram/src/badge/README.en-US.md
@@ -17,6 +17,7 @@ offset | Array | - | Typescript：`Array<string \| number>` | N
 shape | String | circle | options: circle/square/bubble/ribbon | N
 show-zero | Boolean | false | \- | N
 size | String | medium | options: medium/large | N
+
 ### Badge External Classes
 
 className | Description

diff --git a/packages/products/tdesign-miniprogram/src/badge/README.md b/packages/products/tdesign-miniprogram/src/badge/README.md
@@ -17,6 +17,7 @@ offset | Array | - | 设置状态点的位置偏移，示例：[-10, 20] 或 ['1
 shape | String | circle | 形状。可选项：circle/square/bubble/ribbon | N
 show-zero | Boolean | false | 当数值为 0 时，是否展示徽标 | N
 size | String | medium | 尺寸。可选项：medium/large | N
+
 ### Badge External Classes
 
 类名 | 描述

diff --git a/packages/products/tdesign-miniprogram/src/badge/props.ts b/packages/products/tdesign-miniprogram/src/badge/props.ts
@@ -26,10 +26,6 @@ const props: TdBadgeProps = {
     type: Boolean,
     value: false,
   },
-  /** 组件类名，分别用于设置外层元素、默认内容、右上角内容等元素类名 */
-  externalClasses: {
-    type: Array,
-  },
   /** 封顶的数字值 */
   maxCount: {
     type: Number,
@@ -54,11 +50,6 @@ const props: TdBadgeProps = {
     type: String,
     value: 'medium',
   },
-  /** 自定义组件样式 */
-  style: {
-    type: String,
-    value: '',
-  },
 };
 
 export default props;
diff --git a/packages/products/tdesign-miniprogram/src/badge/type.ts b/packages/products/tdesign-miniprogram/src/badge/type.ts
@@ -37,13 +37,6 @@ export interface TdBadgeProps {
     type: BooleanConstructor;
     value?: boolean;
   };
-  /**
-   * 组件类名，分别用于设置外层元素、默认内容、右上角内容等元素类名
-   */
-  externalClasses?: {
-    type: ArrayConstructor;
-    value?: ['t-class', 't-class-content', 't-class-count'];
-  };
   /**
    * 封顶的数字值
    * @default 99
@@ -65,7 +58,7 @@ export interface TdBadgeProps {
    */
   shape?: {
     type: StringConstructor;
-    value?: 'circle' | 'square' | 'round' | 'ribbon';
+    value?: 'circle' | 'square' | 'bubble' | 'ribbon';
   };
   /**
    * 当数值为 0 时，是否展示徽标
@@ -81,14 +74,6 @@ export interface TdBadgeProps {
    */
   size?: {
     type: StringConstructor;
-    value?: 'small' | 'medium';
-  };
-  /**
-   * 自定义组件样式
-   * @default ''
-   */
-  style?: {
-    type: StringConstructor;
-    value?: string;
+    value?: 'medium' | 'large';
   };
 }
diff --git a/packages/products/tdesign-miniprogram/src/button/props.ts b/packages/products/tdesign-miniprogram/src/button/props.ts
@@ -115,11 +115,6 @@ const props: TdButtonProps = {
     type: String,
     value: 'medium',
   },
-  /** 自定义组件样式 */
-  style: {
-    type: String,
-    value: '',
-  },
   /** 按钮标签id */
   tId: {
     type: String,

diff --git a/packages/products/tdesign-miniprogram/src/button/type.ts b/packages/products/tdesign-miniprogram/src/button/type.ts
@@ -193,14 +193,6 @@ export interface TdButtonProps {
     type: StringConstructor;
     value?: 'extra-small' | 'small' | 'medium' | 'large';
   };
-  /**
-   * 自定义组件样式
-   * @default ''
-   */
-  style?: {
-    type: StringConstructor;
-    value?: string;
-  };
   /**
    * 按钮标签id
    * @default ''

diff --git a/packages/products/tdesign-miniprogram/src/cell-group/README.en-US.md b/packages/products/tdesign-miniprogram/src/cell-group/README.en-US.md
diff --git a/packages/products/tdesign-miniprogram/src/cell-group/README.md b/packages/products/tdesign-miniprogram/src/cell-group/README.md
diff --git a/packages/products/tdesign-miniprogram/src/cell-group/props.ts b/packages/products/tdesign-miniprogram/src/cell-group/props.ts
@@ -9,15 +9,12 @@ const props: TdCellGroupProps = {
   /** 是否显示组边框 */
   bordered: {
     type: Boolean,
+    value: false,
   },
-  /** 组件类名 */
-  externalClasses: {
-    type: Array,
-  },
-  /** 自定义组件样式 */
-  style: {
+  /** 单元格组风格 */
+  theme: {
     type: String,
-    value: '',
+    value: 'default',
   },
   /** 单元格组标题 */
   title: {

diff --git a/packages/products/tdesign-miniprogram/src/cell-group/type.ts b/packages/products/tdesign-miniprogram/src/cell-group/type.ts
@@ -7,25 +7,19 @@
 export interface TdCellGroupProps {
   /**
    * 是否显示组边框
+   * @default false
    */
   bordered?: {
     type: BooleanConstructor;
     value?: boolean;
   };
   /**
-   * 组件类名
+   * 单元格组风格
+   * @default default
    */
-  externalClasses?: {
-    type: ArrayConstructor;
-    value?: ['t-class'];
-  };
-  /**
-   * 自定义组件样式
-   * @default ''
-   */
-  style?: {
+  theme?: {
     type: StringConstructor;
-    value?: string;
+    value?: 'default' | 'card';
   };
   /**
    * 单元格组标题

diff --git a/packages/products/tdesign-miniprogram/src/cell/README.en-US.md b/packages/products/tdesign-miniprogram/src/cell/README.en-US.md
@@ -27,6 +27,7 @@ url | String | - | \- | N
 name | params | description
 -- | -- | --
 click | - | [see more ts definition](https://github.com/Tencent/tdesign-miniprogram/blob/develop/src/common/common.ts)
+
 ### Cell External Classes
 
 className | Description
@@ -42,3 +43,21 @@ t-class-note | \-
 t-class-right | \-
 t-class-right-icon | \-
 t-class-title | \-
+
+
+### CellGroup Props
+
+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
+bordered | Boolean | false | \- | N
+theme | String | default | options: default/card | N
+title | String | - | \- | N
+
+### CellGroup External Classes
+
+className | Description
+-- | --
+t-class | \-
+t-class-title | \-