From 9f9bc0e88e9df8a0121750fec4c9c90ab29f4735 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=A8=E5=AD=90-=E6=9D=8E?= <1537080775@qq.com> Date: Wed, 10 Jul 2024 00:51:29 +0000 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=87=E4=BB=B6=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E5=9C=B0=E5=9D=80bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 木子-李 <1537080775@qq.com> --- backend/dvadmin/system/views/file_list.py | 3 +-- web/src/views/system/fileList/crud.tsx | 4 ++++ web/src/views/system/messageCenter/crud.tsx | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/backend/dvadmin/system/views/file_list.py b/backend/dvadmin/system/views/file_list.py index c5956998..4d388e12 100644 --- a/backend/dvadmin/system/views/file_list.py +++ b/backend/dvadmin/system/views/file_list.py @@ -15,8 +15,7 @@ class FileSerializer(CustomModelSerializer): url = serializers.SerializerMethodField(read_only=True) def get_url(self, instance): - base_url = f"{self.request.scheme}://{self.request.get_host()}/" - return base_url + (instance.file_url or (f'media/{str(instance.url)}')) + return instance.file_url or f'media/{str(instance.url)}' class Meta: model = FileList diff --git a/web/src/views/system/fileList/crud.tsx b/web/src/views/system/fileList/crud.tsx index 5c6a0d5a..701e9d78 100644 --- a/web/src/views/system/fileList/crud.tsx +++ b/web/src/views/system/fileList/crud.tsx @@ -1,5 +1,6 @@ import * as api from './api'; import { UserPageQuery, AddReq, DelReq, EditReq, CrudExpose, CrudOptions, CreateCrudOptionsProps, CreateCrudOptionsRet } from '@fast-crud/fast-crud'; +import { getBaseURL } from '/@/utils/baseUrl'; export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOptionsRet { const pageRequest = async (query: UserPageQuery) => { @@ -113,6 +114,9 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp column:{ minWidth: 200, }, + valueBuilder(context: ValueBuilderContext) { + context.row.url = getBaseURL() + context.row.url; + }, }, md5sum: { title: '文件MD5', diff --git a/web/src/views/system/messageCenter/crud.tsx b/web/src/views/system/messageCenter/crud.tsx index dddc1a65..965b11d6 100644 --- a/web/src/views/system/messageCenter/crud.tsx +++ b/web/src/views/system/messageCenter/crud.tsx @@ -4,6 +4,7 @@ import tableSelector from '/@/components/tableSelector/index.vue'; import { shallowRef, computed } from 'vue'; import manyToMany from '/@/components/manyToMany/index.vue'; import { auth } from '/@/utils/authFunction'; +import { getBaseURL } from '/@/utils/baseUrl'; const { compute } = useCompute(); export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet { @@ -356,7 +357,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat uploader: { type: 'form', buildUrl(res: any) { - return res.url; + return getBaseURL() + res.url; }, }, }, -- Gitee