diff --git a/src/locales/lang/en/sys.ts b/src/locales/lang/en/sys.ts index 1e200f57..c88d25d8 100644 --- a/src/locales/lang/en/sys.ts +++ b/src/locales/lang/en/sys.ts @@ -1,5 +1,6 @@ export default { api: { + operationSuccess: 'Operation Success', operationFailed: 'Operation failed', errorTip: 'Error Tip', successTip: 'Success Tip', diff --git a/src/locales/lang/zh-CN/sys.ts b/src/locales/lang/zh-CN/sys.ts index 24d38dc6..44ef9f4e 100644 --- a/src/locales/lang/zh-CN/sys.ts +++ b/src/locales/lang/zh-CN/sys.ts @@ -1,5 +1,6 @@ export default { api: { + operationSuccess: '操作成功', operationFailed: '操作失败', errorTip: '错误提示', successTip: '成功提示', diff --git a/src/utils/http/axios/index.ts b/src/utils/http/axios/index.ts index 7cb1a935..872cd40e 100644 --- a/src/utils/http/axios/index.ts +++ b/src/utils/http/axios/index.ts @@ -10,7 +10,7 @@ import { checkStatus } from './checkStatus'; import { useGlobSetting } from '/@/hooks/setting'; import { useMessage } from '/@/hooks/web/useMessage'; import { RequestEnum, ResultEnum, ContentTypeEnum } from '/@/enums/httpEnum'; -import { isString } from '/@/utils/is'; +import { isString, isUnDef, isNull, isEmpty } from '/@/utils/is'; import { getToken } from '/@/utils/auth'; import { setObjToUrlParams, deepMerge } from '/@/utils'; import { useErrorLogStoreWithOut } from '/@/store/modules/errorLog'; @@ -57,9 +57,11 @@ const transform: AxiosTransform = { const hasSuccess = data && Reflect.has(data, 'code') && code === ResultEnum.SUCCESS; if (hasSuccess) { let successMsg = message; - if (successMsg === null || successMsg === undefined || successMsg === '') { - successMsg = '操作成功'; + + if (isNull(successMsg) || isUnDef(successMsg) || isEmpty(successMsg)) { + successMsg = t(`sys.api.operationSuccess`); } + if (options.successMessageMode === 'modal') { createSuccessModal({ title: t('sys.api.successTip'), content: successMsg }); } else if (options.successMessageMode === 'message') {