From bc099041ce13c64c999c6f7df6470b74e94db84b Mon Sep 17 00:00:00 2001 From: coder_Q <55419399+PlayGuitar-CoderQ@users.noreply.github.com> Date: Thu, 24 Nov 2022 06:44:53 +0800 Subject: [PATCH] =?UTF-8?q?style:=20optimize=20the=20way=20success=20hints?= =?UTF-8?q?=20are=20encoded=20in=20transformRespons=E2=80=A6=20(#2411)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * style: optimize the way success hints are encoded in transformResponseHook #2410 * style: move to introduce location Co-authored-by: 邱子建 --- src/locales/lang/en/sys.ts | 1 + src/locales/lang/zh-CN/sys.ts | 1 + src/utils/http/axios/index.ts | 8 +++++--- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/locales/lang/en/sys.ts b/src/locales/lang/en/sys.ts index 1e200f573..c88d25d81 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 24d38dc6c..44ef9f4ef 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 7cb1a9352..872cd40ec 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') {