From 4b0d153c657bb62672f302ed0926460b69b3b791 Mon Sep 17 00:00:00 2001
From: MrXiangXvFan <74048960+MrXiangXvFan@users.noreply.github.com>
Date: Thu, 15 Aug 2024 14:33:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?docs:=20=E5=AE=98=E7=BD=91icon=E7=9A=84demo?=
=?UTF-8?q?=E6=B5=AE=E5=8A=A8=E5=AF=BC=E8=87=B4icon=E8=B6=85=E5=87=BA?=
=?UTF-8?q?=E7=9B=92=E5=AD=90=E4=B9=8B=E5=A4=96=E9=97=AE=E9=A2=98=E4=BF=AE?=
=?UTF-8?q?=E5=A4=8D=20(#674)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
packages/vantui/src/icon/demo/demo1.tsx | 4 ++--
packages/vantui/src/icon/demo/demo2.tsx | 6 +++---
packages/vantui/src/icon/demo/demo3.tsx | 7 ++++---
packages/vantui/src/icon/demo/demo4.tsx | 7 ++++---
4 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/packages/vantui/src/icon/demo/demo1.tsx b/packages/vantui/src/icon/demo/demo1.tsx
index 98fe8ac0..1617eb15 100644
--- a/packages/vantui/src/icon/demo/demo1.tsx
+++ b/packages/vantui/src/icon/demo/demo1.tsx
@@ -3,7 +3,7 @@ import { Row, Col, Icon } from '@antmjs/vantui'
export default function Demo() {
return (
- <>
+
基本用法
@@ -70,6 +70,6 @@ export default function Demo() {
- >
+
)
}
diff --git a/packages/vantui/src/icon/demo/demo2.tsx b/packages/vantui/src/icon/demo/demo2.tsx
index 2fc9d461..224d8e47 100644
--- a/packages/vantui/src/icon/demo/demo2.tsx
+++ b/packages/vantui/src/icon/demo/demo2.tsx
@@ -1,11 +1,11 @@
-import { Text } from '@tarojs/components'
+import { Text, View } from '@tarojs/components'
import icons from '@vant/icons'
import { Col, Icon } from '@antmjs/vantui'
import * as computed from '../wxs'
export default function Demo() {
return (
- <>
+
{icons.basic.map((name, i) => (
{name}
))}
- >
+
)
}
diff --git a/packages/vantui/src/icon/demo/demo3.tsx b/packages/vantui/src/icon/demo/demo3.tsx
index 90cebdc6..4ed7e217 100644
--- a/packages/vantui/src/icon/demo/demo3.tsx
+++ b/packages/vantui/src/icon/demo/demo3.tsx
@@ -1,11 +1,12 @@
-import { Text } from '@tarojs/components'
+import { Text, View } from '@tarojs/components'
import icons from '@vant/icons'
import { Col, Icon } from '@antmjs/vantui'
import * as computed from '../wxs'
export default function Demo() {
return (
- <>
+ //BFC 解决浮动盒子不撑开问题
+
{icons.outline.map((name, i) => (
{name}
))}
- >
+
)
}
diff --git a/packages/vantui/src/icon/demo/demo4.tsx b/packages/vantui/src/icon/demo/demo4.tsx
index d6ad4cd8..7da67f32 100644
--- a/packages/vantui/src/icon/demo/demo4.tsx
+++ b/packages/vantui/src/icon/demo/demo4.tsx
@@ -1,11 +1,12 @@
-import { Text } from '@tarojs/components'
+import { Text, View } from '@tarojs/components'
import icons from '@vant/icons'
import { Col, Icon } from '@antmjs/vantui'
import * as computed from '../wxs'
export default function Demo() {
return (
- <>
+ //BFC 解决浮动盒子不撑开问题
+
{icons.filled.map((name, i) => (
{name}
))}
- >
+
)
}
From 4c35c257343eb56143a6e6a55e05cdd9dc762abe Mon Sep 17 00:00:00 2001
From: MrXiangXvFan <74048960+MrXiangXvFan@users.noreply.github.com>
Date: Tue, 20 Aug 2024 14:02:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?docs:=20treeSelect=E6=96=87=E6=A1=A3?=
=?UTF-8?q?=E8=A1=A5=E8=B6=B3=EF=BC=88=E4=BF=AE=E6=94=B9=E7=9A=84=E6=B3=A8?=
=?UTF-8?q?=E9=87=8A=EF=BC=8C=E9=9D=9EREADME.md=E6=96=87=E4=BB=B6=EF=BC=89?=
=?UTF-8?q?=20(#677)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
packages/vantui/types/tree-select.d.ts | 34 +++++++++++++++++++++++++-
1 file changed, 33 insertions(+), 1 deletion(-)
diff --git a/packages/vantui/types/tree-select.d.ts b/packages/vantui/types/tree-select.d.ts
index d798a0e0..1f8611e8 100644
--- a/packages/vantui/types/tree-select.d.ts
+++ b/packages/vantui/types/tree-select.d.ts
@@ -1,6 +1,10 @@
import { FunctionComponent, TouchEvent, ReactNode } from 'react'
import { ViewProps } from '@tarojs/components'
export interface TreeSelectProps extends ViewProps {
+ /**
+ * @description 分类显示所需的数据
+ * @default []
+ */
items?: {
text: number | string
badge?: number | string
@@ -12,12 +16,34 @@ export interface TreeSelectProps extends ViewProps {
disabled?: boolean
}[]
}[]
+ /**
+ * @description 右侧选中项的 id,支持传入数组
+ * @default -
+ */
activeId?: string | number | number[] | string[]
+ /**
+ * @description 左侧选中项的索引
+ * @default 0
+ */
mainActiveIndex?: number
- value?: number
+ /**
+ * @description 高度,默认单位为px
+ * @default 300
+ */
height?: number | string
+ /**
+ * @description 右侧项最大选中个数
+ * @default Infinity
+ */
max?: number
+ /**
+ * @description 自定义右侧栏选中状态的图标
+ * @default success
+ */
selectedIcon?: string
+ /**
+ * @description 点击右侧选择项时触发
+ */
onClickItem?: (
event: TouchEvent & {
detail: {
@@ -27,7 +53,13 @@ export interface TreeSelectProps extends ViewProps {
}
},
) => void
+ /**
+ * @description 点击左侧导航时触发
+ */
onClickNav?: (event: { detail: { index: number } }) => void
+ /**
+ * @description 自定义右侧的显示内容
+ */
renderContent?: ReactNode
}
declare const TreeSelect: FunctionComponent