@hzab/form-render 1.6.21-beta → 1.7.0

package/CHANGELOG.md

@@ -1,6 +1,7 @@
-# @hzab/form-render@1.6.21
+# @hzab/form-render@1.7.0
 
-refactor: upload 接入 utils upload utils
+refactor: upload 接入 @hzab/utils upload utils
+feat: components 支持通过项目初始化时全局进行挂载 setFormilyGlobalComponents。便于对 formRender 进行组件拆分
 
 # @hzab/form-render@1.6.20
 

package/README.md

@@ -10,6 +10,29 @@ formily schema 表单渲染组件
 
 ## 示例
 
+#### 项目初始化时挂载全局组件
+
+```jsx
+import { setFormilyGlobalComponents } from "@hzab/utils/src/formily/global-components";
+
+// 挂载 Test1 组件到 formRender 组件
+setFormilyGlobalComponents({
+  Test1() {
+    return <div>Test1</div>;
+  },
+});
+
+// 挂载 Test2 组件到 formRender 组件
+setFormilyGlobalComponents({
+  Test2() {
+    return <div>Test2</div>;
+  },
+  Test3() {
+    return <div>Test3</div>;
+  },
+});
+```
+
 ```jsx
 import FormRender from "@hzab/form-render";
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/form-render",
-  "version": "1.6.21-beta",
+  "version": "1.7.0",
   "description": "",
   "main": "src",
   "scripts": {
@@ -21,6 +21,7 @@
   "devDependencies": {
     "@hzab/data-model": "^1.8.8",
     "@hzab/permissions": "^0.1.1",
+    "@hzab/utils": "^1.0.6",
     "@hzab/webpack-config": "0.0.12",
     "@types/react": "^17.0.62",
     "@types/react-dom": "^17.0.20",
@@ -34,6 +35,7 @@
     "typescript": "^4.9.4"
   },
   "peerDependencies": {
+    "@hzab/utils": ">=1.0.6",
     "antd": "4.x",
     "axios": ">=1.6.2",
     "react": ">=16.8.0",
@@ -44,7 +46,6 @@
     "@formily/core": "2.3.1",
     "@formily/react": "2.3.1",
     "@formily/reactive-react": "2.3.1",
-    "@hzab/utils": "^1.0.4",
     "@turf/turf": "^6.5.0",
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-react": "^1.0.6",

package/src/components/RichEditor/index.tsx

@@ -95,7 +95,6 @@ export const RichEditor = observer(function (props: PropsType, parentRef) {
       file,
       onSuccess: (res) => {
         setIsLoading(false);
-        console.log(res);
         insertFn(res.url, "", "");
       },
       onError: () => {

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

@@ -1,39 +1,4 @@
-import { checkImageUrl, checkVideoUrl, checkAudioUrl } from "./utils";
-
-export const TYPE_VIDEO = "video";
-export const TYPE_IMG = "image";
-export const TYPE_AUDIO = "audio";
-
-export function checkFileType(file) {
-  const { type, url = file?.ossUrl } = file || {};
-  let fileType = "";
-  // 判断文件类型，获取对应展示的数据
-  if (url) {
-    // 图片
-    if (url.startsWith("data:image/") || checkImageUrl(url)) {
-      fileType = TYPE_IMG;
-    } else if (checkVideoUrl(url)) {
-      // 视频
-      fileType = TYPE_VIDEO;
-    } else if (checkAudioUrl(url)) {
-      // 音频
-      fileType = TYPE_AUDIO;
-    }
-  } else if (type) {
-    // 图片
-    if (type?.startsWith("image/")) {
-      fileType = TYPE_IMG;
-    }
-
-    // 视频
-    if (type?.startsWith("video/")) {
-      fileType = TYPE_VIDEO;
-    }
-
-    // 音频
-    if (type?.startsWith("audio/")) {
-      fileType = TYPE_AUDIO;
-    }
-  }
-  return fileType || type;
-}
+export * from "@hzab/utils/src/file/fileType";
+import { getFileTypeStr } from "@hzab/utils/src/file/fileType";
+
+export const checkFileType = getFileTypeStr;

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

@@ -1,142 +1,5 @@
-import { nanoidNumALetters } from "./nanoid";
+export * from "@hzab/utils/src/file/fileName";
 
-/**
- * 获取文件后缀
- * @param fileUrl
- * @returns
- */
-export function getFileExt(fileUrl) {
-  if (typeof fileUrl !== "string") {
-    return;
-  }
-  const res = fileUrl?.match(/([^\/]+?)\.([^\/\.]+)$/);
-  if (res && res.length > 2) {
-    return res[2];
-  }
-  return fileUrl;
-}
+import { getFileNameByFileObj, getFileNameObj, setFileNameObj, getValByKey } from "@hzab/utils/src/upload/uploadUtils";
 
-/**
- * 从 url 获取文件名称，不包含后缀
- * @param {*} fileName
- * @param {*} str
- * @returns
- */
-export function getFileName(fileUrl) {
-  if (typeof fileUrl !== "string") {
-    return;
-  }
-  const res = fileUrl?.match(/([^\/]+?)\.[^\/\.]+$/);
-  if (res && res.length > 0) {
-    return res?.[1] || res?.[0];
-  }
-  return fileUrl;
-}
-
-/**
- * 从 url 获取文件名称，包含后缀
- * @param {*} fileName
- * @param {*} str
- * @returns
- */
-export function getFullFileName(fileUrl) {
-  if (typeof fileUrl !== "string") {
-    return;
-  }
-  const res = fileUrl?.match(/[^\/]+?\.[^\/\.]+$/);
-  if (res && res.length > 0) {
-    return res[0];
-  }
-  return fileUrl;
-}
-
-/**
- * 合并文件名称，自动处理后缀
- * @param {*} fileName
- * @param {*} str
- * @returns
- */
-export const mergeFileName = function (fileName, str = "") {
-  if (typeof fileName !== "string") {
-    return "";
-  }
-
-  const suffix = fileName?.match(/\.([^\/.]+)$/)?.[1] || "";
-  const name = fileName?.match(/([^\/]+)\.[^.]+$/)?.[1] || "";
-  return `${name}${str ?? ""}.${suffix}`;
-};
-
-/**
- * 获取唯一的文件名
- * @param {*} fileName
- * @returns
- */
-export const getUFileName = function (fileName) {
-  return mergeFileName(getFileName(fileName) || "rc-upload", "-" + `~kid-${nanoidNumALetters()}~` + `${Date.now()}`);
-};
-
-/**
- * 根据 file 对象获取文件名称，文件名称包含：初始名称、类型
- * 数据存储格式 ~k[key]-[data]~ 如： ~ktime-1743649562530~
- * key、data 中的 ~ 转为 _
- * @param file
- */
-export const getFileNameByFileObj = (file, opt: any) => {
-  const { useHashName = true } = opt || {};
-  const _fileName = file.name || getFullFileName(file.url);
-  if (_fileName.indexOf("~kid-") >= 0 || !useHashName) {
-    return _fileName;
-  }
-  // id、时间、文件类型
-  const id = file.id || file.uid || nanoidNumALetters();
-  return mergeFileName(
-    _fileName,
-    "-" +
-    setFileNameObj({
-      id,
-      time: file.createTime ?? Date.now(),
-      type: (file.type || file.contentType)?.replace("/", "_"),
-    }),
-  );
-};
-
-/**
- * 解析
- * @param url
- * @returns
- */
-export const getFileNameObj = function (url): any {
-  const list = url.match(/~k([^-~]+)-([^~]*)~/g);
-  const res = {};
-  list?.forEach((it) => {
-    const arr = it?.match(/~k([^-~]+)-([^~]*)~/);
-    if (arr?.length >= 3) {
-      res[arr[1]] = arr[2];
-    }
-  });
-  return res;
-};
-
-/**
- * 解析
- * @param url
- * @returns
- */
-export function setFileNameObj(obj) {
-  return Object.keys(obj)
-    .map((key) => {
-      return `~k${key?.replace(/~/g, "_")}-${obj[key]?.toString()?.replace(/~/g, "_")}~`;
-    })
-    .join("");
-}
-
-/**
- * 通过 key 获取对应的值
- * @param url
- * @param key
- * @returns
- */
-export const getValByKey = function (url, key) {
-  const reg = new RegExp(`~k${key?.replace(/~/g, "_")}-\([^~]*\)~`);
-  return url.match(reg)?.[1];
-};
+export { getFileNameByFileObj, getFileNameObj, setFileNameObj, getValByKey };

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

@@ -1,6 +1,9 @@
-import { getFileURL, getFileType, isBase64Str } from "./utils";
-import { getUFileName, getFileName, getFullFileName, getFileExt, getFileNameObj } from "./fileName";
-import { nanoidNumALetters } from "./nanoid";
+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 { nanoidNumALetters } from "@hzab/utils/src/nanoid";
 
 /**
  * 出入参归一化
@@ -218,7 +221,8 @@ export const handleInputItem = (data, opt: IHandlerOpt) => {
   }
   if (!file.id) {
     file.id =
-      file.uid || `${getFileName(file.url || file.name || file.filename) || "rc-upload"}-${Date.now()}-${nanoidNumALetters()}`;
+      file.uid ||
+      `${getFileName(file.url || file.name || file.filename) || "rc-upload"}-${Date.now()}-${nanoidNumALetters()}`;
   }
   if (!file.name) {
     file.name = file.id;

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

@@ -1,5 +1,4 @@
-import { axios, getSignature, OssUploadUtil } from "@hzab/utils/src/upload/OssUploadUtil";
-console.log('OssUploadUtil', OssUploadUtil);
+import OssUploadUtil, { axios, getSignature } from "@hzab/utils/src/upload/OssUploadUtil";
 
 /**
  * 处理文件上传逻辑

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

@@ -1,195 +1,27 @@
-
-
-
-/**
- * 格式化 dir 字符串，必须为非 / 开头， /  结尾。如： test/
- * @param {*} dir
- * @returns
- */
-export const formatDirStr = function (dir) {
-  return dir?.replace(/^\/(.*)\/*$/, "$1").replace(/(.?=*)\/*$/, "$1/");
-};
-
-/**
- * 合并 dir 字符串
- * @param {*} dir
- */
-export const mergeDirStr = function (dir1, dir2) {
-  return `${formatDirStr(dir1 || "")}${formatDirStr(dir2 || "")}`;
-};
-
-/**
- *  建立一个可以存取该 file 的 url
- * @param {Object} file 文件
- * @returns {string} url
- * blob:http://localhost:8000/c9950644-5118-4231-9be7-8183bde1fdc7
- */
-export function getFileURL(file) {
-  const _file = file?.file || file;
-  if (!(_file instanceof File)) {
-    return;
-  }
-
-  let url = _file.url || null;
-
-  try {
-    // 下面函数执行的效果是一样的，只是需要针对不同的浏览器执行不同的 js 函数而已
-    if (window.createObjectURL != undefined) {
-      // basic
-      return window.createObjectURL(_file);
-    } else if (window.URL != undefined) {
-      // mozilla(firefox)
-      return window.URL.createObjectURL(_file);
-    } else if (window.webkitURL != undefined) {
-      // webkit or chrome
-      return window.webkitURL.createObjectURL(_file);
-    }
-  } catch (error) {
-    console.warn("getFileURL Error: ", error);
-  }
-
-  return url;
-}
-
-/**
- * 是否是 base64 字符串
- * @param {*} str
- * @returns
- */
-export const isBase64Str = function (str) {
-  return /^data:\w+\/\w+;base64/i.test(str);
+import { formatDirStr, mergeDirStr, handleMaxCount, mergePreviewConfig } from "@hzab/utils/upload/uploadUtils";
+import { getFileURL } from "@hzab/utils/file/file";
+import { isBase64Str } from "@hzab/utils/src/base64Str";
+import {
+  checkImageUrl,
+  checkVideoUrl,
+  checkAudioUrl,
+  isValidMediaType,
+  checkUrlSuffix,
+} from "@hzab/utils/src/file/fileType";
+import { getArr } from "@hzab/utils/src/array";
+
+export {
+  formatDirStr,
+  mergeDirStr,
+  getFileURL,
+  isBase64Str,
+  checkImageUrl,
+  checkVideoUrl,
+  checkAudioUrl,
+  isValidMediaType,
+  checkUrlSuffix,
+  getFileType,
+  getArr,
+  handleMaxCount,
+  mergePreviewConfig,
 };
-
-/**
- * 判断 url 是否带有指定图片后缀
- * @param {string} url
- * @returns
- */
-export function checkImageUrl(url) {
-  // base64
-  if (/^data:image\/\w+;base64/i.test(url)) {
-    return true;
-  }
-  const imgTypes = [
-    "apng",
-    "avif",
-    "bmp",
-    "gif",
-    "ico",
-    "cur",
-    "jpg",
-    "jpeg",
-    "jfif",
-    "pjpeg",
-    "pjp",
-    "png",
-    "svg",
-    "tif",
-    "tiff",
-    "webp",
-  ];
-  return checkUrlSuffix(url, imgTypes);
-}
-
-/**
- * 判断是否是合法的媒体类型
- * @param {String} input
- * @returns
- */
-export function isValidMediaType(input) {
-  const validPrefixes = ["image/", "video/", "audio/"];
-  return validPrefixes.some((prefix) => input?.startsWith(prefix));
-}
-
-/**
- * 判断 url 是否带有指定视频后缀
- * @param {string} url
- * @returns
- */
-export function checkVideoUrl(url) {
-  const imgTypes = ["3gp", "mpg", "mpeg", "mp4", "m4v", "m4p", "ogv", "ogg", "mov", "webm"];
-  return checkUrlSuffix(url, imgTypes);
-}
-
-/**
- * 判断 url 是否带有指定音频后缀
- * @param {string} url
- * @returns
- */
-export function checkAudioUrl(url) {
-  const imgTypes = ["3gp", "adts", "mpeg", "mp3", "mp4", "ogg", "mov", "webm", "rtp", "amr", "wav"];
-  return checkUrlSuffix(url, imgTypes);
-}
-
-/**
- * 检查 url 是否带有指定后缀
- * @param {string} url url 地址
- * @param {Array} types 后缀数组
- * @returns
- */
-export function checkUrlSuffix(url, types = [], caseSensitive) {
-  if (!url) {
-    return false;
-  }
-  let _url = url?.replace(/\?.+/, "");
-  const reg = new RegExp(`\.(${types.join("|")})$`, caseSensitive ? undefined : "i");
-  if (reg.test(_url)) {
-    return true;
-  }
-}
-
-export function getFileType(file) {
-  if (typeof file === "object" && file?.type) {
-    return file?.type;
-  }
-  if (typeof file === "string") {
-    let type = null;
-    if (checkVideoUrl(file)) {
-      type = "video/mp4";
-    } else if (checkImageUrl(file)) {
-      type = "image/jpeg";
-    } else if (checkAudioUrl(file)) {
-      type = "audio/3gpp";
-    } else if (checkUrlSuffix(file, ["pdf"])) {
-      type = "application/pdf";
-    } else if (checkUrlSuffix(file, ["pdf"])) {
-      type = "application/pdf";
-    } else if (checkUrlSuffix(file, ["xlsx", "xls", "csv", "xlsm", "xlsb"])) {
-      type = "application/vnd.ms-excel";
-    } else if (checkUrlSuffix(file, ["doc", "docx"])) {
-      type = "application/msword";
-    } else if (checkUrlSuffix(file, ["ppt", "pptx"])) {
-      type = "application/vnd.ms-powerpoint";
-    }
-    return type;
-  }
-}
-
-function getArr(value) {
-  return Array.isArray(value) ? value : (value && [value]) || [];
-}
-
-export function handleMaxCount(fileList, maxCount) {
-  let list = getArr(fileList);
-  if (maxCount > 0 && list.length > maxCount) {
-    list = list.slice(0, maxCount);
-  }
-  return list;
-}
-
-/**
- * 预览 url 添加前缀
- * @param {*} uri
- * @param {*} previewConfig
- * @returns
- */
-export function mergePreviewConfig(uri, previewConfig) {
-  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;
-}

package/src/components/Upload/components/ItemList/index.tsx

@@ -1,6 +1,5 @@
-import { getFileURL } from "../../common/utils";
-
-import { TYPE_VIDEO, TYPE_IMG, TYPE_AUDIO, checkFileType } from "../../common/checkFileType";
+import { getFileURL } from "@hzab/utils/src/file/file";
+import { TYPE_VIDEO, TYPE_IMG, TYPE_AUDIO, getFileTypeStr } from "@hzab/utils/src/file/fileType";
 
 import Video from "../video";
 import Image from "../Image";
@@ -28,7 +27,7 @@ export const ItemList = (props) => {
           </div>
         );
 
-        const fileType = checkFileType(it);
+        const fileType = getFileTypeStr(it);
         if (fileType === TYPE_IMG) {
           content = <Image src={src} alt={name} />;
         }

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

@@ -1,5 +1,13 @@
-import { checkFileType, TYPE_VIDEO, TYPE_IMG, TYPE_AUDIO } from "../../common/checkFileType";
-import { checkImageUrl, checkVideoUrl, checkAudioUrl, isValidMediaType } from "../../common/utils";
+import {
+  TYPE_VIDEO,
+  TYPE_IMG,
+  TYPE_AUDIO,
+  getFileTypeStr,
+  checkImageUrl,
+  checkVideoUrl,
+  checkAudioUrl,
+  isValidMediaType,
+} from "@hzab/utils/src/file/fileType";
 
 export const previewRenderEnum = {
   [TYPE_VIDEO]: videoRender,
@@ -8,7 +16,7 @@ export const previewRenderEnum = {
 };
 
 export function hasPreviewRender(file) {
-  return !!previewRenderEnum[checkFileType(file)];
+  return !!previewRenderEnum[getFileTypeStr(file)];
 }
 
 function getFirstAcceptRule(accept: string): string {
@@ -31,11 +39,11 @@ export function hasPreviewMedium(accept: string): boolean {
 }
 
 export function getPreviewRender(file, accept) {
-  const fileType = checkFileType(file);
+  const fileType = getFileTypeStr(file);
   let render = null;
 
   if (fileType) {
-    render = previewRenderEnum[checkFileType(file)];
+    render = previewRenderEnum[getFileTypeStr(file)];
   }
 
   if (accept) {
@@ -50,8 +58,6 @@ export function getPreviewRender(file, accept) {
   return render;
 }
 
-
-
 export function getPreviewContent(file, accept) {
   let render = getPreviewRender(file, accept);
   if (!render) {

package/src/components/Upload/uploader-input.jsx

@@ -3,7 +3,7 @@ import { Button, Modal, message } from "antd";
 
 import ItemList from "./components/ItemList";
 
-import { handleMaxCount } from "./common/utils";
+import { handleMaxCount } from "@hzab/utils/upload/uploadUtils";
 import { handleInputFileList, handleOutputFileList } from "./common/handleIOFileList";
 import { handleOssUpload } from "./common/ossUpload";
 

package/src/index.tsx

@@ -30,6 +30,7 @@ import {
   ArrayCards,
 } from "c-formily-antd";
 import { Card, Slider, Rate } from "antd";
+import { getFormilyGlobalComponents } from "@hzab/utils/src/formily/global-components";
 
 // 自定义组件
 import * as customComponents from "./components/index";
@@ -67,8 +68,6 @@ const antdComponents = {
   ArrayCards,
 };
 
-const noop = () => {};
-
 const FormRender = forwardRef((props: any, parentRef) => {
   /** schema scope 解决父级无 schema Scope 导致 scope 对象刷新的问题 */
   const schemaScopeRef = useRef<{ _$tempData: Object }>();
@@ -112,6 +111,7 @@ const FormRender = forwardRef((props: any, parentRef) => {
         Slider,
         Rate,
         ...customComponents,
+        ...getFormilyGlobalComponents(),
         ...props.components,
       },
       scope: schemaScopeRef.current,