diff --git a/src/packages/uploader/demos/h5/demo1.tsx b/src/packages/uploader/demos/h5/demo1.tsx index 113c068823..8a2b9315e4 100644 --- a/src/packages/uploader/demos/h5/demo1.tsx +++ b/src/packages/uploader/demos/h5/demo1.tsx @@ -1,9 +1,9 @@ import React, { useState } from 'react' -import { Uploader, Cell, FileItem, Space } from '@nutui/nutui-react' +import { Uploader, Cell, UploaderFileItem, Space } from '@nutui/nutui-react' import { Dongdong } from '@nutui/icons-react' const Demo1 = () => { - const [list, setList] = useState([ + const [list, setList] = useState([ { url: 'https://m.360buyimg.com/babel/jfs/t1/164410/22/25162/93384/616eac6cE6c711350/0cac53c1b82e1b05.gif', uid: 133, @@ -23,7 +23,7 @@ const Demo1 = () => { url: URL.createObjectURL(file), } } - async function uploadFail(file: File): Promise { + async function uploadFail(file: File): Promise { await sleep(2000) throw new Error('Fail to upload') } diff --git a/src/packages/uploader/demos/h5/demo10.tsx b/src/packages/uploader/demos/h5/demo10.tsx index 56bb98d17f..f57027a5c1 100644 --- a/src/packages/uploader/demos/h5/demo10.tsx +++ b/src/packages/uploader/demos/h5/demo10.tsx @@ -1,9 +1,9 @@ import React, { useState } from 'react' import { Loading, Star } from '@nutui/icons-react' -import { Uploader, Button, FileItem } from '@nutui/nutui-react' +import { Uploader, Button, UploaderFileItem } from '@nutui/nutui-react' const Demo10 = () => { - const [list, setList] = useState([ + const [list, setList] = useState([ { name: '文件文件文件文件1文件文件文件文件1文件文件文件文件1.png', url: 'https://m.360buyimg.com/babel/jfs/t1/164410/22/25162/93384/616eac6cE6c711350/0cac53c1b82e1b05.gif', diff --git a/src/packages/uploader/demos/h5/demo2.tsx b/src/packages/uploader/demos/h5/demo2.tsx index f8ac1f50e9..4316b83add 100644 --- a/src/packages/uploader/demos/h5/demo2.tsx +++ b/src/packages/uploader/demos/h5/demo2.tsx @@ -1,9 +1,9 @@ import React from 'react' -import { Uploader, FileItem } from '@nutui/nutui-react' +import { Uploader, UploaderFileItem } from '@nutui/nutui-react' import { Dongdong, Loading, Star } from '@nutui/icons-react' const Demo2 = () => { - const defaultList: FileItem[] = [ + const defaultList: UploaderFileItem[] = [ { uid: 111, name: '文件文件文件文件1文件文件文件文件1文件文件文件文件1.png', @@ -44,7 +44,7 @@ const Demo2 = () => { loadingIcon: , }, ] - const onDelete = (file: FileItem, fileList: FileItem[]) => { + const onDelete = (file: UploaderFileItem, fileList: UploaderFileItem[]) => { console.log('delete事件触发', file, fileList) } return ( diff --git a/src/packages/uploader/demos/h5/demo3.tsx b/src/packages/uploader/demos/h5/demo3.tsx index 1e4274cbc2..58517de307 100644 --- a/src/packages/uploader/demos/h5/demo3.tsx +++ b/src/packages/uploader/demos/h5/demo3.tsx @@ -1,8 +1,8 @@ import React, { useState } from 'react' -import { Uploader, Cell, FileItem, Space } from '@nutui/nutui-react' +import { Uploader, Cell, UploaderFileItem, Space } from '@nutui/nutui-react' const Demo3 = () => { - const [list, setList] = useState([]) + const [list, setList] = useState([]) function sleep(time: number) { return new Promise((resolve) => { setTimeout(() => { diff --git a/src/packages/uploader/demos/h5/demo4.tsx b/src/packages/uploader/demos/h5/demo4.tsx index a89befe47d..1bd6ce1183 100644 --- a/src/packages/uploader/demos/h5/demo4.tsx +++ b/src/packages/uploader/demos/h5/demo4.tsx @@ -1,8 +1,8 @@ import React, { useState } from 'react' -import { Uploader, Cell, FileItem } from '@nutui/nutui-react' +import { Uploader, Cell, UploaderFileItem } from '@nutui/nutui-react' const Demo4 = () => { - const [list, setList] = useState([]) + const [list, setList] = useState([]) const onOversize = (files: File[]) => { console.log('oversize 触发 文件大小不能超过 50kb', files) } diff --git a/src/packages/uploader/demos/h5/demo5.tsx b/src/packages/uploader/demos/h5/demo5.tsx index 1e0722ac27..95367f7601 100644 --- a/src/packages/uploader/demos/h5/demo5.tsx +++ b/src/packages/uploader/demos/h5/demo5.tsx @@ -1,8 +1,8 @@ import React, { useState } from 'react' -import { Uploader, Cell, FileItem } from '@nutui/nutui-react' +import { Uploader, Cell, UploaderFileItem } from '@nutui/nutui-react' const Demo5 = () => { - const [list, setList] = useState([]) + const [list, setList] = useState([]) const beforeUpload = async (files: File[]) => { const allowedTypes = ['image/png'] const filteredFiles = Array.from(files).filter((file) => diff --git a/src/packages/uploader/demos/h5/demo7.tsx b/src/packages/uploader/demos/h5/demo7.tsx index 73c1b89d85..7e691d96eb 100644 --- a/src/packages/uploader/demos/h5/demo7.tsx +++ b/src/packages/uploader/demos/h5/demo7.tsx @@ -1,8 +1,8 @@ import React from 'react' -import { Uploader, Cell, FileItem } from '@nutui/nutui-react' +import { Uploader, Cell, UploaderFileItem } from '@nutui/nutui-react' import { Dongdong, Star } from '@nutui/icons-react' -const defaultFileList: FileItem[] = [ +const defaultFileList: UploaderFileItem[] = [ { name: '文件文件文件文件1文件文件文件文件1文件文件文件文件1.png', url: 'https://m.360buyimg.com/babel/jfs/t1/164410/22/25162/93384/616eac6cE6c711350/0cac53c1b82e1b05.gif', diff --git a/src/packages/uploader/demos/taro/demo1.tsx b/src/packages/uploader/demos/taro/demo1.tsx index b094b77778..36a1014db6 100644 --- a/src/packages/uploader/demos/taro/demo1.tsx +++ b/src/packages/uploader/demos/taro/demo1.tsx @@ -1,12 +1,17 @@ import React, { useState } from 'react' -import { Uploader, Cell, FileItem, Space } from '@nutui/nutui-react-taro' +import { + Uploader, + Cell, + UploaderFileItem, + Space, +} from '@nutui/nutui-react-taro' import { Dongdong } from '@nutui/icons-react-taro' const Demo1 = () => { const demoUrl = 'https://m.360buyimg.com/babel/jfs/t1/164410/22/25162/93384/616eac6cE6c711350/0cac53c1b82e1b05.gif' - const [list, setList] = useState([ + const [list, setList] = useState([ { url: demoUrl, uid: 133, @@ -24,7 +29,7 @@ const Demo1 = () => { await sleep(2000) return { url: demoUrl } } - async function uploadFail(file: File): Promise { + async function uploadFail(file: File): Promise { await sleep(2000) throw new Error('Fail to upload') } diff --git a/src/packages/uploader/demos/taro/demo10.tsx b/src/packages/uploader/demos/taro/demo10.tsx index 0c5653c4b7..bbe194e480 100644 --- a/src/packages/uploader/demos/taro/demo10.tsx +++ b/src/packages/uploader/demos/taro/demo10.tsx @@ -1,9 +1,9 @@ import React, { useState } from 'react' import { Loading, Star } from '@nutui/icons-react' -import { Uploader, Button, FileItem } from '@nutui/nutui-react-taro' +import { Uploader, Button, UploaderFileItem } from '@nutui/nutui-react-taro' const Demo10 = () => { - const [list, setList] = useState([ + const [list, setList] = useState([ { name: '文件文件文件文件1文件文件文件文件1文件文件文件文件1.png', url: 'https://m.360buyimg.com/babel/jfs/t1/164410/22/25162/93384/616eac6cE6c711350/0cac53c1b82e1b05.gif', diff --git a/src/packages/uploader/demos/taro/demo2.tsx b/src/packages/uploader/demos/taro/demo2.tsx index 764cc9d464..12cb800ee5 100644 --- a/src/packages/uploader/demos/taro/demo2.tsx +++ b/src/packages/uploader/demos/taro/demo2.tsx @@ -1,9 +1,9 @@ import React from 'react' -import { Uploader, FileItem } from '@nutui/nutui-react-taro' +import { Uploader, UploaderFileItem } from '@nutui/nutui-react-taro' import { Dongdong, Loading, Star } from '@nutui/icons-react-taro' const Demo2 = () => { - const defaultList: FileItem[] = [ + const defaultList: UploaderFileItem[] = [ { uid: 111, name: '文件文件文件文件1文件文件文件文件1文件文件文件文件1.png', @@ -44,7 +44,7 @@ const Demo2 = () => { loadingIcon: , }, ] - const onDelete = (file: FileItem, fileList: FileItem[]) => { + const onDelete = (file: UploaderFileItem, fileList: UploaderFileItem[]) => { console.log('delete事件触发', file, fileList) } return ( diff --git a/src/packages/uploader/demos/taro/demo3.tsx b/src/packages/uploader/demos/taro/demo3.tsx index 5e9e644b75..fa32f89999 100644 --- a/src/packages/uploader/demos/taro/demo3.tsx +++ b/src/packages/uploader/demos/taro/demo3.tsx @@ -1,11 +1,16 @@ import React, { useState } from 'react' -import { Uploader, Cell, FileItem, Space } from '@nutui/nutui-react-taro' +import { + Uploader, + Cell, + UploaderFileItem, + Space, +} from '@nutui/nutui-react-taro' const Demo3 = () => { const demoUrl = 'https://m.360buyimg.com/babel/jfs/t1/164410/22/25162/93384/616eac6cE6c711350/0cac53c1b82e1b05.gif' - const [list, setList] = useState([]) + const [list, setList] = useState([]) function sleep(time: number) { return new Promise((resolve) => { setTimeout(() => { diff --git a/src/packages/uploader/demos/taro/demo4.tsx b/src/packages/uploader/demos/taro/demo4.tsx index 0d3fcdf942..7b012339f7 100644 --- a/src/packages/uploader/demos/taro/demo4.tsx +++ b/src/packages/uploader/demos/taro/demo4.tsx @@ -1,11 +1,11 @@ import React, { useState } from 'react' -import { Uploader, Cell, FileItem } from '@nutui/nutui-react-taro' +import { Uploader, Cell, UploaderFileItem } from '@nutui/nutui-react-taro' const Demo4 = () => { const demoUrl = 'https://m.360buyimg.com/babel/jfs/t1/164410/22/25162/93384/616eac6cE6c711350/0cac53c1b82e1b05.gif' - const [list, setList] = useState([]) + const [list, setList] = useState([]) function sleep(time: number) { return new Promise((resolve) => { diff --git a/src/packages/uploader/demos/taro/demo5.tsx b/src/packages/uploader/demos/taro/demo5.tsx index 82099058fe..2bc93084e1 100644 --- a/src/packages/uploader/demos/taro/demo5.tsx +++ b/src/packages/uploader/demos/taro/demo5.tsx @@ -1,8 +1,8 @@ import React, { useState } from 'react' -import { Uploader, Cell, FileItem } from '@nutui/nutui-react-taro' +import { Uploader, Cell, UploaderFileItem } from '@nutui/nutui-react-taro' const Demo5 = () => { - const [list, setList] = useState([]) + const [list, setList] = useState([]) const beforeUpload = async (files: File[]) => { const allowedTypes = ['image/png'] const filteredFiles = Array.from(files).filter((file) => diff --git a/src/packages/uploader/demos/taro/demo7.tsx b/src/packages/uploader/demos/taro/demo7.tsx index 7dd9210a6f..1c4cd561d5 100644 --- a/src/packages/uploader/demos/taro/demo7.tsx +++ b/src/packages/uploader/demos/taro/demo7.tsx @@ -1,8 +1,8 @@ import React from 'react' -import { Uploader, Cell, FileItem } from '@nutui/nutui-react-taro' +import { Uploader, Cell, UploaderFileItem } from '@nutui/nutui-react-taro' import { Dongdong, Star } from '@nutui/icons-react-taro' -const defaultFileList: FileItem[] = [ +const defaultFileList: UploaderFileItem[] = [ { name: '文件文件文件文件1文件文件文件文件1文件文件文件文件1.png', url: 'https://m.360buyimg.com/babel/jfs/t1/164410/22/25162/93384/616eac6cE6c711350/0cac53c1b82e1b05.gif', diff --git a/src/packages/uploader/doc.taro.md b/src/packages/uploader/doc.taro.md index 0e0de5fa4e..dccf0b343c 100644 --- a/src/packages/uploader/doc.taro.md +++ b/src/packages/uploader/doc.taro.md @@ -66,7 +66,7 @@ import { Uploader } from '@nutui/nutui-react-taro' ::: -### 选中文件后,通过按钮手动执行上传 +### 直接调起摄像头(移动端生效) :::demo @@ -74,7 +74,7 @@ import { Uploader } from '@nutui/nutui-react-taro' ::: -### 基础用法-上传列表展示 +### 选中文件后,通过按钮手动执行上传 :::demo @@ -82,6 +82,14 @@ import { Uploader } from '@nutui/nutui-react-taro' ::: +### 基础用法-上传列表展示 + +:::demo + + + +::: + ## Uploader ### Props diff --git a/src/packages/uploader/uploader.scss b/src/packages/uploader/uploader.scss index a420f6f8cf..b29a93316e 100644 --- a/src/packages/uploader/uploader.scss +++ b/src/packages/uploader/uploader.scss @@ -87,6 +87,7 @@ height: 100%; background: $uploader-preview-progress-background; border-radius: $uploader-image-border-radius; + z-index: 10; i { margin-bottom: $uploader-image-icon-margin-bottom;