From 52b6c47542a6923531781ba0f18fa62b1ef1b9cd Mon Sep 17 00:00:00 2001
From: iCheng <13384936284@136.com>
Date: Tue, 2 Jan 2024 16:30:37 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=8F=98=E9=87=8F?=
=?UTF-8?q?=E5=90=8D=E3=80=81=E6=96=B0=E5=A2=9E=20demo=20=E6=96=87?=
=?UTF-8?q?=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../nutui-taro-demo/src/nav/pages/tabs/index.vue | 6 ++++++
.../src/nav/pages/tabs/left-align.vue | 11 +++++++++++
src/packages/__VUE/tabs/demo/index.vue | 6 ++++++
src/packages/__VUE/tabs/demo/left-align.vue | 11 +++++++++++
src/packages/__VUE/tabs/doc.en-US.md | 6 +++++-
src/packages/__VUE/tabs/doc.md | 6 +++++-
src/packages/__VUE/tabs/doc.taro.md | 6 +++++-
src/packages/__VUE/tabs/index.taro.vue | 10 +++++-----
src/packages/__VUE/tabs/index.vue | 14 +++++++-------
src/packages/__VUE/tabs/types.ts | 2 +-
10 files changed, 62 insertions(+), 16 deletions(-)
create mode 100644 packages/nutui-taro-demo/src/nav/pages/tabs/left-align.vue
create mode 100644 src/packages/__VUE/tabs/demo/left-align.vue
diff --git a/packages/nutui-taro-demo/src/nav/pages/tabs/index.vue b/packages/nutui-taro-demo/src/nav/pages/tabs/index.vue
index 392ab94654..93dd5e313e 100644
--- a/packages/nutui-taro-demo/src/nav/pages/tabs/index.vue
+++ b/packages/nutui-taro-demo/src/nav/pages/tabs/index.vue
@@ -6,6 +6,9 @@
{{ t('smile') }}
+ {{ t('leftAlign') }}
+
+
{{ t('autoHeight') }}
@@ -40,11 +43,13 @@ import Vertical from './vertical.vue';
import VerticalSmile from './vertical-smile.vue';
import Size from './size.vue';
import Custom from './custom.vue';
+import LeftAlign from './left-align.vue';
const t = useTranslate({
'zh-CN': {
basic: '基础用法',
smile: '微笑曲线',
+ leftAlign: 'Title 左对齐',
autoHeight: '自动高度',
swipeable: '手势滑动切换',
scroll: '标题滚动(上下布局)',
@@ -56,6 +61,7 @@ const t = useTranslate({
'en-US': {
basic: 'Basic Usage',
smile: 'Smile Type',
+ leftAlign: 'Title left align',
autoHeight: 'Auto Height',
swipeable: 'Swipeable',
scroll: 'Title Scroll (horizontal)',
diff --git a/packages/nutui-taro-demo/src/nav/pages/tabs/left-align.vue b/packages/nutui-taro-demo/src/nav/pages/tabs/left-align.vue
new file mode 100644
index 0000000000..58d20e539b
--- /dev/null
+++ b/packages/nutui-taro-demo/src/nav/pages/tabs/left-align.vue
@@ -0,0 +1,11 @@
+
+
+ Content 1
+ Content 2
+ Content 3
+
+
+
diff --git a/src/packages/__VUE/tabs/demo/index.vue b/src/packages/__VUE/tabs/demo/index.vue
index 105980f942..b3942f61f1 100644
--- a/src/packages/__VUE/tabs/demo/index.vue
+++ b/src/packages/__VUE/tabs/demo/index.vue
@@ -6,6 +6,9 @@
{{ t('smile') }}
+ {{ t('leftAlign') }}
+
+
{{ t('autoHeight') }}
@@ -40,11 +43,13 @@ import Vertical from './vertical.vue';
import VerticalSmile from './vertical-smile.vue';
import Size from './size.vue';
import Custom from './custom.vue';
+import LeftAlign from './left-align.vue';
const t = useTranslate({
'zh-CN': {
basic: '基础用法',
smile: '微笑曲线',
+ leftAlign: 'Title 左对齐',
autoHeight: '自动高度',
swipeable: '手势滑动切换',
scroll: '标题滚动(上下布局)',
@@ -56,6 +61,7 @@ const t = useTranslate({
'en-US': {
basic: 'Basic Usage',
smile: 'Smile Type',
+ leftAlign: 'Title left align',
autoHeight: 'Auto Height',
swipeable: 'Swipeable',
scroll: 'Title Scroll (horizontal)',
diff --git a/src/packages/__VUE/tabs/demo/left-align.vue b/src/packages/__VUE/tabs/demo/left-align.vue
new file mode 100644
index 0000000000..58d20e539b
--- /dev/null
+++ b/src/packages/__VUE/tabs/demo/left-align.vue
@@ -0,0 +1,11 @@
+
+
+ Content 1
+ Content 2
+ Content 3
+
+
+
diff --git a/src/packages/__VUE/tabs/doc.en-US.md b/src/packages/__VUE/tabs/doc.en-US.md
index 72174ae036..0752d7f5e8 100644
--- a/src/packages/__VUE/tabs/doc.en-US.md
+++ b/src/packages/__VUE/tabs/doc.en-US.md
@@ -23,6 +23,10 @@ app.use(TabPane);
> demo: tabs smile
+### Title 左对齐
+
+> demo: tabs left-align
+
### Auto Height
> demo: tabs auto-height
@@ -72,7 +76,7 @@ app.use(TabPane);
| sticky | Whether to use sticky mode | boolean | `false` |
| top | Sticky offset top | number | `0` |
| name | In the `taro` environment, `name` must be set to enable the automatic scrolling function of the title bar. | string | '' |
-| alignment | Title alignment in the horizontal axis direction, optional values `left` `center` | string | `center` |
+| align | Title alignment in the horizontal axis direction, optional values `left` `center` | string | `center` |
### Tabs Slots
diff --git a/src/packages/__VUE/tabs/doc.md b/src/packages/__VUE/tabs/doc.md
index 5e40bca7b9..3ea4efc0f2 100644
--- a/src/packages/__VUE/tabs/doc.md
+++ b/src/packages/__VUE/tabs/doc.md
@@ -23,6 +23,10 @@ app.use(TabPane);
> demo: tabs smile
+### Title 左对齐
+
+> demo: tabs left-align
+
### 自动高度
> demo: tabs auto-height
@@ -72,7 +76,7 @@ app.use(TabPane);
| sticky | 是否使用粘性布局 | boolean | `false` |
| top | 粘性布局下的吸顶距离 | number | `0` |
| name | 在`taro`环境下,必须设置`name`以开启标题栏自动滚动功能。 | string | '' |
-| alignment | 横轴方向的标题对齐方式,可选值 left、center | string | `center` |
+| align | 横轴方向的标题对齐方式,可选值 left、center | string | `center` |
### Tabs Slots
diff --git a/src/packages/__VUE/tabs/doc.taro.md b/src/packages/__VUE/tabs/doc.taro.md
index 8fcf68adb3..96f1d79206 100644
--- a/src/packages/__VUE/tabs/doc.taro.md
+++ b/src/packages/__VUE/tabs/doc.taro.md
@@ -23,6 +23,10 @@ app.use(TabPane);
> demo: tabs smile nav
+### Title 左对齐
+
+> demo: tabs left-align nav
+
### 自动高度
> demo: tabs auto-height nav
@@ -70,7 +74,7 @@ app.use(TabPane);
| size | 标签栏字体尺寸大小 可选值 large normal small | string | `normal` |
| auto-height | 自动高度。设置为 true 时,nut-tabs 和 nut-tabs\_\_content 会随着当前 nut-tab-pane 的高度而发生变化。 | boolean | `false` |
| name `v4.2.5 废弃` | 必须设置 name 才能开启 title-scroll 功能,版本 >=4.2.5 时不再需要。 | string | '' |
-| alignment | 横轴方向的标题对齐方式,可选值 left、center | string | `center` |
+| align | 横轴方向的标题对齐方式,可选值 left、center | string | `center` |
### Tabs Slots
diff --git a/src/packages/__VUE/tabs/index.taro.vue b/src/packages/__VUE/tabs/index.taro.vue
index a6e9ee6de3..6a93e41c16 100644
--- a/src/packages/__VUE/tabs/index.taro.vue
+++ b/src/packages/__VUE/tabs/index.taro.vue
@@ -12,7 +12,7 @@
:class="{ [type]: type, scrollable: titleScroll, [size]: size }"
:style="tabsNavStyle"
>
-
+
,
+ align: {
+ type: String as PropType,
default: 'center'
}
},
diff --git a/src/packages/__VUE/tabs/index.vue b/src/packages/__VUE/tabs/index.vue
index 308a8418ea..ab4179048c 100644
--- a/src/packages/__VUE/tabs/index.vue
+++ b/src/packages/__VUE/tabs/index.vue
@@ -6,7 +6,7 @@
ref="navRef"
class="nut-tabs__titles"
:class="{
- 'nut-tabs__titles-left': alignment === 'left',
+ 'nut-tabs__titles-left': align === 'left',
[type]: type,
scrollable: titleScroll,
[size]: size
@@ -21,7 +21,7 @@
class="nut-tabs__titles-item"
:style="titleStyle"
:class="{
- 'nut-tabs__titles-item-left': alignment === 'left',
+ 'nut-tabs__titles-item-left': align === 'left',
active: item.paneKey == modelValue,
disabled: item.disabled
}"
@@ -41,7 +41,7 @@
@@ -53,7 +53,7 @@
class="nut-tabs__titles-item"
:style="titleStyle"
:class="{
- 'nut-tabs__titles-item-left': alignment === 'left',
+ 'nut-tabs__titles-item-left': align === 'left',
active: item.paneKey == modelValue,
disabled: item.disabled
}"
@@ -103,7 +103,7 @@ import { TypeOfFun } from '@/packages/utils/util';
import { useRect } from '@/packages/utils/useRect';
import raf from '@/packages/utils/raf';
import { useTabContentTouch } from './hooks';
-import type { TabsDirection, TabsSize, TabsType, Alignment } from './types';
+import type { TabsDirection, TabsSize, TabsType, TabsAlign } from './types';
export class Title {
title = '';
@@ -174,8 +174,8 @@ export default create({
type: Number,
default: 0
},
- alignment: {
- type: String as PropType,
+ align: {
+ type: String as PropType,
default: 'center'
}
},
diff --git a/src/packages/__VUE/tabs/types.ts b/src/packages/__VUE/tabs/types.ts
index 8314a0270a..efa4d9b568 100644
--- a/src/packages/__VUE/tabs/types.ts
+++ b/src/packages/__VUE/tabs/types.ts
@@ -11,4 +11,4 @@ export type RectItem = {
export type TabsDirection = 'horizontal' | 'vertical';
export type TabsSize = 'large' | 'normal' | 'small';
export type TabsType = 'line' | 'smile';
-export type Alignment = 'left' | 'center';
+export type TabsAlign = 'left' | 'center';