canrd-outside / order-erp-front · Commits

Commit bc099041ce13c64c999c6f7df6470b74e94db84b

Authored by coder_Q
Committed by GitHub
1 parent 0629cc7b

style: optimize the way success hints are encoded in transformRespons… (#2411) 

* style: optimize the way success hints are encoded in transformResponseHook #2410

* style: move to introduce location

Co-authored-by: 邱子建 <qiuzijian@qiuzijiandeMacBook-Air.local>
Inline Side-by-side
Showing 3 changed files with 7 additions and 3 deletions
src/locales/lang/en/sys.ts
  View file @bc09904
1 export default { 1 export default {
2 api: { 2 api: {
  3 + operationSuccess: 'Operation Success',
3 operationFailed: 'Operation failed', 4 operationFailed: 'Operation failed',
4 errorTip: 'Error Tip', 5 errorTip: 'Error Tip',
5 successTip: 'Success Tip', 6 successTip: 'Success Tip',
src/locales/lang/zh-CN/sys.ts
  View file @bc09904
1 export default { 1 export default {
2 api: { 2 api: {
  3 + operationSuccess: '操作成功',
3 operationFailed: '操作失败', 4 operationFailed: '操作失败',
4 errorTip: '错误提示', 5 errorTip: '错误提示',
5 successTip: '成功提示', 6 successTip: '成功提示',
src/utils/http/axios/index.ts
  View file @bc09904
@@ -10,7 +10,7 @@ import { checkStatus } from &#39;./checkStatus&#39;; @@ -10,7 +10,7 @@ import { checkStatus } from &#39;./checkStatus&#39;;
10 import { useGlobSetting } from '/@/hooks/setting'; 10 import { useGlobSetting } from '/@/hooks/setting';
11 import { useMessage } from '/@/hooks/web/useMessage'; 11 import { useMessage } from '/@/hooks/web/useMessage';
12 import { RequestEnum, ResultEnum, ContentTypeEnum } from '/@/enums/httpEnum'; 12 import { RequestEnum, ResultEnum, ContentTypeEnum } from '/@/enums/httpEnum';
13 -import { isString } from '/@/utils/is'; 13 +import { isString, isUnDef, isNull, isEmpty } from '/@/utils/is';
14 import { getToken } from '/@/utils/auth'; 14 import { getToken } from '/@/utils/auth';
15 import { setObjToUrlParams, deepMerge } from '/@/utils'; 15 import { setObjToUrlParams, deepMerge } from '/@/utils';
16 import { useErrorLogStoreWithOut } from '/@/store/modules/errorLog'; 16 import { useErrorLogStoreWithOut } from '/@/store/modules/errorLog';
@@ -57,9 +57,11 @@ const transform: AxiosTransform = { @@ -57,9 +57,11 @@ const transform: AxiosTransform = {
57 const hasSuccess = data && Reflect.has(data, 'code') && code === ResultEnum.SUCCESS; 57 const hasSuccess = data && Reflect.has(data, 'code') && code === ResultEnum.SUCCESS;
58 if (hasSuccess) { 58 if (hasSuccess) {
59 let successMsg = message; 59 let successMsg = message;
60 - if (successMsg === null || successMsg === undefined || successMsg === '') {  
61 - successMsg = '操作成功'; 60 +
  61 + if (isNull(successMsg) || isUnDef(successMsg) || isEmpty(successMsg)) {
  62 + successMsg = t(`sys.api.operationSuccess`);
62 } 63 }
  64 +
63 if (options.successMessageMode === 'modal') { 65 if (options.successMessageMode === 'modal') {
64 createSuccessModal({ title: t('sys.api.successTip'), content: successMsg }); 66 createSuccessModal({ title: t('sys.api.successTip'), content: successMsg });
65 } else if (options.successMessageMode === 'message') { 67 } else if (options.successMessageMode === 'message') {