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

package/dist/cjs/packages/uploader/uploader.js

@@ -10,27 +10,26 @@ Object.defineProperty(exports, "Uploader", {
 });
 var _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 var _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
+var _async_to_generator = require("@swc/helpers/_/_async_to_generator");
 var _object_spread = require("@swc/helpers/_/_object_spread");
 var _object_spread_props = require("@swc/helpers/_/_object_spread_props");
 var _object_without_properties = require("@swc/helpers/_/_object_without_properties");
 var _sliced_to_array = require("@swc/helpers/_/_sliced_to_array");
 var _to_consumable_array = require("@swc/helpers/_/_to_consumable_array");
+var _ts_generator = require("@swc/helpers/_/_ts_generator");
 var _react = /*#__PURE__*/ _interop_require_wildcard._(require("react"));
 var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames"));
 var _taro = /*#__PURE__*/ _interop_require_wildcard._(require("@tarojs/taro"));
-var _components = require("@tarojs/components");
 var _iconsreacttaro = require("@nutui/icons-react-taro");
+var _components = require("@tarojs/components");
 var _index = /*#__PURE__*/ _interop_require_default._(require("../button/index"));
-var _utils = require("./utils");
 var _configprovider = require("../configprovider/configprovider");
 var _interceptor = require("../../utils/interceptor");
 var _typings = require("../../utils/typings");
-var _fileitem = require("./file-item");
 var _usepropsvalue = require("../../utils/use-props-value");
 var _preview = require("./preview");
 var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
-    url: '',
-    maxCount: 1,
+    maxCount: Number.MAX_VALUE,
     sizeType: [
         'original',
         'compressed'
@@ -48,6 +47,9 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
         size: "20px",
         color: "#808080"
     }),
+    deleteIcon: /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Failure, {
+        color: "rgba(0,0,0,0.6)"
+    }),
     uploadLabel: '',
     previewType: 'picture',
     fit: 'cover',
@@ -57,12 +59,7 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
     autoUpload: true,
     multiple: false,
     maxFileSize: Number.MAX_VALUE,
-    data: {},
-    headers: {},
-    method: 'post',
     previewUrl: '',
-    xhrState: 200,
-    timeout: 1000 * 30,
     preview: true,
     deletable: true,
     maxDuration: 10,
@@ -72,9 +69,10 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
 });
 var InternalUploader = function InternalUploader(props, ref) {
     var locale = (0, _configprovider.useConfig)().locale;
-    var _ref = (0, _object_spread._)({}, defaultProps, props), children = _ref.children, uploadIcon = _ref.uploadIcon, uploadLabel = _ref.uploadLabel, accept = _ref.accept, name = _ref.name, camera = _ref.camera, defaultValue = _ref.defaultValue, value = _ref.value, previewType = _ref.previewType, fit = _ref.fit, disabled = _ref.disabled, multiple = _ref.multiple, url = _ref.url, previewUrl = _ref.previewUrl, headers = _ref.headers, timeout = _ref.timeout, method = _ref.method, xhrState = _ref.xhrState, data = _ref.data, preview = _ref.preview, deletable = _ref.deletable, maxCount = _ref.maxCount, maxFileSize = _ref.maxFileSize, mediaType = _ref.mediaType, className = _ref.className, autoUpload = _ref.autoUpload, sizeType = _ref.sizeType, sourceType = _ref.sourceType, maxDuration = _ref.maxDuration, onStart = _ref.onStart, onDelete = _ref.onDelete, onChange = _ref.onChange, onFileItemClick = _ref.onFileItemClick, onProgress = _ref.onProgress, onSuccess = _ref.onSuccess, onUpdate = _ref.onUpdate, onFailure = _ref.onFailure, onOversize = _ref.onOversize, beforeXhrUpload = _ref.beforeXhrUpload, beforeDelete = _ref.beforeDelete, restProps = (0, _object_without_properties._)(_ref, [
+    var _ref = (0, _object_spread._)({}, defaultProps, props), children = _ref.children, uploadIcon = _ref.uploadIcon, deleteIcon = _ref.deleteIcon, uploadLabel = _ref.uploadLabel, accept = _ref.accept, name = _ref.name, camera = _ref.camera, defaultValue = _ref.defaultValue, value = _ref.value, previewType = _ref.previewType, fit = _ref.fit, disabled = _ref.disabled, multiple = _ref.multiple, previewUrl = _ref.previewUrl, preview = _ref.preview, deletable = _ref.deletable, maxCount = _ref.maxCount, maxFileSize = _ref.maxFileSize, mediaType = _ref.mediaType, className = _ref.className, autoUpload = _ref.autoUpload, sizeType = _ref.sizeType, sourceType = _ref.sourceType, maxDuration = _ref.maxDuration, onDelete = _ref.onDelete, onChange = _ref.onChange, onFileItemClick = _ref.onFileItemClick, onOversize = _ref.onOversize, onOverCount = _ref.onOverCount, beforeUpload = _ref.beforeUpload, upload = _ref.upload, beforeDelete = _ref.beforeDelete, onUploadQueueChange = _ref.onUploadQueueChange, restProps = (0, _object_without_properties._)(_ref, [
         "children",
         "uploadIcon",
+        "deleteIcon",
         "uploadLabel",
         "accept",
         "name",
@@ -85,13 +83,7 @@ var InternalUploader = function InternalUploader(props, ref) {
         "fit",
         "disabled",
         "multiple",
-        "url",
         "previewUrl",
-        "headers",
-        "timeout",
-        "method",
-        "xhrState",
-        "data",
         "preview",
         "deletable",
         "maxCount",
@@ -102,17 +94,15 @@ var InternalUploader = function InternalUploader(props, ref) {
         "sizeType",
         "sourceType",
         "maxDuration",
-        "onStart",
         "onDelete",
         "onChange",
         "onFileItemClick",
-        "onProgress",
-        "onSuccess",
-        "onUpdate",
-        "onFailure",
         "onOversize",
-        "beforeXhrUpload",
-        "beforeDelete"
+        "onOverCount",
+        "beforeUpload",
+        "upload",
+        "beforeDelete",
+        "onUploadQueueChange"
     ]);
     var _usePropsValue = (0, _sliced_to_array._)((0, _usepropsvalue.usePropsValue)({
         value: value,
@@ -123,21 +113,41 @@ var InternalUploader = function InternalUploader(props, ref) {
         }
     }), 2), fileList = _usePropsValue[0], setFileList = _usePropsValue[1];
     var _useState = (0, _sliced_to_array._)((0, _react.useState)([]), 2), uploadQueue = _useState[0], setUploadQueue = _useState[1];
+    var fileListRef = (0, _react.useRef)([]);
     var classes = (0, _classnames.default)(className, 'nut-uploader');
     (0, _react.useImperativeHandle)(ref, function() {
         return {
-            submit: function submit() {
-                Promise.all(uploadQueue).then(function(res) {
-                    res.forEach(function(i) {
-                        return i.uploadTaro(_taro.uploadFile, (0, _taro.getEnv)());
-                    });
+            submit: /*#__PURE__*/ (0, _async_to_generator._)(function() {
+                return (0, _ts_generator._)(this, function(_state) {
+                    switch(_state.label){
+                        case 0:
+                            return [
+                                4,
+                                uploadAction(uploadQueue)
+                            ];
+                        case 1:
+                            _state.sent();
+                            return [
+                                2
+                            ];
+                    }
                 });
-            },
+            }),
             clear: function clear() {
                 clearUploadQueue();
             }
         };
     });
+    (0, _react.useEffect)(function() {
+        fileListRef.current = fileList;
+    }, [
+        fileList
+    ]);
+    (0, _react.useEffect)(function() {
+        onUploadQueueChange === null || onUploadQueueChange === void 0 ? void 0 : onUploadQueueChange(uploadQueue);
+    }, [
+        uploadQueue
+    ]);
     var clearUploadQueue = function clearUploadQueue() {
         var index = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : -1;
         if (index > -1) {
@@ -166,171 +176,179 @@ var InternalUploader = function InternalUploader(props, ref) {
             }
         }
         if (((0, _taro.getEnv)() === 'WEAPP' || (0, _taro.getEnv)() === 'JD') && _taro.chooseMedia) {
-            // 其余端全部使用 chooseImage API
             (0, _taro.chooseMedia)({
-                /** 最多可以选择的文件个数 */ count: multiple ? maxCount * 1 - fileList.length : 1,
+                count: multiple ? maxCount * 1 - fileList.length : 1,
                 /** 文件类型 */ mediaType: mediaType,
                 /** 图片和视频选择的来源 */ sourceType: sourceType,
                 /** 拍摄视频最长拍摄时间，单位秒。时间范围为 3s 至 30s 之间 */ maxDuration: maxDuration,
-                /** 仅对 mediaType 为 image 时有效，是否压缩所选文件 */ sizeType: [],
+                /** 仅对 mediaType 为 image 时有效，是否压缩所选文件 */ sizeType: sizeType,
                 /** 仅在 sourceType 为 camera 时生效，使用前置或后置摄像头 */ camera: camera,
-                /** 接口调用失败的回调函数 */ fail: function fail(res) {
-                    onFailure && onFailure(res);
-                },
-                /** 接口调用成功的回调函数 */ success: onChangeMedia
+                success: onChangeMedia
             });
         } else {
             (0, _taro.chooseImage)({
-                // 选择数量
                 count: multiple ? maxCount * 1 - fileList.length : 1,
                 // 可以指定是原图还是压缩图，默认二者都有
                 sizeType: sizeType,
                 sourceType: sourceType,
-                success: onChangeImage,
-                fail: function fail(res) {
-                    onFailure && onFailure(res);
-                }
+                success: onChangeImage
             });
         }
     };
-    var executeUpload = function executeUpload(fileItem, index) {
-        var uploadOption = new _utils.UploadOptions();
-        uploadOption.name = name;
-        uploadOption.url = url;
-        uploadOption.fileType = fileItem.type;
-        uploadOption.formData = fileItem.formData;
-        uploadOption.timeout = timeout * 1;
-        uploadOption.method = method;
-        uploadOption.xhrState = xhrState;
-        uploadOption.headers = headers;
-        uploadOption.taroFilePath = fileItem.path;
-        uploadOption.beforeXhrUpload = beforeXhrUpload;
-        uploadOption.onStart = function(option) {
-            clearUploadQueue(index);
-            setFileList(fileList.map(function(item) {
-                if (item.uid === fileItem.uid) {
-                    item.status = 'ready';
-                    item.message = locale.uploader.readyUpload;
-                }
-                return item;
-            }));
-            onStart && onStart(option);
-        };
-        uploadOption.onProgress = function(e, option) {
-            setFileList(fileList.map(function(item) {
-                if (item.uid === fileItem.uid) {
-                    item.status = _utils.UPLOADING;
-                    item.message = locale.uploader.uploading;
-                    item.percentage = e.progress;
-                    onProgress && onProgress({
-                        e: e,
-                        option: option,
-                        percentage: item.percentage
-                    });
+    var uploadAction = /*#__PURE__*/ function() {
+        var _ref = (0, _async_to_generator._)(function(tasks) {
+            var taskIds, list;
+            return (0, _ts_generator._)(this, function(_state) {
+                switch(_state.label){
+                    case 0:
+                        taskIds = tasks.map(function(task) {
+                            return task.uid;
+                        });
+                        list = fileListRef.current.map(function(file) {
+                            if (taskIds.includes(file.uid)) {
+                                return (0, _object_spread_props._)((0, _object_spread._)({}, file), {
+                                    status: 'uploading',
+                                    message: locale.uploader.uploading
+                                });
+                            }
+                            return file;
+                        });
+                        setFileList(list);
+                        return [
+                            4,
+                            Promise.all(tasks.map(/*#__PURE__*/ function() {
+                                var _ref = (0, _async_to_generator._)(function(currentTask, index) {
+                                    var result, list, e, list1;
+                                    return (0, _ts_generator._)(this, function(_state) {
+                                        switch(_state.label){
+                                            case 0:
+                                                _state.trys.push([
+                                                    0,
+                                                    2,
+                                                    ,
+                                                    3
+                                                ]);
+                                                return [
+                                                    4,
+                                                    upload(currentTask.file)
+                                                ];
+                                            case 1:
+                                                result = _state.sent();
+                                                list = fileListRef.current.map(function(item) {
+                                                    if (item.uid === currentTask.uid) {
+                                                        item.status = 'success';
+                                                        item.message = locale.uploader.success;
+                                                        item.url = result.url;
+                                                    }
+                                                    return item;
+                                                });
+                                                setFileList(list);
+                                                return [
+                                                    3,
+                                                    3
+                                                ];
+                                            case 2:
+                                                e = _state.sent();
+                                                list1 = fileListRef.current.map(function(item) {
+                                                    if (item.uid === currentTask.uid) {
+                                                        item.status = 'error';
+                                                        item.message = locale.uploader.error;
+                                                    }
+                                                    return item;
+                                                });
+                                                setFileList(list1);
+                                                throw e;
+                                            case 3:
+                                                return [
+                                                    2
+                                                ];
+                                        }
+                                    });
+                                });
+                                return function(currentTask, index) {
+                                    return _ref.apply(this, arguments);
+                                };
+                            }())).catch(function(errs) {
+                                return console.error(errs);
+                            })
+                        ];
+                    case 1:
+                        _state.sent();
+                        return [
+                            2
+                        ];
                 }
-                return item;
-            }));
-        };
-        uploadOption.onSuccess = function(responseText, option) {
-            var list = fileList.map(function(item) {
-                if (item.uid === fileItem.uid) {
-                    item.status = _utils.SUCCESS;
-                    item.message = locale.uploader.success;
-                    item.responseText = responseText;
-                }
-                return item;
-            });
-            setFileList(list);
-            onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess({
-                responseText: responseText,
-                option: option,
-                files: list
             });
+        });
+        return function uploadAction(tasks) {
+            return _ref.apply(this, arguments);
         };
-        uploadOption.onFailure = function(responseText, option) {
-            var list = fileList.map(function(item) {
-                if (item.uid === fileItem.uid) {
-                    item.status = _utils.ERROR;
-                    item.message = locale.uploader.error;
-                    item.responseText = responseText;
+    }();
+    var idCountRef = (0, _react.useRef)(0);
+    var readFile = /*#__PURE__*/ function() {
+        var _ref = (0, _async_to_generator._)(function(files) {
+            var tasks;
+            return (0, _ts_generator._)(this, function(_state) {
+                switch(_state.label){
+                    case 0:
+                        tasks = files.map(function(file) {
+                            var _file_originalFileObj, _file_originalFileObj1;
+                            var fileType = file.type;
+                            var filepath = file.tempFilePath || file.path;
+                            if (file.fileType) {
+                                fileType = file.fileType;
+                            } else {
+                                var imgReg = /\.(png|jpeg|jpg|webp|gif)$/i;
+                                if (!fileType && (imgReg.test(filepath) || filepath.includes('data:image'))) {
+                                    fileType = 'image';
+                                }
+                            }
+                            var info = {
+                                uid: idCountRef.current++,
+                                status: autoUpload ? 'uploading' : 'ready',
+                                file: file,
+                                message: autoUpload ? locale.uploader.uploading : locale.uploader.waitingUpload,
+                                name: (0, _taro.getEnv)() === 'WEB' ? (_file_originalFileObj = file.originalFileObj) === null || _file_originalFileObj === void 0 ? void 0 : _file_originalFileObj.name : filepath,
+                                path: filepath,
+                                type: (0, _taro.getEnv)() === 'WEB' ? (_file_originalFileObj1 = file.originalFileObj) === null || _file_originalFileObj1 === void 0 ? void 0 : _file_originalFileObj1.type : fileType
+                            };
+                            if (preview) {
+                                info.url = fileType === 'video' ? file.thumbTempFilePath : filepath;
+                            }
+                            fileListRef.current = (0, _to_consumable_array._)(fileListRef.current).concat([
+                                info
+                            ]);
+                            setFileList(fileListRef.current);
+                            return info;
+                        });
+                        if (!!autoUpload) return [
+                            3,
+                            1
+                        ];
+                        setUploadQueue(tasks);
+                        return [
+                            3,
+                            3
+                        ];
+                    case 1:
+                        return [
+                            4,
+                            uploadAction(tasks)
+                        ];
+                    case 2:
+                        _state.sent();
+                        _state.label = 3;
+                    case 3:
+                        return [
+                            2
+                        ];
                 }
-                return item;
-            });
-            setFileList(list);
-            onFailure === null || onFailure === void 0 ? void 0 : onFailure({
-                responseText: responseText,
-                option: option,
-                files: list
             });
-        };
-        var task = new _utils.UploaderTaro(uploadOption);
-        if (autoUpload) {
-            task.uploadTaro(_taro.uploadFile, (0, _taro.getEnv)());
-        } else {
-            uploadQueue.push(new Promise(function(resolve, reject) {
-                resolve(task);
-            }));
-            setUploadQueue(uploadQueue);
-        }
-    };
-    var readFile = function readFile(files) {
-        files.forEach(function(file, index) {
-            var fileType = file.type;
-            var filepath = file.tempFilePath || file.path;
-            var fileItem = new _fileitem.FileItem();
-            if (file.fileType) {
-                fileType = file.fileType;
-            } else {
-                var imgReg = /\.(png|jpeg|jpg|webp|gif)$/i;
-                if (!fileType && (imgReg.test(filepath) || filepath.includes('data:image'))) {
-                    fileType = 'image';
-                }
-            }
-            fileItem.path = filepath;
-            fileItem.name = filepath;
-            fileItem.status = 'ready';
-            fileItem.type = fileType;
-            fileItem.uid = "".concat(fileItem.uid, "_").concat(index);
-            fileItem.message = autoUpload ? locale.uploader.readyUpload : locale.uploader.waitingUpload;
-            if ((0, _taro.getEnv)() === 'WEB') {
-                var _file_originalFileObj, _file_originalFileObj1;
-                var formData = new FormData();
-                var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-                try {
-                    for(var _iterator = Object.entries(data)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-                        var _step_value = (0, _sliced_to_array._)(_step.value, 2), key = _step_value[0], value = _step_value[1];
-                        formData.append(key, value);
-                    }
-                } catch (err) {
-                    _didIteratorError = true;
-                    _iteratorError = err;
-                } finally{
-                    try {
-                        if (!_iteratorNormalCompletion && _iterator.return != null) {
-                            _iterator.return();
-                        }
-                    } finally{
-                        if (_didIteratorError) {
-                            throw _iteratorError;
-                        }
-                    }
-                }
-                formData.append(name, file.originalFileObj);
-                fileItem.name = (_file_originalFileObj = file.originalFileObj) === null || _file_originalFileObj === void 0 ? void 0 : _file_originalFileObj.name;
-                fileItem.type = (_file_originalFileObj1 = file.originalFileObj) === null || _file_originalFileObj1 === void 0 ? void 0 : _file_originalFileObj1.type;
-                fileItem.formData = formData;
-            } else {
-                fileItem.formData = data;
-            }
-            if (preview) {
-                fileItem.url = fileType === 'video' ? file.thumbTempFilePath : filepath;
-            }
-            setFileList((0, _to_consumable_array._)(fileList).concat([
-                fileItem
-            ]));
-            executeUpload(fileItem, index);
         });
-    };
+        return function readFile(files) {
+            return _ref.apply(this, arguments);
+        };
+    }();
     var filterFiles = function filterFiles(files) {
         var maximum = maxCount * 1;
         var maximize = maxFileSize * 1;
@@ -342,11 +360,10 @@ var InternalUploader = function InternalUploader(props, ref) {
             }
             return true;
         });
-        if (oversizes.length) {
-            onOversize && onOversize(files);
-        }
+        oversizes.length && (onOversize === null || onOversize === void 0 ? void 0 : onOversize(files));
         var currentFileLength = filterFile.length + fileList.length;
         if (currentFileLength > maximum) {
+            onOverCount === null || onOverCount === void 0 ? void 0 : onOverCount(filterFile.length);
             filterFile.splice(filterFile.length - (currentFileLength - maximum));
         }
         return filterFile;
@@ -370,49 +387,105 @@ var InternalUploader = function InternalUploader(props, ref) {
             }
         });
     };
-    var onChangeMedia = function onChangeMedia(res) {
-        // 返回选定照片的本地文件路径列表，tempFilePath可以作为img标签的src属性显示图片
-        var tempFiles = res.tempFiles;
-        var _files = filterFiles(tempFiles);
-        readFile(_files);
-    };
-    var onChangeImage = function onChangeImage(res) {
-        // 返回选定照片的本地文件路径列表，tempFilePath可以作为img标签的src属性显示图片
-        var tempFiles = res.tempFiles;
-        var _files = filterFiles(tempFiles);
-        readFile(_files);
-    };
+    var onChangeMedia = /*#__PURE__*/ function() {
+        var _ref = (0, _async_to_generator._)(function(res) {
+            var tempFiles, _files;
+            return (0, _ts_generator._)(this, function(_state) {
+                // 返回选定照片的本地文件路径列表，tempFilePath可以作为img标签的src属性显示图片
+                tempFiles = res.tempFiles;
+                _files = filterFiles(tempFiles);
+                if (beforeUpload) {
+                    beforeUpload(new Array().slice.call(_files)).then(function(f) {
+                        var _files = filterFiles(new Array().slice.call(f));
+                        if (!_files.length) res.tempFiles = [];
+                        readFile(_files);
+                    });
+                } else {
+                    readFile(_files);
+                }
+                return [
+                    2
+                ];
+            });
+        });
+        return function onChangeMedia(res) {
+            return _ref.apply(this, arguments);
+        };
+    }();
+    var onChangeImage = /*#__PURE__*/ function() {
+        var _ref = (0, _async_to_generator._)(function(res) {
+            var tempFiles, _files, files, filesArr;
+            return (0, _ts_generator._)(this, function(_state) {
+                switch(_state.label){
+                    case 0:
+                        // 返回选定照片的本地文件路径列表，tempFilePath可以作为img标签的src属性显示图片
+                        tempFiles = res.tempFiles;
+                        _files = filterFiles(tempFiles);
+                        files = [];
+                        filesArr = new Array().slice.call(files);
+                        if (!beforeUpload) return [
+                            3,
+                            2
+                        ];
+                        return [
+                            4,
+                            beforeUpload(filesArr)
+                        ];
+                    case 1:
+                        files = _state.sent();
+                        _state.label = 2;
+                    case 2:
+                        files = filterFiles(filesArr);
+                        readFile(_files);
+                        return [
+                            2
+                        ];
+                }
+            });
+        });
+        return function onChangeImage(res) {
+            return _ref.apply(this, arguments);
+        };
+    }();
     var handleItemClick = function handleItemClick(file, index) {
         onFileItemClick === null || onFileItemClick === void 0 ? void 0 : onFileItemClick(file, index);
     };
+    var renderListUploader = function renderListUploader() {
+        return previewType === 'list' && /*#__PURE__*/ _react.default.createElement(_components.View, {
+            className: "nut-uploader-slot"
+        }, /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/ _react.default.createElement(_index.default, {
+            size: "small",
+            type: "primary"
+        }, locale.uploader.list), Number(maxCount) > fileList.length && /*#__PURE__*/ _react.default.createElement(_index.default, {
+            className: "nut-uploader-input",
+            onClick: _chooseImage
+        })));
+    };
+    var renderImageUploader = function renderImageUploader() {
+        var shouldShow = Number(maxCount) > fileList.length && previewType === 'picture';
+        return shouldShow && /*#__PURE__*/ _react.default.createElement(_components.View, {
+            className: "nut-uploader-upload ".concat(previewType, " ").concat(disabled ? 'nut-uploader-upload-disabled' : '')
+        }, /*#__PURE__*/ _react.default.createElement(_components.View, {
+            className: "nut-uploader-icon"
+        }, uploadIcon, /*#__PURE__*/ _react.default.createElement("span", {
+            className: "nut-uploader-icon-tip"
+        }, uploadLabel)), /*#__PURE__*/ _react.default.createElement(_index.default, {
+            className: "nut-uploader-input",
+            onClick: _chooseImage
+        }));
+    };
     return /*#__PURE__*/ _react.default.createElement(_components.View, (0, _object_spread._)({
         className: classes
-    }, restProps), (children || previewType === 'list') && /*#__PURE__*/ _react.default.createElement(_components.View, {
-        className: "nut-uploader-slot"
-    }, /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, children || /*#__PURE__*/ _react.default.createElement(_index.default, {
-        size: "small",
-        type: "primary"
-    }, "上传文件"), Number(maxCount) > fileList.length && /*#__PURE__*/ _react.default.createElement(_index.default, {
-        className: "nut-uploader-input",
-        onClick: _chooseImage
-    }))), /*#__PURE__*/ _react.default.createElement(_preview.Preview, {
+    }, restProps), renderListUploader(), /*#__PURE__*/ _react.default.createElement(_preview.Preview, {
         fileList: fileList,
         previewType: previewType,
         deletable: deletable,
         onDeleteItem: onDeleteItem,
         handleItemClick: handleItemClick,
         previewUrl: previewUrl,
+        deleteIcon: deleteIcon,
         children: children
-    }), Number(maxCount) > fileList.length && previewType === 'picture' && !children && /*#__PURE__*/ _react.default.createElement(_components.View, {
-        className: "nut-uploader-upload ".concat(previewType, " ").concat(disabled ? 'nut-uploader-upload-disabled' : '')
-    }, /*#__PURE__*/ _react.default.createElement(_components.View, {
-        className: "nut-uploader-icon"
-    }, uploadIcon, /*#__PURE__*/ _react.default.createElement("span", {
-        className: "nut-uploader-icon-tip"
-    }, uploadLabel)), /*#__PURE__*/ _react.default.createElement(_index.default, {
-        className: "nut-uploader-input",
-        onClick: _chooseImage
-    })));
+    }), renderImageUploader());
 };
 var Uploader = /*#__PURE__*/ _react.default.forwardRef(InternalUploader);
 Uploader.displayName = 'NutUploader';

package/dist/cjs/packages/video/style/style.css

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-video {
   width: 100%;
   height: 100%;

package/dist/cjs/packages/video/video.js

@@ -14,6 +14,7 @@ var _object_without_properties = require("@swc/helpers/_/_object_without_propert
 var _react = /*#__PURE__*/ _interop_require_default._(require("react"));
 var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames"));
 var _components = require("@tarojs/components");
+var _mergeprops = require("../../utils/merge-props");
 var defaultProps = {
     source: {
         type: {},
@@ -30,8 +31,7 @@ var defaultProps = {
 };
 var classPrefix = "nut-video";
 var Video = function Video(props) {
-    var _ref = (0, _object_spread._)({}, defaultProps, props), children = _ref.children, source = _ref.source, options = _ref.options, className = _ref.className, style = _ref.style, onPlay = _ref.onPlay, onPause = _ref.onPause, onPlayEnd = _ref.onPlayEnd, restProps = (0, _object_without_properties._)(_ref, [
-        "children",
+    var _mergeProps = (0, _mergeprops.mergeProps)(defaultProps, props), source = _mergeProps.source, options = _mergeProps.options, className = _mergeProps.className, style = _mergeProps.style, onPlay = _mergeProps.onPlay, onPause = _mergeProps.onPause, onPlayEnd = _mergeProps.onPlayEnd, restProps = (0, _object_without_properties._)(_mergeProps, [
         "source",
         "options",
         "className",
@@ -45,7 +45,7 @@ var Video = function Video(props) {
         className: classes,
         style: style
     }, /*#__PURE__*/ _react.default.createElement(_components.Video, (0, _object_spread._)({
-        className: "nut-video-player",
+        className: "".concat(classPrefix, "-player"),
         muted: options.muted,
         autoplay: options.autoplay,
         loop: options.loop,