From 01502cf69ed94736463ff7f4bd1c3b15d5e29344 Mon Sep 17 00:00:00 2001 From: tealyao Date: Tue, 25 Oct 2022 19:26:52 +0800 Subject: [PATCH 1/6] =?UTF-8?q?feat:=20=E7=A4=BA=E4=BE=8B=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=94=B9=E9=80=A0-badge=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/badge/_example/basic.jsx | 25 ---------- src/badge/_example/color.jsx | 24 --------- src/badge/_example/index.jsx | 76 +++++------------------------ src/badge/_example/offset.jsx | 35 ------------- src/badge/_example/shape.jsx | 25 ---------- src/badge/_example/style/index.less | 33 +++++++++---- 6 files changed, 36 insertions(+), 182 deletions(-) delete mode 100644 src/badge/_example/basic.jsx delete mode 100644 src/badge/_example/color.jsx delete mode 100644 src/badge/_example/offset.jsx delete mode 100644 src/badge/_example/shape.jsx diff --git a/src/badge/_example/basic.jsx b/src/badge/_example/basic.jsx deleted file mode 100644 index a398a4ad..00000000 --- a/src/badge/_example/basic.jsx +++ /dev/null @@ -1,25 +0,0 @@ -import React from 'react'; -import { CellGroup, Badge } from 'tdesign-mobile-react'; - -export default function BadgeBasicDemo() { - return ( -
- -
-
- 消息 -
-
- 消息 -
-
- 消息 -
-
- 消息 -
-
-
-
- ); -} diff --git a/src/badge/_example/color.jsx b/src/badge/_example/color.jsx deleted file mode 100644 index dacc5eaf..00000000 --- a/src/badge/_example/color.jsx +++ /dev/null @@ -1,24 +0,0 @@ -import React from 'react'; -import { Badge, CellGroup, Button } from 'tdesign-mobile-react'; - -export default function BadgeColorDemo() { - return ( -
- -
-
- - - - - - - - - -
-
-
-
- ); -} diff --git a/src/badge/_example/index.jsx b/src/badge/_example/index.jsx index 1cc539e1..e651d9a6 100644 --- a/src/badge/_example/index.jsx +++ b/src/badge/_example/index.jsx @@ -1,76 +1,24 @@ import React from 'react'; -import { Button, Badge, Cell, CellGroup } from 'tdesign-mobile-react'; import TDemoBlock from '../../../site/mobile/components/DemoBlock'; import TDemoHeader from '../../../site/mobile/components/DemoHeader'; - +import NormalDemo from './normal'; +import SingleLineDemo from './single-line'; +import ButtonDemo from './button'; import './style/index.less'; export default function BadgeDemo() { return ( -
+
- -
-
- 消息 -
-
- 消息 -
-
- 消息 -
-
- 消息 -
-
-
-
- - - -
-
- - - -
- -
- - - -
-
- - - -
-
- - }> - }> - - - - - } - > - }> - + + + + + + + +
); diff --git a/src/badge/_example/offset.jsx b/src/badge/_example/offset.jsx deleted file mode 100644 index 71608de4..00000000 --- a/src/badge/_example/offset.jsx +++ /dev/null @@ -1,35 +0,0 @@ -import React from 'react'; -import { Badge, Button } from 'tdesign-mobile-react'; - -export default function BadgeOffsetDemo() { - return ( -
-
-
- offset: [10, 10] - - - -
-
- offset: [-10, 10] - - - -
-
- offset: [-10, -10] - - - -
-
- offset: [10, -10] - - - -
-
-
- ); -} diff --git a/src/badge/_example/shape.jsx b/src/badge/_example/shape.jsx deleted file mode 100644 index 8a47b2b6..00000000 --- a/src/badge/_example/shape.jsx +++ /dev/null @@ -1,25 +0,0 @@ -import React from 'react'; -import { Badge, Button, CellGroup, Cell } from 'tdesign-mobile-react'; - -export default function BadgeShapeDemo() { - return ( -
-
- - - - - - - - - - - - - - -
-
- ); -} diff --git a/src/badge/_example/style/index.less b/src/badge/_example/style/index.less index bf1119be..95ba72d4 100644 --- a/src/badge/_example/style/index.less +++ b/src/badge/_example/style/index.less @@ -1,15 +1,30 @@ .badge-demo { - display: flex; - padding: 16px 0; - width: 100%; + .tdesign-mobile-demo { + padding: 10px; + } &__container { - width: 24%; - text-align: center; - position: relative; + width: auto; } - .badge-item { - width: 24%; - text-align: center; + + .badge-demo { + padding-bottom: 10px; + + .t-badge { + margin-right: 25px; + } + } + + .badge-tag { + margin-right: 8px; + } + + .badge-wrap { + padding: 10px 0; + } + + .list-item-badge { + float: left; + vertical-align: middle; } } From 59f2f3fef715ca862d42bb03d90a090e57f9e999 Mon Sep 17 00:00:00 2001 From: tealyao Date: Tue, 25 Oct 2022 19:28:31 +0800 Subject: [PATCH 2/6] =?UTF-8?q?feat:=20=E7=A4=BA=E4=BE=8B=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=94=B9=E9=80=A0-badge=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/badge/_example/{max-count.jsx => button.jsx} | 2 ++ src/badge/_example/{dist.jsx => normal.jsx} | 0 src/badge/_example/{text.jsx => single-line.jsx} | 16 ++++++++++++++++ 3 files changed, 18 insertions(+) rename src/badge/_example/{max-count.jsx => button.jsx} (95%) rename src/badge/_example/{dist.jsx => normal.jsx} (100%) rename src/badge/_example/{text.jsx => single-line.jsx} (64%) diff --git a/src/badge/_example/max-count.jsx b/src/badge/_example/button.jsx similarity index 95% rename from src/badge/_example/max-count.jsx rename to src/badge/_example/button.jsx index e61e9c96..d0b1343a 100644 --- a/src/badge/_example/max-count.jsx +++ b/src/badge/_example/button.jsx @@ -11,6 +11,8 @@ export default function BadgeMaxCountDemo() { +
+
diff --git a/src/badge/_example/dist.jsx b/src/badge/_example/normal.jsx similarity index 100% rename from src/badge/_example/dist.jsx rename to src/badge/_example/normal.jsx diff --git a/src/badge/_example/text.jsx b/src/badge/_example/single-line.jsx similarity index 64% rename from src/badge/_example/text.jsx rename to src/badge/_example/single-line.jsx index 193eef3b..cae1d9f5 100644 --- a/src/badge/_example/text.jsx +++ b/src/badge/_example/single-line.jsx @@ -25,6 +25,22 @@ export default function BadgeTextDemo() {
+
+ + + + + + + + + + + + + + +
); } From e2c9b100ed54fa5a261de414730722c2fa27c302 Mon Sep 17 00:00:00 2001 From: tealyao Date: Tue, 25 Oct 2022 20:00:31 +0800 Subject: [PATCH 3/6] =?UTF-8?q?feat:=20=E7=A4=BA=E4=BE=8B=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=94=B9=E9=80=A0-badge=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/badge/_example/button.jsx | 55 +++++++++++++++------------ src/badge/_example/normal.jsx | 29 ++++++++------- src/badge/_example/single-line.jsx | 58 +++++++++-------------------- src/badge/_example/style/index.less | 36 ++++++------------ 4 files changed, 76 insertions(+), 102 deletions(-) diff --git a/src/badge/_example/button.jsx b/src/badge/_example/button.jsx index d0b1343a..6b00faa8 100644 --- a/src/badge/_example/button.jsx +++ b/src/badge/_example/button.jsx @@ -1,32 +1,39 @@ import React from 'react'; -import { Badge, CellGroup, Cell, Button } from 'tdesign-mobile-react'; +import { Badge, Button } from 'tdesign-mobile-react'; -export default function BadgeMaxCountDemo() { +export default function BadgeButtonDemo() { return (
- - - - - - -
-
- - - - - - -
-
- - - 单行标题 - - - +
+ + + +
+
+ + + +
+ +
+ + + +
+
+ + + +
); diff --git a/src/badge/_example/normal.jsx b/src/badge/_example/normal.jsx index b11e231c..7a5cb149 100644 --- a/src/badge/_example/normal.jsx +++ b/src/badge/_example/normal.jsx @@ -1,21 +1,22 @@ import React from 'react'; -import { Badge, CellGroup, Cell, Button } from 'tdesign-mobile-react'; +import { Badge } from 'tdesign-mobile-react'; -export default function BadgeDistDemo() { +export default function BadgeNormalDemo() { return (
-
- - - -
-
- - - 单行标题 - - - +
+
+ 消息 +
+
+ 消息 +
+
+ 消息 +
+
+ 消息 +
); diff --git a/src/badge/_example/single-line.jsx b/src/badge/_example/single-line.jsx index cae1d9f5..bd608b57 100644 --- a/src/badge/_example/single-line.jsx +++ b/src/badge/_example/single-line.jsx @@ -1,46 +1,24 @@ import React from 'react'; -import { Badge, Button, CellGroup, Cell } from 'tdesign-mobile-react'; +import { Badge, CellGroup, Cell } from 'tdesign-mobile-react'; -export default function BadgeTextDemo() { +export default function BadgeSingleLineDemo() { return ( -
-
- - - - - - -
-
- - - 单行标题 -
- - - - -
-
-
-
-
- - - - - - - - - - - - - - -
+
+ + }> + }> + + + + + } + > + }> +
); } diff --git a/src/badge/_example/style/index.less b/src/badge/_example/style/index.less index 95ba72d4..759f82cc 100644 --- a/src/badge/_example/style/index.less +++ b/src/badge/_example/style/index.less @@ -1,30 +1,18 @@ -.badge-demo { - .tdesign-mobile-demo { - padding: 10px; - } - - &__container { - width: auto; - } - +.tdesign-mobile-demo { .badge-demo { - padding-bottom: 10px; + display: flex; + padding: 16px 0; + width: 100%; - .t-badge { - margin-right: 25px; + &__container { + width: 24%; + text-align: center; + position: relative; } - } - .badge-tag { - margin-right: 8px; - } - - .badge-wrap { - padding: 10px 0; - } - - .list-item-badge { - float: left; - vertical-align: middle; + .badge-item { + width: 24%; + text-align: center; + } } } From b4b12df6d4091340743195ce82a3bfdd7d73fa19 Mon Sep 17 00:00:00 2001 From: tealyao Date: Wed, 26 Oct 2022 13:37:11 +0800 Subject: [PATCH 4/6] =?UTF-8?q?feat:=20=E7=A4=BA=E4=BE=8B=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=94=B9=E9=80=A0-badge=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/badge/_example/{normal.jsx => base.jsx} | 0 .../_example/{single-line.jsx => cell.jsx} | 0 src/badge/_example/index.jsx | 16 ++++----- src/badge/_example/style/index.less | 36 +++++++++---------- 4 files changed, 26 insertions(+), 26 deletions(-) rename src/badge/_example/{normal.jsx => base.jsx} (100%) rename src/badge/_example/{single-line.jsx => cell.jsx} (100%) diff --git a/src/badge/_example/normal.jsx b/src/badge/_example/base.jsx similarity index 100% rename from src/badge/_example/normal.jsx rename to src/badge/_example/base.jsx diff --git a/src/badge/_example/single-line.jsx b/src/badge/_example/cell.jsx similarity index 100% rename from src/badge/_example/single-line.jsx rename to src/badge/_example/cell.jsx diff --git a/src/badge/_example/index.jsx b/src/badge/_example/index.jsx index e651d9a6..08d21c04 100644 --- a/src/badge/_example/index.jsx +++ b/src/badge/_example/index.jsx @@ -1,24 +1,24 @@ import React from 'react'; import TDemoBlock from '../../../site/mobile/components/DemoBlock'; import TDemoHeader from '../../../site/mobile/components/DemoHeader'; -import NormalDemo from './normal'; -import SingleLineDemo from './single-line'; +import BaseDemo from './base'; import ButtonDemo from './button'; +import CellDemo from './cell'; import './style/index.less'; export default function BadgeDemo() { return (
- + - - + + - + - - + +
); diff --git a/src/badge/_example/style/index.less b/src/badge/_example/style/index.less index 759f82cc..b812a887 100644 --- a/src/badge/_example/style/index.less +++ b/src/badge/_example/style/index.less @@ -1,18 +1,18 @@ -.tdesign-mobile-demo { - .badge-demo { - display: flex; - padding: 16px 0; - width: 100%; - - &__container { - width: 24%; - text-align: center; - position: relative; - } - - .badge-item { - width: 24%; - text-align: center; - } - } -} +.tdesign-mobile-demo { + .badge-demo { + display: flex; + padding: 16px 0; + width: 100%; + + &__container { + width: 24%; + text-align: center; + position: relative; + } + + .badge-item { + width: 24%; + text-align: center; + } + } +} From fa00a730a235d91ebc8bd53db98563dbb601652e Mon Sep 17 00:00:00 2001 From: tealyao Date: Wed, 26 Oct 2022 14:38:15 +0800 Subject: [PATCH 5/6] =?UTF-8?q?feat:=20=E7=A4=BA=E4=BE=8B=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=94=B9=E9=80=A0-badge=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/badge/_example/base.jsx | 2 +- src/badge/_example/cell.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/badge/_example/base.jsx b/src/badge/_example/base.jsx index 7a5cb149..212796ea 100644 --- a/src/badge/_example/base.jsx +++ b/src/badge/_example/base.jsx @@ -1,7 +1,7 @@ import React from 'react'; import { Badge } from 'tdesign-mobile-react'; -export default function BadgeNormalDemo() { +export default function BadgeBaseDemo() { return (
diff --git a/src/badge/_example/cell.jsx b/src/badge/_example/cell.jsx index bd608b57..828409ee 100644 --- a/src/badge/_example/cell.jsx +++ b/src/badge/_example/cell.jsx @@ -1,7 +1,7 @@ import React from 'react'; import { Badge, CellGroup, Cell } from 'tdesign-mobile-react'; -export default function BadgeSingleLineDemo() { +export default function BadgeCellDemo() { return (
From f4791b50f7629c48ccf0370ade843a97c8bf26c6 Mon Sep 17 00:00:00 2001 From: tealyao Date: Wed, 26 Oct 2022 15:15:24 +0800 Subject: [PATCH 6/6] test: badge demo --- src/badge/_example/index.jsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/badge/_example/index.jsx b/src/badge/_example/index.jsx index 08d21c04..e72cfc0b 100644 --- a/src/badge/_example/index.jsx +++ b/src/badge/_example/index.jsx @@ -10,7 +10,6 @@ export default function BadgeDemo() { return (
-