From ac7edf81481af3f8b2e7c21ba51c2d5a64d2caca Mon Sep 17 00:00:00 2001 From: Y Date: Tue, 15 Aug 2023 11:26:12 +0800 Subject: [PATCH] fix(CellGroup): resolved bordered invalid (#1010) * fix(CellGroup): resolved bordered invalid * test: update snapshots --- .../__test__/__snapshots__/demo.test.jsx.snap | 1483 +++++++++-------- src/cell/cell-group-props.ts | 5 +- src/cell/cell-group.vue | 17 +- src/cell/cell.en-US.md | 2 +- src/cell/cell.md | 2 +- src/cell/type.ts | 1 + .../__test__/__snapshots__/demo.test.jsx.snap | 64 +- .../__test__/__snapshots__/demo.test.jsx.snap | 4 +- 8 files changed, 820 insertions(+), 758 deletions(-) diff --git a/src/cell/__test__/__snapshots__/demo.test.jsx.snap b/src/cell/__test__/__snapshots__/demo.test.jsx.snap index d4e62dc66..5dce79c41 100644 --- a/src/cell/__test__/__snapshots__/demo.test.jsx.snap +++ b/src/cell/__test__/__snapshots__/demo.test.jsx.snap @@ -2,179 +2,185 @@ exports[`Cell > Cell groupVue demo works fine 1`] = `
- +
+
- +
- - - + + + + +
+ +
+
+ 单行标题 + +
- -
-
- 单行标题 - -
- -
- +
- - + + + +
-
-
- +
- - + + + +
+ +
+
+ 单行标题 + +
- -
-
- 单行标题 - -
- -
- +
- - + + + +
-
-
- +
- - + + + +
+ +
+
+ 单行标题 + +
- -
-
- 单行标题 - -
- -
- +
- - + + + +
+
@@ -219,11 +225,11 @@ exports[`Cell > Cell mobileVue demo works fine 1`] = ` class="tdesign-mobile-demo-block__slot" > + +
-
Cell mobileVue demo works fine 1`] = `
+
Cell mobileVue demo works fine 1`] = ` class="tdesign-mobile-demo-block__slot" > + +
-
Cell mobileVue demo works fine 1`] = `
+
Cell mobileVue demo works fine 1`] = ` class="tdesign-mobile-demo-block__slot" > + +
-
Cell mobileVue demo works fine 1`] = `
+
@@ -1248,506 +1257,512 @@ exports[`Cell > Cell mobileVue demo works fine 1`] = ` exports[`Cell > Cell multipleVue demo works fine 1`] = `
- +
+
- - -
-
- 单行标题 -
- 一段很长很长的内容文字 + +
-
- -
- + 单行标题 + +
- - + 一段很长很长的内容文字 +
-
-
-
-
- -
-
- 单行标题 - -  * -
- 一段很长很长的内容文字 +
+ + + +
-
- + + +
+
+ 单行标题 + - - +  * + +
+ 一段很长很长的内容文字 +
-
-
-
-
- - -
-
- 单行标题
- 一段很长很长的内容文字 +
+ + + +
-
+ + +
+
+ 单行标题 +
- + 一段很长很长的内容文字
+
+
+
- - 16 - +
+ +
+
+ + 16 + +
+
- +
- -
-
- +
- - + + + +
-
-
-
- - -
- 单行标题 -
- 一段很长很长的内容文字 + + +
+
+ 单行标题 + +
+ 一段很长很长的内容文字 +
-
-
-
+
- - +
+ + +
+
- -
- -
-
-
-
- 单行标题 -
- 一段很长很长的内容文字 + +
-
-
- 辅助信息 -
-
- + 单行标题 + +
- - + 一段很长很长的内容文字 +
-
-
-
-
- - - - - - + 辅助信息
- -
-
- 单行标题 -
- 一段很长很长的内容文字 +
+ + + +
-
- +
- - + + + + + + +
+ +
+
+ 单行标题 + +
+ 一段很长很长的内容文字 +
-
-
-
-
- - -
-
- 单行标题
- 一段很长很长的内容文字,长文本自动换行,该选项的描述是一段很长的内容 +
+ + + +
- - -
-
+
+ + +
+
+ 单行标题 + +
+ 一段很长很长的内容文字,长文本自动换行,该选项的描述是一段很长的内容 +
+
+ -
- 多行高度不定,长文本自动换行,该选项的描述是一段很长的内容 -
- 一段很长很长的内容文字,长文本自动换行,该选项的描述是一段很长的内容 + +
+
+ 多行高度不定,长文本自动换行,该选项的描述是一段很长的内容 + +
+ 一段很长很长的内容文字,长文本自动换行,该选项的描述是一段很长的内容 +
+
+ +
- - -
-
-
+
-
+
-
-
-
- + class="t-loading__dots" + style="animation-duration: 800ms; width: 20px; height: 20px;" + > + +
+
+
+ +
+ +
- -
+ + + +
- - - -
+
- + +
- -
+
- +
- -
-
- 多行带头像 -
- 一段很长很长的内容文字 + 多行带头像 + +
+ 一段很长很长的内容文字 +
-
- -
+
- +
- - + + + +
-
-
-
- - -
- 多行带图片 -
+ + +
+
- 一段很长很长的内容文字 + 多行带图片 + +
+ 一段很长很长的内容文字 +
+ +
- - +
@@ -1755,293 +1770,299 @@ exports[`Cell > Cell multipleVue demo works fine 1`] = ` exports[`Cell > Cell singleVue demo works fine 1`] = `
- +
+
+
+ + +
+
+ 单行标题 + + +
- -
-
- 单行标题 - - -
- -
- +
- - + + + +
-
-
-
- - -
- 单行标题 - -  * - - -
- -
+ + +
- + 单行标题 + - - +  * + +
-
-
-
-
- - -
-
- 单行标题 - +
+
+ + + +
+
-
+ + +
+
+ 单行标题 + + +
+
+
+
+ +
+
+ + 16 + +
+ +
+
- - 16 - + + +
-
-
- - - + class="t-cell__left" + > + +
-
-
-
-
- - -
-
- 单行标题 - - -
-
-
+ 单行标题 + + +
+
+
- - +
+ + +
+
- -
- -
-
-
- - -
-
- 单行标题 - -
-
- 辅助信息
- + + +
+
+ 单行标题 + + +
+
+ 辅助信息 +
+
+
- - + + + +
-
-
- +
- - - + + + + +
+ +
+
+ 单行标题 + +
- -
-
- 单行标题 - -
- -
- +
- - + + + +
+
diff --git a/src/cell/cell-group-props.ts b/src/cell/cell-group-props.ts index d20c1a8b8..dbad6f27c 100644 --- a/src/cell/cell-group-props.ts +++ b/src/cell/cell-group-props.ts @@ -9,7 +9,10 @@ import { PropType } from 'vue'; export default { /** 是否显示组边框 */ - bordered: Boolean, + bordered: { + type: Boolean, + default: false, + }, /** 单元格组风格 */ theme: { type: String as PropType, diff --git a/src/cell/cell-group.vue b/src/cell/cell-group.vue index 81064b882..42676a9f7 100644 --- a/src/cell/cell-group.vue +++ b/src/cell/cell-group.vue @@ -1,15 +1,15 @@ diff --git a/src/cell/cell.en-US.md b/src/cell/cell.en-US.md index ef91b8aa9..0ebf9d75a 100644 --- a/src/cell/cell.en-US.md +++ b/src/cell/cell.en-US.md @@ -28,7 +28,7 @@ click | `(context: { e: MouseEvent })` | Typescript:`string \| TNode`。[see m name | type | default | description | required -- | -- | -- | -- | -- -bordered | Boolean | - | \- | N +bordered | Boolean | false | \- | N theme | String | default | `0.15.0`。options:default/card | N title | String | - | \- | N diff --git a/src/cell/cell.md b/src/cell/cell.md index abaaaeb89..5ab678eca 100644 --- a/src/cell/cell.md +++ b/src/cell/cell.md @@ -28,7 +28,7 @@ click | `(context: { e: MouseEvent })` | 右侧内容。TS 类型:`string \| T 名称 | 类型 | 默认值 | 说明 | 必传 -- | -- | -- | -- | -- -bordered | Boolean | - | 是否显示组边框 | N +bordered | Boolean | false | 是否显示组边框 | N theme | String | default | `0.15.0`。单元格组风格。可选项:default/card | N title | String | - | 单元格组标题 | N diff --git a/src/cell/type.ts b/src/cell/type.ts index 4e4edf1aa..334a60464 100644 --- a/src/cell/type.ts +++ b/src/cell/type.ts @@ -64,6 +64,7 @@ export interface TdCellProps { export interface TdCellGroupProps { /** * 是否显示组边框 + * @default false */ bordered?: boolean; /** diff --git a/src/indexes/__test__/__snapshots__/demo.test.jsx.snap b/src/indexes/__test__/__snapshots__/demo.test.jsx.snap index f596333cd..a23d9ced2 100644 --- a/src/indexes/__test__/__snapshots__/demo.test.jsx.snap +++ b/src/indexes/__test__/__snapshots__/demo.test.jsx.snap @@ -99,10 +99,11 @@ exports[`Indexes > Indexes baseVue demo works fine 1`] = `
+ +
-
Indexes baseVue demo works fine 1`] = `
+
Indexes baseVue demo works fine 1`] = `
+ +
-
Indexes baseVue demo works fine 1`] = `
+
Indexes baseVue demo works fine 1`] = `
+ +
-
Indexes baseVue demo works fine 1`] = `
+
Indexes baseVue demo works fine 1`] = `
+ +
-
Indexes baseVue demo works fine 1`] = `
+
Indexes baseVue demo works fine 1`] = `
+ +
-
Indexes baseVue demo works fine 1`] = `
+
Indexes baseVue demo works fine 1`] = `
+ +
-
Indexes baseVue demo works fine 1`] = `
+
Indexes baseVue demo works fine 1`] = `
+ +
-
Indexes baseVue demo works fine 1`] = `
+
Indexes baseVue demo works fine 1`] = `
+ +
-
Indexes baseVue demo works fine 1`] = `
+
Indexes baseVue demo works fine 1`] = `
+ +
-
Indexes baseVue demo works fine 1`] = ` +
`; @@ -2163,10 +2181,11 @@ exports[`Indexes > Indexes customVue demo works fine 1`] = ` + +
-
Indexes customVue demo works fine 1`] = `
+
Indexes customVue demo works fine 1`] = `
+ +
-
Indexes customVue demo works fine 1`] = `
+
Indexes customVue demo works fine 1`] = `
+ +
-
Indexes customVue demo works fine 1`] = `
+
Indexes customVue demo works fine 1`] = `
+ +
-
Indexes customVue demo works fine 1`] = `
+
Indexes customVue demo works fine 1`] = `
+ +
-
Indexes customVue demo works fine 1`] = `
+
Indexes customVue demo works fine 1`] = `
+ +
-
Indexes customVue demo works fine 1`] = `
+
Indexes customVue demo works fine 1`] = `
+ +
-
Indexes customVue demo works fine 1`] = ` +
`; diff --git a/src/picker/__test__/__snapshots__/demo.test.jsx.snap b/src/picker/__test__/__snapshots__/demo.test.jsx.snap index 59fe67d11..9f01330ba 100644 --- a/src/picker/__test__/__snapshots__/demo.test.jsx.snap +++ b/src/picker/__test__/__snapshots__/demo.test.jsx.snap @@ -499,10 +499,11 @@ exports[`Picker > Picker cascadeVue demo works fine 1`] = ` > + +
-
Picker cascadeVue demo works fine 1`] = `
+