fix: invalid regular expression in safari

fix #108
buqiyuan · Jul 26, 2022 · 6375f53 · 6375f53 · vercel · Jul 26, 2022
1 parent 31cbd31
commit 6375f53
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/utils/request.ts b/src/utils/request.ts
@@ -1,5 +1,6 @@
 import axios from 'axios';
 import { message as $message } from 'ant-design-vue';
+import { uniqueSlash } from './urlUtils';
 import type { AxiosRequestConfig } from 'axios';
 import { ACCESS_TOKEN_KEY } from '@/enums/cacheEnum';
 import { Storage } from '@/utils/Storage';
@@ -113,7 +114,7 @@ export const request = async <T = any>(
       return $message.error('你没有访问该接口的权限，请联系管理员！');
     }
     const fullUrl = `${(isMock ? baseMockUrl : baseApiUrl) + config.url}`;
-    config.url = fullUrl.replace(/(?<!:)\/{2,}/g, '/');
+    config.url = uniqueSlash(fullUrl);
     // if (IS_PROD) {
     //   // 保持api请求的协议与当前访问的站点协议一致
     //   config.url.replace(/^https?:/g, location.protocol);

diff --git a/src/utils/urlUtils.ts b/src/utils/urlUtils.ts
@@ -28,4 +28,6 @@ export function setObjToUrlParams(baseUrl: string, obj: object): string {
  * @param path 要处理的路径
  * @returns {string} 将/去重后的结果
  */
-export const uniqueSlash = (path: string) => path.replace(/(?<!:)\/{2,}/g, '/');
+export const uniqueSlash = (path: string) => path.replace(/(https?:\/)|(\/)+/g, '$1$2');
+// Safari 不支持以下正则(反向否定查找) shit!
+// export const uniqueSlash = (path: string) => path.replace(/(?<!:)\/{2,}/g, '/');