@nutui/nutui-react-taro 3.0.0-beta.1 → 3.0.0-beta.10

package/dist/es/packages/uploader/preview.js

@@ -1,12 +1,12 @@
 import React from "react";
 import { Del, Failure, Link as LinkIcon, Loading } from "@nutui/icons-react-taro";
-import { Image, View } from "@tarojs/components";
-import Progress from "../progress/index";
-import { ERROR } from "./utils";
+import { View } from "@tarojs/components";
+import { Image } from "../image/image";
+import { Progress } from "../progress/progress";
 export var Preview = function(param) {
     var fileList = param.fileList, previewType = param.previewType, deletable = param.deletable, onDeleteItem = param.onDeleteItem, handleItemClick = param.handleItemClick, previewUrl = param.previewUrl, deleteIcon = param.deleteIcon, children = param.children;
     var renderIcon = function(item) {
-        if (item.status === ERROR) {
+        if (item.status === 'error') {
             return item.failIcon || /*#__PURE__*/ React.createElement(Failure, {
                 color: "#fff"
             });
@@ -17,38 +17,37 @@ export var Preview = function(param) {
         });
     };
     return /*#__PURE__*/ React.createElement(React.Fragment, null, fileList.length !== 0 && fileList.map(function(item, index) {
-        var _item_type;
+        var _item_status = item.status, status = _item_status === void 0 ? 'success' : _item_status, _item_uid = item.uid, uid = _item_uid === void 0 ? index : _item_uid, url = item.url, _item_message = item.message, message = _item_message === void 0 ? '' : _item_message, _item_name = item.name, name = _item_name === void 0 ? '' : _item_name, _item_type = item.type, type = _item_type === void 0 ? 'image' : _item_type;
         return /*#__PURE__*/ React.createElement(View, {
             className: "nut-uploader-preview ".concat(previewType),
-            key: item.uid
+            key: uid
         }, previewType === 'picture' && !children && deletable && /*#__PURE__*/ React.createElement(View, {
-            className: "close",
             onClick: function() {
                 return onDeleteItem(item, index);
-            }
+            },
+            className: "close"
         }, deleteIcon), previewType === 'picture' && !children && /*#__PURE__*/ React.createElement(View, {
             className: "nut-uploader-preview-img"
-        }, item.status === 'ready' ? /*#__PURE__*/ React.createElement(View, {
+        }, status === 'ready' ? /*#__PURE__*/ React.createElement(View, {
             className: "nut-uploader-preview-progress"
         }, /*#__PURE__*/ React.createElement(View, {
             className: "nut-uploader-preview-progress-msg"
-        }, item.message)) : item.status !== 'success' && /*#__PURE__*/ React.createElement(View, {
-            className: "nut-uploader-preview-progress"
+        }, message)) : status !== 'success' && /*#__PURE__*/ React.createElement(View, {
+            className: "nut-uploader-preview-progress",
+            style: {
+                zIndex: 10
+            }
         }, renderIcon(item), /*#__PURE__*/ React.createElement(View, {
             className: "nut-uploader-preview-progress-msg"
-        }, item.message)), ((_item_type = item.type) === null || _item_type === void 0 ? void 0 : _item_type.includes('image')) ? /*#__PURE__*/ React.createElement(React.Fragment, null, item.url && /*#__PURE__*/ React.createElement(Image, {
+        }, message)), type.includes('image') ? /*#__PURE__*/ React.createElement(React.Fragment, null, url && /*#__PURE__*/ React.createElement(Image, {
             className: "nut-uploader-preview-img-c",
-            style: {
-                objectFit: 'fill'
-            },
-            mode: "aspectFit",
-            src: item.url,
+            src: url,
+            mode: "aspectFill",
             onClick: function() {
                 return handleItemClick(item, index);
             }
         })) : /*#__PURE__*/ React.createElement(React.Fragment, null, previewUrl ? /*#__PURE__*/ React.createElement(Image, {
             className: "nut-uploader-preview-img-c",
-            mode: "aspectFit",
             src: previewUrl,
             onClick: function() {
                 return handleItemClick(item, index);
@@ -62,22 +61,24 @@ export var Preview = function(param) {
             className: "nut-uploader-preview-img-file-name"
         }, /*#__PURE__*/ React.createElement(LinkIcon, {
             color: "#808080"
-        }), /*#__PURE__*/ React.createElement("span", null, "\xa0", item.name)))), item.status === 'success' ? /*#__PURE__*/ React.createElement(View, {
+        }), /*#__PURE__*/ React.createElement("span", null, "\xa0", name)))), status === 'success' && name ? /*#__PURE__*/ React.createElement(View, {
             className: "tips"
-        }, item.name) : null), previewType === 'list' && /*#__PURE__*/ React.createElement(View, {
+        }, name) : null), previewType === 'list' && /*#__PURE__*/ React.createElement(View, {
             className: "nut-uploader-preview-list"
         }, /*#__PURE__*/ React.createElement(View, {
-            className: "nut-uploader-preview-img-file-name ".concat(item.status),
+            className: "nut-uploader-preview-img-file-name ".concat(status),
             onClick: function() {
                 return handleItemClick(item, index);
             }
-        }, /*#__PURE__*/ React.createElement(LinkIcon, null), /*#__PURE__*/ React.createElement("span", null, "\xa0", item.name)), deletable && /*#__PURE__*/ React.createElement(Del, {
+        }, /*#__PURE__*/ React.createElement(LinkIcon, null), /*#__PURE__*/ React.createElement("span", {
+            className: "nut-uploader-preview-img-file-name ".concat(status)
+        }, "\xa0", name)), deletable && /*#__PURE__*/ React.createElement(Del, {
             color: "#808080",
             className: "nut-uploader-preview-img-file-del",
             onClick: function() {
                 return onDeleteItem(item, index);
             }
-        }), item.status === 'uploading' && /*#__PURE__*/ React.createElement(Progress, {
+        }), item.status === 'uploading' && item.percentage && /*#__PURE__*/ React.createElement(Progress, {
             percent: item.percentage,
             color: "linear-gradient(270deg, rgba(18,126,255,1) 0%,rgba(32,147,255,1) 32.815625%,rgba(13,242,204,1) 100%)",
             showText: false

package/dist/es/packages/uploader/style/style.css

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-progress {
   display: flex;
   align-items: center;
@@ -8,7 +12,7 @@
   flex: auto;
   border-radius: var(--nutui-progress-border-radius, 12px);
   height: var(--nutui-progress-height, 10px);
-  background: var(--nutui-progress-background, var(--nutui-color-background, #f5f6fa));
+  background: var(--nutui-progress-background, var(--nutui-gray-3));
 }
 .nut-progress-outer .nut-progress-active:before {
   content: "";
@@ -27,7 +31,7 @@
   justify-content: center;
   transition: all 0.4s;
   border-radius: var(--nutui-progress-border-radius, 12px);
-  background-color: var(--nutui-progress-color, #ff0f23);
+  background: var(--nutui-progress-color, linear-gradient(135deg, var(--nutui-color-primary-stop-1, #ff475d) 0%, var(--nutui-color-primary-stop-2, #ff0f23) 100%));
 }
 .nut-progress-text {
   display: flex;
@@ -36,6 +40,7 @@
   top: var(--nutui-progress-text-position-top, -4px);
   bottom: var(--nutui-progress-text-position-bottom, -4px);
   transition: all 0.4s;
+  transform: translate(-50%);
 }
 .nut-progress-text-inner {
   display: flex;
@@ -44,12 +49,12 @@
   align-items: center;
   height: 100%;
   width: 100%;
-  color: var(--nutui-progress-text-color, var(--nutui-color-primary-text, #ffffff));
+  color: var(--nutui-progress-text-color, #ffffff);
   padding: var(--nutui-progress-text-padding, 0 5px);
   border-radius: var(--nutui-progress-text-border-radius, 5px);
   font-size: var(--nutui-progress-text-font-size, 9px);
   line-height: 1;
-  background: var(--nutui-progress-text-background, #ff0f23);
+  background: var(--nutui-progress-text-background, linear-gradient(135deg, var(--nutui-color-primary-stop-1, #ff475d) 0%, var(--nutui-color-primary-stop-2, #ff0f23) 100%));
 }
 @keyframes progressActive {
   0% {
@@ -84,7 +89,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  background: var(--nutui-uploader-background, var(--nutui-color-background, #f5f6fa));
+  background: var(--nutui-uploader-background, var(--nutui-gray-3));
   width: var(--nutui-uploader-image-width, 100px);
   height: var(--nutui-uploader-image-height, 100px);
   border: var(--nutui-uploader-image-border, 0px);
@@ -95,11 +100,11 @@
   flex-direction: column;
   justify-content: center;
   align-items: center;
-  color: var(--nutui-uploader-image-color, var(--nutui-color-text-help, #888b94));
+  color: var(--nutui-uploader-image-color, var(--nutui-gray-5));
 }
 .nut-uploader-icon i,
 .nut-uploader-icon .nut-icon {
-  color: var(--nutui-uploader-image-color, var(--nutui-color-text-help, #888b94));
+  color: var(--nutui-uploader-image-color, var(--nutui-gray-5));
   margin-bottom: var(--nutui-uploader-image-icon-margin-bottom, 6px);
 }
 .nut-uploader-icon-tip {
@@ -119,12 +124,12 @@
   cursor: not-allowed;
 }
 .nut-uploader-upload-disabled {
-  background: var(--nutui-uploader-background-disabled, var(--nutui-color-background, #f5f6fa));
-  color: var(--nutui-uploader-image-disabled, var(--nutui-color-text-disabled, #c2c4cc));
+  background: var(--nutui-uploader-background-disabled, var(--nutui-gray-3));
+  color: var(--nutui-uploader-image-disabled, var(--nutui-gray-4));
 }
 .nut-uploader-upload-disabled .nut-uploader-icon i,
 .nut-uploader-upload-disabled .nut-uploader-icon .nut-icon {
-  color: var(--nutui-uploader-image-disabled, var(--nutui-color-text-disabled, #c2c4cc));
+  color: var(--nutui-uploader-image-disabled, var(--nutui-gray-4));
   margin-bottom: var(--nutui-uploader-image-icon-margin-bottom, 6px);
 }
 .nut-uploader-preview {
@@ -144,14 +149,14 @@
   justify-content: center;
   width: 100%;
   height: 100%;
-  background: var(--nutui-uploader-preview-progress-background, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
+  background: var(--nutui-uploader-preview-progress-background, var(--nutui-black-10));
   border-radius: var(--nutui-uploader-image-border-radius, 4px);
 }
 .nut-uploader-preview-progress i {
   margin-bottom: var(--nutui-uploader-image-icon-margin-bottom, 6px);
 }
 .nut-uploader-preview-progress-msg {
-  color: var(--nutui-color-text-help, #888b94);
+  color: var(--nutui-gray-5);
   font-size: 12px;
 }
 .nut-uploader-preview.list {
@@ -169,7 +174,7 @@
   align-items: center;
   justify-content: space-between;
   padding: 0 10px;
-  background-color: var(--nutui-color-background-sunken, #f7f8fc);
+  background-color: var(--nutui-color-background-sunken, var(--nutui-gray-2));
 }
 .nut-uploader-preview-list .nut-uploader-preview-img-file-name {
   display: flex;
@@ -205,7 +210,7 @@
   overflow: hidden;
 }
 .nut-uploader-preview-img i {
-  color: var(--nutui-color-title, #1a1a1a);
+  color: var(--nutui-gray-7);
 }
 .nut-uploader-preview-img .tips {
   position: absolute;
@@ -247,7 +252,7 @@
   display: flex;
   width: 90%;
   font-size: 12px;
-  color: var(--nutui-color-text, #505259);
+  color: var(--nutui-gray-6);
   display: -webkit-box;
   -webkit-box-orient: vertical;
   -webkit-line-clamp: 2;

package/dist/es/packages/uploader/types.d.ts

@@ -0,0 +1,17 @@
+export type FileItem = {
+    status?: FileItemStatus;
+    message?: string;
+    uid?: string | number;
+    name?: string;
+    url?: string;
+    type?: 'image' | 'list' | string;
+    path?: string;
+    loadingIcon?: React.ReactNode;
+    failIcon?: React.ReactNode;
+    file?: File;
+    percentage?: number;
+};
+export type FileItemStatus = 'ready' | 'uploading' | 'success' | 'error';
+export type FileType<T> = {
+    [key: string]: T;
+};

package/dist/es/packages/uploader/types.js

@@ -0,0 +1 @@
+export { };

package/dist/es/packages/uploader/uploader.d.ts

@@ -1,8 +1,7 @@
 import React from 'react';
 import Taro from '@tarojs/taro';
-import { UploadOptions } from './utils';
 import { BasicComponent } from "../../utils/typings";
-import { FileItem } from "./file-item";
+import { FileItem } from './types';
 interface sizeType {
     /** 原图 */
     original: string;
@@ -22,200 +21,39 @@ interface mediaType {
     video: string;
 }
 export interface UploaderProps extends BasicComponent {
-    /**
-    * 上传服务器的接口地址
-    * @default -
-    */
-    url: string
-    /**
-    * 文件上传数量限制
-    * @default 1
-    */
-    maxCount: string | number
-    /**
-    * [是否压缩所选文件]("https://developers.weixin.qq.com/miniprogram/dev/api/media/video/wx.chooseMedia.html")
-    * @default ['original','compressed']
-    */
-    sizeType: (keyof sizeType)[]
-    /**
-    * [选择文件的来源]("https://developers.weixin.qq.com/miniprogram/dev/api/media/video/wx.chooseMedia.html")
-    * @default ['album','camera']
-    */
-    sourceType: (keyof sourceType)[]
+    maxCount: string | number;
+    sizeType: (keyof sizeType)[];
+    sourceType: (keyof sourceType)[];
     mediaType: (keyof mediaType)[];
     camera: string;
-    /**
-    * 可以设定最大上传文件的大小（字节）
-    * @default Number.MAX_VALUE
-    */
-    maxFileSize: number
-    /**
-    * 默认已经上传的文件列表
-    * @default []
-    */
-    defaultValue?: FileItem[]
-    /**
-    * 已经上传的文件列表
-    * @default []
-    */
-    value?: FileItem[]
-    /**
-    * 上传列表的内建样式，支持两种基本样式 picture、list
-    * @default picture
-    */
-    previewType: 'picture' | 'list'
-    /**
-    * 图片填充模式
-    * @default cover
-    */
-    fit: 'contain' | 'cover' | 'fill' | 'none' | 'scale-down'
-    /**
-    * 上传区域<a href="#/zh-CN/icon">图标名称</a>
-    * @default -
-    */
-    uploadIcon?: React.ReactNode
-    /**
-    * 删除区域的图标名称
-    * @default -
-    */
-    deleteIcon?: React.ReactNode
-    /**
-    * 上传区域图片下方文字
-    * @default &quot;&quot;
-    */
-    uploadLabel?: React.ReactNode
-    /**
-    * input 标签 name 的名称，发到后台的文件参数名
-    * @default file
-    */
-    name: string
+    maxFileSize: number;
+    defaultValue?: FileItem[];
+    value?: FileItem[];
+    previewType: 'picture' | 'list';
+    fit: 'contain' | 'cover' | 'fill' | 'none' | 'scale-down';
+    uploadIcon?: React.ReactNode;
+    deleteIcon?: React.ReactNode;
+    uploadLabel?: React.ReactNode;
+    name: string;
     accept: string;
-    /**
-    * 是否禁用文件上传
-    * @default false
-    */
-    disabled: boolean
-    /**
-    * 是否在选取文件后立即进行上传，false 时需要手动执行 ref submit 方法进行上传
-    * @default true
-    */
-    autoUpload: boolean
-    /**
-    * 是否支持文件多选
-    * @default false
-    */
-    multiple: boolean
-    /**
-    * 超时时间，单位为毫秒
-    * @default 1000 * 30
-    */
-    timeout: number
-    /**
-    * 附加上传的信息 formData
-    * @default {}
-    */
-    data: any
-    /**
-    * 上传请求的 http method
-    * @default post
-    */
-    method: string
-    /**
-    * 接口响应的成功状态（status）值
-    * @default 200
-    */
-    xhrState: number | string
-    /**
-    * 设置上传的请求头部
-    * @default {}
-    */
-    headers: any
-    /**
-    * 是否上传成功后展示预览图
-    * @default true
-    */
-    preview: boolean
-    /**
-    * 是否展示删除按钮
-    * @default true
-    */
-    deletable: boolean
+    disabled: boolean;
+    autoUpload: boolean;
+    multiple: boolean;
+    preview: boolean;
+    deletable: boolean;
     className: string;
-    /**
-    * 当上传非图片('image')格式的默认图片地址
-    * @default -
-    */
-    previewUrl?: string
+    previewUrl?: string;
     maxDuration: number;
     style: React.CSSProperties;
-    /**
-    * 文件上传开始
-    * @default -
-    */
-    onStart?: (option: UploadOptions) => void
-    /**
-    * 文件删除之前的状态
-    * @default -
-    */
-    onDelete?: (file: FileItem, files: FileItem[]) => void
-    /**
-    * 上传成功
-    * @default -
-    */
-    onSuccess?: (param: {
-        responseText: XMLHttpRequest['responseText'];
-        option: UploadOptions;
-        files: FileItem[];
-    }) => void
-    /**
-    * 文件上传的进度
-    * @default -
-    */
-    onProgress?: (param: {
-        e: ProgressEvent<XMLHttpRequestEventTarget>;
-        option: UploadOptions;
-        percentage: number | string;
-    }) => void
-    /**
-    * 上传失败
-    * @default -
-    */
-    onFailure?: (param: {
-        responseText: XMLHttpRequest['responseText'];
-        option: UploadOptions;
-        files: FileItem[];
-    }) => void
-    onUpdate?: (files: FileItem[]) => void;
-    /**
-    * 文件大小超过限制时触发
-    * @default -
-    */
-    onOversize?: (files: Taro.chooseImage.ImageFile[] | Taro.chooseMedia.ChooseMedia[] | any) => void
-    /**
-    * 上传文件改变时的状态
-    * @default -
-    */
-    onChange?: (files: FileItem[]) => void
-    /**
-    * 上传前的函数需要返回一个Promise对象
-    * @default -
-    */
-    beforeUpload?: (files: Taro.chooseImage.ImageFile[] | Taro.chooseMedia.ChooseMedia[] | any) => Promise<File[] | boolean>
-    /**
-    * 执行 XHR 上传时，自定义方式
-    * @default -
-    */
-    beforeXhrUpload?: (xhr: XMLHttpRequest, options: any) => void
-    /**
-    * 除文件时的回调，返回值为 false 时不移除。支持返回一个 Promise 对象，Promise 对象 resolve(false) 或 reject 时不移除
-    * @default -
-    */
-    beforeDelete?: (file: FileItem, files: FileItem[]) => boolean
-    /**
-    * 文件上传成功后点击触发
-    * @default -
-    */
-    onFileItemClick?: (file: FileItem, index: number) => void
+    onDelete?: (file: FileItem, files: FileItem[]) => void;
+    onOversize?: (files: Taro.chooseImage.ImageFile[] | Taro.chooseMedia.ChooseMedia[] | any) => void;
+    onOverCount?: (count: number) => void;
+    onChange?: (files: FileItem[]) => void;
+    upload: (files: Taro.chooseImage.ImageFile | Taro.chooseMedia.ChooseMedia | any) => Promise<FileItem>;
+    beforeUpload?: (files: Taro.chooseImage.ImageFile[] | Taro.chooseMedia.ChooseMedia[] | any) => Promise<File[]>;
+    beforeDelete?: (file: FileItem, files: FileItem[]) => boolean;
+    onFileItemClick?: (file: FileItem, index: number) => void;
+    onUploadQueueChange?: (tasks: FileItem[]) => void;
 }
 export declare const Uploader: React.ForwardRefExoticComponent<Partial<UploaderProps> & {
     children?: React.ReactNode | undefined;