@hzab/form-render 1.7.1 → 1.7.2-beta

package/CHANGELOG.md

@@ -1,4 +1,9 @@
+# @hzab/form-render@1.7.2
+
+feat: 上传图片列表支持缩略图
+
 # @hzab/form-render@1.7.1
+
 feat: 文件上传组件删除后重走数据处理逻辑
 
 # @hzab/form-render@1.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/form-render",
-  "version": "1.7.1",
+  "version": "1.7.2-beta",
   "description": "",
   "main": "src",
   "scripts": {

package/src/components/RichEditor/index.tsx

@@ -42,8 +42,8 @@ export const RichEditor = observer(function (props: PropsType, parentRef) {
     offlineServerUrl = "",
     uploadParams = {},
     // ossUrl = "https://test-abt.hzabjt.com:18091/api/v1/user/oss/getWebOssConfig",
-    ossServerUrl = "/api/v1/user/oss/getWebOssConfig",
-    ossUrl = "/api/v1/user/oss/getWebOssConfig",
+    ossServerUrl = "/api/v1/common/oss/getWebOssConfig",
+    ossUrl = "/api/v1/common/oss/getWebOssConfig",
     zIndex = 9999,
   } = props;
   const isPrivateStore =

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

@@ -52,6 +52,8 @@ export interface IFile {
   createTime?: string;
   /** 最后更新时间戳 */
   lastModified?: number;
+  thumbUrl?: string;
+
 }
 
 /**
@@ -66,6 +68,9 @@ export interface IHandlerOpt {
   itemMode: "object" | "file" | "url" | "jsonStr";
   /** 预览配置参数 */
   previewConfig?: Object;
+  thumbnailParams?: string,
+  selfUrlList?: string[]
+
 }
 
 /** 内部文件格式 */
@@ -122,7 +127,7 @@ export const objStrToObj = function (objStr) {
     if (/^\[.*\]$|^\{.*\}$/.test(_objStr)) {
       try {
         _objStr = JSON.parse(_objStr);
-      } catch (error) {}
+      } catch (error) { }
     }
   }
   return _objStr;
@@ -164,7 +169,16 @@ export function mergePreviewConfig(uri, previewConfig) {
 
   return _uri;
 }
-
+/**判断是否私有 */
+const isSelf = (selfUrlList, fileUrl) => {
+  let flag = "?";
+  selfUrlList?.forEach((el) => {
+    if (fileUrl?.startsWith(el)) {
+      flag = "&";
+    }
+  });
+  return flag;
+};
 /**
  * 子项数据归一化
  * 字符串：url、base64
@@ -176,6 +190,8 @@ export const handleInputItem = (data, opt: IHandlerOpt) => {
     console.warn("Upload handleInputData 请传入正确的数据");
     return data;
   }
+  const { thumbnailParams, selfUrlList } = opt
+
   let file = {
     ...fileTpl,
   };
@@ -184,7 +200,7 @@ export const handleInputItem = (data, opt: IHandlerOpt) => {
   if (typeof _data === "string") {
     const obj = getFileNameObj(_data);
     file.id = obj?.id;
-    file.uid = file.id || nanoidNumALetters();
+    file.uid = file.id;
     file.url = _data;
     file.storeUrl = _data;
     file.name = getFullFileName(file.url);
@@ -192,10 +208,12 @@ export const handleInputItem = (data, opt: IHandlerOpt) => {
     file.originalFilename = getFullFileName(file.url);
     file.type = getFileType(file.url);
     file.ext = getFileExt(file.url);
+    file.thumbUrl = `${_data}${thumbnailParams ? isSelf(selfUrlList, _data) + thumbnailParams : ""}`;
   } else if (typeof _data === "object") {
     const sourceData = _data.originFileObj || _data;
     file.id = _data.id || _data.uid;
     file.url = sourceData.url || sourceData.ossUrl;
+    file.thumbUrl = `${file.url}${thumbnailParams ? isSelf(selfUrlList, file.url) + thumbnailParams : ""}`;
     file.storeUrl = file.url;
     file.originalFilename = _data.originalFilename || getFullFileName(file.url) || _data.name;
     file.name = _data.filename || _data.name || getFullFileName(file.url);
@@ -284,7 +302,7 @@ export const handleInputFileList = (fileList, opt: IHandlerOpt) => {
   return _fileList;
 };
 
-export const handleFileName = function () {};
+export const handleFileName = function () { };
 
 /**
  * 子项数据归一化

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

@@ -13,7 +13,7 @@ export async function handleOssUpload(files, opt) {
     ...opt,
     axios: opt.axios,
     axiosConf: axiosConf,
-    serverUrl: ossUrl || "/api/v1/user/oss/getWebOssConfig",
+    serverUrl: ossUrl || "/api/v1/common/oss/getWebOssConfig",
   });
 
   const promise = [];

package/src/components/Upload/uploader.jsx

@@ -47,7 +47,7 @@ export function Uploader({ onChange, ...props }) {
     listType = "text",
     disabled = false,
     readOnly = false,
-    ossServerUrl = "/api/v1/user/oss/getWebOssConfig",
+    ossServerUrl = "/api/v1/common/oss/getWebOssConfig",
     // 是否使用 oss 上传文件
     isOssUpload = true,
     // 是否使用字符串结果
@@ -62,6 +62,8 @@ export function Uploader({ onChange, ...props }) {
     templateDownloadText = "模板下载",
     isFileObj = false,
     isFileJson = false,
+    thumbnailParams = "image_process=resize,p_30",
+    selfUrlList = ["https://self-oss.abt.hzabjt.com"]
   } = props;
   const isPrivateStore =
     props.uploadParams?.fileAcl === "private" || props.ossOpt?.signatureParams?.fileAcl === "private";
@@ -109,8 +111,8 @@ export function Uploader({ onChange, ...props }) {
           typeof promiseRes === "object"
             ? promiseRes.url
             : promiseRes || _file.ossUrl || typeof _file === "string"
-            ? _file
-            : "";
+              ? _file
+              : "";
 
         if (typeof _file.url === "string") {
           _files[i].url = _file.url;
@@ -135,7 +137,7 @@ export function Uploader({ onChange, ...props }) {
   };
 
   useEffect(() => {
-    const list = handleInputFileList(value, { ...fileListConf, maxCount, previewConfig });
+    const list = handleInputFileList(value, { ...fileListConf, maxCount, previewConfig, thumbnailParams, selfUrlList });
 
     async function handlePreview() {
       await handlePreviewUrls(list, {
@@ -153,13 +155,8 @@ export function Uploader({ onChange, ...props }) {
   }, [value]);
 
   const onRemove = (file) => {
-    const files = (fileList || []).filter((v) => v.uid !== file.uid);
-    let _files = [...files];
-    // 处理出参格式
-    _files = handleOutputFileList(_files, {
-      ...fileListConf,
-    });
-    onChange && onChange(_files);
+    const files = (fileList || []).filter((v) => v.url !== file.url);
+    onChange && onChange(files);
   };
 
   // 自定义请求逻辑