@hzab/utils 1.1.0 → 1.1.2

package/changelog.md

@@ -1,3 +1,11 @@
+# @hzab/utils@1.1.2
+
+fix: opt?.params?.hasPrePath 支持关闭内部默认地址前缀
+
+# @hzab/utils@1.1.1
+
+fix: fileName 添加 hash 判断
+
 # @hzab/utils@1.1.0
 
 refactor: lodash 改为 lodash-es

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/utils",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "utils",
   "main": "src",
   "scripts": {

package/src/upload/OfflineUpload.ts

@@ -228,7 +228,8 @@ export class OfflineUpload {
 
   getSignature(serverUrl = this.serverUrl, opt) {
     // path 前缀 oss-upload 文件目录
-    opt.params.path = mergeDirStr("web-upload/", opt.params.path ?? opt.params.dir);
+    const prePath = opt?.params?.hasPrePath !== false ? "web-upload/" : "";
+    opt.params.dir = mergeDirStr(prePath, opt.params.path ?? opt.params.dir);
     return getSignature({
       ...opt,
       serverUrl,

package/src/upload/ossUpload.ts

@@ -7,7 +7,8 @@ import OssUploadUtil, { axios, IUploadOpt } from "./OssUploadUtil";
 class OssUpload extends OssUploadUtil {
   getSignature(serverUrl = this.serverUrl, opt) {
     // dir 前缀 oss-upload 文件目录
-    opt.params.dir = mergeDirStr("web-upload/", opt.params.dir);
+    const prePath = opt?.params?.hasPrePath !== false ? "web-upload/" : "";
+    opt.params.dir = mergeDirStr(prePath, opt.params.dir);
     return this._getSignature(serverUrl, opt);
   }
 

package/src/upload/uploadUtils.ts

@@ -78,7 +78,7 @@ export const getFileNameByFileObj = (file, opt: any) => {
 
 
   const hashStr = useHashName ? nanoidNumALetters() : "";
-  const nm = mergeFileName(_fileName + "." + _ext, (_fileName.indexOf("~kid-") ? "" : `~kid-${hashStr}-${file.createTime || dayjs().valueOf()}-${ext}`));
+  const nm = mergeFileName(_fileName + "." + _ext, (_fileName.indexOf("~kid-") < 0 ? `~kid-${hashStr}-${file.createTime || dayjs().valueOf()}-${ext}` : ""));
 
   return nm;
 };