From 23952e9a2a9c72ead7d2d30485437e56764f0768 Mon Sep 17 00:00:00 2001 From: songchenglin3 <353833373@qq.com> Date: Mon, 28 Oct 2024 14:30:21 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=20divider=20?= =?UTF-8?q?=E5=9E=82=E7=9B=B4=E7=B1=BB=E5=9E=8B=E5=86=99=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/divider/demo.taro.tsx | 2 +- src/packages/divider/demos/taro/demo6.tsx | 20 +++++++++----------- src/packages/divider/divider.scss | 2 -- src/packages/divider/doc.en-US.md | 1 - src/packages/divider/doc.md | 1 - src/packages/divider/doc.taro.md | 1 - src/packages/divider/doc.zh-TW.md | 1 - 7 files changed, 10 insertions(+), 18 deletions(-) diff --git a/src/packages/divider/demo.taro.tsx b/src/packages/divider/demo.taro.tsx index adf2960b45..1524c7e86f 100644 --- a/src/packages/divider/demo.taro.tsx +++ b/src/packages/divider/demo.taro.tsx @@ -52,7 +52,7 @@ const DividerDemo = () => {

{translated.verticalDivider}

- + diff --git a/src/packages/divider/demos/taro/demo6.tsx b/src/packages/divider/demos/taro/demo6.tsx index a56f734ebc..dfeb5c94b9 100644 --- a/src/packages/divider/demos/taro/demo6.tsx +++ b/src/packages/divider/demos/taro/demo6.tsx @@ -4,17 +4,15 @@ import { Divider } from '@nutui/nutui-react-taro' const Demo6 = () => { return ( <> -
- 文本 - - - 链接 - - - - 链接 - -
+ 文本 + + + 链接 + + + + 链接 + ) } diff --git a/src/packages/divider/divider.scss b/src/packages/divider/divider.scss index 11283461f9..470c6f7307 100644 --- a/src/packages/divider/divider.scss +++ b/src/packages/divider/divider.scss @@ -49,8 +49,6 @@ } &-vertical { - position: relative; - top: $divider-vertical-top; display: inline-block; width: auto; height: $divider-vertical-height; diff --git a/src/packages/divider/doc.en-US.md b/src/packages/divider/doc.en-US.md index f78a181870..bb99700d0a 100644 --- a/src/packages/divider/doc.en-US.md +++ b/src/packages/divider/doc.en-US.md @@ -90,5 +90,4 @@ The component provides the following CSS variables, which can be used to customi | \--nutui-divider-line-height | The row height of the dividing line | `2px` | | \--nutui-divider-spacing | The spacing value between the dividing line of the text | `8px` | | \--nutui-divider-vertical-height | The height of the vertical split line | `12px` | -| \--nutui-divider-vertical-top | The top value of the vertical split line | `2px` | | \--nutui-divider-vertical-margin | The margin value of the vertical split line | `0 8px` | diff --git a/src/packages/divider/doc.md b/src/packages/divider/doc.md index 568a73323f..37401c9036 100644 --- a/src/packages/divider/doc.md +++ b/src/packages/divider/doc.md @@ -90,5 +90,4 @@ import { Divider } from '@nutui/nutui-react' | \--nutui-divider-line-height | 分割线的行高 | `2px` | | \--nutui-divider-spacing | 左边分割线与文案的间隔值 | `8px` | | \--nutui-divider-vertical-height | 垂直分割线的高度 | `12px` | -| \--nutui-divider-vertical-top | 垂直分割线的top值 | `2px` | | \--nutui-divider-vertical-margin | 垂直分割线的margin值 | `0 8px` | diff --git a/src/packages/divider/doc.taro.md b/src/packages/divider/doc.taro.md index 0659ee11e8..33054e37a6 100644 --- a/src/packages/divider/doc.taro.md +++ b/src/packages/divider/doc.taro.md @@ -90,5 +90,4 @@ import { Divider } from '@nutui/nutui-react-taro' | \--nutui-divider-line-height | 分割线的行高 | `2px` | | \--nutui-divider-spacing | 左边分割线与文案的间隔值 | `8px` | | \--nutui-divider-vertical-height | 垂直分割线的高度 | `12px` | -| \--nutui-divider-vertical-top | 垂直分割线的top值 | `2px` | | \--nutui-divider-vertical-margin | 垂直分割线的margin值 | `0 8px` | diff --git a/src/packages/divider/doc.zh-TW.md b/src/packages/divider/doc.zh-TW.md index 01b7c7761f..7db7fad783 100644 --- a/src/packages/divider/doc.zh-TW.md +++ b/src/packages/divider/doc.zh-TW.md @@ -90,5 +90,4 @@ import { Divider } from '@nutui/nutui-react' | \--nutui-divider-line-height | 分割線的行高 | `2px` | | \--nutui-divider-spacing | 左邊分割線與文案的間隔值 | `8px` | | \--nutui-divider-vertical-height | 垂直分割線的高度 | `12px` | -| \--nutui-divider-vertical-top | 垂直分割線的top值 | `2px` | | \--nutui-divider-vertical-margin | 垂直分割線的margin值 | `0 8px` | From 4f66f0d86ec93e1979f98e19baf1373680425304 Mon Sep 17 00:00:00 2001 From: songchenglin3 <353833373@qq.com> Date: Mon, 28 Oct 2024 14:38:06 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E7=A7=BB=E9=99=A4=E5=86=97=E4=BD=99?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/variables-jmapp.scss | 1 - src/styles/variables.scss | 1 - 2 files changed, 2 deletions(-) diff --git a/src/styles/variables-jmapp.scss b/src/styles/variables-jmapp.scss index c039dc6b7c..5665af21ef 100644 --- a/src/styles/variables-jmapp.scss +++ b/src/styles/variables-jmapp.scss @@ -488,7 +488,6 @@ $divider-line-height: var(--nutui-divider-line-height, 2px) !default; $divider-spacing: var(--nutui-divider-spacing, $spacing-base) !default; $divider-side-width: var(--nutui-divider-side-width, 16px) !default; $divider-vertical-height: var(--nutui-divider-vertical-height, 12px) !default; -$divider-vertical-top: var(--nutui-divider-vertical-top, 2px) !default; $divider-vertical-margin: var(--nutui-divider-vertical-margin, 0 8px) !default; // icon(✅) diff --git a/src/styles/variables.scss b/src/styles/variables.scss index abc09b68d6..c1c326b1ec 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -454,7 +454,6 @@ $divider-line-height: var(--nutui-divider-line-height, 2px) !default; $divider-spacing: var(--nutui-divider-spacing, 8px) !default; $divider-side-width: var(--nutui-divider-side-width, 10%) !default; $divider-vertical-height: var(--nutui-divider-vertical-height, 12px) !default; -$divider-vertical-top: var(--nutui-divider-vertical-top, 2px) !default; $divider-vertical-margin: var(--nutui-divider-vertical-margin, 0 8px) !default; // icon(✅) From 7761f63dd1478de442489be85bcc4c02220a863c Mon Sep 17 00:00:00 2001 From: songchenglin3 <353833373@qq.com> Date: Tue, 29 Oct 2024 14:17:29 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96demo=E5=86=99?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/divider/demos/h5/demo6.tsx | 4 ++-- src/packages/divider/demos/taro/demo6.tsx | 23 +++++++++++++++++------ src/packages/divider/divider.scss | 1 + 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/packages/divider/demos/h5/demo6.tsx b/src/packages/divider/demos/h5/demo6.tsx index ca5d62bda7..a96612ec88 100644 --- a/src/packages/divider/demos/h5/demo6.tsx +++ b/src/packages/divider/demos/h5/demo6.tsx @@ -7,11 +7,11 @@ const Demo6 = () => {
文本 - + 链接 - + 链接
diff --git a/src/packages/divider/demos/taro/demo6.tsx b/src/packages/divider/demos/taro/demo6.tsx index dfeb5c94b9..16f7029e56 100644 --- a/src/packages/divider/demos/taro/demo6.tsx +++ b/src/packages/divider/demos/taro/demo6.tsx @@ -1,19 +1,30 @@ import React from 'react' import { Divider } from '@nutui/nutui-react-taro' +import { View, Text } from '@tarojs/components' const Demo6 = () => { return ( - <> + 文本 - + { + console.log('跳转') + }} + style={{ color: '#1989fa', verticalAlign: 'middle' }} + > 链接 - + - + { + console.log('跳转') + }} + style={{ color: '#1989fa', verticalAlign: 'middle' }} + > 链接 - - + + ) } export default Demo6 diff --git a/src/packages/divider/divider.scss b/src/packages/divider/divider.scss index 470c6f7307..e14ecb18ef 100644 --- a/src/packages/divider/divider.scss +++ b/src/packages/divider/divider.scss @@ -54,6 +54,7 @@ height: $divider-vertical-height; border-left: 1px solid $divider-border-color; margin: $divider-vertical-margin; + vertical-align: middle; } } From 16770d3d7bf7ee8d3723e49593c16614d5911ede Mon Sep 17 00:00:00 2001 From: songchenglin3 <353833373@qq.com> Date: Tue, 29 Oct 2024 14:35:52 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E7=A7=BB=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/divider/demo.taro.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/packages/divider/demo.taro.tsx b/src/packages/divider/demo.taro.tsx index 1524c7e86f..adf2960b45 100644 --- a/src/packages/divider/demo.taro.tsx +++ b/src/packages/divider/demo.taro.tsx @@ -52,7 +52,7 @@ const DividerDemo = () => {

{translated.verticalDivider}

- +