@nocobase/plugin-file-manager 1.7.0-beta.3 → 1.7.0-beta.31

package/dist/server/utils.js

@@ -37,12 +37,15 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   cloudFilenameGetter: () => cloudFilenameGetter,
+  encodeURL: () => encodeURL,
+  ensureUrlEncoded: () => ensureUrlEncoded,
   getFileKey: () => getFileKey,
   getFilename: () => getFilename
 });
 module.exports = __toCommonJS(utils_exports);
-var import_path = __toESM(require("path"));
 var import_utils = require("@nocobase/utils");
+var import_path = __toESM(require("path"));
+var import_url_join = __toESM(require("url-join"));
 function getFilename(req, file, cb) {
   const originalname = Buffer.from(file.originalname, "binary").toString("utf8");
   const baseName = import_path.default.basename(originalname.replace(/[<>?*|:"\\/]/g, "-"), import_path.default.extname(originalname));
@@ -57,11 +60,31 @@ const cloudFilenameGetter = (storage) => (req, file, cb) => {
   });
 };
 function getFileKey(record) {
-  return [record.path.replace(/^\/|\/$/g, ""), record.filename].filter(Boolean).join("/");
+  return (0, import_url_join.default)(record.path || "", record.filename).replace(/^\//, "");
+}
+function ensureUrlEncoded(value) {
+  try {
+    if (decodeURIComponent(value) !== value) {
+      return value;
+    }
+  } catch (e) {
+    return encodeURIComponent(value);
+  }
+  return encodeURIComponent(value);
+}
+function encodePathKeepSlash(path2) {
+  return path2.split("/").map((segment) => ensureUrlEncoded(segment)).join("/");
+}
+function encodeURL(url) {
+  const parsedUrl = new URL(url);
+  parsedUrl.pathname = encodePathKeepSlash(parsedUrl.pathname);
+  return parsedUrl.toString();
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   cloudFilenameGetter,
+  encodeURL,
+  ensureUrlEncoded,
   getFileKey,
   getFilename
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-file-manager",
-  "version": "1.7.0-beta.3",
+  "version": "1.7.0-beta.31",
   "displayName": "File manager",
   "displayName.zh-CN": "文件管理器",
   "description": "Provides files storage services with files collection template and attachment field.",
@@ -10,26 +10,28 @@
   "homepage": "https://docs.nocobase.com/handbook/file-manager",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/file-manager",
   "devDependencies": {
-    "@aws-sdk/client-s3": "^3.750.0",
+    "@aws-sdk/client-s3": "3.750.0",
     "@formily/antd-v5": "1.x",
     "@formily/core": "2.x",
     "@formily/react": "2.x",
     "@formily/shared": "2.x",
-    "@koa/multer": "^3.0.0",
-    "@types/koa-multer": "^1.0.1",
+    "@koa/multer": "^3.1.0",
+    "@types/koa-multer": "^1.0.4",
     "@types/multer": "^1.4.5",
     "antd": "5.x",
+    "axios": "^1.7.0",
     "cos-nodejs-sdk-v5": "^2.11.14",
     "koa-static": "^5.0.0",
     "mime-match": "^1.0.2",
     "mkdirp": "~0.5.4",
-    "multer": "^1.4.2",
+    "multer": "^1.4.5-lts.2",
     "multer-aliyun-oss": "2.1.3",
     "multer-cos": "^1.0.3",
     "multer-s3": "^3.0.1",
     "react": "^18.2.0",
     "react-i18next": "^11.15.1",
-    "supertest": "^6.1.6"
+    "supertest": "^6.1.6",
+    "url-join": "4.0.1"
   },
   "peerDependencies": {
     "@nocobase/actions": "1.x",
@@ -43,5 +45,5 @@
     "Collections",
     "Collection fields"
   ],
-  "gitHead": "8d52cb1d366a968f87c1cd3f98f55f24be3056a5"
+  "gitHead": "84bf8bcfeeaf3a05086e24cef00507ca209ac3c5"
 }

package/dist/server/FileModel.js

@@ -1,58 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var FileModel_exports = {};
-__export(FileModel_exports, {
-  FileModel: () => FileModel
-});
-module.exports = __toCommonJS(FileModel_exports);
-var import_database = require("@nocobase/database");
-var import_constants = require("../constants");
-const currentStorage = [import_constants.STORAGE_TYPE_LOCAL, import_constants.STORAGE_TYPE_ALI_OSS, import_constants.STORAGE_TYPE_S3, import_constants.STORAGE_TYPE_TX_COS];
-class FileModel extends import_database.Model {
-  toJSON() {
-    var _a, _b, _c, _d, _e;
-    const json = super.toJSON();
-    const fileStorages = (_a = this.constructor["database"]) == null ? void 0 : _a["_fileStorages"];
-    if (json.storageId && fileStorages && fileStorages.has(json.storageId)) {
-      const storage = fileStorages.get(json.storageId);
-      if (currentStorage.includes(storage == null ? void 0 : storage.type) && ((_b = storage == null ? void 0 : storage.options) == null ? void 0 : _b.thumbnailRule)) {
-        json["preview"] = `${json["url"]}${((_c = storage == null ? void 0 : storage.options) == null ? void 0 : _c.thumbnailRule) || ""}`;
-      }
-      if ((_d = storage == null ? void 0 : storage.options) == null ? void 0 : _d.thumbnailRule) {
-        json["thumbnailRule"] = (_e = storage == null ? void 0 : storage.options) == null ? void 0 : _e.thumbnailRule;
-      }
-      if ((storage == null ? void 0 : storage.type) === "local" && process.env.APP_PUBLIC_PATH) {
-        json["url"] = process.env.APP_PUBLIC_PATH.replace(/\/$/g, "") + json.url;
-      }
-    }
-    return json;
-  }
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  FileModel
-});