@hzab/form-render 1.7.16-alpha.0 → 1.7.17

package/package.json

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

package/src/components/LocationPicker/components/MapSearch/index.jsx

@@ -1,57 +1,57 @@
-import { useState } from "react";
-import { Input, AutoComplete } from "antd";
-
-import { getSearchTips } from "../../servers";
-
-import "./index.less";
-
-const cityCode = "0571";
-
-function Search(props) {
-  const [loading, setLoading] = useState(false);
-  const [tips, setTips] = useState([]);
-
-  function onSelect(value, option) {
-    const { lng: _lng, lat: _lat } = option || {};
-    props.setPoint && props.setPoint(_lng, _lat, { changeCenter: true });
-  }
-
-  function onSearch(search) {
-    if (!search) {
-      setTips([]);
-      return;
-    }
-    setLoading(true);
-    getSearchTips(search, props.cityCode || cityCode)
-      .then((res) => {
-        setTips(
-          res?.map((it) => ({
-            ...it,
-            label: it.name,
-            // 解决回显为 id 的问题
-            value: it.name,
-          })),
-        );
-        setLoading(false);
-      })
-      .catch((err) => {
-        setLoading(false);
-      });
-  }
-
-  return (
-    <AutoComplete
-      className="location-map-search"
-      options={tips}
-      onSelect={onSelect}
-      onSearch={_.debounce(onSearch, 500)}
-      onClear={() => {
-        setTips([]);
-      }}
-    >
-      <Input.Search allowClear loading={loading} placeholder="请输入" />
-    </AutoComplete>
-  );
-}
-
-export default Search;
+import { useState } from "react";
+import { Input, AutoComplete } from "antd";
+
+import { getSearchTips } from "../../servers";
+
+import "./index.less";
+
+const cityCode = "0571";
+
+function Search(props) {
+  const [loading, setLoading] = useState(false);
+  const [tips, setTips] = useState([]);
+
+  function onSelect(value, option) {
+    const { lng: _lng, lat: _lat } = option || {};
+    props.setPoint && props.setPoint(_lng, _lat, { changeCenter: true });
+  }
+
+  function onSearch(search) {
+    if (!search) {
+      setTips([]);
+      return;
+    }
+    setLoading(true);
+    getSearchTips(search, props.cityCode || cityCode)
+      .then((res) => {
+        setTips(
+          res?.map((it) => ({
+            ...it,
+            label: it.name,
+            // 解决回显为 id 的问题
+            value: it.name,
+          })),
+        );
+        setLoading(false);
+      })
+      .catch((err) => {
+        setLoading(false);
+      });
+  }
+
+  return (
+    <AutoComplete
+      className="location-map-search"
+      options={tips}
+      onSelect={onSelect}
+      onSearch={_.debounce(onSearch, 500)}
+      onClear={() => {
+        setTips([]);
+      }}
+    >
+      <Input.Search allowClear loading={loading} placeholder="请输入" />
+    </AutoComplete>
+  );
+}
+
+export default Search;

package/src/components/TreeCheckbox/common/utils.ts

@@ -1,221 +1,221 @@
-import _ from "lodash";
-
-export interface ITabTableDataOpt extends optT {
-  /**
-   * 展示 tab 的层级
-   */
-  tabLevel?: number;
-  /**
-   * 当前处理的层级
-   */
-  _level?: number;
-  fieldNames?: {
-    label?: string;
-    value?: string;
-    children?: string;
-  };
-}
-/**
- * 处理数据，按需设置 tab、table 数据
- * @param treeData 树数据数组
- * @param opt 配置项
- * @returns
- */
-export function getTabTableData(_treeData = [], opt: ITabTableDataOpt = {}) {
-  const treeData = _.cloneDeep(_treeData);
-  const { tabLevel = 0, _level = 0, fieldNames } = opt || {};
-  const { value, children } = fieldNames || {};
-  let resList = [];
-  // 当前层级小于 tabLevel，视为当前层级渲染为 tab
-  const isTab = _level < tabLevel;
-
-  // 当前层级渲染为 tab，直接 push 到 resList 中
-  if (isTab) {
-    resList.push({
-      level: _level,
-      defaultActiveKey: treeData[0]?.[value],
-      tabList: treeData,
-    });
-    // 继续处理子集数据
-    treeData?.forEach((it) => {
-      if (it[children]?.length > 0) {
-        it[children] = getTabTableData(it[children], {
-          ...opt,
-          _level: _level + 1,
-        });
-      }
-    });
-  } else {
-    // 非 tab 层级，处理 table 渲染数据（handleTreeToArray 自动处理子集）
-    resList.push({
-      level: _level,
-      tableData: handleTreeToArray(treeData, {
-        ...opt,
-        level: undefined,
-      }),
-    });
-  }
-  return resList;
-}
-
-/**
- * 处理树形数据，把树形数据方向转为多维数组，便于渲染
- * @param params
- * @returns
-    如：
-    [{key:1, children:[{key:11},{key:12}]}, {key:2, children:[{key:21, children:[{key:211}]},{key:22},{key:23}]}]
-    结果数组：
-      [1, 11,    ]
-      [ , 12,    ]
-      [2, 21, 211]
-      [ , 22,    ]
-      [ , 23,    ]
- */
-export function handleTreeToArray(treeData = [], opt: any = {}) {
-  const { resList, maxCol } = transformTreeData(treeData, opt);
-  resList?.forEach((row) => {
-    fillArrByPush(maxCol, row);
-  });
-  return resList;
-}
-
-export type optT = {
-  resList?: Array<any>;
-  preCol?: number;
-  //是否合并叶子节点
-  mergeLeaf?: boolean;
-  // 最后一列是否合并到一个单元格
-  mergeFullLeaf?: boolean;
-  // 当前递归的层级
-  level?: number;
-  fieldNames?: {
-    value?: string;
-    label?: string;
-    children?: string;
-  };
-};
-
-/**
- * 处理树形数据，把树形数据方向转为多维数组，便于渲染
- * @param params
- * @returns
-    如：
-    [{key:1, children:[{key:11},{key:12}]}, {key:2, children:[{key:21, children:[{key:211}]},{key:22},{key:23}]}]
-    结果数组：
-      [1, 11,    ]
-      [ , 12,    ]
-      [2, 21, 211]
-      [ , 22,    ]
-      [ , 23,    ]
- */
-export function transformTreeData(treeData = [], opt: optT = {}) {
-  const { resList = [], preCol = 0, mergeLeaf, mergeFullLeaf, level = 0, fieldNames } = opt || {};
-  const { value = "value", children = "children", label = "label" } = fieldNames || {};
-  let maxCol = preCol + 1;
-  // 统计当前项包含的最大行数（当前项的行数等于所有子项行数之和），用于合并行的值
-  let maxRow = 0;
-
-  const leafIndexList = [];
-  const leafItemList = [];
-
-  // 是否有子项
-  let hasChildren = false;
-  treeData?.forEach((it, i) => {
-    if (it && Array.isArray(it[children]) && it[children].length > 0) {
-      hasChildren = true;
-    } else {
-      // 保存当前层级的叶子节点，用于叶子节点合并
-      leafIndexList.push(i);
-      leafItemList.push(it);
-    }
-  });
-
-  let lastRowIdx = resList.length > 0 ? resList.length - 1 : 0;
-  // 合并不存在 children 的层级，mergeFullLeaf === true && hasChildren === false && level > 0 时，合并当前数据
-  if (mergeFullLeaf === true && !hasChildren && level > 0) {
-    resList[lastRowIdx].push([...treeData?.map((it) => ({ ...it, label: it[label], value: it[value] }))]);
-    return {
-      resList,
-      maxCol,
-      // 合并之后视为 1 行
-      maxRow: 1,
-    };
-  }
-
-  // 合并当前层级的叶子节点，非叶子节点忽略
-  if (mergeLeaf === true && leafIndexList.length > 0) {
-    // treeData 中删除当前层级其他叶子节点
-    for (let i = leafIndexList.length - 1; i >= 0; i--) {
-      const idx = leafIndexList[i];
-      treeData.splice(idx, 1);
-    }
-    // 所有叶子节点放在尾部
-    treeData.push({
-      _type_: "leafList",
-      leafList: leafItemList?.map((it) => ({ ...it, label: it[label], value: it[value] })),
-    });
-  }
-
-  treeData?.forEach((it, i) => {
-    let item = null;
-    if (it._type_ === "leafList") {
-      // 合并当前层级的叶子节点
-      item = it.leafList;
-    } else {
-      item = { ...it, value: it[value], label: it[label] };
-    }
-    const childList = item[children] || [];
-    const childLen = childList?.length;
-    // 当 mergeFullLeaf !== true && children 长度大于1时，子项下标大于 0 的项需要另起一行，同时补充之前空的列。
-    if (i > 0) {
-      resList.push(fillArrByPush(preCol, [], { content: false }));
-    }
-    lastRowIdx = resList.length > 0 ? resList.length - 1 : 0;
-    // 解决首次进来第一行数组空的问题
-    if (!resList[lastRowIdx]) {
-      resList[lastRowIdx] = [];
-    }
-    resList[lastRowIdx].push(item);
-    if (childLen > 0) {
-      const res = transformTreeData(childList, {
-        ...opt,
-        resList,
-        preCol: preCol + 1,
-        level: level + 1,
-      });
-      if (maxCol < res.maxCol) {
-        maxCol = res.maxCol;
-      }
-      // 当前的最大行数加上子项的行数
-      maxRow = maxRow + res.maxRow;
-      // 每项的最大行数为子项的最大行数之和
-      item._maxRow = res.maxRow;
-    } else {
-      item._maxRow = 1;
-      maxRow += 1;
-    }
-  });
-
-  return {
-    resList,
-    maxCol,
-    maxRow,
-  };
-}
-
-/**
- * 填充数组
- * @param len
- * @param arr
- * @param opt
- * @returns
- */
-export function fillArrByPush(len, arr = [], opt: any = {}) {
-  const { content } = opt || {};
-  if (arr.length < len) {
-    for (let i = arr.length; i < len; i++) {
-      arr.push(content);
-    }
-  }
-  return arr;
-}
+import _ from "lodash";
+
+export interface ITabTableDataOpt extends optT {
+  /**
+   * 展示 tab 的层级
+   */
+  tabLevel?: number;
+  /**
+   * 当前处理的层级
+   */
+  _level?: number;
+  fieldNames?: {
+    label?: string;
+    value?: string;
+    children?: string;
+  };
+}
+/**
+ * 处理数据，按需设置 tab、table 数据
+ * @param treeData 树数据数组
+ * @param opt 配置项
+ * @returns
+ */
+export function getTabTableData(_treeData = [], opt: ITabTableDataOpt = {}) {
+  const treeData = _.cloneDeep(_treeData);
+  const { tabLevel = 0, _level = 0, fieldNames } = opt || {};
+  const { value, children } = fieldNames || {};
+  let resList = [];
+  // 当前层级小于 tabLevel，视为当前层级渲染为 tab
+  const isTab = _level < tabLevel;
+
+  // 当前层级渲染为 tab，直接 push 到 resList 中
+  if (isTab) {
+    resList.push({
+      level: _level,
+      defaultActiveKey: treeData[0]?.[value],
+      tabList: treeData,
+    });
+    // 继续处理子集数据
+    treeData?.forEach((it) => {
+      if (it[children]?.length > 0) {
+        it[children] = getTabTableData(it[children], {
+          ...opt,
+          _level: _level + 1,
+        });
+      }
+    });
+  } else {
+    // 非 tab 层级，处理 table 渲染数据（handleTreeToArray 自动处理子集）
+    resList.push({
+      level: _level,
+      tableData: handleTreeToArray(treeData, {
+        ...opt,
+        level: undefined,
+      }),
+    });
+  }
+  return resList;
+}
+
+/**
+ * 处理树形数据，把树形数据方向转为多维数组，便于渲染
+ * @param params
+ * @returns
+    如：
+    [{key:1, children:[{key:11},{key:12}]}, {key:2, children:[{key:21, children:[{key:211}]},{key:22},{key:23}]}]
+    结果数组：
+      [1, 11,    ]
+      [ , 12,    ]
+      [2, 21, 211]
+      [ , 22,    ]
+      [ , 23,    ]
+ */
+export function handleTreeToArray(treeData = [], opt: any = {}) {
+  const { resList, maxCol } = transformTreeData(treeData, opt);
+  resList?.forEach((row) => {
+    fillArrByPush(maxCol, row);
+  });
+  return resList;
+}
+
+export type optT = {
+  resList?: Array<any>;
+  preCol?: number;
+  //是否合并叶子节点
+  mergeLeaf?: boolean;
+  // 最后一列是否合并到一个单元格
+  mergeFullLeaf?: boolean;
+  // 当前递归的层级
+  level?: number;
+  fieldNames?: {
+    value?: string;
+    label?: string;
+    children?: string;
+  };
+};
+
+/**
+ * 处理树形数据，把树形数据方向转为多维数组，便于渲染
+ * @param params
+ * @returns
+    如：
+    [{key:1, children:[{key:11},{key:12}]}, {key:2, children:[{key:21, children:[{key:211}]},{key:22},{key:23}]}]
+    结果数组：
+      [1, 11,    ]
+      [ , 12,    ]
+      [2, 21, 211]
+      [ , 22,    ]
+      [ , 23,    ]
+ */
+export function transformTreeData(treeData = [], opt: optT = {}) {
+  const { resList = [], preCol = 0, mergeLeaf, mergeFullLeaf, level = 0, fieldNames } = opt || {};
+  const { value = "value", children = "children", label = "label" } = fieldNames || {};
+  let maxCol = preCol + 1;
+  // 统计当前项包含的最大行数（当前项的行数等于所有子项行数之和），用于合并行的值
+  let maxRow = 0;
+
+  const leafIndexList = [];
+  const leafItemList = [];
+
+  // 是否有子项
+  let hasChildren = false;
+  treeData?.forEach((it, i) => {
+    if (it && Array.isArray(it[children]) && it[children].length > 0) {
+      hasChildren = true;
+    } else {
+      // 保存当前层级的叶子节点，用于叶子节点合并
+      leafIndexList.push(i);
+      leafItemList.push(it);
+    }
+  });
+
+  let lastRowIdx = resList.length > 0 ? resList.length - 1 : 0;
+  // 合并不存在 children 的层级，mergeFullLeaf === true && hasChildren === false && level > 0 时，合并当前数据
+  if (mergeFullLeaf === true && !hasChildren && level > 0) {
+    resList[lastRowIdx].push([...treeData?.map((it) => ({ ...it, label: it[label], value: it[value] }))]);
+    return {
+      resList,
+      maxCol,
+      // 合并之后视为 1 行
+      maxRow: 1,
+    };
+  }
+
+  // 合并当前层级的叶子节点，非叶子节点忽略
+  if (mergeLeaf === true && leafIndexList.length > 0) {
+    // treeData 中删除当前层级其他叶子节点
+    for (let i = leafIndexList.length - 1; i >= 0; i--) {
+      const idx = leafIndexList[i];
+      treeData.splice(idx, 1);
+    }
+    // 所有叶子节点放在尾部
+    treeData.push({
+      _type_: "leafList",
+      leafList: leafItemList?.map((it) => ({ ...it, label: it[label], value: it[value] })),
+    });
+  }
+
+  treeData?.forEach((it, i) => {
+    let item = null;
+    if (it._type_ === "leafList") {
+      // 合并当前层级的叶子节点
+      item = it.leafList;
+    } else {
+      item = { ...it, value: it[value], label: it[label] };
+    }
+    const childList = item[children] || [];
+    const childLen = childList?.length;
+    // 当 mergeFullLeaf !== true && children 长度大于1时，子项下标大于 0 的项需要另起一行，同时补充之前空的列。
+    if (i > 0) {
+      resList.push(fillArrByPush(preCol, [], { content: false }));
+    }
+    lastRowIdx = resList.length > 0 ? resList.length - 1 : 0;
+    // 解决首次进来第一行数组空的问题
+    if (!resList[lastRowIdx]) {
+      resList[lastRowIdx] = [];
+    }
+    resList[lastRowIdx].push(item);
+    if (childLen > 0) {
+      const res = transformTreeData(childList, {
+        ...opt,
+        resList,
+        preCol: preCol + 1,
+        level: level + 1,
+      });
+      if (maxCol < res.maxCol) {
+        maxCol = res.maxCol;
+      }
+      // 当前的最大行数加上子项的行数
+      maxRow = maxRow + res.maxRow;
+      // 每项的最大行数为子项的最大行数之和
+      item._maxRow = res.maxRow;
+    } else {
+      item._maxRow = 1;
+      maxRow += 1;
+    }
+  });
+
+  return {
+    resList,
+    maxCol,
+    maxRow,
+  };
+}
+
+/**
+ * 填充数组
+ * @param len
+ * @param arr
+ * @param opt
+ * @returns
+ */
+export function fillArrByPush(len, arr = [], opt: any = {}) {
+  const { content } = opt || {};
+  if (arr.length < len) {
+    for (let i = arr.length; i < len; i++) {
+      arr.push(content);
+    }
+  }
+  return arr;
+}

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}
       />
     </>
   );