@nocobase/plugin-file-manager 0.9.4-alpha.2 → 0.10.0-alpha.2

package/lib/client/locale/zh-CN.js

@@ -4,14 +4,35 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-const locale = {
+var _default = {
   'File collection': '文件数据表',
   'File name': '文件名',
   'Extension name': '扩展名',
   Size: '文件大小',
-  'Mime Type': 'Mime 类型',
+  'MIME type': 'MIME 类型',
   URL: 'URL',
-  'File storage': '文件存储'
+  'File storage': '文件存储',
+  'File manager': '文件管理器',
+  Attachment: '附件',
+  'Allow uploading multiple files': '允许上传多个文件',
+  Storage: '存储空间',
+  Storages: '存储空间',
+  'Storage name': '存储空间标识',
+  'Storage type': '存储类型',
+  'Default storage': '默认存储空间',
+  'Storage base URL': '访问 URL 基础',
+  Destination: '上传目标文件夹',
+  'Use the built-in static file server': '使用内置静态文件服务',
+  'Local storage': '本地存储',
+  'Aliyun OSS': '阿里云 OSS',
+  'Amazon S3': '亚马逊 S3',
+  'Tencent COS': '腾讯云 COS',
+  Region: '区域',
+  Bucket: '存储桶',
+  Path: '相对路径',
+  Filename: '文件名',
+  'Will be used for API': '将用于 API',
+  'Default storage will be used when not selected': '留空将使用默认存储空间',
+  'Keep file in storage when destroy record': '删除记录时保留文件'
 };
-var _default = locale;
 exports.default = _default;

package/lib/client/schemas/storage.js

@@ -18,6 +18,7 @@ function _client() {
   };
   return data;
 }
+var _locale = require("../locale");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -30,7 +31,7 @@ const collection = {
     name: 'title',
     interface: 'input',
     uiSchema: {
-      title: '{{t("Storage display name")}}',
+      title: '{{t("Title")}}',
       type: 'string',
       'x-component': 'Input',
       required: true
@@ -40,7 +41,8 @@ const collection = {
     name: 'name',
     interface: 'input',
     uiSchema: {
-      title: '{{t("Storage name")}}',
+      title: `{{t("Storage name", { ns: "${_locale.NAMESPACE}" })}}`,
+      descriptions: `{{t("Will be used for API", { ns: "${_locale.NAMESPACE}" })}}`,
       type: 'string',
       'x-component': 'Input'
     }
@@ -49,21 +51,21 @@ const collection = {
     name: 'type',
     interface: 'select',
     uiSchema: {
-      title: '{{t("Storage type")}}',
+      title: `{{t("Storage type", { ns: "${_locale.NAMESPACE}" })}}`,
       type: 'string',
       'x-component': 'Select',
       required: true,
       enum: [{
-        label: '{{t("Local storage")}}',
+        label: `{{t("Local storage", { ns: "${_locale.NAMESPACE}" })}}`,
         value: 'local'
       }, {
-        label: '{{t("Aliyun OSS")}}',
+        label: `{{t("Aliyun OSS", { ns: "${_locale.NAMESPACE}" })}}`,
         value: 'ali-oss'
       }, {
-        label: '{{t("Amazon S3")}}',
+        label: `{{t("Amazon S3", { ns: "${_locale.NAMESPACE}" })}}`,
         value: 's3'
       }, {
-        label: '{{t("Tencent COS")}}',
+        label: `{{t("Tencent COS", { ns: "${_locale.NAMESPACE}" })}}`,
         value: 'tx-cos'
       }]
     }
@@ -72,7 +74,7 @@ const collection = {
     name: 'baseUrl',
     interface: 'input',
     uiSchema: {
-      title: '{{t("Storage base URL")}}',
+      title: `{{t("Storage base URL", { ns: "${_locale.NAMESPACE}" })}}`,
       type: 'string',
       'x-component': 'Input',
       required: true
@@ -82,7 +84,7 @@ const collection = {
     name: 'path',
     interface: 'input',
     uiSchema: {
-      title: '{{t("Path")}}',
+      title: `{{t("Path", { ns: "${_locale.NAMESPACE}" })}}`,
       type: 'string',
       'x-component': 'Input'
     }
@@ -91,7 +93,16 @@ const collection = {
     name: 'default',
     interface: 'boolean',
     uiSchema: {
-      title: '{{t("Default storage")}}',
+      title: `{{t("Default storage", { ns: "${_locale.NAMESPACE}" })}}`,
+      type: 'boolean',
+      'x-component': 'Checkbox'
+    }
+  }, {
+    type: 'boolean',
+    name: 'paranoid',
+    interface: 'boolean',
+    uiSchema: {
+      title: `{{t("Keep file in storage when destroy record", { ns: "${_locale.NAMESPACE}" })}}`,
       type: 'boolean',
       'x-component': 'Checkbox'
     }
@@ -137,14 +148,14 @@ const storageSchema = {
               'x-component-props': {
                 useAction: '{{ cm.useBulkDestroyAction }}',
                 confirm: {
-                  title: "{{t('Delete storage')}}",
+                  title: "{{t('Delete')}}",
                   content: "{{t('Are you sure you want to delete it?')}}"
                 }
               }
             },
             create: {
               type: 'void',
-              title: '{{t("Add storage")}}',
+              title: '{{t("Add new")}}',
               'x-component': 'Action',
               'x-component-props': {
                 type: 'primary'
@@ -166,7 +177,7 @@ const storageSchema = {
                       }));
                     }
                   },
-                  title: '{{t("Add storage")}}',
+                  title: '{{t("Add new")}}',
                   properties: {
                     title: {
                       'x-component': 'CollectionField',
@@ -197,7 +208,13 @@ const storageSchema = {
                       'x-component': 'CollectionField',
                       'x-decorator': 'FormItem',
                       title: '',
-                      'x-content': '{{t("Default storage")}}'
+                      'x-content': `{{t("Default storage", { ns: "${_locale.NAMESPACE}" })}}`
+                    },
+                    paranoid: {
+                      title: '',
+                      'x-component': 'CollectionField',
+                      'x-decorator': 'FormItem',
+                      'x-content': `{{t("Keep file in storage when destroy record", { ns: "${_locale.NAMESPACE}" })}}`
                     },
                     footer: {
                       type: 'void',
@@ -301,7 +318,7 @@ const storageSchema = {
                           'x-decorator-props': {
                             useValues: '{{ cm.useValuesFromRecord }}'
                           },
-                          title: '{{t("Edit storage")}}',
+                          title: '{{t("Edit")}}',
                           properties: {
                             title: {
                               'x-component': 'CollectionField',
@@ -333,7 +350,13 @@ const storageSchema = {
                               title: '',
                               'x-component': 'CollectionField',
                               'x-decorator': 'FormItem',
-                              'x-content': '{{t("Default storage")}}'
+                              'x-content': `{{t("Default storage", { ns: "${_locale.NAMESPACE}" })}}`
+                            },
+                            paranoid: {
+                              title: '',
+                              'x-component': 'CollectionField',
+                              'x-decorator': 'FormItem',
+                              'x-content': `{{t("Keep file in storage when destroy record", { ns: "${_locale.NAMESPACE}" })}}`
                             },
                             footer: {
                               type: 'void',
@@ -366,8 +389,8 @@ const storageSchema = {
                       'x-component': 'Action.Link',
                       'x-component-props': {
                         confirm: {
-                          title: "{{t('Delete role')}}",
-                          content: "{{t('Are you sure you want to delete it?')}}"
+                          title: '{{t("Delete")}}',
+                          content: '{{t("Are you sure you want to delete it?")}}'
                         },
                         useAction: '{{cm.useDestroyAction}}'
                       }

package/lib/client/templates/file.js

@@ -85,7 +85,7 @@ const file = {
       deletable: false,
       uiSchema: {
         type: 'string',
-        title: `{{t("Mime type", { ns: "${_locale.NAMESPACE}" })}}`,
+        title: `{{t("MIME type", { ns: "${_locale.NAMESPACE}" })}}`,
         'x-component': 'Input',
         'x-read-pretty': true
       }

package/lib/server/actions/attachments.d.ts

@@ -0,0 +1,3 @@
+import { Context, Next } from '@nocobase/actions';
+export declare function createMiddleware(ctx: Context, next: Next): Promise<any>;
+export declare function destroyMiddleware(ctx: Context, next: Next): Promise<any>;

package/lib/server/actions/{upload.js → attachments.js}

@@ -3,9 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createAction = createAction;
-exports.middleware = middleware;
-exports.uploadAction = uploadAction;
+exports.createMiddleware = createMiddleware;
+exports.destroyMiddleware = destroyMiddleware;
 function _multer() {
   const data = _interopRequireDefault(require("@koa/multer"));
   _multer = function _multer() {
@@ -27,186 +26,186 @@ const _excluded = ["size"];
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-function getRules(ctx) {
-  const resourceField = ctx.resourceField;
-  if (!resourceField) {
-    return ctx.storage.rules;
-  }
-  const _ref = resourceField.options.attachment || {},
-    _ref$rules = _ref.rules,
-    rules = _ref$rules === void 0 ? {} : _ref$rules;
-  return Object.assign({}, ctx.storage.rules, rules);
-}
 // TODO(optimize): 需要优化错误处理，计算失败后需要抛出对应错误，以便程序处理
-function getFileFilter(ctx) {
+function getFileFilter(storage) {
   return (req, file, cb) => {
     // size 交给 limits 处理
-    const _getRules = getRules(ctx),
-      size = _getRules.size,
-      rules = _objectWithoutProperties(_getRules, _excluded);
+    const _storage$rules = storage.rules,
+      size = _storage$rules.size,
+      rules = _objectWithoutProperties(_storage$rules, _excluded);
     const ruleKeys = Object.keys(rules);
-    const result = !ruleKeys.length || !ruleKeys.some(key => typeof Rules[key] !== 'function' || !Rules[key](file, rules[key], ctx));
+    const result = !ruleKeys.length || !ruleKeys.some(key => typeof Rules[key] !== 'function' || !Rules[key](file, rules[key]));
     cb(null, result);
   };
 }
-const isUploadAction = ctx => {
-  var _collection$options;
-  const _ctx$action = ctx.action,
-    resourceName = _ctx$action.resourceName,
-    actionName = _ctx$action.actionName;
-  if (actionName === 'upload' && resourceName === 'attachments') {
-    return true;
+function getFileData(ctx) {
+  const file = ctx[_constants.FILE_FIELD_NAME],
+    storage = ctx.storage;
+  if (!file) {
+    return ctx.throw(400, 'file validation failed');
   }
-  const collection = ctx.db.getCollection(resourceName);
-  if ((collection === null || collection === void 0 ? void 0 : (_collection$options = collection.options) === null || _collection$options === void 0 ? void 0 : _collection$options.template) === 'file' && ['upload', 'create'].includes(actionName)) {
-    return true;
-  }
-};
-function middleware(_x, _x2) {
-  return _middleware.apply(this, arguments);
+  const storageConfig = (0, _storages.getStorageConfig)(storage.type);
+  const name = file[storageConfig.filenameKey || 'filename'];
+  // make compatible filename across cloud service (with path)
+  const filename = _path().default.basename(name);
+  const extname = _path().default.extname(filename);
+  const urlPath = storage.path ? storage.path.replace(/^([^/])/, '/$1') : '';
+  return _objectSpread({
+    title: file.originalname.replace(extname, ''),
+    filename,
+    extname,
+    // TODO(feature): 暂时两者相同，后面 storage.path 模版化以后，这里只是 file 实际的 path
+    path: storage.path,
+    size: file.size,
+    // 直接缓存起来
+    url: `${storage.baseUrl}${urlPath}/${filename}`,
+    mimetype: file.mimetype,
+    // @ts-ignore
+    meta: ctx.request.body,
+    storageId: storage.id
+  }, storageConfig.getFileData ? storageConfig.getFileData(file) : {});
 }
-function _middleware() {
-  _middleware = _asyncToGenerator(function* (ctx, next) {
-    const resourceName = ctx.action.resourceName;
-    const collection = ctx.db.getCollection(resourceName);
-    if (!isUploadAction(ctx)) {
-      return next();
-    }
-    const Storage = ctx.db.getCollection('storages');
-    let storage;
-    if (collection.options.storage) {
-      storage = yield Storage.repository.findOne({
-        filter: {
-          name: collection.options.storage
-        }
-      });
-    } else {
-      storage = yield Storage.repository.findOne({
-        filter: {
-          default: true
-        }
-      });
-    }
+function multipart(_x, _x2) {
+  return _multipart.apply(this, arguments);
+}
+function _multipart() {
+  _multipart = _asyncToGenerator(function* (ctx, next) {
+    var _storage$rules$size;
+    const storage = ctx.storage;
     if (!storage) {
-      console.error('[file-manager] no default or linked storage provided');
+      ctx.logger.error('[file-manager] no linked or default storage provided');
       return ctx.throw(500);
     }
-    // 传递已取得的存储引擎，避免重查
-    ctx.storage = storage;
     const storageConfig = (0, _storages.getStorageConfig)(storage.type);
     if (!storageConfig) {
-      console.error(`[file-manager] storage type "${storage.type}" is not defined`);
+      ctx.logger.error(`[file-manager] storage type "${storage.type}" is not defined`);
       return ctx.throw(500);
     }
     const multerOptions = {
-      fileFilter: getFileFilter(ctx),
+      fileFilter: getFileFilter(storage),
       limits: {
-        fileSize: Math.min(getRules(ctx).size || _constants.LIMIT_MAX_FILE_SIZE, _constants.LIMIT_MAX_FILE_SIZE),
+        fileSize: (_storage$rules$size = storage.rules.size) !== null && _storage$rules$size !== void 0 ? _storage$rules$size : _constants.DEFAULT_MAX_FILE_SIZE,
         // 每次只允许提交一个文件
         files: _constants.LIMIT_FILES
       },
       storage: storageConfig.make(storage)
     };
     const upload = (0, _multer().default)(multerOptions).single(_constants.FILE_FIELD_NAME);
-    return upload(ctx, next);
+    try {
+      // NOTE: empty next and invoke after success
+      yield upload(ctx, () => {});
+    } catch (err) {
+      if (err.name === 'MulterError') {
+        return ctx.throw(400, err);
+      }
+      return ctx.throw(500);
+    }
+    const values = getFileData(ctx);
+    ctx.action.mergeParams({
+      values
+    });
+    yield next();
   });
-  return _middleware.apply(this, arguments);
+  return _multipart.apply(this, arguments);
 }
-function createAction(_x3, _x4) {
-  return _createAction.apply(this, arguments);
+function createMiddleware(_x3, _x4) {
+  return _createMiddleware.apply(this, arguments);
 }
-function _createAction() {
-  _createAction = _asyncToGenerator(function* (ctx, next) {
-    if (!isUploadAction(ctx)) {
+function _createMiddleware() {
+  _createMiddleware = _asyncToGenerator(function* (ctx, next) {
+    var _collection$options, _ctx$db$getFieldByPat, _ctx$db$getFieldByPat2;
+    const _ctx$action = ctx.action,
+      resourceName = _ctx$action.resourceName,
+      actionName = _ctx$action.actionName;
+    const attachmentField = ctx.action.params.attachmentField;
+    const collection = ctx.db.getCollection(resourceName);
+    if ((collection === null || collection === void 0 ? void 0 : (_collection$options = collection.options) === null || _collection$options === void 0 ? void 0 : _collection$options.template) !== 'file' || !['upload', 'create'].includes(actionName)) {
       return next();
     }
-    const file = ctx[_constants.FILE_FIELD_NAME],
-      storage = ctx.storage;
-    if (!file) {
-      return ctx.throw(400, 'file validation failed');
-    }
-    const storageConfig = (0, _storages.getStorageConfig)(storage.type);
-    const name = file[storageConfig.filenameKey || 'filename'];
-    // make compatible filename across cloud service (with path)
-    const filename = _path().default.basename(name);
-    const extname = _path().default.extname(filename);
-    const urlPath = storage.path ? storage.path.replace(/^([^\/])/, '/$1') : '';
-    const values = _objectSpread({
-      title: file.originalname.replace(extname, ''),
-      filename,
-      extname,
-      // TODO(feature): 暂时两者相同，后面 storage.path 模版化以后，这里只是 file 实际的 path
-      path: storage.path,
-      size: file.size,
-      // 直接缓存起来
-      url: `${storage.baseUrl}${urlPath}/${filename}`,
-      mimetype: file.mimetype,
-      storageId: storage.id,
-      // @ts-ignore
-      meta: ctx.request.body
-    }, storageConfig.getFileData ? storageConfig.getFileData(file) : {});
-    ctx.action.mergeParams({
-      values
+    const storageName = ((_ctx$db$getFieldByPat = ctx.db.getFieldByPath(attachmentField)) === null || _ctx$db$getFieldByPat === void 0 ? void 0 : (_ctx$db$getFieldByPat2 = _ctx$db$getFieldByPat.options) === null || _ctx$db$getFieldByPat2 === void 0 ? void 0 : _ctx$db$getFieldByPat2.storage) || collection.options.storage;
+    const StorageRepo = ctx.db.getRepository('storages');
+    const storage = yield StorageRepo.findOne({
+      filter: storageName ? {
+        name: storageName
+      } : {
+        default: true
+      }
     });
-    yield next();
+    ctx.storage = storage;
+    yield multipart(ctx, next);
   });
-  return _createAction.apply(this, arguments);
+  return _createMiddleware.apply(this, arguments);
 }
-function uploadAction(_x5, _x6) {
-  return _uploadAction.apply(this, arguments);
+function destroyMiddleware(_x5, _x6) {
+  return _destroyMiddleware.apply(this, arguments);
 }
-function _uploadAction() {
-  _uploadAction = _asyncToGenerator(function* (ctx, next) {
-    const file = ctx[_constants.FILE_FIELD_NAME],
-      storage = ctx.storage;
-    if (!file) {
-      return ctx.throw(400, 'file validation failed');
+function _destroyMiddleware() {
+  _destroyMiddleware = _asyncToGenerator(function* (ctx, next) {
+    var _collection$options2;
+    const _ctx$action2 = ctx.action,
+      resourceName = _ctx$action2.resourceName,
+      actionName = _ctx$action2.actionName;
+    const collection = ctx.db.getCollection(resourceName);
+    if ((collection === null || collection === void 0 ? void 0 : (_collection$options2 = collection.options) === null || _collection$options2 === void 0 ? void 0 : _collection$options2.template) !== 'file' || actionName !== 'destroy') {
+      return next();
     }
-    const storageConfig = (0, _storages.getStorageConfig)(storage.type);
-    const name = file[storageConfig.filenameKey || 'filename'];
-    // make compatible filename across cloud service (with path)
-    const filename = _path().default.basename(name);
-    const extname = _path().default.extname(filename);
-    const urlPath = storage.path ? storage.path.replace(/^([^\/])/, '/$1') : '';
-    const data = _objectSpread({
-      title: file.originalname.replace(extname, ''),
-      filename,
-      extname,
-      // TODO(feature): 暂时两者相同，后面 storage.path 模版化以后，这里只是 file 实际的 path
-      path: storage.path,
-      size: file.size,
-      // 直接缓存起来
-      url: `${storage.baseUrl}${urlPath}/${filename}`,
-      mimetype: file.mimetype,
-      storageId: storage.id,
-      // @ts-ignore
-      meta: ctx.request.body
-    }, storageConfig.getFileData ? storageConfig.getFileData(file) : {});
-    const fileData = yield ctx.db.sequelize.transaction( /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator(function* (transaction) {
-        const resourceName = ctx.action.resourceName;
-        const repository = ctx.db.getRepository(resourceName);
-        const result = yield repository.create({
-          values: _objectSpread({}, data),
-          transaction
-        });
-        return result;
+    const repository = ctx.db.getRepository(resourceName);
+    const _ctx$action$params = ctx.action.params,
+      filterByTk = _ctx$action$params.filterByTk,
+      filter = _ctx$action$params.filter;
+    const records = yield repository.find({
+      filterByTk,
+      filter,
+      context: ctx
+    });
+    const storageIds = new Set(records.map(record => record.storageId));
+    const storageGroupedRecords = records.reduce((result, record) => {
+      const storageId = record.storageId;
+      if (!result[storageId]) {
+        result[storageId] = [];
+      }
+      result[storageId].push(record);
+      return result;
+    }, {});
+    const storages = yield ctx.db.getRepository('storages').find({
+      filter: {
+        id: [...storageIds],
+        paranoid: {
+          $ne: true
+        }
+      }
+    });
+    let count = 0;
+    const undeleted = [];
+    yield storages.reduce((promise, storage) => promise.then( /*#__PURE__*/_asyncToGenerator(function* () {
+      const storageConfig = (0, _storages.getStorageConfig)(storage.type);
+      const result = yield storageConfig.delete(storage, storageGroupedRecords[storage.id]);
+      count += result[0];
+      undeleted.push(...result[1]);
+    })), Promise.resolve());
+    if (undeleted.length) {
+      const ids = undeleted.map(record => record.id);
+      ctx.action.mergeParams({
+        filter: {
+          id: {
+            $notIn: ids
+          }
+        }
       });
-      return function (_x7) {
-        return _ref2.apply(this, arguments);
-      };
-    }());
-    ctx.body = fileData;
+      ctx.logger.error('[file-manager] some of attachment files are not successfully deleted: ', {
+        ids
+      });
+    }
     yield next();
   });
-  return _uploadAction.apply(this, arguments);
+  return _destroyMiddleware.apply(this, arguments);
 }

package/lib/server/actions/index.d.ts

@@ -0,0 +1,3 @@
+export default function ({ app }: {
+    app: any;
+}): void;

package/lib/server/actions/index.js

@@ -0,0 +1,22 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = _default;
+function _actions() {
+  const data = _interopRequireDefault(require("@nocobase/actions"));
+  _actions = function _actions() {
+    return data;
+  };
+  return data;
+}
+var _attachments = require("./attachments");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _default({
+  app
+}) {
+  app.resourcer.use(_attachments.createMiddleware);
+  app.resourcer.registerActionHandler('upload', _actions().default.create);
+  app.resourcer.use(_attachments.destroyMiddleware);
+}

package/lib/server/collections/attachments.js

@@ -11,6 +11,7 @@ var _default = {
   title: '文件管理器',
   createdBy: true,
   updatedBy: true,
+  template: 'file',
   fields: [{
     comment: '用户文件名（不含扩展名）',
     type: 'string',

package/lib/server/collections/storages.js

@@ -52,8 +52,9 @@ var _default = {
     name: 'default',
     defaultValue: false
   }, {
-    type: 'hasMany',
-    name: 'attachments'
+    type: 'boolean',
+    name: 'paranoid',
+    defaultValue: false
   }]
 };
 exports.default = _default;

package/lib/server/constants.d.ts

@@ -1,6 +1,6 @@
 export declare const FILE_FIELD_NAME = "file";
 export declare const LIMIT_FILES = 1;
-export declare const LIMIT_MAX_FILE_SIZE: number;
+export declare const DEFAULT_MAX_FILE_SIZE: number;
 export declare const STORAGE_TYPE_LOCAL = "local";
 export declare const STORAGE_TYPE_ALI_OSS = "ali-oss";
 export declare const STORAGE_TYPE_S3 = "s3";

package/lib/server/constants.js

@@ -3,13 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.STORAGE_TYPE_TX_COS = exports.STORAGE_TYPE_S3 = exports.STORAGE_TYPE_LOCAL = exports.STORAGE_TYPE_ALI_OSS = exports.LIMIT_MAX_FILE_SIZE = exports.LIMIT_FILES = exports.FILE_FIELD_NAME = void 0;
+exports.STORAGE_TYPE_TX_COS = exports.STORAGE_TYPE_S3 = exports.STORAGE_TYPE_LOCAL = exports.STORAGE_TYPE_ALI_OSS = exports.LIMIT_FILES = exports.FILE_FIELD_NAME = exports.DEFAULT_MAX_FILE_SIZE = void 0;
 const FILE_FIELD_NAME = 'file';
 exports.FILE_FIELD_NAME = FILE_FIELD_NAME;
 const LIMIT_FILES = 1;
 exports.LIMIT_FILES = LIMIT_FILES;
-const LIMIT_MAX_FILE_SIZE = 1024 * 1024 * 1024;
-exports.LIMIT_MAX_FILE_SIZE = LIMIT_MAX_FILE_SIZE;
+const DEFAULT_MAX_FILE_SIZE = 1024 * 1024 * 1024;
+exports.DEFAULT_MAX_FILE_SIZE = DEFAULT_MAX_FILE_SIZE;
 const STORAGE_TYPE_LOCAL = 'local';
 exports.STORAGE_TYPE_LOCAL = STORAGE_TYPE_LOCAL;
 const STORAGE_TYPE_ALI_OSS = 'ali-oss';

package/lib/server/rules/mimetype.d.ts

@@ -1 +1 @@
-export default function (file: any, options: string | string[], ctx: any): boolean;
+export default function (file: any, options?: string | string[]): boolean;