fix: prevent admin bootstrap merge helper race

This commit is contained in:
richjohnrambo
2026-09-24 01:20:59 +08:00
parent 32017a2fbf
commit e24a04a920
+10 -3
View File
@@ -7,8 +7,7 @@ import { formatRequestDate, joinTimestamp } from './helper';
import { ContentTypeEnum, RequestEnum, ResultEnum } from '@/enums/httpEnum';
import { PageEnum } from '@/enums/pageEnum';
import { useGlobSetting } from '@/hooks/setting';
import { isString, isUrl } from '@/utils/is/';
import { deepMerge } from '@/utils';
import { isObject, isString, isUrl } from '@/utils/is/';
import { setObjToUrlParams } from '@/utils/urlUtils';
import { CreateAxiosOptions, RequestOptions, Result } from './types';
import { useUserStoreWidthOut } from '@/store/modules/user';
@@ -21,6 +20,14 @@ import { useI18nStore } from '@/store/modules/i18n';
const globSetting = useGlobSetting();
const urlPrefix = globSetting.urlPrefix || '';
function mergeOptions<T = any>(src: any = {}, target: any = {}): T {
let key: string;
for (key in target) {
src[key] = isObject(src[key]) ? mergeOptions(src[key], target[key]) : (src[key] = target[key]);
}
return src;
}
/**
* @description: 数据处理,方便区分多种处理方式
*/
@@ -238,7 +245,7 @@ const transform: AxiosTransform = {
function createAxios(opt?: Partial<CreateAxiosOptions>) {
return new VAxios(
deepMerge(
mergeOptions(
{
timeout: 30 * 1000,
authenticationScheme: '',