@hzab/form-render 1.1.1 → 1.1.3

package/src/components/Upload/components/PreviewModal/previewRender.tsx

@@ -36,12 +36,12 @@ export function getPreviewRender(file, accept) {
 
   if (fileType) {
     render = previewRenderEnum[checkFileType(file)];
-  } else {
-    if (accept) {
-      // 只获取accept中第一个媒体类型，之后传入的类型不做判断
-      const mediaType = getFirstAcceptRule(accept);
-      render = previewRenderEnum[mediaType];
-    }
+  }
+
+  if (accept) {
+    // 只获取accept中第一个媒体类型，之后传入的类型不做判断
+    const mediaType = getFirstAcceptRule(accept);
+    render = previewRenderEnum[mediaType];
   }
 
   if (!render) {
@@ -50,12 +50,26 @@ export function getPreviewRender(file, accept) {
   return render;
 }
 
-export function getPreviewContent(file, accept) {
+function mergePreviewConfig(uri: string, previewConfig: { query: string; url: string }) {
+  const isUriPattern = /http[s]?:\/\/[^\s]+/.test(uri);
+  const query = previewConfig?.query ? "?" + previewConfig?.query : "";
+
+  if (isUriPattern) return `${uri}${query}`?.trim();
+
+  if (previewConfig) return `${previewConfig?.url}/${uri}${query}`?.trim();
+
+  return uri;
+}
+
+export function getPreviewContent(file, accept, previewConfig) {
   let render = getPreviewRender(file, accept);
   if (!render) {
     render = () => file?.name || file;
   }
-  return render(file?.url || file);
+
+  const fileURL = mergePreviewConfig(file?.url, previewConfig);
+
+  return render(fileURL || file);
 }
 
 export function videoRender(src) {

package/src/components/Upload/uploader.jsx

@@ -46,6 +46,7 @@ export function Uploader({ onChange, ...props }) {
     isFileObj = false,
     isFileJson = false,
     UploadOss,
+    previewConfig,
   } = props;
 
   const [fileList, setFileList] = useState([]);
@@ -250,6 +251,7 @@ export function Uploader({ onChange, ...props }) {
         accept={props?.accept}
         setPreviewFile={setPreviewFile}
         modalConf={props.modalConf}
+        previewConfig={previewConfig}
       />
     </>
   );