@nocobase/plugin-file-manager 0.9.1-alpha.1 → 0.9.2-alpha.1

package/lib/client/schemas/storage.js

@@ -4,33 +4,25 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.storageSchema = void 0;
-
 function _shared() {
   const data = require("@formily/shared");
-
   _shared = function _shared() {
     return data;
   };
-
   return data;
 }
-
 function _client() {
   const data = require("@nocobase/client");
-
   _client = function _client() {
     return data;
   };
-
   return data;
 }
-
 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) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+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); }
 const collection = {
   name: 'storages',
   fields: [{
@@ -108,7 +100,7 @@ const collection = {
 const storageSchema = {
   type: 'object',
   properties: {
-    block1: {
+    [(0, _shared().uid)()]: {
       type: 'void',
       'x-decorator': 'ResourceActionProvider',
       'x-decorator-props': {
@@ -173,7 +165,6 @@ const storageSchema = {
                         refreshDeps: [ctx.visible]
                       }));
                     }
-
                   },
                   title: '{{t("Add storage")}}',
                   properties: {

package/lib/client/templates/file.d.ts

@@ -0,0 +1,2 @@
+import { CollectionOptions } from '@nocobase/database';
+export declare const file: CollectionOptions;

package/lib/client/templates/file.js

@@ -0,0 +1,164 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.file = void 0;
+function _client() {
+  const data = require("@nocobase/client");
+  _client = function _client() {
+    return data;
+  };
+  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; }
+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); }
+const file = {
+  name: 'file',
+  title: `{{t("File collection", { ns: "${_locale.NAMESPACE}" })}}`,
+  order: 3,
+  color: 'blue',
+  default: {
+    createdBy: true,
+    updatedBy: true,
+    fields: [{
+      interface: 'input',
+      type: 'string',
+      name: 'title',
+      deletable: false,
+      uiSchema: {
+        type: 'string',
+        title: `{{t("Title")}}`,
+        'x-component': 'Input'
+      }
+    },
+    // '系统文件名（含扩展名）',
+    {
+      interface: 'input',
+      type: 'string',
+      name: 'filename',
+      deletable: false,
+      uiSchema: {
+        type: 'string',
+        title: `{{t("File name", { ns: "${_locale.NAMESPACE}" })}}`,
+        'x-component': 'Input',
+        'x-read-pretty': true
+      }
+    },
+    // '扩展名（含“.”）',
+    {
+      interface: 'input',
+      type: 'string',
+      name: 'extname',
+      deletable: false,
+      uiSchema: {
+        type: 'string',
+        title: `{{t("Extension name", { ns: "${_locale.NAMESPACE}" })}}`,
+        'x-component': 'Input',
+        'x-read-pretty': true
+      }
+    },
+    // '文件体积（字节）',
+    {
+      interface: 'integer',
+      type: 'integer',
+      name: 'size',
+      deletable: false,
+      uiSchema: {
+        type: 'number',
+        title: `{{t("Size", { ns: "${_locale.NAMESPACE}" })}}`,
+        'x-component': 'InputNumber',
+        'x-read-pretty': true,
+        'x-component-props': {
+          stringMode: true,
+          step: '0'
+        }
+      }
+    }, {
+      interface: 'input',
+      type: 'string',
+      name: 'mimetype',
+      deletable: false,
+      uiSchema: {
+        type: 'string',
+        title: `{{t("Mime type", { ns: "${_locale.NAMESPACE}" })}}`,
+        'x-component': 'Input',
+        'x-read-pretty': true
+      }
+    },
+    // '相对路径（含“/”前缀）',
+    {
+      interface: 'input',
+      type: 'string',
+      name: 'path',
+      deletable: false,
+      uiSchema: {
+        type: 'string',
+        title: `{{t("Path")}}`,
+        'x-component': 'Input',
+        'x-read-pretty': true
+      }
+    },
+    // 文件的可访问地址
+    {
+      interface: 'input',
+      type: 'string',
+      name: 'url',
+      deletable: false,
+      uiSchema: {
+        type: 'string',
+        title: `{{t("URL")}}`,
+        'x-component': 'Input.URL',
+        'x-read-pretty': true
+      }
+    },
+    // 用于预览
+    {
+      interface: 'url',
+      type: 'string',
+      name: 'preview',
+      field: 'url',
+      deletable: false,
+      uiSchema: {
+        type: 'string',
+        title: `{{t("Preview")}}`,
+        'x-component': 'Preview',
+        'x-read-pretty': true
+      }
+    }, {
+      comment: '存储引擎',
+      type: 'belongsTo',
+      name: 'storage',
+      target: 'storages',
+      foreignKey: 'storageId',
+      deletable: false
+    },
+    // '其他文件信息（如图片的宽高）',
+    {
+      type: 'jsonb',
+      name: 'meta',
+      deletable: false,
+      defaultValue: {}
+    }]
+  },
+  configurableProperties: _objectSpread(_objectSpread(_objectSpread({}, (0, _client().getConfigurableProperties)('title', 'name')), {}, {
+    inherits: _objectSpread(_objectSpread({}, (0, _client().getConfigurableProperties)('inherits').inherits), {}, {
+      'x-reactions': ['{{useAsyncDataSource(loadCollections)}}']
+    })
+  }, (0, _client().getConfigurableProperties)('category')), {}, {
+    storage: {
+      title: `{{t("File storage", { ns: "${_locale.NAMESPACE}" })}}`,
+      type: 'hasOne',
+      name: 'storage',
+      required: true,
+      'x-decorator': 'FormItem',
+      'x-component': 'Select',
+      'x-reactions': ['{{useAsyncDataSource(loadStorages)}}']
+    }
+  })
+};
+exports.file = file;

package/lib/client/templates/index.d.ts

@@ -0,0 +1 @@
+export * from './file';

package/lib/client/templates/index.js

@@ -0,0 +1,16 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var _file = require("./file");
+Object.keys(_file).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _file[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _file[key];
+    }
+  });
+});

package/lib/index.js

@@ -9,7 +9,5 @@ Object.defineProperty(exports, "default", {
     return _server.default;
   }
 });
-
 var _server = _interopRequireDefault(require("./server"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

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

@@ -1,3 +1,4 @@
 import { Context, Next } from '@nocobase/actions';
 export declare function middleware(ctx: Context, next: Next): Promise<any>;
-export declare function action(ctx: Context, next: Next): Promise<never>;
+export declare function createAction(ctx: Context, next: Next): Promise<any>;
+export declare function uploadAction(ctx: Context, next: Next): Promise<never>;

package/lib/server/actions/upload.js

@@ -3,154 +3,110 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.action = action;
+exports.createAction = createAction;
 exports.middleware = middleware;
-
+exports.uploadAction = uploadAction;
 function _multer() {
   const data = _interopRequireDefault(require("@koa/multer"));
-
   _multer = function _multer() {
     return data;
   };
-
-  return data;
-}
-
-function _database() {
-  const data = require("@nocobase/database");
-
-  _database = function _database() {
-    return data;
-  };
-
   return data;
 }
-
 function _path() {
   const data = _interopRequireDefault(require("path"));
-
   _path = function _path() {
     return data;
   };
-
   return data;
 }
-
 var _constants = require("../constants");
-
 var Rules = _interopRequireWildcard(require("../rules"));
-
 var _storages = require("../storages");
-
 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 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) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+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;
-
+    _ref$rules = _ref.rules,
+    rules = _ref$rules === void 0 ? {} : _ref$rules;
   return Object.assign({}, ctx.storage.rules, rules);
-} // TODO(optimize): 需要优化错误处理，计算失败后需要抛出对应错误，以便程序处理
-
-
+}
+// TODO(optimize): 需要优化错误处理，计算失败后需要抛出对应错误，以便程序处理
 function getFileFilter(ctx) {
   return (req, file, cb) => {
     // size 交给 limits 处理
     const _getRules = getRules(ctx),
-          size = _getRules.size,
-          rules = _objectWithoutProperties(_getRules, _excluded);
-
+      size = _getRules.size,
+      rules = _objectWithoutProperties(_getRules, _excluded);
     const ruleKeys = Object.keys(rules);
     const result = !ruleKeys.length || !ruleKeys.some(key => typeof Rules[key] !== 'function' || !Rules[key](file, rules[key], ctx));
     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;
+  }
+  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);
 }
-
 function _middleware() {
   _middleware = _asyncToGenerator(function* (ctx, next) {
-    const _ctx$action$params = ctx.action.params,
-          resourceName = _ctx$action$params.resourceName,
-          actionName = _ctx$action$params.actionName,
-          associatedName = _ctx$action$params.associatedName;
-
-    if (actionName !== 'upload') {
+    const resourceName = ctx.action.resourceName;
+    const collection = ctx.db.getCollection(resourceName);
+    if (!isUploadAction(ctx)) {
       return next();
-    } // NOTE:
-    // 1. 存储引擎选择依赖于字段定义
-    // 2. 字段定义中需包含引擎的外键值
-    // 3. 无字段时按 storages 表的默认项
-    // 4. 插件初始化后应提示用户添加至少一个存储引擎并设为默认
-
-
+    }
     const Storage = ctx.db.getCollection('storages');
     let storage;
-
-    if (resourceName === 'attachments') {
-      // 如果没有包含关联，则直接按默认文件上传至默认存储引擎
+    if (collection.options.storage) {
       storage = yield Storage.repository.findOne({
         filter: {
-          default: true
+          name: collection.options.storage
         }
       });
-    } else if (associatedName) {
-      const AssociatedCollection = ctx.db.getCollection(associatedName);
-      const resourceField = AssociatedCollection.getField(resourceName);
-      ctx.resourceField = resourceField;
-      const _resourceField$option = resourceField.options.attachment,
-            attachment = _resourceField$option === void 0 ? {} : _resourceField$option;
+    } else {
       storage = yield Storage.repository.findOne({
-        filter: attachment.storage ? {
-          name: attachment.storage
-        } : {
+        filter: {
           default: true
         }
       });
     }
-
     if (!storage) {
       console.error('[file-manager] no default or linked 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`);
       return ctx.throw(500);
     }
-
     const multerOptions = {
       fileFilter: getFileFilter(ctx),
       limits: {
@@ -165,29 +121,62 @@ function _middleware() {
   });
   return _middleware.apply(this, arguments);
 }
-
-function action(_x3, _x4) {
-  return _action.apply(this, arguments);
+function createAction(_x3, _x4) {
+  return _createAction.apply(this, arguments);
 }
-
-function _action() {
-  _action = _asyncToGenerator(function* (ctx, next) {
+function _createAction() {
+  _createAction = _asyncToGenerator(function* (ctx, next) {
+    if (!isUploadAction(ctx)) {
+      return next();
+    }
     const file = ctx[_constants.FILE_FIELD_NAME],
-          storage = ctx.storage;
-
+      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 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
+    });
+    yield next();
+  });
+  return _createAction.apply(this, arguments);
+}
+function uploadAction(_x5, _x6) {
+  return _uploadAction.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');
+    }
+    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,
@@ -198,49 +187,26 @@ function _action() {
       // 直接缓存起来
       url: `${storage.baseUrl}${urlPath}/${filename}`,
       mimetype: file.mimetype,
+      storageId: storage.id,
       // @ts-ignore
       meta: ctx.request.body
     }, storageConfig.getFileData ? storageConfig.getFileData(file) : {});
-
-    const attachment = yield ctx.db.sequelize.transaction( /*#__PURE__*/function () {
+    const fileData = yield ctx.db.sequelize.transaction( /*#__PURE__*/function () {
       var _ref2 = _asyncToGenerator(function* (transaction) {
-        // TODO(optimize): 应使用关联 accessors 获取
-        const result = yield storage.createAttachment(data, {
-          context: ctx,
+        const resourceName = ctx.action.resourceName;
+        const repository = ctx.db.getRepository(resourceName);
+        const result = yield repository.create({
+          values: _objectSpread({}, data),
           transaction
         });
-        const _ctx$action$params2 = ctx.action.params,
-              associatedName = _ctx$action$params2.associatedName,
-              associatedIndex = _ctx$action$params2.associatedIndex,
-              resourceName = _ctx$action$params2.resourceName;
-        const AssociatedCollection = ctx.db.getCollection(associatedName);
-
-        if (AssociatedCollection && associatedIndex && resourceName) {
-          const Repo = AssociatedCollection.repository.relation(resourceName).of(associatedIndex);
-          const Attachment = ctx.db.getCollection('attachments').model;
-          const opts = {
-            tk: result[Attachment.primaryKeyAttribute],
-            transaction
-          };
-
-          if (Repo instanceof _database().BelongsToManyRepository) {
-            yield Repo.add(opts);
-          } else if (Repo instanceof _database().BelongsToRepository) {
-            yield Repo.set(opts);
-          }
-        }
-
         return result;
       });
-
-      return function (_x5) {
+      return function (_x7) {
         return _ref2.apply(this, arguments);
       };
-    }()); // 将存储引擎的信息附在已创建的记录里，节省一次查询
-    // attachment.setDataValue('storage', storage);
-
-    ctx.body = attachment;
+    }());
+    ctx.body = fileData;
     yield next();
   });
-  return _action.apply(this, arguments);
+  return _uploadAction.apply(this, arguments);
 }

package/lib/server/collections/attachments.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _default = {
-  namespace: 'file-manager',
+  namespace: 'file-manager.attachmentRecords',
   duplicator: 'optional',
   name: 'attachments',
   title: '文件管理器',
@@ -27,7 +27,8 @@ var _default = {
     comment: '文件体积（字节）',
     type: 'integer',
     name: 'size'
-  }, // TODO: 使用暂不明确，以后再考虑
+  },
+  // TODO: 使用暂不明确，以后再考虑
   // {
   //   comment: '文件类型（mimetype 前半段，通常用于预览）',
   //   type: 'string',
@@ -52,8 +53,8 @@ var _default = {
   }, {
     comment: '网络访问地址',
     type: 'string',
-    name: 'url' // formula: '{{ storage.baseUrl }}{{ path }}/{{ filename }}'
-
+    name: 'url'
+    // formula: '{{ storage.baseUrl }}{{ path }}/{{ filename }}'
   }]
 };
 exports.default = _default;

package/lib/server/collections/storages.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _default = {
-  namespace: 'file-manager',
+  namespace: 'file-manager.storageSetting',
   duplicator: 'optional',
   name: 'storages',
   title: '存储引擎',
@@ -44,7 +44,8 @@ var _default = {
     type: 'string',
     name: 'baseUrl',
     defaultValue: ''
-  }, // TODO(feature): 需要使用一个实现了可设置默认值的字段
+  },
+  // TODO(feature): 需要使用一个实现了可设置默认值的字段
   {
     comment: '默认引擎',
     type: 'radio',

package/lib/server/index.js

@@ -10,9 +10,7 @@ Object.defineProperty(exports, "default", {
     return _server.default;
   }
 });
-
 var _constants = require("./constants");
-
 Object.keys(_constants).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -24,7 +22,5 @@ Object.keys(_constants).forEach(function (key) {
     }
   });
 });
-
 var _server = _interopRequireDefault(require("./server"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/server/rules/index.js

@@ -9,7 +9,5 @@ Object.defineProperty(exports, "mimetype", {
     return _mimetype.default;
   }
 });
-
 var _mimetype = _interopRequireDefault(require("./mimetype"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }