@hzab/form-render 1.5.1-beta → 1.5.1-beta2

package/CHANGELOG.md

@@ -1,6 +1,7 @@
 # @hzab/form-render@1.6.0
 
 feat: 私有部署文件上传
+fix: 文件名称是否 hash 支持配置 useHashName
 
 # @hzab/form-render@1.5.1
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/form-render",
-  "version": "1.5.1-beta",
+  "version": "1.5.1-beta2",
   "description": "",
   "main": "src",
   "scripts": {
@@ -19,6 +19,7 @@
   "license": "ISC",
   "devDependencies": {
     "@hzab/data-model": "^1.2.0",
+    "@hzab/permissions": "^0.1.1",
     "@hzab/webpack-config": "0.0.12",
     "@types/react": "^17.0.62",
     "@types/react-dom": "^17.0.20",
@@ -41,8 +42,9 @@
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@formily/core": "2.3.1",
     "@formily/react": "2.3.1",
-    "@turf/turf": "^6.5.0",
     "@formily/reactive-react": "2.3.1",
+    "@turf/turf": "^6.5.0",
+    "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-react": "^1.0.6",
     "ajv": "^8.12.0",
     "c-formily-antd": "^2.3.1",

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

@@ -56,6 +56,10 @@ export interface IUploadOpt {
    * 配置接口地址
    */
   serverUrl?: string;
+  /**
+   * 是否开启 Hash 命名
+   */
+  useHashName?: boolean;
   /**
    * 文件上传接口地址
    */
@@ -234,7 +238,7 @@ export class OfflineUpload {
   upload(file, opt: IUploadOpt = {}) {
     return new Promise(async (resolve, reject) => {
       // filename 表示待上传的本地文件名称。
-      const filename = getFileNameByFileObj(file);
+      const filename = getFileNameByFileObj(file, opt);
       try {
         const fileInfo = await this.getSignature(opt.serverUrl || this.serverUrl, {
           ...opt,

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

@@ -16,6 +16,8 @@ export const getOfflineUploadRequest = (opt) => {
     offlinePreviewUrl,
     ossOpt,
     params,
+    useHashName = true
+
   } = opt || {};
   return ({ action, data, file, filename, headers, method, onSuccess, onProgress, onError }) => {
     const _UploadOss = UploadOss || OfflineUpload;
@@ -27,6 +29,7 @@ export const getOfflineUploadRequest = (opt) => {
     file.ossPromise = offlineUpload
       .upload(file, {
         uploadUrl: offlineUploadUrl,
+        useHashName,
         params: {
           ...(params || {}),
         },
@@ -53,7 +56,7 @@ export const getOfflineUploadRequest = (opt) => {
  * @returns
  */
 export const getOssUploadRequest = (opt) => {
-  const { UploadOss, ossServerUrl, ossOpt, params } = opt || {};
+  const { UploadOss, ossServerUrl, ossOpt, params, useHashName = true } = opt || {};
   return ({ action, data, file, filename, headers, method, onSuccess, onProgress, onError }) => {
     const _UploadOss = UploadOss || LUploadOss;
     const ossUpload = new _UploadOss({
@@ -62,6 +65,7 @@ export const getOssUploadRequest = (opt) => {
     });
     file.ossPromise = ossUpload
       .upload(file, {
+        useHashName,
         params: {
           ...(params || {}),
         },

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

@@ -80,9 +80,10 @@ export const getUFileName = function (fileName) {
  * key、data 中的 ~ 转为 _
  * @param file
  */
-export const getFileNameByFileObj = (file) => {
+export const getFileNameByFileObj = (file, opt: any) => {
+  const { useHashName = true } = opt || {};
   const _fileName = file.name || getFullFileName(file.url);
-  if (_fileName.indexOf("--Cs--") >= 0) {
+  if (_fileName.indexOf("~kid-") >= 0 || !useHashName) {
     return _fileName;
   }
   // id、时间、文件类型
@@ -90,11 +91,11 @@ export const getFileNameByFileObj = (file) => {
   return mergeFileName(
     _fileName,
     "-" +
-      setFileNameObj({
-        id,
-        time: file.createTime ?? Date.now(),
-        type: (file.type || file.contentType)?.replace("/", "_"),
-      }),
+    setFileNameObj({
+      id,
+      time: file.createTime ?? Date.now(),
+      type: (file.type || file.contentType)?.replace("/", "_"),
+    }),
   );
 };
 

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

@@ -54,17 +54,18 @@ class OssUpload {
   }
 
   upload(file, opt = {}) {
+
     return new Promise(async (resolve, reject) => {
       const ossParams = await this.getSignature(opt.serverUrl || this.serverUrl, {
         ...opt,
         params: { ...this.signatureParams, ...opt.params },
       });
 
-      const { ossParams: propOssParams } = opt || {};
+      const { ossParams: propOssParams, useHashName } = opt || {};
       const formData = new FormData();
       // key 表示上传到 Bucket 内的 Object 的完整路径，例如 exampledir/exampleobject.txtObject，完整路径中不能包含 Bucket 名称。
       // filename 表示待上传的本地文件名称。
-      const filename = getFileNameByFileObj(file);
+      const filename = getFileNameByFileObj(file, opt);
       const key = `${ossParams?.dir}${filename}`;
       formData.set("key", key);
       formData.set("OSSAccessKeyId", ossParams.accessid);
@@ -109,7 +110,7 @@ class OssUpload {
  */
 export async function handleOssUpload(files, opt) {
   const _files = files;
-  const { ossUrl, signatureParams, ossParams, axiosConf } = opt || {};
+  const { ossUrl, signatureParams, ossParams, axiosConf, useHashName } = opt || {};
   const ossUpload = new OssUpload({
     axios: opt.axios,
     axiosConf: axiosConf,
@@ -131,6 +132,7 @@ export async function handleOssUpload(files, opt) {
             },
             ossParams,
             axiosConf,
+            useHashName,
           })
           .then((res) => {
             return Promise.resolve(res?.data?.data?.fileUrl);

package/src/components/Upload/uploader.jsx

@@ -109,8 +109,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;
@@ -163,6 +163,7 @@ export function Uploader({ onChange, ...props }) {
 
   // 自定义请求逻辑
   let customRequest = props.customRequest;
+
   if (uploadMode === "oss") {
     customRequest = getOssUploadRequest({
       ...props,