@cloudbase/weda-ui 3.20.1 → 3.20.3

package/dist/web/components/form/location/common/propsConfig.d.ts

@@ -8,7 +8,7 @@ export namespace propTypes {
     const APIKEY: PropTypes.Requireable<string>;
     const showLngLat: PropTypes.Requireable<boolean>;
     const showMap: PropTypes.Requireable<boolean>;
-    const defauleShowLocation: PropTypes.Requireable<boolean>;
+    const defaultShowLocation: PropTypes.Requireable<boolean>;
     const drag: PropTypes.Requireable<boolean>;
     const zoom: PropTypes.Requireable<boolean>;
     const disabled: PropTypes.Requireable<boolean>;
@@ -31,8 +31,8 @@ export namespace defaultProps {
     export { showLngLat_1 as showLngLat };
     const showMap_1: boolean;
     export { showMap_1 as showMap };
-    const defauleShowLocation_1: boolean;
-    export { defauleShowLocation_1 as defauleShowLocation };
+    const defaultShowLocation_1: boolean;
+    export { defaultShowLocation_1 as defaultShowLocation };
     const drag_1: boolean;
     export { drag_1 as drag };
     const zoom_1: boolean;

package/dist/web/components/form/location/common/propsConfig.js

@@ -11,7 +11,7 @@ export const propTypes = {
     APIKEY: PropTypes.string,
     showLngLat: PropTypes.bool,
     showMap: PropTypes.bool,
-    defauleShowLocation: PropTypes.bool,
+    defaultShowLocation: PropTypes.bool,
     drag: PropTypes.bool,
     zoom: PropTypes.bool,
     disabled: PropTypes.bool,
@@ -30,7 +30,7 @@ export const defaultProps = {
     APIKEY: '',
     showLngLat: false,
     showMap: false,
-    defauleShowLocation: false,
+    defaultShowLocation: false,
     drag: true,
     zoom: true,
     disabled: false,

package/dist/web/components/form/location/components/LocationH5/location.h5.js

@@ -52,33 +52,24 @@ export default function LocationH5(props) {
     const currentLocations = useRef();
     const customLocation = useRef();
     useEffect(() => {
-        if (value || !currentLocations.current)
-            return;
-        setUserSelectStatus('');
-        // 重置表单时
-        const { poiname, detailedAddress, latlng: { lat, lng }, } = currentLocations.current;
-        let location = {
-            poiname,
-            detailedAddress,
-            latlng: { lat, lng },
-        };
-        if (locationType === 1) {
-            location.locationType = 1;
+        if (locationType !== 3) {
+            // 默认位置选择无时【locationType=1】
+            let location = {
+                latlng: {
+                    lat: 39.98410411,
+                    lng: 116.307503,
+                },
+                poiname: '',
+                detailedAddress: '',
+                locationType,
+            };
+            // 默认位置选择当前用户位置时【locationType=2】
+            if (locationType === 2 && currentLocations.current) {
+                location = currentLocations.current;
+            }
+            setLocation(location);
+            setUserSelectStatus((location === null || location === void 0 ? void 0 : location.detailedAddress) ? 'selected' : '');
         }
-        setLocation(location);
-    }, [value, locationType]);
-    useEffect(() => {
-        let loc = {
-            latlng: {
-                lat: 39.98410411,
-                lng: 116.307503,
-            },
-            poiname: '',
-            detailedAddress: '',
-            locationType,
-        };
-        setLocation(loc);
-        // 暂不支持自定位置，初始化表单值都是{}
     }, [locationType]);
     useEffect(() => {
         if (checkCustomLocation(value)) {
@@ -91,8 +82,26 @@ export default function LocationH5(props) {
                 latlng: { lng: coordinates[0], lat: coordinates[1] },
             };
             customLocation.current = value;
-            setUserSelectStatus('selected');
             setLocation(loc);
+            setUserSelectStatus('selected');
+        }
+        else {
+            // 默认位置选择无时【locationType=1】
+            let location = {
+                latlng: {
+                    lat: 39.98410411,
+                    lng: 116.307503,
+                },
+                poiname: '',
+                detailedAddress: '',
+                locationType,
+            };
+            // 默认位置选择当前用户位置时【locationType=2】
+            if (locationType === 2 && currentLocations.current) {
+                location = currentLocations.current;
+            }
+            setLocation(location);
+            setUserSelectStatus((location === null || location === void 0 ? void 0 : location.poiname) ? 'selected' : '');
         }
     }, [value]);
     // 获取定位信息

package/dist/web/components/form/location/components/LocationPC/Header.js

@@ -13,10 +13,10 @@ const Header = ({ onClick, isEdit, info, disabled, showLngLat, locationType, dat
         if (locationType === 1 && info.locationType === 1) {
             status = false;
         }
-        else if (locationType === 2 && !dataSourceStatus) {
+        else if ([2, 3].includes(locationType) && !dataSourceStatus) {
             status = false;
         }
-        else if (locationType === 2 && !apiKeyStatus.status) {
+        else if ([2, 3].includes(locationType) && !apiKeyStatus.status) {
             status = false;
         }
         else if (!currentLocStatus) {

package/dist/web/components/form/location/components/LocationPC/location.PC.js

@@ -56,6 +56,26 @@ export default function LocationPC(props) {
         dataSourceStatus,
         eventsChange,
     });
+    useEffect(() => {
+        if (locationType !== 3) {
+            // 默认位置选择无时【locationType=1】
+            let location = {
+                latlng: {
+                    lat: 39.98410411,
+                    lng: 116.307503,
+                },
+                poiname: '',
+                detailedAddress: '',
+                locationType,
+            };
+            // 默认位置选择当前用户位置时【locationType=2】
+            if (locationType === 2 && currentLocations.current) {
+                location = currentLocations.current;
+            }
+            setLocation(location);
+            setUserSelectStatus((location === null || location === void 0 ? void 0 : location.detailedAddress) ? 'selected' : '');
+        }
+    }, [locationType]);
     useEffect(() => {
         if (checkCustomLocation(value)) {
             // 表单为新增时回传点位信息
@@ -70,23 +90,25 @@ export default function LocationPC(props) {
             setLocation(loc);
             setUserSelectStatus('selected');
         }
-    }, [value]);
-    useEffect(() => {
-        if (value || !currentLocations.current)
-            return;
-        setUserSelectStatus('');
-        // 重置表单时
-        const { poiname, detailedAddress, latlng: { lat, lng }, } = currentLocations.current;
-        let location = {
-            poiname,
-            detailedAddress,
-            latlng: { lat, lng },
-        };
-        if (locationType === 1) {
-            location.locationType = 1;
+        else {
+            // 默认位置选择无时【locationType=1】
+            let location = {
+                latlng: {
+                    lat: 39.98410411,
+                    lng: 116.307503,
+                },
+                poiname: '',
+                detailedAddress: '',
+                locationType,
+            };
+            // 默认位置选择当前用户位置时【locationType=2】
+            if (locationType === 2 && currentLocations.current) {
+                location = currentLocations.current;
+            }
+            setLocation(location);
+            setUserSelectStatus((location === null || location === void 0 ? void 0 : location.poiname) ? 'selected' : '');
         }
-        setLocation(location);
-    }, [value, locationType]);
+    }, [value]);
     const showToast = (message) => {
         weui.toast(message, {
             duration: 3000,
@@ -156,31 +178,6 @@ export default function LocationPC(props) {
             });
         }
     }, [dataSource]);
-    useEffect(() => {
-        let loc = {
-            latlng: {
-                lat: 39.98410411,
-                lng: 116.307503,
-            },
-            poiname: '',
-            detailedAddress: '',
-            locationType,
-        };
-        switch (locationType) {
-            case 2:
-                loc = {
-                    latlng: {
-                        lat: location.latlng.lat,
-                        lng: location.latlng.lng,
-                    },
-                    poiname: location.poiname,
-                    detailedAddress: location.detailedAddress,
-                };
-                break;
-        }
-        setLocation(loc);
-        // 暂不支持自定位置，初始化表单值都是{}
-    }, [locationType]);
     const getIsShowMap = () => {
         let status = showMap;
         if (locationType === 1 && location.locationType === 1) {

package/dist/web/components/form/uploader/upload/index.d.ts

@@ -19,6 +19,7 @@ interface UploadProps extends EventsType {
     callbacks?: DataType['callbacks'];
     onChange?: (val?: any) => void;
     setUploadHandle?: (uploadHandle: any) => void;
+    storageType?: DataType['storageType'];
     children?: any;
 }
 export declare const IMAGE_TYPES: string[];

package/dist/web/components/form/uploader/upload/index.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { forwardRef, useState, useCallback, useEffect, useImperativeHandle } from 'react';
 import { getUuid } from '../../../../utils/tool';
-import { upload as uploadAction, checkBeforeUpload, getPreviewFileMap, getInitTempFile, getBase64 } from '../util';
+import { upload as uploadAction, checkBeforeUpload, getPreviewFileMap, getInitTempFile, getBase64, storageTypeIsHttps, } from '../util';
 import { errorHandler } from '../../../../utils/error';
 import { isNil } from '../../../../utils/lodash';
 import { toBase64Uri } from '../../../../utils/file2base64';
@@ -19,7 +19,8 @@ export const IMAGE_TYPES = [
     'image/gif',
 ];
 export const Upload = forwardRef(function Upload({ children, ...props }, ref) {
-    const { maxUploadCount, acceptTypes, multiple, maxSize, disabled, readOnly, name, isCompressBeforeUpload, compressQuality, compressedHeight, compressedWidth, events, onChange, callbacks, setUploadHandle, value: _value, sourceType, } = props;
+    const { maxUploadCount, acceptTypes, multiple, maxSize, disabled, readOnly, name, isCompressBeforeUpload, compressQuality, compressedHeight, compressedWidth, events, onChange, callbacks, setUploadHandle, value: _value, sourceType, storageType, } = props;
+    const _storageTypeIsHttps = storageTypeIsHttps(storageType);
     const inputRef = React.useRef(null);
     const [inputId, setInputId] = useState(() => {
         return getUuid();
@@ -50,6 +51,7 @@ export const Upload = forwardRef(function Upload({ children, ...props }, ref) {
         compressQuality,
         compressedHeight,
         compressedWidth,
+        storageType,
     }, equal);
     const [initFlag, setInitFlag] = useState(false);
     React.useEffect(() => {
@@ -72,7 +74,7 @@ export const Upload = forwardRef(function Upload({ children, ...props }, ref) {
         var _a;
         updatePreviewFile(allFile);
         const getTempFile = (allFile = []) => {
-            let value = allFile.map((i) => i === null || i === void 0 ? void 0 : i.cloudId).filter((j) => !!j);
+            let value = allFile.map((i) => (_storageTypeIsHttps ? i.url.split('?')[0] : i === null || i === void 0 ? void 0 : i.cloudId)).filter((j) => !!j);
             value = !multiple ? value[0] || '' : value;
             return value;
         };
@@ -80,7 +82,7 @@ export const Upload = forwardRef(function Upload({ children, ...props }, ref) {
         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 });
         setInputId(getUuid());
-    }, [events, multiple, onChange]);
+    }, [events, multiple, onChange, storageType]);
     const uploadChange = useCallback(async (e) => {
         const { accepts, maxSize, maxUploadCount } = config;
         let files = [...e.target.files];
@@ -163,7 +165,7 @@ export const Upload = forwardRef(function Upload({ children, ...props }, ref) {
             onSuccess(item) {
                 var _a;
                 updatePreviewFile((allTempFile) => allTempFile.map((i) => (i.key === item.key ? { ...i, ...item } : i)));
-                (_a = events === null || events === void 0 ? void 0 : events.success) === null || _a === void 0 ? void 0 : _a.call(events, { value: item.cloudId, file: item.file });
+                (_a = events === null || events === void 0 ? void 0 : events.success) === null || _a === void 0 ? void 0 : _a.call(events, { value: _storageTypeIsHttps ? item.url : item.cloudId, file: item.file });
             },
             onFail(err) {
                 events === null || events === void 0 ? void 0 : events.error(err);

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

@@ -36,5 +36,6 @@ export interface H5UploaderProps extends Except<CommonFormPropsType, 'events'>,
     tempFile?: any;
     setTempFile?: any;
     setUploadHandle?: (arg?: any) => void;
+    storageType?: DataType['storageType'];
 }
 export {};

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

@@ -19,7 +19,7 @@ export const IMAGE_TYPES = [
     'image/gif',
 ];
 export function UploaderPCInner(props) {
-    const { tips = '', btnTitle = '上传图片', maxUploadCount = 9, maxSize = 10, acceptTypes = IMAGE_TYPES, single = false, disabled = false, imgTypeCls, readOnly, sourceType, popupContainer: portalContainer, defaultValue, setUploadHandle: outSetUploadHandle, } = props;
+    const { tips = '', btnTitle = '上传图片', maxUploadCount = 9, 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]);

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

@@ -1,5 +1,6 @@
 import { TempFileProps } from './upload/index';
 export declare const DEFAULT_UPLOAD_PATH = "weda-uploader";
+export declare const storageTypeIsHttps: (storageType: any) => boolean;
 export declare const getBase64: (files: any) => Promise<any[]>;
 export declare const uploadTcbMulti: (files: any, props: any) => Promise<any[]>;
 export declare const filenameRegex: RegExp;

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

@@ -4,6 +4,7 @@ import { toBase64Uri } from '../../../utils/file2base64';
 import { randomStr, alertErrorMessage } from '../../../utils/platform';
 import { errorHandler } from '../../../utils/error';
 export const DEFAULT_UPLOAD_PATH = 'weda-uploader';
+export const storageTypeIsHttps = (storageType) => storageType === 'https';
 export const getBase64 = (files) => {
     return Promise.all(files.map(async (item) => {
         let tempUrl = '';
@@ -60,7 +61,7 @@ const uploadToTcb = async (item, props) => {
             _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({
+        const res = await tcb.uploadFile({
             cloudPath,
             filePath: file,
             onUploadProgress: (progressEvent) => {
@@ -84,7 +85,8 @@ const uploadToTcb = async (item, props) => {
             ...item,
             progress: 100,
             loading: false,
-            cloudId: fileID,
+            cloudId: res.fileID,
+            url: res.download_url,
         };
         if (onUploadFinish) {
             onUploadFinish(fileItem);
@@ -172,6 +174,7 @@ export const getInitTempFile = ({ value }) => {
         tempUrl: '',
         progress: 100,
         loading: false,
+        url: '',
     }));
     return tempFile;
 };
@@ -189,8 +192,9 @@ export const IMAGE_TYPES = [
 ];
 export const upload = async (fileList, uploadInstance, allTempFile) => {
     const { config = {}, onComplete, onSuccess, onFail, onUploadProgress } = uploadInstance;
-    const { isCompressBeforeUpload, compressQuality, compressedHeight, compressedWidth } = config;
+    const { isCompressBeforeUpload, compressQuality, compressedHeight, compressedWidth, storageType } = config;
     const result = await uploadTcbMulti(fileList, {
+        storageType,
         isCompressBeforeUpload,
         compressedHeight,
         compressedWidth,

package/dist/web/components/form/uploaderFile/uploadFile.h5.d.ts

@@ -3,7 +3,7 @@ import type { CommonFormPropsType } from '../types';
 import type { DataType } from '../../../../configs/components/wd-upload-file';
 export declare const FILES_TYPES: string[];
 export declare function UploadFileH5({ layout, id, style, labelVisible, label, requiredFlag, disabled, className, acceptTypes, tips, btnTitle, uploadTipText, maxUploadCount, maxSize, deleteVisible, downloadVisible, value, // 需要兼容 cloud:和https: 协议，需要兼容字符串和字符串数组
-events, defaultValue, uploadPath, single, onChange, isEdit, $node, readOnly, callbacks, }: IUploadFileH5): JSX.Element;
+events, defaultValue, uploadPath, single, onChange, isEdit, $node, readOnly, callbacks, storageType, }: IUploadFileH5): JSX.Element;
 export interface IUploadFileH5 extends CommonFormPropsType {
     className?: string;
     label?: string;
@@ -24,4 +24,5 @@ export interface IUploadFileH5 extends CommonFormPropsType {
     readOnly?: boolean;
     callbacks?: DataType['callbacks'];
     uploadTipText?: string;
+    storageType?: DataType['storageType'];
 }

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

@@ -13,7 +13,7 @@ import { WdButton } from '../../wd-button/wd-button';
 import { toBase64Uri } from '../../../utils/file2base64';
 import { isNil } from '../../../utils/lodash';
 import { errorHandler } from '../../../utils/error';
-import { filenameRegex, checkAcceptedFiles } from '../uploader/util';
+import { filenameRegex, checkAcceptedFiles, storageTypeIsHttps } from '../uploader/util';
 // 默认组件类前缀
 const CLASS_PREFIX = 'weda-upload-file-mobile';
 // 默认图片类型
@@ -42,8 +42,9 @@ export function UploadFileH5({
 layout, id = '', style = defaultStyle, labelVisible = true, label = '上传文件', requiredFlag = false, disabled = false, className = '', acceptTypes = emptyArray, 
 // 组件属性
 tips = '', btnTitle = '点击上传', uploadTipText = '支持批量上传', maxUploadCount = 9, maxSize = 10, deleteVisible = true, downloadVisible = true, value = emptyArray, // 需要兼容 cloud:和https: 协议，需要兼容字符串和字符串数组
-events = emptyObject, defaultValue, uploadPath = 'weda-uploader', single = true, onChange = null, isEdit = true, $node, readOnly, callbacks, }) {
+events = emptyObject, defaultValue, uploadPath = 'weda-uploader', single = true, onChange = null, isEdit = true, $node, readOnly, callbacks, storageType = 'cloudID', }) {
     var _a;
+    const _storageTypeIsHttps = storageTypeIsHttps(storageType);
     const [fileIDList, setfileIDList] = React.useState(isInIde() ? [] : filterStrList([].concat(defaultValue, value))); // 上传成功文件ID列表，fileID[]
     const [fileList, setFileList] = React.useState([]); // 上传中的文件列表，file[]，file为原始文件 + uuid属性
     const [fileSizeObj, setFileSizeObj] = React.useState({}); // 管理上传文件大小 {uuid:size}
@@ -94,8 +95,9 @@ events = emptyObject, defaultValue, uploadPath = 'weda-uploader', single = true,
         return acceptTypes.includes('*') || acceptTypes.length === 0 ? ['*'] : Array.from(new Set(acceptTypes));
     }, [acceptTypes]);
     // 上传后文件列表 fileIDList 改变事件，'add'|'delete'
-    const handleChange = ({ fileID, uuid, type, size, file }) => {
+    const handleChange = ({ fileID: _fileID, uuid, type, size, file, url }) => {
         var _a;
+        const fileID = _storageTypeIsHttps ? url : _fileID;
         if (fileID) {
             changeTypeRef.current = type;
             if (type === 'add') {
@@ -257,12 +259,12 @@ const TcbFileUpload = ({ id, file, disabled, formType }) => {
     }, [file === null || file === void 0 ? void 0 : file._uuid]);
     // 上传过程
     const handleUpload = async (file) => {
-        var _a, _b;
+        var _a, _b, _c;
         const tcb = await getCloudInstance();
         try {
             setStatus('UPLOAD_STATUS_PENDING');
             const _uploadPath = getDefaultUploadPath(uploadPath);
-            const { fileID } = await tcb.uploadFile({
+            const { fileID, download_url } = await tcb.uploadFile({
                 cloudPath: `${_uploadPath}/${randomStr()}-${(_a = file === null || file === void 0 ? void 0 : file.name) === null || _a === void 0 ? void 0 : _a.replace(filenameRegex, '-')}`,
                 filePath: file,
                 onUploadProgress: (progressEvent) => {
@@ -272,7 +274,8 @@ const TcbFileUpload = ({ id, file, disabled, formType }) => {
                     setPercent(percent < 100 ? percent : 100);
                 },
             });
-            !cancelRef.current && (onChange === null || onChange === void 0 ? void 0 : onChange({ fileID, type: 'add', uuid, size, file }));
+            const url = (_b = download_url === null || download_url === void 0 ? void 0 : download_url.split('?')) === null || _b === void 0 ? void 0 : _b[0];
+            !cancelRef.current && (onChange === null || onChange === void 0 ? void 0 : onChange({ fileID, url, type: 'add', uuid, size, file }));
             setStatus('UPLOAD_STATUS_SUCCESS');
         }
         catch (err) {
@@ -282,7 +285,7 @@ const TcbFileUpload = ({ id, file, disabled, formType }) => {
                 id,
             });
             setStatus('UPLOAD_STATUS_ERROR');
-            (_b = events === null || events === void 0 ? void 0 : events.error) === null || _b === void 0 ? void 0 : _b.call(events, err);
+            (_c = events === null || events === void 0 ? void 0 : events.error) === null || _c === void 0 ? void 0 : _c.call(events, err);
         }
     };
     return (_jsxs("div", { className: `${CLASS_PREFIX}__item`, role: "TcbFileUpload", children: [_jsx("div", { className: `${CLASS_PREFIX}__item-left`, children: _jsx(UploadFileStatus, { status: status, percent: percent, size: size, title: title, percentSize: (((file === null || file === void 0 ? void 0 : file.size) / 1024) * percent) / 100, formType: formType }) }), _jsx("div", { className: `${CLASS_PREFIX}__btn-group`, children: _jsx(UploadFileAction, { file: file, uuid: file === null || file === void 0 ? void 0 : file._uuid, status: status, onCancel: (uuid) => {
@@ -309,7 +312,7 @@ const UploadFileStatus = ({ status = 'UPLOAD_STATUS_SUCCESS', percent = 0, size,
 const UploadFileAction = ({ status = 'UPLOAD_STATUS_PENDING', fileID = '', uuid = '', src = '', file = null, onReLoad = null, onCancel = null, disabled, title = 'downfile', }) => {
     const { onChange, downloadVisible, deleteVisible, isEdit } = React.useContext(FileContext) || {};
     // 操作列按钮-删除
-    const renderDelete = () => isEdit && _jsx(Button, { icon: "delete", onClick: () => onChange === null || onChange === void 0 ? void 0 : onChange({ fileID, uuid, type: 'delete' }), disabled: disabled });
+    const renderDelete = () => isEdit && (_jsx(Button, { icon: "delete", onClick: () => onChange === null || onChange === void 0 ? void 0 : onChange({ fileID, uuid, type: 'delete', url: src }), disabled: disabled }));
     // 操作列按钮-取消
     const renderCancel = () => isEdit && _jsx(Button, { icon: "dismiss", onClick: () => onCancel === null || onCancel === void 0 ? void 0 : onCancel(uuid) });
     // 操作列按钮-重新上传

package/dist/web/components/form/uploaderFile/uploadFile.pc.d.ts

@@ -7,7 +7,7 @@ import type { DataType } from '../../../../configs/components/wd-upload-file';
  */
 export declare function UploadFilePc({ layout, id, style, labelVisible, label, requiredFlag, disabled, className, events, decorator, tips, btnTitle, uploadTipText, maxUploadCount, maxSize, single, defaultValue, // 组件默认初始化值
 value, // 用于模型组件中 formily 的值管理
-acceptTypes, downloadVisible, deleteVisible, uploadPath, onChange, isEdit, $node, readOnly, callbacks, }: IUploaderFilePc): JSX.Element;
+acceptTypes, downloadVisible, deleteVisible, uploadPath, onChange, isEdit, $node, readOnly, callbacks, storageType, }: IUploaderFilePc): JSX.Element;
 export interface IUploaderFilePc extends CommonFormPropsType {
     btnTitle?: string;
     maxUploadCount?: number;
@@ -25,6 +25,7 @@ export interface IUploaderFilePc extends CommonFormPropsType {
     readOnly?: boolean;
     callbacks?: DataType['callbacks'];
     uploadTipText?: string;
+    storageType?: DataType['storageType'];
 }
 export interface IUploadFileAction {
     status?: string;

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

@@ -14,7 +14,7 @@ import { getParentForm } from '../../../utils/widget-api';
 import { toBase64Uri } from '../../../utils/file2base64';
 import { isNil } from '../../../utils/lodash';
 import { errorHandler } from '../../../utils/error';
-import { filenameRegex } from '../uploader/util';
+import { filenameRegex, storageTypeIsHttps } from '../uploader/util';
 // 默认组件类前缀
 const CLASS_PREFIX = 'weda-upload-file-pc';
 // 上传状态字典
@@ -35,8 +35,9 @@ layout, id = '', style, labelVisible = true, label = '上传文件', requiredFla
 // 组件属性
 decorator, tips = '', btnTitle = '点击上传', uploadTipText = '支持批量上传', maxUploadCount = 9, maxSize = 1024, single = true, defaultValue = emptyArray, // 组件默认初始化值
 value = emptyArray, // 用于模型组件中 formily 的值管理
-acceptTypes = emptyArray, downloadVisible = true, deleteVisible = true, uploadPath = 'weda-uploader', onChange = null, isEdit = true, $node, readOnly, callbacks, }) {
+acceptTypes = emptyArray, downloadVisible = true, deleteVisible = true, uploadPath = 'weda-uploader', onChange = null, isEdit = true, $node, readOnly, callbacks, storageType = 'cloudID', }) {
     var _a;
+    const _storageTypeIsHttps = storageTypeIsHttps(storageType);
     const [fileIDList, setfileIDList] = React.useState(() => {
         let defaultVal = defaultValue;
         let val = value;
@@ -163,8 +164,9 @@ acceptTypes = emptyArray, downloadVisible = true, deleteVisible = true, uploadPa
         return Promise.reject(false);
     };
     // 上传后文件列表 fileIDList 改变事件，'add'|'delete'
-    const handleChange = ({ fileID, uuid, type, size, file }) => {
+    const handleChange = ({ fileID: _fileID, uuid, type, size, file, url }) => {
         var _a;
+        const fileID = _storageTypeIsHttps ? url : _fileID;
         if (fileID) {
             changeTypeRef.current = type;
             if (type === 'add') {
@@ -220,7 +222,7 @@ const TcbFileEcho = ({ fileID, disabled, formType, readOnly }) => {
     const { fileSizeObj } = React.useContext(FileContext) || {};
     const { data: src } = useTempUrl(fileID);
     const title = React.useMemo(() => {
-        if (isCloudFileID(fileID)) {
+        if (isCloudFileID(fileID) || isHttpFileID(fileID)) {
             return transFileCloudidToName(fileID);
         }
         else {
@@ -249,12 +251,12 @@ const TcbFileUpload = ({ id, file, disabled, formType }) => {
     }, [file === null || file === void 0 ? void 0 : file._uuid]);
     // 上传过程
     const handleUpload = async (file) => {
-        var _a;
+        var _a, _b;
         const tcb = await getCloudInstance();
         try {
             setStatus('0');
             const _uploadPath = getDefaultUploadPath(uploadPath);
-            const { fileID } = await tcb.uploadFile({
+            const { fileID, download_url } = await tcb.uploadFile({
                 cloudPath: `${_uploadPath}/${randomStr()}-${(_a = file === null || file === void 0 ? void 0 : file.name) === null || _a === void 0 ? void 0 : _a.replace(filenameRegex, '-')}`,
                 filePath: file,
                 onUploadProgress: (progressEvent) => {
@@ -264,7 +266,8 @@ const TcbFileUpload = ({ id, file, disabled, formType }) => {
                     setPercent(percent < 100 ? percent : 100);
                 },
             });
-            !cancelRef.current && (onChange === null || onChange === void 0 ? void 0 : onChange({ fileID, type: 'add', uuid, size, file }));
+            const url = (_b = download_url === null || download_url === void 0 ? void 0 : download_url.split('?')) === null || _b === void 0 ? void 0 : _b[0];
+            !cancelRef.current && (onChange === null || onChange === void 0 ? void 0 : onChange({ fileID, url, type: 'add', uuid, size, file }));
             setStatus('2');
         }
         catch (e) {
@@ -301,7 +304,7 @@ const UploadFileAction = ({ title = 'downfile', status = '0', fileID = '', uuid
     // 操作列按钮-删除
     const renderDelete = () => isEdit &&
         deleteVisible &&
-        !readOnly && (_jsx(WdButton, { text: "\u5220\u9664", size: "sm", variant: "link", disabled: disabled, events: { tap: () => onChange === null || onChange === void 0 ? void 0 : onChange({ fileID, uuid, type: 'delete' }) } }));
+        !readOnly && (_jsx(WdButton, { text: "\u5220\u9664", size: "sm", variant: "link", disabled: disabled, events: { tap: () => onChange === null || onChange === void 0 ? void 0 : onChange({ fileID, uuid, type: 'delete', url: src }) } }));
     // 操作列按钮-取消
     const renderCancel = () => isEdit && _jsx(WdButton, { events: { tap: () => onCancel === null || onCancel === void 0 ? void 0 : onCancel(uuid) }, variant: "link", text: "\u53D6\u6D88", size: "sm" });
     // 操作列按钮-重新上传

package/dist/web/components/form-location/index.d.ts

@@ -30,7 +30,7 @@ declare const FormLocation: React.ForwardRefExoticComponent<CommonPropsType & {
     customRange: number;
     requiredFlag: boolean;
     requiredMsg: string;
-    defauleShowLocation: boolean;
+    defaultShowLocation: boolean;
     dataSource: Record<string, unknown>;
 } & {
     onChange: (v: DataType['value']) => void;

package/dist/web/components/form-location/index.js

@@ -5,10 +5,10 @@ import Location from '../form/location';
 import Tips from '../form/tips';
 import { useFormInputTrait } from '../form-input-hooks';
 const FormLocation = React.forwardRef(function FormLocation(props, inputRef) {
-    const { className, id, style, events, required, requiredFlag, label, labelVisible, customRange, dataSource, defauleShowLocation, locationRange, locationType, showLngLat, showMap, zoom, drag, 
+    const { className, id, style, events, required, requiredFlag, label, labelVisible, customRange, dataSource, defaultShowLocation, locationRange, locationType, showLngLat, showMap, zoom, drag, 
     // @ts-expect-error 里面有，但dataForm没有，但json有传
     customLocation, ...restProps } = props;
-    const { value, name, onChange, disabled, layout, readOnly, validateErrorMsg, validateState, visible, } = useFormInputTrait({
+    const { value, name, onChange, disabled, layout, readOnly, validateErrorMsg, validateState, visible } = useFormInputTrait({
         name: restProps.name,
         inputRef,
         required,
@@ -18,6 +18,6 @@ const FormLocation = React.forwardRef(function FormLocation(props, inputRef) {
     if (!visible) {
         return null;
     }
-    return (_jsxs(FormItemWrapper, { children: [_jsx(Location, { id: id, style: style, className: className, events: events, name: name, disabled: disabled, label: label, labelVisible: labelVisible, layout: layout, requiredFlag: required && requiredFlag, value: value, customLocation: customLocation, customRange: customRange, dataSource: dataSource, defauleShowLocation: defauleShowLocation, drag: drag, locationType: locationType, locationRange: locationRange, showLngLat: showLngLat, showMap: showMap, zoom: zoom, onChange: onChange, readOnly: readOnly }), (validateState === 'error' || validateState === 'warn') && (_jsx(Tips, { tips: validateErrorMsg, type: "warn" }))] }));
+    return (_jsxs(FormItemWrapper, { children: [_jsx(Location, { id: id, style: style, className: className, events: events, name: name, disabled: disabled, label: label, labelVisible: labelVisible, layout: layout, requiredFlag: required && requiredFlag, value: value, customLocation: customLocation, customRange: customRange, dataSource: dataSource, defaultShowLocation: defaultShowLocation, drag: drag, locationType: locationType, locationRange: locationRange, showLngLat: showLngLat, showMap: showMap, zoom: zoom, onChange: onChange, readOnly: readOnly }), (validateState === 'error' || validateState === 'warn') && _jsx(Tips, { tips: validateErrorMsg, type: "warn" })] }));
 });
 export default FormLocation;

package/dist/web/components/form-user-tree-select/index.js

@@ -5,16 +5,18 @@ import Tips from '../form/tips';
 import { useFormInputTrait, useParentForm } from '../form-input-hooks';
 import { FormItemWrapper } from '../common/form-item-wrapper';
 import { convertSingleValue } from '../../utils/tool';
+import { parseStrToArr } from '../form/userOrgSelect/common/utils';
 const FormUserTreeSelect = React.forwardRef(function FormUserTreeSelect(props, inputRef) {
     const parent = useParentForm(props.$widget);
     const { className, id, style, events, required, requiredFlag, label, labelVisible, confirmValue, defaultValueType, multiple, size, where, secondDisplay, corpScope, ...restProps } = props;
     // 强制转换初始值
     const initRef = useRef(false);
     const formValue = useMemo(() => {
+        const _value = parseStrToArr(props.value);
         if (initRef.current)
-            return props.value;
+            return _value;
         initRef.current = true;
-        return convertSingleValue(props.value, !multiple);
+        return convertSingleValue(_value, !multiple);
     }, [props.value, multiple]);
     const { value, name, onChange, disabled, layout, readOnly, validateErrorMsg, validateState, visible } = useFormInputTrait({
         name: restProps.name,

package/dist/web/components/richText/index.d.ts

@@ -1,8 +1,9 @@
 import React from 'react';
 import './style';
+import type { DataType } from '../../../configs/components/wd-rich-text';
 declare const _default: React.MemoExoticComponent<typeof RichText>;
 export default _default;
-declare function RichText({ id, style, className, events, label, labelVisible, value, readOnly, layout, disabled, requiredFlag, onChange, decorator, acceptTypes, initialContent, placeholder, iconPack, maxSize, cloudPath, visible, }: {
+declare function RichText({ id, style, className, events, label, labelVisible, value, readOnly, layout, disabled, requiredFlag, onChange, decorator, acceptTypes, initialContent, placeholder, iconPack, maxSize, cloudPath, visible, storageType, }: {
     id: any;
     style: any;
     className?: string;
@@ -23,6 +24,7 @@ declare function RichText({ id, style, className, events, label, labelVisible, v
     maxSize: any;
     cloudPath: any;
     visible: any;
+    storageType?: string;
 }): JSX.Element;
 declare namespace RichText {
     var whyDidYouRender: boolean;
@@ -57,4 +59,5 @@ export interface WdRichTextProps {
     maxSize?: number;
     name?: string;
     cloudPath?: string;
+    storageType?: DataType['storageType'];
 }