Merge branch 'main' of https://github.com/AntmJS/vantui into doc_tabbar

AntmJS · Aug 27, 2024 · 718fe88 · 718fe88
2 parents 67c077c + 4c35c25
commit 718fe88
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 12 deletions.
diff --git 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 (
-    <>
+    <View style={{ overflow: 'hidden' }}>
       <Row>
         <View className="demo-block__title">基本用法</View>
         <Col className="col" span="6">
@@ -70,6 +70,6 @@ export default function Demo() {
           <Icon name="demo3" classPrefix="page-icon" size="40px" />
         </Col>
       </Row>
-    </>
+    </View>
   )
 }
diff --git 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 (
-    <>
+    <View style={{ overflow: 'hidden' }}>
       {icons.basic.map((name, i) => (
         <Col
           key={i}
@@ -17,6 +17,6 @@ export default function Demo() {
           <Text>{name}</Text>
         </Col>
       ))}
-    </>
+    </View>
   )
 }
diff --git 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 解决浮动盒子不撑开问题
+    <View style={{ overflow: 'hidden' }}>
       {icons.outline.map((name, i) => (
         <Col
           key={i}
@@ -17,6 +18,6 @@ export default function Demo() {
           <Text style={{ textAlign: 'center' }}>{name}</Text>
         </Col>
       ))}
-    </>
+    </View>
   )
 }
diff --git 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 解决浮动盒子不撑开问题
+    <View style={{ overflow: 'hidden' }}>
       {icons.filled.map((name, i) => (
         <Col
           key={i}
@@ -17,6 +18,6 @@ export default function Demo() {
           <Text style={{ textAlign: 'center' }}>{name}</Text>
         </Col>
       ))}
-    </>
+    </View>
   )
 }
diff --git 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<TreeSelectProps>