diff --git a/src/utils/common/message.js b/src/utils/common/message.js index 17d76f7..491fa8b 100644 --- a/src/utils/common/message.js +++ b/src/utils/common/message.js @@ -1,6 +1,7 @@ /* eslint-disable */ import { Modal, message as antdMessage } from 'antd-v4'; import { Modal as mobileModal } from 'antd-mobile-v2'; +import * as commonFunc from '@/components/Common/commonFunc';/* 通用单据方法 */ import commonConfig from '../config'; const { warning } = Modal; @@ -15,7 +16,7 @@ const queryWidth = () => { } const openConfirm = (config) => { - + queryWidth(); const { message, ...rest } = config; secondContent.push(

{message}

) @@ -61,9 +62,11 @@ export const message = { ...antdMessage, error: (content, ...rest) => { const userinfo = JSON.parse(localStorage.getItem(`${commonConfig.prefix}userinfo`)) || {}; + const commonConst = JSON.parse(localStorage.getItem(`${commonConfig.prefix}commonConst`)) || {}; + const requiredText = commonFunc.showMessage(commonConst, 'required'); const language = userinfo.sLanguage || 'sChinese'; // 默认简体中文 - const requiredText = language === 'sEnglish' ? 'is Required' : - (language === 'sBig5' ? '為必填項' : '为必填项'); + // const requiredText = language === 'sEnglish' ? ' is required' : + // (language === 'sBig5' ? '為必填項' : '为必填项'); const sContent = content?.replace('为必填项', requiredText); openConfirm({ message: sContent, ...rest }); },