Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-web into dev

# Conflicts:
#	src/router/routes/basic.ts

src/api/system/file/index.ts

@@ -2,28 +2,38 @@ import { defHttp } from '/@/utils/http/axios';
 
 import { ErrorMessageMode } from '/#/axios';
 import { FilePageListParams, FilePageListSearchModel, FilePageListResultModel, ZipFilesModel, FileModel } from './model';
+
+import { useGlobSetting } from '/@/hooks/setting';
+const globSetting = useGlobSetting();
+
+const urlPrefix = globSetting.apiUrl;
+
 enum Api {
   File = '/system/file',
   Info = '/system/file/info',
-  InfoByDownloadUrl = '/system/file/info-byDownloadUrl',
-  List = '/system/file',
+  List = '/system/file/list',
   Page = '/system/file/page',
-  DeleteFile = '/system/file/delete-single',
+  DeleteFile = '/system/file/delete',
   ZipFiles = '/system/file/package-files',
 }
 
-export async function getInfoByDownloadUrl(params: {id: string}, mode: ErrorMessageMode = 'modal') {
-  return defHttp.get<FileModel>(
-    {
-      url: Api.InfoByDownloadUrl,
-      params,
-    },
-    {
-      errorMessageMode: mode,
-    },
-  );
+export function parseDownloadUrl(url:string,th?:boolean,full?:boolean) {
+  // 空值防护：如果url为空，直接返回空字符串（避免拼接出错）
+  if (!url) return '';
+
+  // 判断url是否以/api开头（忽略首尾空格，兼容可能的空格场景）
+  const trimmedUrl = url.trim();
+  if(urlPrefix!=undefined && trimmedUrl.startsWith(urlPrefix)){
+     return trimmedUrl + (th ? '&th=true' : '');
+  }
+  let resultUrl = urlPrefix + trimmedUrl + (th ? '&th=true' : '');
+  if(full){
+     return location.origin + resultUrl;
+  }
+  return resultUrl;
 }
 
+
 /**
  * @description: 查询文件分页
  */
@@ -48,7 +58,7 @@ export async function getFilePage(
 export async function deleteFile(ids: string[], mode: ErrorMessageMode = 'modal') {
   return defHttp.delete<number>(
     {
-      url: Api.File,
+      url: Api.DeleteFile,
       data: ids,
     },
     {
@@ -61,15 +71,15 @@ export async function deleteFile(ids: string[], mode: ErrorMessageMode = 'modal'
  * @description: 删除单个文件
  */
 export async function deleteSingleFile(id: string, mode: ErrorMessageMode = 'modal') {
-  return defHttp.delete<string>(
-    {
-      url: Api.DeleteFile,
-      data: id,
-    },
-    {
+   return defHttp.delete<string>(
+     {
+       url: Api.DeleteFile,
+       data: [id],
+     },
+     {
       errorMessageMode: mode,
     },
-  );
+   );
 }
 
 /**