Merge remote-tracking branch 'origin/develop' into develop

web/src/views/system/downloadCenter/crud.tsx

@@ -2,7 +2,8 @@ import { CrudOptions, AddReq, DelReq, EditReq, dict, CrudExpose, compute } from
 import * as api from './api';
 import { dictionary } from '/@/utils/dictionary';
 import { successMessage } from '../../../utils/message';
-import { auth } from '/@/utils/authFunction'
+import { auth } from '/@/utils/authFunction';
+import { getBaseURL } from '/@/utils/baseUrl';
 
 interface CreateCrudOptionsTypes {
     output: any;
@@ -27,7 +28,6 @@ export const createCrudOptions = function ({ crudExpose }: { crudExpose: CrudExp
 
     //权限判定
 
-    // @ts-ignore
     // @ts-ignore
     return {
         crudOptions: {
@@ -72,7 +72,7 @@ export const createCrudOptions = function ({ crudExpose }: { crudExpose: CrudExp
                         show: compute(ctx => ctx.row.task_status === 2),
                         text: '下载文件',
                         type: 'warning',
-                        click: (ctx) => window.open(ctx.row.url, '_blank')
+                        click: (ctx) => window.open(getBaseURL(ctx.row.url), '_blank')
                     }
                 },
             },

web/src/views/system/fileList/crud.tsx

@@ -11,6 +11,7 @@ import {
   dict
 } from '@fast-crud/fast-crud';
 import fileSelector from '/@/components/fileSelector/index.vue';
+import { getBaseURL } from '/@/utils/baseUrl';
 
 export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const pageRequest = async (query: UserPageQuery) => {
@@ -146,6 +147,11 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp
           },
           column: {
             minWidth: 360,
+            component: {
+                async buildUrl(value: any) {
+                    return getBaseURL(value);
+                    }
+            }
           },
         },
         md5sum: {