@hzab/form-render 1.7.16 → 1.7.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/form-render",
-  "version": "1.7.16",
+  "version": "1.7.17",
   "description": "",
   "main": "src",
   "scripts": {

package/src/components/Upload/README.md

@@ -27,13 +27,26 @@
 | ossServerUrl         | string   | 否   | -        | 获取 oss 参数的接口，默认 /api/v1/user/oss/getWebOssConfig                           |
 | ossOpt               | Object   | 否   | -        | oss 上传的配置参数                                                                   |
 | fileListConf         | Object   | 否   | {}       | 结果数据配置                                                                         |
-| previewConfig        | Object   | 否   | {}       | 预览场景的配置                                                                       |
+| previewConfig        | Object   | 否   | {}       | 预览场景配置（见下表）。仅影响列表/弹窗预览，不进入 onChange / 表单提交 |
+| previewBaseUrl       | string   | 否   | -        | 仅预览使用的域名/路径前缀（糖衣）。与 `previewConfig.url` 并存时，以 `previewConfig.url` 为准；不进入表单提交 |
 | onCountExceed        | Function | 否   | -        | 数量超出 maxCount 时的回调                                                           |
 | beforeUploadCheck    | Function | 否   | -        | 追加的 beforeUpload 检查，返回 Promise.reject() 进行拦截                             |
 | templateUrl          | string   | 否   | -        | 模板下载的地址                                                                       |
 | templateDownloadText | string   | 否   | 模板下载 | 模板下载按钮的文案                                                                   |
 | uploadParams         | Object   | 否   | {}       | 文件上传接口入参                                                                     |
 
+### previewConfig 预览配置
+
+| 参数 | 类型 | 必填 | 默认值 | 说明 |
+| ---- | ---- | ---- | ------ | ---- |
+| url | string | 否 | - | 预览域名或路径前缀，如 `https://cdn.example.com`。相对路径会拼到此前缀后用于列表缩略图与弹窗预览 |
+| query | object | 否 | - | 追加到预览地址的 query 对象，推荐写法，如 `{ loookType: 1 }` |
+| search | string | 否 | - | `?` 后的原始字符串（可不含 `?`），会先解析再与 `query` 合并；同名键以 `query` 为准 |
+
+兼容：把 `query` 写成字符串（如 `"loookType=1"`）时，组件会解析为 `search`，无需立刻改业务 schema。
+
+> **边界**：`previewConfig.url` / `previewBaseUrl` 只用于上传列表视图与弹窗预览；`onChange` 与表单提交仍使用后端返回的相对/原始路径，不会提交拼接后的完整地址。
+
 ### fileListConf 结果数据配置
 
 | 参数     | 类型   | 必填 | 默认值 | 说明                         |

package/src/components/Upload/common/handleIOFileList.ts

@@ -1,11 +1,12 @@
 import { getFileURL } from "@hzab/utils/src/file/file";
 import { getFileType } from "@hzab/utils/src/file/fileType";
-import { isBase64Str } from "@hzab/utils/src/base64Str";
 import { getUFileName, getFileName, getFullFileName, getFileExt } from "@hzab/utils/src/file/fileName";
-import { getFileNameObj } from "@hzab/utils/src/upload/uploadUtils";
+import { getFileNameObj, mergePreviewConfig } from "@hzab/utils/src/upload/uploadUtils";
 import { nanoidNumALetters } from "@hzab/utils/src/nanoid";
 import { getFormRenderPCGlobalServeConfig } from "../../../globalConfig";
-import { addQuery } from "@hzab/utils/src/url"
+import { addQuery } from "@hzab/utils/src/url";
+
+export { mergePreviewConfig };
 
 
 /**
@@ -139,43 +140,6 @@ export const objStrToObj = function (objStr) {
   return _objStr;
 };
 
-/**
- * 预览 url 添加前缀
- * @param {*} uri
- * @param {*} previewConfig
- * @returns
- */
-export function mergePreviewConfig(uri, previewConfig) {
-  let _uri = uri;
-  let basePath = "";
-  if (typeof _uri === "object") {
-    basePath = _uri.basePath;
-    _uri = _uri.previewUrl || _uri.url;
-  }
-  if (typeof _uri !== "string") {
-    return _uri;
-  }
-  _uri = _uri?.trim();
-  // base64 直接返回
-  if (isBase64Str(_uri)) {
-    return _uri;
-  }
-  const isUriPattern = /http[s]?:\/\/[^\s]+/.test(_uri);
-  const query = previewConfig?.query?.trim() ? "?" + previewConfig?.query?.trim() : "";
-
-  if (isUriPattern) {
-    // 源地址为 http 地址，直接拼接 query 参数
-    return `${_uri}${query}`;
-  }
-
-  if (previewConfig) {
-    // 拼接前缀
-    return `${previewConfig?.url?.trim()}/${_uri}${query}`?.trim();
-  }
-
-  return _uri;
-}
-
 /**
  * 子项数据归一化
  * 字符串：url、base64

package/src/components/Upload/common/utils.js

@@ -1,5 +1,5 @@
-import { formatDirStr, mergeDirStr, handleMaxCount, mergePreviewConfig } from "@hzab/utils/upload/uploadUtils";
-import { getFileURL } from "@hzab/utils/file/file";
+import { formatDirStr, mergeDirStr, handleMaxCount, mergePreviewConfig } from "@hzab/utils/src/upload/uploadUtils";
+import { getFileURL } from "@hzab/utils/src/file/file";
 import { isBase64Str } from "@hzab/utils/src/base64Str";
 import {
   checkImageUrl,
@@ -7,6 +7,7 @@ import {
   checkAudioUrl,
   isValidMediaType,
   checkUrlSuffix,
+  getFileType,
 } from "@hzab/utils/src/file/fileType";
 import { getArr } from "@hzab/utils/src/array";
 

package/src/components/Upload/uploader.jsx

@@ -10,6 +10,7 @@ import { Button, Upload as AUpload, message } from "antd";
 import React, { useEffect, useState, useMemo } from "react";
 
 import { handleInputFileList, handleOutputFileList } from "./common/handleIOFileList";
+import { mergePreviewConfig } from "@hzab/utils/src/upload/uploadUtils";
 
 import PreviewModal, { hasPreviewRender, hasPreviewMedium } from "./components/PreviewModal";
 import { getOssUploadRequest, getOfflineUploadRequest } from "./common/customRequest";
@@ -57,6 +58,8 @@ export function Uploader({ onChange, ...props }) {
     isResRemoveArr = true,
     /** 预览配置参数 */
     previewConfig = {},
+    /** 仅预览使用的域名/路径前缀，不参与 onChange / 表单提交；优先级低于 previewConfig.url */
+    previewBaseUrl = getFormRenderPCGlobalServeConfig()?.previewBaseUrl || "",
     onCountExceed,
     templateUrl,
     beforeUploadCheck,
@@ -69,6 +72,26 @@ export function Uploader({ onChange, ...props }) {
   const isPrivateStore =
     props.uploadParams?.fileAcl === "private" || props.ossOpt?.signatureParams?.fileAcl === "private";
 
+  /** 预览前缀配置：previewConfig.url 优先，其次 previewBaseUrl；*/
+  const resolvedPreviewConfig = useMemo(() => {
+    const url = previewConfig?.url || previewBaseUrl;
+    const { query, search, ...rest } = previewConfig || {};
+    const isQueryObject = query && typeof query === "object";
+    const legacyQueryStr = typeof query === "string" ? query.trim() : "";
+    const resolvedSearch = (search || legacyQueryStr || "").replace(/^\?/, "") || undefined;
+    const resolvedQuery = isQueryObject ? query : undefined;
+
+    if (!url && !resolvedQuery && !resolvedSearch) {
+      return previewConfig || {};
+    }
+    return {
+      ...rest,
+      url,
+      ...(resolvedQuery ? { query: resolvedQuery } : {}),
+      ...(resolvedSearch ? { search: resolvedSearch } : {}),
+    };
+  }, [previewConfig.url, previewConfig.query, previewConfig.search, previewBaseUrl]);
+
   /**
    * 数据格式配置
    */
@@ -135,7 +158,12 @@ export function Uploader({ onChange, ...props }) {
   };
 
   useEffect(() => {
-    const list = handleInputFileList(value, { ...fileListConf, maxCount, previewConfig, thumbnailParams });
+    const list = handleInputFileList(value, {
+      ...fileListConf,
+      maxCount,
+      previewConfig: resolvedPreviewConfig,
+      thumbnailParams,
+    });
 
     async function handlePreview() {
       await handlePreviewUrls(list, {
@@ -150,7 +178,27 @@ export function Uploader({ onChange, ...props }) {
     } else {
       setFileList(list);
     }
-  }, [value]);
+  }, [value, resolvedPreviewConfig]);
+
+  /** 仅用于列表展示：补齐 thumbUrl/previewUrl，不改动 url（提交仍用相对路径） */
+  const displayFileList = useMemo(() => {
+    if (!resolvedPreviewConfig?.url || !fileList?.length) {
+      return fileList;
+    }
+    return fileList.map((file) => {
+      if (!file || typeof file !== "object") {
+        return file;
+      }
+      // 用存储路径 url 拼前缀，避免已是完整 previewUrl 时语义混乱；无 url 时回退对象自身
+      const previewUrl = mergePreviewConfig(file.url || file, resolvedPreviewConfig);
+      const thumbUrl = file.thumbUrl ? mergePreviewConfig(file.thumbUrl, resolvedPreviewConfig) : previewUrl;
+      return {
+        ...file,
+        previewUrl,
+        thumbUrl,
+      };
+    });
+  }, [fileList, resolvedPreviewConfig]);
 
   const onRemove = (file) => {
     const files = (fileList || []).filter((v) => v.url !== file.url);
@@ -206,7 +254,7 @@ export function Uploader({ onChange, ...props }) {
     multiple: multiple,
     listType: listType,
     maxCount: maxCount,
-    fileList: fileList,
+    fileList: displayFileList,
     onChange: handleChange,
     disabled,
     readOnly,
@@ -249,10 +297,14 @@ export function Uploader({ onChange, ...props }) {
       setChecking(false);
     },
     customRequest,
+    ...(props || {}),
+    // 保证展示列表与预览逻辑不被 props 覆盖丢失
+    fileList: displayFileList,
     onPreview(file) {
       // TODO: 逻辑合并到数据处理中
       const isShowPreview = hasPreviewRender(file) || hasPreviewMedium(props.accept);
-      const fileUrl = file.previewUrl;
+      // 预览出口统一走 mergePreviewConfig；提交仍使用 file.url 相对路径
+      const fileUrl = mergePreviewConfig(file.url || file, resolvedPreviewConfig);
       if (isShowPreview) {
         setPreviewFile({
           ...file,
@@ -316,7 +368,7 @@ export function Uploader({ onChange, ...props }) {
         accept={props?.accept}
         setPreviewFile={setPreviewFile}
         modalConf={props.modalConf}
-        previewConfig={previewConfig}
+        previewConfig={resolvedPreviewConfig}
       />
     </>
   );