Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/packages/uploader/demos/h5/demo1.tsx
Original file line number Diff line number Diff line change
@@ -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<FileItem[]>([
const [list, setList] = useState<UploaderFileItem[]>([
{
url: 'https://m.360buyimg.com/babel/jfs/t1/164410/22/25162/93384/616eac6cE6c711350/0cac53c1b82e1b05.gif',
uid: 133,
Expand All @@ -23,7 +23,7 @@ const Demo1 = () => {
url: URL.createObjectURL(file),
}
}
async function uploadFail(file: File): Promise<FileItem> {
async function uploadFail(file: File): Promise<UploaderFileItem> {
await sleep(2000)
throw new Error('Fail to upload')
}
Expand Down
4 changes: 2 additions & 2 deletions src/packages/uploader/demos/h5/demo10.tsx
Original file line number Diff line number Diff line change
@@ -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<FileItem[]>([
const [list, setList] = useState<UploaderFileItem[]>([
{
name: '文件文件文件文件1文件文件文件文件1文件文件文件文件1.png',
url: 'https://m.360buyimg.com/babel/jfs/t1/164410/22/25162/93384/616eac6cE6c711350/0cac53c1b82e1b05.gif',
Expand Down
6 changes: 3 additions & 3 deletions src/packages/uploader/demos/h5/demo2.tsx
Original file line number Diff line number Diff line change
@@ -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',
Expand Down Expand Up @@ -44,7 +44,7 @@ const Demo2 = () => {
loadingIcon: <Loading className="nut-icon-Loading" color="#fff" />,
},
]
const onDelete = (file: FileItem, fileList: FileItem[]) => {
const onDelete = (file: UploaderFileItem, fileList: UploaderFileItem[]) => {
console.log('delete事件触发', file, fileList)
}
return (
Expand Down
4 changes: 2 additions & 2 deletions src/packages/uploader/demos/h5/demo3.tsx
Original file line number Diff line number Diff line change
@@ -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<FileItem[]>([])
const [list, setList] = useState<UploaderFileItem[]>([])
function sleep(time: number) {
return new Promise<void>((resolve) => {
setTimeout(() => {
Expand Down
4 changes: 2 additions & 2 deletions src/packages/uploader/demos/h5/demo4.tsx
Original file line number Diff line number Diff line change
@@ -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<FileItem[]>([])
const [list, setList] = useState<UploaderFileItem[]>([])
const onOversize = (files: File[]) => {
console.log('oversize 触发 文件大小不能超过 50kb', files)
}
Expand Down
4 changes: 2 additions & 2 deletions src/packages/uploader/demos/h5/demo5.tsx
Original file line number Diff line number Diff line change
@@ -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<FileItem[]>([])
const [list, setList] = useState<UploaderFileItem[]>([])
const beforeUpload = async (files: File[]) => {
const allowedTypes = ['image/png']
const filteredFiles = Array.from(files).filter((file) =>
Expand Down
4 changes: 2 additions & 2 deletions src/packages/uploader/demos/h5/demo7.tsx
Original file line number Diff line number Diff line change
@@ -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',
Expand Down
11 changes: 8 additions & 3 deletions src/packages/uploader/demos/taro/demo1.tsx
Original file line number Diff line number Diff line change
@@ -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<FileItem[]>([
const [list, setList] = useState<UploaderFileItem[]>([
{
url: demoUrl,
uid: 133,
Expand All @@ -24,7 +29,7 @@ const Demo1 = () => {
await sleep(2000)
return { url: demoUrl }
}
async function uploadFail(file: File): Promise<FileItem> {
async function uploadFail(file: File): Promise<UploaderFileItem> {
await sleep(2000)
throw new Error('Fail to upload')
}
Expand Down
4 changes: 2 additions & 2 deletions src/packages/uploader/demos/taro/demo10.tsx
Original file line number Diff line number Diff line change
@@ -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<FileItem[]>([
const [list, setList] = useState<UploaderFileItem[]>([
{
name: '文件文件文件文件1文件文件文件文件1文件文件文件文件1.png',
url: 'https://m.360buyimg.com/babel/jfs/t1/164410/22/25162/93384/616eac6cE6c711350/0cac53c1b82e1b05.gif',
Expand Down
6 changes: 3 additions & 3 deletions src/packages/uploader/demos/taro/demo2.tsx
Original file line number Diff line number Diff line change
@@ -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',
Expand Down Expand Up @@ -44,7 +44,7 @@ const Demo2 = () => {
loadingIcon: <Loading className="nut-icon-Loading" color="#fff" />,
},
]
const onDelete = (file: FileItem, fileList: FileItem[]) => {
const onDelete = (file: UploaderFileItem, fileList: UploaderFileItem[]) => {
console.log('delete事件触发', file, fileList)
}
return (
Expand Down
9 changes: 7 additions & 2 deletions src/packages/uploader/demos/taro/demo3.tsx
Original file line number Diff line number Diff line change
@@ -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<FileItem[]>([])
const [list, setList] = useState<UploaderFileItem[]>([])
function sleep(time: number) {
return new Promise<void>((resolve) => {
setTimeout(() => {
Expand Down
4 changes: 2 additions & 2 deletions src/packages/uploader/demos/taro/demo4.tsx
Original file line number Diff line number Diff line change
@@ -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<FileItem[]>([])
const [list, setList] = useState<UploaderFileItem[]>([])

function sleep(time: number) {
return new Promise<void>((resolve) => {
Expand Down
4 changes: 2 additions & 2 deletions src/packages/uploader/demos/taro/demo5.tsx
Original file line number Diff line number Diff line change
@@ -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<FileItem[]>([])
const [list, setList] = useState<UploaderFileItem[]>([])
const beforeUpload = async (files: File[]) => {
const allowedTypes = ['image/png']
const filteredFiles = Array.from(files).filter((file) =>
Expand Down
4 changes: 2 additions & 2 deletions src/packages/uploader/demos/taro/demo7.tsx
Original file line number Diff line number Diff line change
@@ -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',
Expand Down
12 changes: 10 additions & 2 deletions src/packages/uploader/doc.taro.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,22 +66,30 @@ import { Uploader } from '@nutui/nutui-react-taro'

:::

### 选中文件后,通过按钮手动执行上传
### 直接调起摄像头(移动端生效)

:::demo

<CodeBlock src='taro/demo8.tsx'></CodeBlock>

:::

### 基础用法-上传列表展示
### 选中文件后,通过按钮手动执行上传

:::demo

<CodeBlock src='taro/demo9.tsx'></CodeBlock>

:::

### 基础用法-上传列表展示

:::demo

<CodeBlock src='taro/demo10.tsx'></CodeBlock>

:::

## Uploader

### Props
Expand Down
1 change: 1 addition & 0 deletions src/packages/uploader/uploader.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading