fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-07-02 11:12:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(plugin-fm): fix cos path error (#4537)

Browse Source
This commit is contained in:
Junyi 2024-05-31 11:29:31 +08:00 committed by GitHub
parent dc309cbab5
commit ccef72cb0b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/plugins/@nocobase/plugin-file-manager/src/client/FileSizeField.tsx
View File

@ -47,7 +47,7 @@ export function FileSizeField(props) {
const dvOption = getUnitOption(defaultValue, defaultUnit); const dvOption = getUnitOption(defaultValue, defaultUnit);
const dv = defaultValue / dvOption.value; const dv = defaultValue / dvOption.value;
const vOption = getUnitOption(value ?? defaultValue, defaultUnit); const vOption = getUnitOption(value ?? defaultValue, defaultUnit);
const v = value == null ? dv : value / vOption.value; const v = value == null ? value : value / vOption.value;
const onNumberChange = useCallback( const onNumberChange = useCallback(
(val) => { (val) => {

2
packages/plugins/@nocobase/plugin-file-manager/src/server/actions/attachments.ts
View File

@ -44,7 +44,7 @@ function getFileData(ctx: Context) {
// make compatible filename across cloud service (with path) // make compatible filename across cloud service (with path)
const filename = Path.basename(name); const filename = Path.basename(name);
const extname = Path.extname(filename); const extname = Path.extname(filename);
const path = storage.path.replace(/^\/|\/$/g, ''); const path = (storage.path || '').replace(/^\/|\/$/g, '');
const baseUrl = storage.baseUrl.replace(/\/+$/, ''); const baseUrl = storage.baseUrl.replace(/\/+$/, '');
const pathname = [path, filename].filter(Boolean).join('/'); const pathname = [path, filename].filter(Boolean).join('/');

9
packages/plugins/@nocobase/plugin-file-manager/src/server/storages/tx-cos.ts
View File

@ -11,15 +11,18 @@ import { promisify } from 'util';
import { AttachmentModel, StorageType } from '.'; import { AttachmentModel, StorageType } from '.';
import { STORAGE_TYPE_TX_COS } from '../../constants'; import { STORAGE_TYPE_TX_COS } from '../../constants';
import { cloudFilenameGetter, getFileKey } from '../utils'; import { getFilename, getFileKey } from '../utils';
export default class extends StorageType { export default class extends StorageType {
filenameKey = 'url'; filenameKey = 'url';
make(storage) { make(storage) {
const createTxCosStorage = require('multer-cos'); const createTxCosStorage = require('multer-cos');
return new createTxCosStorage({ return new createTxCosStorage({
cos: storage.options, cos: {
filename: cloudFilenameGetter(storage), ...storage.options,
dir: (storage.path ?? '').replace(/\/+$/, ''),
},
filename: getFilename,
}); });
} }
defaults() { defaults() {