@cloudbase/weda-ui 3.15.8 → 3.17.0

package/dist/web/components/form/uploader/uploader.h5.js

@@ -2,46 +2,31 @@ import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-run
 import * as React from 'react';
 import weui from '../../../utils/weui';
 import classNames from '../../../utils/classnames';
-import { browserEnv, alertErrorMessage } from '../../../utils/platform';
+import { browserEnv } from '../../../utils/platform';
 import { IMAGE_TYPES, encodeConvert } from './uploader.pc';
 import { useTempUrl } from '../../../utils/hooks/use-cloud-id-temp-url';
-import { toBase64Uri } from '../../../utils/file2base64';
-import { isNil } from '../../../utils/lodash';
-import { useUploader } from './useUploadFile';
-import { errorHandler } from '../../../utils/error';
-import { checkAcceptedFiles } from './util';
+import { Upload } from './upload';
 /**
  * H5端
  */
 export function ImageUploaderH5(props) {
     var _a;
-    const { title: label, maxUploadCount, maxSize = 10, acceptTypes = IMAGE_TYPES, className, id, events, layout: _layout, single = false, disabled = false, requiredFlag = false, labelVisible = true, onChange, style, imgTypeCls, readOnly, sourceType, callbacks, } = props;
+    const { title: label, maxUploadCount, maxSize = 10, acceptTypes = IMAGE_TYPES, className, id, events, layout: _layout, single = false, disabled = false, requiredFlag = false, labelVisible = true, onChange, style, imgTypeCls, readOnly, sourceType, callbacks, defaultValue, setUploadHandle: outSetUploadHandle, } = props;
     const layout = _layout !== 'vertical' ? 'horizontal' : 'vertical';
     const layoutCls = layout === 'horizontal' ? 'weda-formcells weui-flex' : '';
     const cls = classNames({
         'weda-ui': true,
         [className]: className,
     });
-    const inputRef = React.useRef(null);
-    const { tempFile, uploading, upload, getTempFile } = useUploader(props);
+    const uploadRef = React.useRef(null);
+    const [uploadHandle, setUploadHandle] = React.useState({});
+    const tempFile = React.useMemo(() => (uploadHandle === null || uploadHandle === void 0 ? void 0 : uploadHandle.previewFile) || [], [uploadHandle === null || uploadHandle === void 0 ? void 0 : uploadHandle.previewFile]);
+    const uploading = tempFile === null || tempFile === void 0 ? void 0 : tempFile.some((i) => i.loading);
     const finalMaxImgCount = React.useMemo(() => {
         if (single)
             return 1;
         return maxUploadCount;
     }, [single, maxUploadCount]);
-    const deleteFile = (file) => {
-        const fileList = tempFile.filter((d) => d.key !== file.key);
-        handleChange(fileList, true);
-    };
-    const handleChange = (allFile = [], isDelete = false) => {
-        var _a;
-        const value = getTempFile(allFile);
-        onChange === null || onChange === void 0 ? void 0 : onChange(value);
-        (_a = events === null || events === void 0 ? void 0 : events.change) === null || _a === void 0 ? void 0 : _a.call(events, { value, isDelete });
-    };
-    const accepts = React.useMemo(() => {
-        return acceptTypes.length === 0 ? IMAGE_TYPES : Array.from(new Set(acceptTypes));
-    }, [acceptTypes]);
     const showAdd = React.useMemo(() => {
         if (single) {
             // single 模式时，当数组为空且不在上传文件过程中时显示
@@ -49,82 +34,29 @@ export function ImageUploaderH5(props) {
         }
         return tempFile.length < maxUploadCount;
     }, [tempFile, single, maxUploadCount, uploading]);
-    const uploadChange = async (e) => {
-        let files = [...e.target.files];
-        const isAccepted = files.every((i) => checkAcceptedFiles(i, accepts));
-        if (!isAccepted) {
-            alertErrorMessage({
-                message: `上传图片类型错误`,
-                icon: 'none',
-            });
-            return false;
-        }
-        if (files.some((f) => f.size > maxSize * 1024 * 1024)) {
-            alertErrorMessage({
-                message: `请上传不超过 ${maxSize}M 的图片`,
-                icon: 'none',
-            });
-            return false;
+    const setUploadRef = React.useCallback((uploadHandle) => {
+        setUploadHandle(uploadHandle);
+        // 兼容云后台数据库中使用uploader组件，未传outSetUploadHandle
+        if (outSetUploadHandle) {
+            outSetUploadHandle(uploadHandle);
         }
-        if (files.length > finalMaxImgCount) {
-            // 防止一下子选择过多文件
-            alertErrorMessage({
-                message: `最多只能上传${finalMaxImgCount}张图片，请重新选择`,
-                icon: 'none',
-            });
-            return false;
-        }
-        if (tempFile.length + files.length > finalMaxImgCount) {
-            alertErrorMessage({
-                message: `最多只能上传${finalMaxImgCount}张图片`,
-                icon: 'none',
-            });
-            return false;
-        }
-        let shouldUploadToCos = true;
-        if (typeof (callbacks === null || callbacks === void 0 ? void 0 : callbacks.beforeUpload) === 'function') {
-            try {
-                const base64Uri = await Promise.all(files.map((file) => toBase64Uri(file)));
-                const ret = await callbacks.beforeUpload({ files, base64Uri });
-                if (typeof ret === 'boolean') {
-                    shouldUploadToCos = ret;
-                }
-                else if (Array.isArray(ret) && ret.every((item) => item instanceof File)) {
-                    files = ret;
-                }
-                else if (!isNil(ret)) {
-                    throw new TypeError('web端返回值接受布尔值 / File对象数组');
-                }
-            }
-            catch (err) {
-                errorHandler({
-                    code: 'BEFORE_UPLOAD_ERROR',
-                    error: err,
-                });
-                shouldUploadToCos = false;
-            }
-        }
-        if (shouldUploadToCos === false) {
-            return;
-        }
-        const allFile = await upload(files);
-        handleChange(allFile);
-    };
-    return (_jsx("div", { className: cls, id: id, style: style, children: _jsxs("div", { className: classNames('weui-uploader weui-cells weui-cells_form weda-formcells', layout, layoutCls), children: [_jsx("div", { className: classNames('weui-uploader__hd', layout), children: _jsx(UploaderLabel, { layout: layout, label: label, labelVisible: labelVisible, currentCount: tempFile.length, maxCount: finalMaxImgCount, requiredFlag: requiredFlag }) }), _jsx("div", { className: "weui-uploader__bd", children: _jsxs("ul", { className: "weui-uploader__files", id: "uploaderFiles", children: [(_a = (tempFile !== null && tempFile !== void 0 ? tempFile : [])) === null || _a === void 0 ? void 0 : _a.map((f) => (_jsx(SingleImage, { tempFile: f, deleteBySrc: deleteFile, disabled: disabled || readOnly || sourceType === 'album', imgTypeCls: imgTypeCls }, f === null || f === void 0 ? void 0 : f.key))), tempFile.length < 1 && readOnly && _jsx(_Fragment, { children: "-" }), showAdd && !readOnly && (_jsx("li", { className: `weui-uploader__input-box ${imgTypeCls}`, children: !disabled &&
-                                    sourceType !== 'album' &&
-                                    (sourceType === 'camera' ? (_jsx("input", { ref: inputRef, onClick: () => {
-                                            inputRef.current && (inputRef.current.value = '');
-                                        }, "data-testid": "uploaderh5_input", id: "uploaderInput", className: "weui-uploader__input", type: "file", accept: accepts.join(','), multiple: !single && !(browserEnv().android && browserEnv().weixin), capture: true, onChange: uploadChange })) : (_jsx("input", { ref: inputRef, onClick: () => {
-                                            inputRef.current && (inputRef.current.value = '');
-                                        }, "data-testid": "uploaderh5_input", id: "uploaderInput", className: "weui-uploader__input", type: "file", accept: accepts.join(','), multiple: !single && !(browserEnv().android && browserEnv().weixin), onChange: uploadChange }))) }))] }) })] }) }));
+    }, [outSetUploadHandle]);
+    const multiple = !single && !(browserEnv().android && browserEnv().weixin);
+    return (_jsx("div", { className: cls, id: id, style: style, children: _jsxs("div", { className: classNames('weui-uploader weui-cells weui-cells_form weda-formcells', layout, layoutCls), children: [_jsx("div", { className: classNames('weui-uploader__hd', layout), children: _jsx(UploaderLabel, { layout: layout, label: label, labelVisible: labelVisible, currentCount: tempFile.length, maxCount: finalMaxImgCount, requiredFlag: requiredFlag }) }), _jsx("div", { className: "weui-uploader__bd", children: _jsx(Upload, { ...props, acceptTypes: acceptTypes, events: events, capture: sourceType === 'camera' ? 'capture' : null, multiple: multiple, maxSize: maxSize, maxUploadCount: maxUploadCount, disabled: disabled, onChange: onChange, callbacks: callbacks, ref: uploadRef, value: defaultValue, setUploadHandle: setUploadRef, children: _jsxs("ul", { className: "weui-uploader__files", id: "uploaderFiles", children: [(_a = (tempFile !== null && tempFile !== void 0 ? tempFile : [])) === null || _a === void 0 ? void 0 : _a.map((f) => (_jsx(SingleImage, { tempFile: f, deleteBySrc: (file) => {
+                                        var _a;
+                                        (_a = uploadRef === null || uploadRef === void 0 ? void 0 : uploadRef.current) === null || _a === void 0 ? void 0 : _a.delete({ cloudId: file.cloudId });
+                                    }, disabled: disabled || readOnly || sourceType === 'album', imgTypeCls: imgTypeCls }, f === null || f === void 0 ? void 0 : f.cloudId))), tempFile.length < 1 && readOnly && _jsx(_Fragment, { children: "-" }), showAdd && !readOnly && (_jsx("li", { className: `weui-uploader__input-box ${imgTypeCls}`, children: !disabled && sourceType !== 'album' && (_jsx("span", { onClick: () => {
+                                            var _a;
+                                            (_a = uploadRef === null || uploadRef === void 0 ? void 0 : uploadRef.current) === null || _a === void 0 ? void 0 : _a.upload();
+                                        }, "data-testid": "uploaderh5_input", id: "uploaderInput", className: "weui-uploader__input" })) }))] }) }) })] }) }));
 }
 function SingleImage({ deleteBySrc, disabled, imgTypeCls, tempFile }) {
-    const { progress, loading, realUrl, tempUrl } = tempFile;
+    const { progress, loading, cloudId, tempUrl } = tempFile;
     const cls = classNames({
         'weui-uploader__file': true,
         'weui-uploader__file_status': loading,
     });
-    const src = realUrl !== null && realUrl !== void 0 ? realUrl : tempUrl;
+    const src = cloudId !== null && cloudId !== void 0 ? cloudId : tempUrl;
     const { data: realSrc, error } = useTempUrl(src);
     const encodeSrc = encodeConvert(realSrc !== null && realSrc !== void 0 ? realSrc : tempUrl);
     // 圆括号冲突，加上引号引用url地址
@@ -145,11 +77,11 @@ function SingleImage({ deleteBySrc, disabled, imgTypeCls, tempFile }) {
             },
         });
     };
-    return (_jsxs("li", { className: `${cls} ${imgTypeCls}`, style: imgStyle, onClick: showGallery, "data-testid": "uploaderh5_imgStyle", children: [error || status ? (_jsx("div", { className: "weui-uploader__file-content", children: error ? (_jsx("i", { role: "img", "aria-label": "\u9519\u8BEF", className: "weui-icon-warn" })) : (_jsx("i", { className: `weui-loading ${imgTypeCls}`, style: { width: 30, height: 30 } })) })) : (false), loading && _jsxs("div", { className: "weui-uploader__file-progress", children: [progress, "%"] })] }));
+    return (_jsxs("li", { className: `${cls} ${imgTypeCls}`, style: imgStyle, onClick: showGallery, "data-testid": "uploaderh5_imgStyle", children: [error || status ? (_jsx("div", { className: "weui-uploader__file-content", children: error ? (_jsx("i", { role: "img", "aria-label": "\u9519\u8BEF", className: "weui-icon-warn" })) : (_jsx("i", { className: `weui-loading ${imgTypeCls}`, style: { width: 30, height: 30 } })) })) : (false), loading && _jsxs("div", { className: "weui-uploader__file-progress", children: [progress, "%"] })] }, cloudId));
 }
 const UploaderLabel = ({ layout, label, currentCount, maxCount, requiredFlag, labelVisible }) => {
     if (layout === 'horizontal') {
-        return (_jsx(React.Fragment, { children: _jsx(_Fragment, { children: labelVisible && (_jsx("div", { className: "weda-formcells__label weui-cell", children: _jsxs("div", { children: [requiredFlag && _jsx("label", { className: "weda-formcells__flag", children: "*" }), _jsx("p", { className: "weui-uploader__title", children: label }), _jsxs("div", { className: "weui-uploader__info", children: [_jsx("span", { id: "uploadCount", children: currentCount }), "/", maxCount] })] }) })) }) }));
+        return (_jsx(React.Fragment, { children: labelVisible && (_jsx("div", { className: "weda-formcells__label weui-cell", children: _jsxs("div", { children: [requiredFlag && _jsx("label", { className: "weda-formcells__flag", children: "*" }), _jsx("p", { className: "weui-uploader__title", children: label }), _jsxs("div", { className: "weui-uploader__info", children: [_jsx("span", { id: "uploadCount", children: currentCount }), "/", maxCount] })] }) })) }));
     }
-    return (_jsx(React.Fragment, { children: _jsx(_Fragment, { children: labelVisible && (_jsxs("div", { className: "weda-formcells__label weui-cell", children: [_jsxs("div", { className: "weui-uploader__label", children: [requiredFlag && _jsx("label", { className: "weda-formcells__flag", children: "*" }), _jsx("p", { className: "weui-uploader__title", children: label })] }), _jsxs("div", { className: "weui-uploader__info", children: [_jsx("span", { id: "uploadCount", children: currentCount }), "/", maxCount] })] })) }) }));
+    return (_jsx(React.Fragment, { children: labelVisible && (_jsxs("div", { className: "weda-formcells__label weui-cell", children: [_jsxs("div", { className: "weui-uploader__label", children: [requiredFlag && _jsx("label", { className: "weda-formcells__flag", children: "*" }), _jsx("p", { className: "weui-uploader__title", children: label })] }), _jsxs("div", { className: "weui-uploader__info", children: [_jsx("span", { id: "uploadCount", children: currentCount }), "/", maxCount] })] })) }));
 };

package/dist/web/components/form/uploader/uploader.pc.d.ts

@@ -5,7 +5,7 @@ export declare const IMAGE_TYPES: string[];
 interface TempFileProps {
     progress?: number;
     loading?: boolean;
-    realUrl?: string;
+    cloudId?: string;
     tempUrl?: string;
     key?: string;
 }

package/dist/web/components/form/uploader/uploader.pc.js

@@ -1,14 +1,11 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import * as React from 'react';
-import { Upload, Icon, ErrorTip, ConfigProvider } from 'tea-component';
+import { Icon, ErrorTip, ConfigProvider } from 'tea-component';
 import { useTempUrl } from '../../../utils/hooks/use-cloud-id-temp-url';
-import { toBase64Uri } from '../../../utils/file2base64';
-import { isNil } from '../../../utils/lodash';
 import { errorHandler } from '../../../utils/error';
-import { alertErrorMessage } from '../../../utils/platform';
 import { WdIcon } from '../../wd-icon';
-import { useUploader } from './useUploadFile';
 import { ImagePreview } from '../../wd-image/ImagePreview';
+import { Upload } from './upload';
 // 默认组件类前缀
 export const CLASS_PREFIX = 'weda-uploader-pc';
 // 默认图片类型
@@ -22,117 +19,50 @@ export const IMAGE_TYPES = [
     'image/gif',
 ];
 export function UploaderPCInner(props) {
-    const { tips = '', btnTitle = '上传图片', maxUploadCount = 9, maxSize = 10, acceptTypes = IMAGE_TYPES, events, single = false, disabled = false, onChange, imgTypeCls, readOnly, sourceType, callbacks, popupContainer: portalContainer, } = props;
-    const { tempFile, uploading, upload, getTempFile } = useUploader(props);
-    const handleChange = (allFile = [], isDelete = false) => {
-        var _a;
-        const value = getTempFile(allFile);
-        onChange === null || onChange === void 0 ? void 0 : onChange(value);
-        (_a = events === null || events === void 0 ? void 0 : events.change) === null || _a === void 0 ? void 0 : _a.call(events, { value, isDelete });
-    };
-    // 方法：上传前，判断图片大小、数量是否满足，取消默认组件的上传事件，用自定义的 tcb 上传方法
-    const beforeHandle = async (file, fileList, isAccepted, error) => {
-        const finalMaxImgCount = single ? 1 : maxUploadCount;
-        if (!isAccepted) {
-            try {
-                const errorList = [];
-                if (error.find((item) => (item === null || item === void 0 ? void 0 : item.code) === 'file-invalid-type')) {
-                    errorList.push('上传图片类型错误');
-                }
-                if (error.find((item) => (item === null || item === void 0 ? void 0 : item.code) === 'file-too-large')) {
-                    errorList.push(`上传图片大小不能超过${maxSize}M`);
-                }
-                alertErrorMessage({
-                    message: errorList.join(', '),
-                    icon: 'error',
-                });
-            }
-            catch (e) {
-                errorHandler({
-                    code: 'BEFORE_UPLOAD_ERROR',
-                    error: e,
-                });
-            }
-            return Promise.reject(false);
-        }
-        const ids = fileList.filter((f) => !!f.id);
-        if (ids.length < fileList.length)
-            return Promise.reject(false);
-        if (fileList.length > finalMaxImgCount) {
-            // 防止一下子选择过多文件
-            alertErrorMessage({
-                message: `最多只能上传${finalMaxImgCount}张图片，请重新选择`,
-                icon: 'error',
-            });
-            return Promise.reject(false);
-        }
-        if (tempFile.length + fileList.length > finalMaxImgCount) {
-            alertErrorMessage({
-                message: `最多只能上传${finalMaxImgCount}张图片`,
-                icon: 'error',
-            });
-            return Promise.reject(false);
-        }
-        let shouldUploadToCos = true;
-        if (typeof (callbacks === null || callbacks === void 0 ? void 0 : callbacks.beforeUpload) === 'function') {
-            try {
-                const base64Uri = await Promise.all(fileList.map((file) => toBase64Uri(file)));
-                const ret = await callbacks.beforeUpload({
-                    files: fileList,
-                    base64Uri,
-                });
-                if (typeof ret === 'boolean') {
-                    shouldUploadToCos = ret;
-                }
-                else if (Array.isArray(ret) && ret.every((item) => item instanceof File)) {
-                    fileList = ret;
-                }
-                else if (!isNil(ret)) {
-                    throw new TypeError('web端返回值接受布尔值 / File对象数组');
-                }
-            }
-            catch (err) {
-                errorHandler({
-                    code: 'BEFORE_UPLOAD_ERROR',
-                    error: err,
-                });
-                shouldUploadToCos = false;
-            }
-        }
-        if (shouldUploadToCos === false) {
-            return Promise.reject(false);
+    const { tips = '', btnTitle = '上传图片', maxUploadCount = 9, maxSize = 10, acceptTypes = IMAGE_TYPES, single = false, disabled = false, imgTypeCls, readOnly, sourceType, popupContainer: portalContainer, defaultValue, setUploadHandle: outSetUploadHandle, } = props;
+    const uploadRef = React.useRef(null);
+    const [uploadHandle, setUploadHandle] = React.useState({});
+    const tempFile = React.useMemo(() => (uploadHandle === null || uploadHandle === void 0 ? void 0 : uploadHandle.previewFile) || [], [uploadHandle === null || uploadHandle === void 0 ? void 0 : uploadHandle.previewFile]);
+    const uploading = tempFile === null || tempFile === void 0 ? void 0 : tempFile.some((i) => i.loading);
+    const setUploadRef = React.useCallback((uploadHandle) => {
+        setUploadHandle(uploadHandle);
+        // 设置最外层组件方法
+        // 兼容云后台数据库中使用uploader组件，未传outSetUploadHandle
+        if (outSetUploadHandle) {
+            outSetUploadHandle(uploadHandle);
         }
-        const allFile = await upload(fileList);
-        handleChange(allFile);
-    };
+    }, [outSetUploadHandle]);
     // 删除图片
-    const deleteHandle = (fileItem) => {
-        const fileList = tempFile.filter((d) => d.key !== fileItem.key);
-        handleChange(fileList, true);
+    const deleteHandle = (file) => {
+        var _a;
+        (_a = uploadRef === null || uploadRef === void 0 ? void 0 : uploadRef.current) === null || _a === void 0 ? void 0 : _a.delete({ cloudId: file.cloudId });
     };
     // 转换后的属性
-    const extraProps = {};
+    const extraProps = { ...props };
     //是否支持多选
     extraProps['multiple'] = !single;
     extraProps['accept'] = acceptTypes.length === 0 ? IMAGE_TYPES : Array.from(new Set(acceptTypes));
     tips && (extraProps['title'] = tips);
     maxSize && (extraProps['maxSize'] = maxSize * 1024 * 1024);
     const hasActions = !uploading && !readOnly && !(disabled || sourceType === 'camera');
-    return (_jsx(ConfigProvider, { classPrefix: "wedatea2td", children: _jsxs("div", { className: "_weda-fn-upload-result", children: [tempFile === null || tempFile === void 0 ? void 0 : tempFile.map((d, index) => (_jsx("div", { className: `_weda-fn-upload-result__item ${imgTypeCls}`, children: _jsx(TcbImage, { index: index, allFile: tempFile, tempFile: d, imgTypeCls: imgTypeCls, isZoom: true, previewIcon: "td:browse", portalContainer: portalContainer, actions: hasActions && (_jsx(WdIcon, { className: `${CLASS_PREFIX}__image-actions-delete`, name: "td:delete", onClick: () => deleteHandle(d), size: "sm" })) }) }, d.key))), _jsxs("div", { className: `${CLASS_PREFIX}__input-box`, children: [readOnly && tempFile.length < 1 && _jsx("div", { children: "-" }), sourceType === 'camera' || (disabled && !readOnly) ? (_jsx("div", { className: `_weda-fn-upload-result__item wedatea2td-disabled weda-uploader-btn__box ${imgTypeCls}`, children: _jsxs("div", { className: "_weda-fn-upload-result__status", children: [_jsx("i", { className: "wedatea2td-icon wedatea2td-icon-plus", role: "img", "aria-label": "plus" }), _jsx("span", { className: "wedatea2td-mt-1n wedatea2td-text-label wedatea2td-fz-reset", children: btnTitle })] }) })) : (((!single && tempFile.length < maxUploadCount) || (single && tempFile.length < 1 && !uploading)) &&
-                            !readOnly && (
-                        // single 模式时，当数组为空且不在上传文件过程中时显示
-                        _jsx(Upload, { ...extraProps, beforeUpload: beforeHandle, children: _jsxs("div", { 
+    return (_jsx(ConfigProvider, { classPrefix: "wedatea2td", children: _jsx(Upload, { ...extraProps, ref: uploadRef, value: defaultValue, setUploadHandle: setUploadRef, children: _jsxs("div", { className: "_weda-fn-upload-result", children: [tempFile === null || tempFile === void 0 ? void 0 : tempFile.map((d, index) => (_jsx("div", { className: `_weda-fn-upload-result__item ${imgTypeCls}`, children: _jsx(TcbImage, { index: index, allFile: tempFile, tempFile: d, imgTypeCls: imgTypeCls, isZoom: true, previewIcon: "td:browse", portalContainer: portalContainer, actions: hasActions && (_jsx(WdIcon, { className: `${CLASS_PREFIX}__image-actions-delete`, name: "td:delete", onClick: () => deleteHandle(d), size: "sm" })) }) }, d.cloudId))), _jsxs("div", { className: `${CLASS_PREFIX}__input-box`, children: [readOnly && tempFile.length < 1 && _jsx("div", { children: "-" }), sourceType === 'camera' || (disabled && !readOnly) ? (_jsx("div", { className: `_weda-fn-upload-result__item wedatea2td-disabled weda-uploader-btn__box ${imgTypeCls}`, children: _jsxs("div", { className: "_weda-fn-upload-result__status", children: [_jsx("i", { className: "wedatea2td-icon wedatea2td-icon-plus", role: "img", "aria-label": "plus" }), _jsx("span", { className: "wedatea2td-mt-1n wedatea2td-text-label wedatea2td-fz-reset", children: btnTitle })] }) })) : (((!single && tempFile.length < maxUploadCount) || (single && tempFile.length < 1 && !uploading)) &&
+                                !readOnly && (
+                            // single 模式时，当数组为空且不在上传文件过程中时显示
+                            _jsxs("div", { 
                                 // className={"_weda-fn-upload-result__item _weda-fn-upload-result__item--upload" imgTypeCls}
                                 // className={classNames(
                                 //   `_weda-fn-upload-result__item _weda-fn-upload-result__item--upload`,
                                 //   imgTypeCls
                                 // )}
-                                className: `_weda-fn-upload-result__item weda-uploader-btn__box _weda-fn-upload-result__item--upload ${imgTypeCls}`, children: [imgTypeCls, _jsxs("div", { className: "_weda-fn-upload-result__status", children: [_jsx("i", { className: "wedatea2td-icon wedatea2td-icon-plus", role: "img", "aria-label": "plus" }), _jsx("span", { className: "wedatea2td-mt-1n wedatea2td-text-label wedatea2td-fz-reset", children: btnTitle })] })] }) })))] })] }) }));
+                                className: `_weda-fn-upload-result__item weda-uploader-btn__box _weda-fn-upload-result__item--upload ${imgTypeCls}`, onClick: () => {
+                                    var _a;
+                                    (_a = uploadRef === null || uploadRef === void 0 ? void 0 : uploadRef.current) === null || _a === void 0 ? void 0 : _a.upload();
+                                }, children: [imgTypeCls, _jsxs("div", { className: "_weda-fn-upload-result__status", children: [_jsx("i", { className: "wedatea2td-icon wedatea2td-icon-plus", role: "img", "aria-label": "plus" }), _jsx("span", { className: "wedatea2td-mt-1n wedatea2td-text-label wedatea2td-fz-reset", children: btnTitle })] })] })))] })] }) }) }));
 }
 export const TcbImage = (props) => {
-    const { fileID, tempFile = { progress: 100, loading: false, realUrl: null, tempUrl: null }, isZoom, imgTypeCls, previewIcon, actions, allFile = [], index, portalContainer, ...rest } = props;
-    const { progress, loading, realUrl, tempUrl } = tempFile;
-    const fileCloudID = (realUrl !== null && realUrl !== void 0 ? realUrl : tempUrl) || fileID;
+    const { fileID, tempFile = { progress: 100, loading: false, cloudId: null, tempUrl: null }, isZoom, imgTypeCls, previewIcon, actions, allFile = [], index, portalContainer, ...rest } = props;
+    const { progress, loading, cloudId, tempUrl } = tempFile;
+    const fileCloudID = (cloudId !== null && cloudId !== void 0 ? cloudId : tempUrl) || fileID;
     const [isError, setIsError] = React.useState(false);
     const { data: src, error: requestError } = useTempUrl(fileCloudID);
     const encodeSrc = encodeConvert(src);
@@ -152,7 +82,7 @@ export const TcbImage = (props) => {
     };
     if (!isZoom)
         return renderImg();
-    const previewImageList = allFile.map((i) => i.realUrl || i.tempUrl);
+    const previewImageList = allFile.map((i) => i.cloudId || i.tempUrl);
     const previewProps = {
         index,
         'data-testid': 'uploaderpc_imgStyle',

package/dist/web/components/form/uploader/util.d.ts

@@ -1,4 +1,20 @@
+import { TempFileProps } from './upload/index';
+export declare const DEFAULT_UPLOAD_PATH = "weda-uploader";
 export declare const getBase64: (files: any) => Promise<any[]>;
 export declare const uploadTcbMulti: (files: any, props: any) => Promise<any[]>;
 export declare const filenameRegex: RegExp;
 export declare const checkAcceptedFiles: (file: any, acceptedFiles: any) => any;
+export declare const checkBeforeUpload: ({ tempFile, files, accepts, maxSize, maxUploadCount }: {
+    tempFile: any;
+    files: any;
+    accepts: any;
+    maxSize: any;
+    maxUploadCount: any;
+}) => boolean;
+export declare const getPreviewFileMap: (previewFile: any) => any;
+export declare const getInitTempFile: ({ value }: {
+    value?: any;
+}) => TempFileProps[];
+export declare const CLASS_PREFIX = "weda-uploader-pc";
+export declare const IMAGE_TYPES: string[];
+export declare const upload: (fileList: any, uploadInstance: any, allTempFile: any) => Promise<void>;

package/dist/web/components/form/uploader/util.js

@@ -1,8 +1,9 @@
 import { compressImage } from './compress';
 import { getCloudInstance, getDefaultUploadPath } from '../../../utils/tcb';
 import { toBase64Uri } from '../../../utils/file2base64';
-import { randomStr } from '../../../utils/platform';
+import { randomStr, alertErrorMessage } from '../../../utils/platform';
 import { errorHandler } from '../../../utils/error';
+export const DEFAULT_UPLOAD_PATH = 'weda-uploader';
 export const getBase64 = (files) => {
     return Promise.all(files.map(async (item) => {
         let tempUrl = '';
@@ -35,13 +36,29 @@ export const uploadTcbMulti = async (files, props) => {
     return result;
 };
 export const filenameRegex = /[^a-zA-Z0-9\u4e00-\u9fff-*!_.]/g;
+const sanitizeFilename = (filename, replacement = '') => {
+    return (filename
+        // 移除非法字符
+        // eslint-disable-next-line no-control-regex
+        .replace(/[<>.:"\\|?*\x00-\x1F]/g, replacement)
+        // 处理Windows保留文件名（CON, PRN等）
+        .replace(/^(CON|PRN|AUX|NUL|COM[1-9]|LPT[1-9])(\..*)?$/i, replacement)
+        // 移除开头和结尾的点,空格,反斜杠（Windows不允许）
+        .replace(/^[. /]+/, '')
+        .replace(/[. /]+$/, '')
+        // 可选：限制长度
+        .slice(0, 255));
+};
 const uploadToTcb = async (item, props) => {
     var _a;
-    const { onUploadProgress, onUploadFinish, onUploadError } = props;
-    const { file, uploadPath } = item;
+    const { onUploadProgress, onUploadFinish, onUploadError, uploadPath, customUploadPath } = props;
+    const { file } = item;
     try {
         const tcb = await getCloudInstance();
-        const _uploadPath = getDefaultUploadPath(uploadPath);
+        let _uploadPath = getDefaultUploadPath(uploadPath);
+        if (customUploadPath) {
+            _uploadPath = `${_uploadPath}/${sanitizeFilename(customUploadPath, '')}}`;
+        }
         const cloudPath = `${_uploadPath}/${randomStr()}-${(_a = file === null || file === void 0 ? void 0 : file.name) === null || _a === void 0 ? void 0 : _a.replace(filenameRegex, '-')}`;
         const { fileID } = await tcb.uploadFile({
             cloudPath,
@@ -67,7 +84,7 @@ const uploadToTcb = async (item, props) => {
             ...item,
             progress: 100,
             loading: false,
-            realUrl: fileID,
+            cloudId: fileID,
         };
         if (onUploadFinish) {
             onUploadFinish(fileItem);
@@ -109,3 +126,87 @@ export const checkAcceptedFiles = (file, acceptedFiles) => {
     }
     return true;
 };
+export const checkBeforeUpload = ({ tempFile, files, accepts, maxSize, maxUploadCount }) => {
+    const isAccepted = files.every((i) => checkAcceptedFiles(i, accepts));
+    if (!isAccepted) {
+        alertErrorMessage({
+            message: `上传图片类型错误`,
+            icon: 'error',
+        });
+        return false;
+    }
+    if (files.some((f) => f.size > maxSize * 1024 * 1024)) {
+        alertErrorMessage({
+            message: `请上传不超过 ${maxSize}M 的图片`,
+            icon: 'error',
+        });
+        return false;
+    }
+    if (files.length > maxUploadCount) {
+        // 防止一下子选择过多文件
+        alertErrorMessage({
+            message: `最多只能上传${maxUploadCount}张图片，请重新选择`,
+            icon: 'error',
+        });
+        return false;
+    }
+    if ((tempFile === null || tempFile === void 0 ? void 0 : tempFile.length) + (files === null || files === void 0 ? void 0 : files.length) > maxUploadCount) {
+        alertErrorMessage({
+            message: `最多只能上传${maxUploadCount}张图片`,
+            icon: 'error',
+        });
+        return false;
+    }
+    return true;
+};
+export const getPreviewFileMap = (previewFile) => {
+    return previewFile.reduce((acc, obj) => {
+        acc[obj === null || obj === void 0 ? void 0 : obj.cloudId] = obj; // 使用 cloudId 作为新对象的 key
+        return acc;
+    }, {});
+};
+export const getInitTempFile = ({ value }) => {
+    const tempFile = value.map((i) => ({
+        key: randomStr(),
+        cloudId: i,
+        tempUrl: '',
+        progress: 100,
+        loading: false,
+    }));
+    return tempFile;
+};
+// 默认组件类前缀
+export const CLASS_PREFIX = 'weda-uploader-pc';
+// 默认图片类型
+export const IMAGE_TYPES = [
+    'image/jpg',
+    'image/png',
+    'image/tif',
+    'image/bmp',
+    'image/jpeg',
+    'image/tiff',
+    'image/gif',
+];
+export const upload = async (fileList, uploadInstance, allTempFile) => {
+    const { config = {}, onComplete, onSuccess, onFail, onUploadProgress } = uploadInstance;
+    const { isCompressBeforeUpload, compressQuality, compressedHeight, compressedWidth } = config;
+    const result = await uploadTcbMulti(fileList, {
+        isCompressBeforeUpload,
+        compressedHeight,
+        compressedWidth,
+        compressQuality,
+        customUploadPath: config.customUploadPath,
+        uploadPath: DEFAULT_UPLOAD_PATH,
+        onUploadProgress: (item) => {
+            onUploadProgress(item);
+        },
+        onUploadFinish: (item) => {
+            onSuccess(item);
+        },
+        onUploadError: (err) => {
+            onFail(err);
+        },
+    });
+    const allFile = allTempFile.map((i) => result.find((j) => (j === null || j === void 0 ? void 0 : j.key) === (i === null || i === void 0 ? void 0 : i.key)) || i);
+    onComplete(allFile);
+};

package/dist/web/components/form/uploaderFile/uploadFile.h5.js

@@ -69,7 +69,7 @@ events = emptyObject, defaultValue, uploadPath = 'weda-uploader', single = true,
         }
     }, [defaultValue]);
     React.useEffect(() => {
-        var _a, _b;
+        var _a;
         if (isObjectEqual(fileRef.current, fileIDList))
             return;
         // 外部 onChange 事件
@@ -79,10 +79,6 @@ events = emptyObject, defaultValue, uploadPath = 'weda-uploader', single = true,
         if (changeTypeRef.current) {
             (_a = events === null || events === void 0 ? void 0 : events.change) === null || _a === void 0 ? void 0 : _a.call(events, { value });
         }
-        if (changeTypeRef.current === 'add') {
-            const files = pureFileIDList.map((d) => { var _a; return (_a = fileSizeObj[d]) === null || _a === void 0 ? void 0 : _a.file; });
-            (_b = events === null || events === void 0 ? void 0 : events.success) === null || _b === void 0 ? void 0 : _b.call(events, { value: pureFileIDList, file: files });
-        }
         fileRef.current = fileIDList;
     }, [fileIDList]);
     // 外层组件类
@@ -99,11 +95,13 @@ events = emptyObject, defaultValue, uploadPath = 'weda-uploader', single = true,
     }, [acceptTypes]);
     // 上传后文件列表 fileIDList 改变事件，'add'|'delete'
     const handleChange = ({ fileID, uuid, type, size, file }) => {
+        var _a;
         if (fileID) {
             changeTypeRef.current = type;
             if (type === 'add') {
                 setFileSizeObj((obj) => ({ ...obj, [fileID]: { size, file } }));
                 setfileIDList((fileIDList) => [...fileIDList, fileID]);
+                (_a = events === null || events === void 0 ? void 0 : events.success) === null || _a === void 0 ? void 0 : _a.call(events, { value: fileID, file });
             }
             else {
                 setfileIDList((fileIDList) => fileIDList.filter((f) => f !== fileID));

package/dist/web/components/form/uploaderFile/uploadFile.pc.js

@@ -71,7 +71,7 @@ acceptTypes = emptyArray, downloadVisible = true, deleteVisible = true, uploadPa
         }
     }, [defaultValue]);
     React.useEffect(() => {
-        var _a, _b;
+        var _a;
         if (isObjectEqual(fileRef.current, fileIDList))
             return;
         // 外部 onChange 事件
@@ -81,10 +81,6 @@ acceptTypes = emptyArray, downloadVisible = true, deleteVisible = true, uploadPa
         if (changeTypeRef.current) {
             (_a = events === null || events === void 0 ? void 0 : events.change) === null || _a === void 0 ? void 0 : _a.call(events, { value });
         }
-        if (changeTypeRef.current === 'add') {
-            const files = pureFileIDList.map((d) => { var _a; return (_a = fileSizeObj[d]) === null || _a === void 0 ? void 0 : _a.file; });
-            (_b = events === null || events === void 0 ? void 0 : events.success) === null || _b === void 0 ? void 0 : _b.call(events, { value: pureFileIDList, file: files });
-        }
         fileRef.current = fileIDList;
     }, [fileIDList]);
     // 外层组件类
@@ -168,11 +164,13 @@ acceptTypes = emptyArray, downloadVisible = true, deleteVisible = true, uploadPa
     };
     // 上传后文件列表 fileIDList 改变事件，'add'|'delete'
     const handleChange = ({ fileID, uuid, type, size, file }) => {
+        var _a;
         if (fileID) {
             changeTypeRef.current = type;
             if (type === 'add') {
                 setFileSizeObj((obj) => ({ ...obj, [fileID]: { size, file } }));
                 setfileIDList((list) => [...list, fileID]);
+                (_a = events === null || events === void 0 ? void 0 : events.success) === null || _a === void 0 ? void 0 : _a.call(events, { value: fileID, file });
             }
             else {
                 setfileIDList((list) => list.filter((d) => d !== fileID));

package/dist/web/components/uploaderView/index.js

@@ -38,7 +38,7 @@ alt = '[加载失败]', gutter = 8, height = 100, width = 100, events = emptyObj
                         onLoad: () => setSuccessList((list) => [...list, d]),
                         onError: () => setErrorList((list) => [...list, d]),
                         portalContainer,
-                        allFile: values === null || values === void 0 ? void 0 : values.map((d) => ({ realUrl: d })),
+                        allFile: values === null || values === void 0 ? void 0 : values.map((d) => ({ cloudId: d })),
                         index: i,
                     };
                     return (_jsx("div", { className: `${CLASS_PREFIX}__image-box`, style: boxStyle, title: d, children: _jsx(TcbImage, { ...imgProps }) }, `${d}-${i}`));

package/dist/web/components/wd-ad/wd-ad.js

@@ -9,13 +9,11 @@ import { X_RUNTIME_DEFAULT } from '../../../configs/type-utils/x-runtime-default
  */
 export function WdAd(props) {
     const { className, id, style, adType: _adType = X_RUNTIME_DEFAULT.adType, gridCount: _gridCount = X_RUNTIME_DEFAULT.gridCount, } = props;
-    const adType = ['banner', 'video', 'grid'].includes(_adType)
-        ? _adType
-        : 'banner';
+    const adType = ['banner', 'video', 'grid', 'rewardedVideoAd'].includes(_adType) ? _adType : 'banner';
     const gridCount = _gridCount == 8 ? 8 : 5;
     const { classPrefix } = useConfig();
     const canPreview = useCanPreview();
     if (!canPreview)
         return null;
-    return (_jsx(ConfigProvider, { classPrefix: "wedatea2td", children: _jsx(Bubble, { placement: "auto", openDelay: 300, content: _jsxs(_Fragment, { children: ["\u8BE5\u7EC4\u4EF6\u5FC5\u987B\u5728\u5C0F\u7A0B\u5E8F\u771F\u5B9E\u73AF\u5883\u4F7F\u7528\u624D\u80FD\u591F\u770B\u5230\u5B9E\u9645\u6548\u679C\u3002", _jsx("br", {}), "\u8BF7\u9075\u5FAA\u5FAE\u4FE1\u5E7F\u544A\u7EC4\u4EF6\u5E94\u7528\u89C4\u8303\uFF0C\u5426\u5219\u53EF\u80FD\u5BFC\u81F4\u5C0F\u7A0B\u5E8F\u5BA1\u6838\u5931\u8D25\u3002"] }), children: _jsxs("div", { className: `${classPrefix}-ad ${classPrefix}-ad--${adType} ${className}`, id: id, style: style, children: [adType === 'banner' && _jsx(BannerAd, {}), adType === 'video' && _jsx(VideoAd, {}), adType === 'grid' && _jsx(GridAd, { gridCount: gridCount })] }) }) }));
+    return (_jsx(ConfigProvider, { classPrefix: "wedatea2td", children: _jsx(Bubble, { placement: "auto", openDelay: 300, content: _jsxs(_Fragment, { children: ["\u8BE5\u7EC4\u4EF6\u5FC5\u987B\u5728\u5C0F\u7A0B\u5E8F\u771F\u5B9E\u73AF\u5883\u4F7F\u7528\u624D\u80FD\u591F\u770B\u5230\u5B9E\u9645\u6548\u679C\u3002", _jsx("br", {}), "\u8BF7\u9075\u5FAA\u5FAE\u4FE1\u5E7F\u544A\u7EC4\u4EF6\u5E94\u7528\u89C4\u8303\uFF0C\u5426\u5219\u53EF\u80FD\u5BFC\u81F4\u5C0F\u7A0B\u5E8F\u5BA1\u6838\u5931\u8D25\u3002"] }), children: _jsxs("div", { className: `${classPrefix}-ad ${classPrefix}-ad--${adType} ${className}`, id: id, style: style, children: [adType === 'banner' && _jsx(BannerAd, {}), ['rewardedVideoAd', 'video'].includes(adType) && _jsx(VideoAd, {}), adType === 'grid' && _jsx(GridAd, { gridCount: gridCount })] }) }) }));
 }