diff --git a/src/assets/hasCancel_english.png b/src/assets/hasCancel_english.png new file mode 100644 index 0000000..d2cb85b --- /dev/null +++ b/src/assets/hasCancel_english.png diff --git a/src/assets/hasChecked.png b/src/assets/hasChecked.png new file mode 100644 index 0000000..65a5324 --- /dev/null +++ b/src/assets/hasChecked.png diff --git a/src/assets/hasChecked_big5.png b/src/assets/hasChecked_big5.png new file mode 100644 index 0000000..94a005a --- /dev/null +++ b/src/assets/hasChecked_big5.png diff --git a/src/assets/hasChecked_english.png b/src/assets/hasChecked_english.png new file mode 100644 index 0000000..cce3cca --- /dev/null +++ b/src/assets/hasChecked_english.png diff --git a/src/assets/hasChecking_big5.png b/src/assets/hasChecking_big5.png new file mode 100644 index 0000000..8f84ff6 --- /dev/null +++ b/src/assets/hasChecking_big5.png diff --git a/src/assets/hasChecking_english.png b/src/assets/hasChecking_english.png new file mode 100644 index 0000000..7cc03d4 --- /dev/null +++ b/src/assets/hasChecking_english.png diff --git a/src/assets/haveCancel_big5.png b/src/assets/haveCancel_big5.png new file mode 100644 index 0000000..ea00c99 --- /dev/null +++ b/src/assets/haveCancel_big5.png diff --git a/src/assets/haveCancel_english.png b/src/assets/haveCancel_english.png new file mode 100644 index 0000000..3602850 --- /dev/null +++ b/src/assets/haveCancel_english.png diff --git a/src/assets/haveSubmit_english.png b/src/assets/haveSubmit_english.png new file mode 100644 index 0000000..b1cebe3 --- /dev/null +++ b/src/assets/haveSubmit_english.png diff --git a/src/assets/haveSubmit_english1.png b/src/assets/haveSubmit_english1.png new file mode 100644 index 0000000..023df72 --- /dev/null +++ b/src/assets/haveSubmit_english1.png diff --git a/src/assets/haveSubmit_sBig5.png b/src/assets/haveSubmit_sBig5.png new file mode 100644 index 0000000..afd4e2d --- /dev/null +++ b/src/assets/haveSubmit_sBig5.png diff --git a/src/components/AuditInformation/AuditInformation.js b/src/components/AuditInformation/AuditInformation.js index 536c1e1..32be17e 100644 --- a/src/components/AuditInformation/AuditInformation.js +++ b/src/components/AuditInformation/AuditInformation.js @@ -112,8 +112,8 @@ class AuditInformation extends Component { } }; render() { - const { pageLoading, masterData } = this.props; - const imgSrc = commonBusiness.handleAddIcon(masterData); + const { masterData, sModelsType, app } = this.props; + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app); return ( { }; render() { - const { masterData } = this.props; - const imgSrc = commonBusiness.handleAddIcon(masterData); + const { masterData, sModelsType, app } = this.props; + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app); return ( { } }; render() { - const { masterData } = this.props; - const imgSrc = commonBusiness.handleAddIcon(masterData); + const { masterData, sModelsType, app } = this.props; + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app); return ( { } render() { - const { masterData } = this.props; - const imgSrc = commonBusiness.handleAddIcon(masterData); + const { masterData, sModelsType, app } = this.props; + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app); return ( { + let chooseTitle = '选择'; + if(commonUtils.isNotEmptyObject(this.props.app) && commonUtils.isNotEmptyObject(this.props.app.commonConst)) { + chooseTitle = commonFunc.showMessage(this.props.app.commonConst, 'choose') ; + } const obj = { onKeyDown: this.onKeyDown, onChange: e => this.handleSelectOptionEvent(e.target.value), /* 数据改变回带到父组件 */ - value: commonUtils.isUndefined(this.state.dataValue) ? '选择' : commonUtils.strUndefinedToEmpty(this.state.dataValue), /* 数据值 */ + value: commonUtils.isUndefined(this.state.dataValue) ? chooseTitle : commonUtils.strUndefinedToEmpty(this.state.dataValue), /* 数据值 */ }; return obj; } @@ -1113,6 +1118,10 @@ export default class CommonComponent extends Component { const { sTableTitleSql, iVisCount, sName, sDateFormat, } = this.props.showConfig; + let chooseTitle = '选择'; + if(commonUtils.isNotEmptyObject(this.props.app) && commonUtils.isNotEmptyObject(this.props.app.commonConst)) { + chooseTitle = commonFunc.showMessage(this.props.app.commonConst, 'choose') ; + } if (commonUtils.isNotEmptyStr(sTableTitleSql) && iVisCount > 1) { return ; } @@ -1251,7 +1260,7 @@ export default class CommonComponent extends Component { return ; } } else if (this.state.enabled && commonUtils.isNotEmptyObject(this.props.showConfig.sName) && this.props.showConfig.sDropDownType === 'popup') { /* 通用弹窗 */ - return (); + return (); } else if (this.firstDataIndex === 'i' || this.firstDataIndex === 'd') { /* 数字输入框(整形i和浮点型d) */ return innerInputProps.readOnly ? : location.pathname.includes('quotationPackTableTree') && this.props.name === 'control' && this.props.showConfig.sName === 'dSinglePQty' ? : ; diff --git a/src/components/Common/CommonElementEvent.js b/src/components/Common/CommonElementEvent.js index 1a0bcd2..97ae34c 100644 --- a/src/components/Common/CommonElementEvent.js +++ b/src/components/Common/CommonElementEvent.js @@ -391,7 +391,18 @@ export default (ChildComponent) => { customizeParamConfig = customizeParamConfigNew; } + /* 自定义参数 */ + let selfParamConfig = commonUtils.isNotEmptyArr(formData.filter(item => item.bGrd && item.sTbName === 'sisformulacustomizevariable')) ? + formData.filter(item => item.bGrd && item.sTbName === 'sisformulacustomizeparam')[0] : {}; + let selfParamColumn = []; + if(commonUtils.isNotEmptyArr(selfParamConfig)) { + selfParamColumn = commonFunc.getHeaderConfig(selfParamConfig); + } + console.log('systemParamColumn', selfParamConfig, selfParamColumn); + + this.handleGetSlaveData('Set', 'param', paramConfig); + this.handleGetSlaveData('Set', 'selfParam', selfParamConfig); let addState = {}; let addStateMaster = {}; @@ -411,6 +422,7 @@ export default (ChildComponent) => { config.masterConfig = masterConfig; config.paramConfig = paramConfig; config.customizeParamConfig = customizeParamConfig; + config.selfParamConfig = selfParamConfig; addState = await this.handleAdd(config, nextProps.app.currentPane.copyTo, true); } else { addStateMaster = await this.handleGetSlaveData('One', undefined, masterConfig); @@ -468,6 +480,9 @@ export default (ChildComponent) => { if (commonUtils.isNotEmptyObject(customizeParamConfig)) { this.handleGetSlaveData('customizeParam', 'customizeParam', customizeParamConfig); } + if (commonUtils.isNotEmptyObject(selfParamConfig)) { + this.handleGetSlaveData('Set', 'selfParam', selfParamConfig); + } } let customizeParamColumn = []; @@ -529,6 +544,8 @@ export default (ChildComponent) => { systemFunctionData, bussinessFunctionData, bReceived, + selfParamConfig, + selfParamColumn, pageLoading: false, ...addState, ...addState1, @@ -1895,7 +1912,7 @@ export default (ChildComponent) => { const { sModelsType, masterConfig, slaveConfig, iPlcNoConfig, siscommonstyleproductclassifyConfig, contactConfig, addressConfig, machineConfig, assortConfig, outsideConfig, processstyleConfig, processApsRuleConfig, dynamicParamConfig, supplyConfig, stockConfig, customerInfoConfig, picFileConfig, eleemployeeConfig, elemachineConfig, jurgroupConfig, customergroupConfig, supplygroupConfig, - persongroupConfig, processgroupConfig, drivergroupConfig, departgroupConfig, paramConfig, userConfig, phaseConfig, conditionConfig, sischeckphaselogininfoConfig, + persongroupConfig, processgroupConfig, drivergroupConfig, departgroupConfig, paramConfig, selfParamConfig, userConfig, phaseConfig, conditionConfig, sischeckphaselogininfoConfig, sisproductclassifyProcessClassifyConfig, sysmsguserConfig, eleknifemouldproductConfig, eleknifemouldfileConfig, eleteststandarditemConfig, formData, approveGroupConfig, brandgroupConfig, slave0Config, memoDataList, } = this.props; @@ -1934,6 +1951,7 @@ export default (ChildComponent) => { this.handleGetSlaveData('One', null, masterConfig, bEditClick); } else if (sModelsType === 'system/sisformulaInfo') { this.handleGetSlaveData('Set', 'param', paramConfig, bEditClick); + this.handleGetSlaveData('Set', 'selfParam', selfParamConfig, bEditClick); this.handleGetSlaveData('One', undefined, masterConfig, bEditClick); let customizeParamConfig = commonUtils.isNotEmptyArr(formData.filter(item => item.bGrd && item.sTbName === 'sisformulacustomizeparam')) ? formData.filter(item => item.bGrd && item.sTbName === 'sisformulacustomizeparam')[0] : {}; /* 获取主表自定义列名为自定义变量配置 */ @@ -2351,6 +2369,7 @@ export default (ChildComponent) => { userDelData, phaseDelData, conditionDelData, sisproductclassifyProcessClassifyData, sisproductclassifyProcessClassifyDelData, siscommonstyleproductclassifyConfig, siscommonstyleproductclassifyData, siscommonstyleproductclassifyDelData, customerInfoData, customerInfoDelData, sysmsguserConfig, customergroupOldData, customergroupOldDelData, supplygroupOldData, supplygroupOldDelData, + selfParamConfig, selfParamData,selfParamDelData, processgroupOldData, processgroupOldDelData, jurgroupOldData, jurgroupOldDelData, persongroupOldData, persongroupOldDelData, drivergroupOldData, drivergroupOldDelData, eleknifemouldproductData, eleknifemouldproductDelData, eleknifemouldfileData, eleknifemouldfileDelData, eleteststandarditemData, eleteststandarditemDelData, customizeParamConfig, customizeParamData, customizeParamDelData, dynamicParamData, dynamicParamDelData, departgroupOldData, departgroupOldDelData, customizeParamName, @@ -2766,6 +2785,9 @@ export default (ChildComponent) => { } else if (commonUtils.isNotEmptyObject(customizeParamConfig)) { data.push(commonBusiness.mergeData('customizeParam', customizeParamConfig.sTbName, customizeParamData, customizeParamDelData)); } + if (commonUtils.isNotEmptyObject(selfParamConfig)) { + data.push(commonBusiness.mergeData('selfParam', selfParamConfig.sTbName, selfParamData, selfParamDelData)); + } } else if (sModelsType === 'smg/sendMailMsg') { masterData.sContent = masterData.sContentMemo; masterData.sType = '1'; @@ -4709,8 +4731,8 @@ export default (ChildComponent) => { this.props.onSaveState({ slavePagination }); }; render() { - const { masterData, sModelsType } = this.props; - const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType); + const { masterData, sModelsType, app } = this.props; + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app ); return ( { } render() { - const { masterData } = this.props; - const imgSrc = commonBusiness.handleAddIcon(masterData); + const { masterData, sModelsType, app } = this.props; + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app); return ( { this.props.onSaveState({ [`${name}${optionName}Keys`]: value }); } render() { - const { masterData } = this.props; - const imgSrc = commonBusiness.handleAddIcon(masterData); + const { masterData, sModelsType, app } = this.props; + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app); return ( { }; render() { - const { masterData } = this.props; - const imgSrc = commonBusiness.handleAddIcon(masterData); + const { masterData, sModelsType, app } = this.props; + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app); return ( - - + + diff --git a/src/components/Common/CommonListTreeSelect/index.js b/src/components/Common/CommonListTreeSelect/index.js index 9e9be41..752acea 100644 --- a/src/components/Common/CommonListTreeSelect/index.js +++ b/src/components/Common/CommonListTreeSelect/index.js @@ -534,7 +534,10 @@ const CommonListComponent = Form.create({ rowSelection: props.rowSelection, }; } - + + const BtnSure =commonFunc.showMessage(app.commonConst, 'BtnSure') || '确认'; + const BtnCancel =commonFunc.showMessage(app.commonConst, 'BtnCancel') || '取消'; + const realizeHeight = commonUtils.isNotEmptyNumber(props.realizeHeight) ? props.realizeHeight : 0; const btnClick = (btn) => { const { sControlName } = btn; @@ -566,7 +569,7 @@ const CommonListComponent = Form.create({ }; return ( -
+
@@ -609,8 +612,8 @@ const CommonListComponent = Form.create({ }
- - + +
: '' } diff --git a/src/components/Common/CommonNewBillEvent.js b/src/components/Common/CommonNewBillEvent.js index 2c81487..ff56ea5 100644 --- a/src/components/Common/CommonNewBillEvent.js +++ b/src/components/Common/CommonNewBillEvent.js @@ -5841,8 +5841,8 @@ export default (ChildComponent) => { } render() { - const { masterData } = this.props; - const imgSrc = commonBusiness.handleAddIcon(masterData); + const { masterData, sModelsType, app } = this.props; + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app); return ( { } render() { - const { masterData } = this.props; - const imgSrc = commonBusiness.handleAddIcon(masterData); - const imgPersonSrc = commonBusiness.handleCheckIcon(masterData); + const { masterData, sModelsType, app } = this.props; + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app); return ( { this.props.onSaveState({ [modelVisible]: false }); }; render() { - const { masterData } = this.props; - const imgSrc = commonBusiness.handleAddIcon(masterData); + const { masterData, sModelsType, app } = this.props; + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app ); return ( { } } render() { - const { masterData } = this.props; - const imgSrc = commonBusiness.handleAddIcon(masterData); + const { masterData, sModelsType, app } = this.props; + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app ); return ( { }; render() { - const { masterData } = this.props; - const imgSrc = commonBusiness.handleAddIcon(masterData); + const { masterData, sModelsType, app } = this.props; + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app); return ( @@ -475,7 +478,7 @@ export default class CommonView extends Component { ].includes(child.sName) ) ? - {sModelsType !== 'smg/sendMailMsg' ? '保存后自动生成' : '发送消息无需生成单据号'} + {sModelsType !== 'smg/sendMailMsg' ? afterSave : afterSave} : '' } ); diff --git a/src/components/Common/PersonCenter/PersonCenter.js b/src/components/Common/PersonCenter/PersonCenter.js index 627826c..92ee6a1 100644 --- a/src/components/Common/PersonCenter/PersonCenter.js +++ b/src/components/Common/PersonCenter/PersonCenter.js @@ -862,6 +862,8 @@ const PersonCenterOnlineUser = Form.create({ app, } = props; const { userinfo } = app; + const BtnSure =commonFunc.showMessage(app.commonConst, 'BtnSure') || '确认'; + const BtnCancel =commonFunc.showMessage(app.commonConst, 'BtnCancel') || '取消'; const OnlineUsers = commonFunc.showMessage(props.app.commonConst, 'OnlineUsers');/* 在线用户 */ const Website = commonFunc.showMessage(props.app.commonConst, 'Website');/* 站点数 */ @@ -937,39 +939,36 @@ const PersonCenterOnlineUser = Form.create({ const title = `${OnlineUserName}${commonUtils.isNotEmptyObject(onlineUserDataNew) ? `【 ${Website}：${onlineUserDataNew.consumerCount}\xa0\xa0\xa0\xa0\xa0${ExpirationDate}：${onlineUserDataNew.afterTime}` : ''} 】`; return (
- { - onlineUserVisible ? - +
{ + if (ref) { + ref.querySelector(".ant-table-container").style.height = tableHeight + "px"; + ref.querySelector(".ant-table-body").style.height = tableHeight - 30 + "px"; + // ref.querySelectorAll('.ant-table-cell-fix-right').forEach(item => { + // if (item.previousSibling) { + // item.previousSibling.style.display = 'none'; + // } + // }); + } + }} > -
{ - if (ref) { - ref.querySelector('.ant-table-container').style.height = tableHeight + 'px'; - ref.querySelector('.ant-table-body').style.height = tableHeight - 30 + 'px'; - // ref.querySelectorAll('.ant-table-cell-fix-right').forEach(item => { - // if (item.previousSibling) { - // item.previousSibling.style.display = 'none'; - // } - // }); - } - }} - > - -
-
- - -
- - : '' - } + +
+
+ + +
+ + ) : ( + "" + )}
); }); diff --git a/src/components/Common/SearchComponent/index.js b/src/components/Common/SearchComponent/index.js index 79dd911..693d8e3 100644 --- a/src/components/Common/SearchComponent/index.js +++ b/src/components/Common/SearchComponent/index.js @@ -716,7 +716,7 @@ export default class SearchComponent extends Component { handleFields = (searchColumns) => { /* 默认快捷过滤 */ if (commonUtils.isEmptyArr(searchColumns)) { return; } - const { masterData, searchRowKeys } = this.props; + const { masterData, searchRowKeys, app } = this.props; const children = searchRowKeys.map((key) => { const { [`sFirst-${key}`]: sFirstValue, [`sSecond-${key}`]: sSecondValue, [`${key}disabled`]: disabled } = masterData; const firstDataIndex = commonUtils.isEmpty(sFirstValue) ? 's' : @@ -750,8 +750,11 @@ export default class SearchComponent extends Component { sDropDownType: 'sql', bNotEmpty: true, iVisCount: 1, - dropDownData: sSecondConditionPro && DropDownType === 'sql' ? commonConfig.seaJudge.s_proDropDown : sSecondConditionPro ? commonConfig.seaJudge.s_pro : commonConfig.seaJudge[firstDataIndex], - bCanInput: false, + dropDownData: this.getTranslatedSeaJudge( + sSecondConditionPro && DropDownType === 'sql' ? 's_proDropDown' : + sSecondConditionPro ? 's_pro' : firstDataIndex, + app?.userinfo?.sLanguage + ), bCanInput: false, }; const showThirdConfig = { sId, @@ -1235,6 +1238,71 @@ export default class SearchComponent extends Component { sGroupByList, }); }; + /* 在类中添加一个方法用于处理多语言转换*/ + getTranslatedSeaJudge = (type, sLanguage) => { + const { seaJudge } = commonConfig; + const judgeMap = seaJudge[type] || []; + + // 定义翻译映射 + const translations = { + sEnglish: { + '包含': 'Contains', + '不包含': 'Not Contains', + '等于': 'Equal', + '大于': 'Greater Than', + '小于': 'Less Than', + '大于等于': 'Greater Than or Equal', + '小于等于': 'Less Than or Equal', + '区间': 'Between', + '区间(默认今天)': 'Between (Default Today)', + '区间(默认昨天)': 'Between (Default Yesterday)', + '区间时间': 'Between Time', + '今日': 'Today', + '今日未清': 'Unfinished Today', + '今天之前': 'Before Today', + '明天之前': 'Before Tomorrow', + '后天之前': 'Before Day After Tomorrow', + '本月': 'This Month', + '上月': 'Last Month', + '本周': 'This Week', + '上周': 'Last Week', + '本期间': 'This Period' + }, + sBig5: { + '包含': '包含', + '不包含': '不包含', + '等于': '等於', + '大于': '大於', + '小于': '小於', + '大于等于': '大於等於', + '小于等于': '小於等於', + '区间': '區間', + '区间(默认今天)': '區間(默認今天)', + '区间(默认昨天)': '區間(默認昨天)', + '区间时间': '區間時間', + '今日': '今日', + '今日未清': '今日未清', + '今天之前': '今天之前', + '明天之前': '明天之前', + '后天之前': '後天之前', + '本月': '本月', + '上月': '上月', + '本周': '本周', + '上周': '上周', + '本期间': '本期間' + } + }; + + if (sLanguage === 'sEnglish' || sLanguage === 'sBig5') { + return judgeMap.map(item => ({ + ...item, + value: translations[sLanguage][item.value] || item.value + })); + } + + return judgeMap; +}; + render() { const { searchSolution, searchColumns, expand, activeTagId, sType, modalVisible, modalSolutionNameVisible, confirmLoading, masterData, columnSettingVisible, app, diff --git a/src/components/Common/commonBusiness.js b/src/components/Common/commonBusiness.js index b978fd8..2095272 100644 --- a/src/components/Common/commonBusiness.js +++ b/src/components/Common/commonBusiness.js @@ -12,10 +12,19 @@ import * as commonFunc from './commonFunc'; /* 通用单据方法 */ import commonConfig from '../../utils/config'; import * as commonServices from '../../services/services'; import imgCheck from '../../assets/hasChecked.svg'; /* 已审核ICON */ +import imgCheckBig5 from '../../assets/hasChecked_big5.png'; /* 已审核ICON-繁体 */ +import imgCheckEnglish from '../../assets/hasChecked_english.png'; /* 已审核ICON-英文 */ import imgInvalid from '../../assets/haveCancel.png'; /* 已作废ICON */ +import imgInvalidBig5 from '../../assets/haveCancel_big5.png'; /* 已作废ICON */ +import imgInvalidEnglish from '../../assets/haveCancel_english.png'; /* 已作废ICON */ import imgChecking from '../../assets/haveChecking.svg'; /* 审核中 */ +import imgCheckingBig5 from '../../assets/hasChecking_big5.png'; /* 审核中-繁体 */ +import imgCheckingEnglish from '../../assets/hasChecking_english.png'; /* 审核中-英文 */ + import imgCheckPerson from '../../assets/personChecked1.png'; /* 审核中 */ import imgSubmit from '../../assets/haveSubmited.svg'; /* 已提交 */ +import imgSubmitBig5 from '../../assets/haveSubmit_sBig5.png'; /* 审核中-繁体 */ +import imgSubmitEnglish from '../../assets/haveSubmit_english.png'; /* 审核中-英文 */ import { cloneDeep } from 'lodash'; // ----------------------------------------------------------------------- @@ -138,8 +147,13 @@ export function validateField(values, props) { } /** 添加审核或者作废图标 */ // eslint-disable-next-line no-unused-vars -export function handleAddIcon(masterData, sModelsType) { +export function handleAddIcon(masterData, sModelsType, app = {}) { let imgSrc = ''; + // 从app中获取用户语言设置 + const userLanguage = app?.userinfo?.sLanguage || 'sChinese'; // 默认简体中文 + const isTraditionalChinese = userLanguage === 'sBig5'; + const isEnglish = userLanguage === 'sEnglish'; + if (commonUtils.isNotEmptyObject(masterData)) { const { bInvalid, @@ -148,21 +162,21 @@ export function handleAddIcon(masterData, sModelsType) { bSubmit, } = masterData; if (bInvalid) { - imgSrc = imgInvalid; + imgSrc = isEnglish ? imgInvalidEnglish : (isTraditionalChinese ? imgInvalidBig5 : imgInvalid); } else if (bCheck) { if (commonUtils.isNotEmptyStr(sModelsType) && sModelsType.includes('element/')) { if (sModelsType.includes('element/customerInfo')) { - imgSrc = imgCheck; + imgSrc = isEnglish ? imgCheckEnglish : (isTraditionalChinese ? imgCheckBig5 : imgCheck); } else { imgSrc = ''; } } else { - imgSrc = imgCheck; + imgSrc = isEnglish ? imgCheckEnglish : (isTraditionalChinese ? imgCheckBig5 : imgCheck); } } else if (sStatus === '2') { - imgSrc = imgChecking; + imgSrc = isEnglish ? imgCheckingEnglish : (isTraditionalChinese ? imgCheckingBig5 : imgChecking); } else if (bSubmit) { - imgSrc = imgSubmit; + imgSrc = isEnglish ? imgSubmitEnglish : (isTraditionalChinese ? imgSubmitBig5 : imgSubmit); } } return imgSrc; diff --git a/src/components/CommonElementEvent/SisformulaInfo.js b/src/components/CommonElementEvent/SisformulaInfo.js index 19e6b19..a5b22ed 100644 --- a/src/components/CommonElementEvent/SisformulaInfo.js +++ b/src/components/CommonElementEvent/SisformulaInfo.js @@ -114,6 +114,8 @@ const SisformulaComponent = Form.create({ const tabCalculationParameter = commonFunc.showMessage(app.commonConst, 'tabCalculationParameter');/* 计算参数 */ const tabSystemFunction = commonFunc.showMessage(app.commonConst, 'tabSystemFunction');/* 系统函数 */ const tabBusinessFunction = commonFunc.showMessage(app.commonConst, 'tabBusinessFunction');/* 业务函数 */ + const tabBusinessParameters = commonFunc.showMessage(app.commonConst, 'tabBusinessParameters');/* 自定义参数 */ + const showTypeProps = { record: masterData, name: 'master', @@ -146,6 +148,16 @@ const SisformulaComponent = Form.create({ rowSelection: null, }; + /* 自定义参数 */ + const selfParamPropsType = { + ...commonBusiness.getTableTypes('selfParam', props), + tableProps: { + AutoTableHeight: 255, + }, + // bNaturalWidth: true, /* 原始宽度 不进行最后一列计算 */ + rowSelection: null, + }; + const customizeParamPropsTypeArr = []; if (commonUtils.isNotEmptyArr(props.customizeParamName)) { props.customizeParamName.forEach((paramName) => { @@ -263,6 +275,9 @@ const SisformulaComponent = Form.create({ + + { commonUtils.isNotEmptyObject(selfParamPropsType) ? : ''} + {/*
*/} diff --git a/src/components/Manufacture/ProcessCard/ProcessCard.js b/src/components/Manufacture/ProcessCard/ProcessCard.js index 90ce638..40c8873 100644 --- a/src/components/Manufacture/ProcessCard/ProcessCard.js +++ b/src/components/Manufacture/ProcessCard/ProcessCard.js @@ -2927,8 +2927,8 @@ class ProcessCard extends Component { } render() { - const { pageLoading, masterData, fastOrderModalVisible } = this.props; - const imgSrc = commonBusiness.handleAddIcon(masterData); + const { pageLoading, masterData, fastOrderModalVisible, sModelsType, app } = this.props; + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app); return ( { // 审核状态 const AvatarComponent = props => { - const { masterData } = props; - const imgSrc = commonBusiness.handleAddIcon(masterData); + const { masterData, sModelsType, app } = props; + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app); if (!imgSrc) return ""; return (
diff --git a/src/components/Manufacture/WorkOrder/WorkOrder.js b/src/components/Manufacture/WorkOrder/WorkOrder.js index c34ae30..239f283 100644 --- a/src/components/Manufacture/WorkOrder/WorkOrder.js +++ b/src/components/Manufacture/WorkOrder/WorkOrder.js @@ -3707,8 +3707,8 @@ class WorkOrder extends Component { } render() { - const { pageLoading, masterData, fastOrderModalVisible } = this.props; - const imgSrc = commonBusiness.handleAddIcon(masterData); + const { pageLoading, masterData, fastOrderModalVisible, sModelsType, app } = this.props; + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app ); return ( { // 审核状态 const AvatarComponent = props => { - const { masterData } = props; - const imgSrc = commonBusiness.handleAddIcon(masterData); + const { masterData, sModelsType, app } = props; + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app); if (!imgSrc) return ""; return (
diff --git a/src/components/ProductionReport/ProductionReport.js b/src/components/ProductionReport/ProductionReport.js index fbe2d68..6970231 100644 --- a/src/components/ProductionReport/ProductionReport.js +++ b/src/components/ProductionReport/ProductionReport.js @@ -1118,7 +1118,7 @@ class ProductionReport extends Component { render() { const { - pageLoading, masterData, visible, checkConditions, checkPersonData, app, + pageLoading, masterData, visible, checkConditions, checkPersonData, app, sModelsType, } = this.props; const checkCondition = commonFunc.showMessage(app.commonConst, 'checkCondition');/* 审核条件 */ const checkSmemo = commonFunc.showMessage(app.commonConst, 'checkSmemo');/* 备注 */ @@ -1131,7 +1131,7 @@ class ProductionReport extends Component { dataIndex: 'sMemo', key: 'sMemo', }]; - const imgSrc = commonBusiness.handleAddIcon(masterData); + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app); const btnSure = commonFunc.showMessage(app.commonConst, 'btnSure');/* 确认 */ const check = commonFunc.showMessage(app.commonConst, 'check');/* 审核 */ const BtnClose = commonFunc.showMessage(app.commonConst, 'BtnClose');/* 关闭 */ diff --git a/src/components/QuoQuotation/Quotation/Quotation.js b/src/components/QuoQuotation/Quotation/Quotation.js index 2f65f00..1ecbb4b 100644 --- a/src/components/QuoQuotation/Quotation/Quotation.js +++ b/src/components/QuoQuotation/Quotation/Quotation.js @@ -3705,8 +3705,8 @@ class Quotation extends Component { } render() { - const { pageLoading, masterData, fastOrderModalVisible } = this.props; - const imgSrc = commonBusiness.handleAddIcon(masterData); + const { pageLoading, masterData, fastOrderModalVisible, sModelsType, app } = this.props; + const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app); return ( { window.xlyReload = () => { @@ -20,8 +23,20 @@ function IndexPage() { }; }, []); + // 根据用户语言选择对应的语言包 + const getLocale = () => { + switch(currentLanguage) { + case 'sEnglish': + return enUS; + case 'sBig5': + return zhTW; + default: + return zhCN; + } + }; + return ( - +
@@ -48,4 +63,4 @@ function IndexPage() { IndexPage.propTypes = {}; -export default connect()(IndexPage); +export default connect(({ app }) => ({ app }))(IndexPage); diff --git a/src/utils/common/message.js b/src/utils/common/message.js index e02e027..17d76f7 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 commonConfig from '../config'; const { warning } = Modal; const antdMobileAlert = mobileModal.alert; @@ -24,15 +25,22 @@ const openConfirm = (config) => { }; const fn = () => { + const userinfo = JSON.parse(localStorage.getItem(`${commonConfig.prefix}userinfo`)) || {}; + const language = userinfo.sLanguage || 'sChinese'; // 默认简体中文 + const isEnglish = language === 'sEnglish'; + + // 使用语言设置 + const sTitle = isEnglish ? 'Reminder' : language === 'sBig5' ? '溫馨提示' : '温馨提示'; + const okText = language === 'sEnglish' ? 'Confirm' : language === 'sBig5' ? '確認': '确认'; if (location.pathname.toLocaleLowerCase().includes('mobile')) { - antdMobileAlert('温馨提示', secondContent || '出错了', [ + antdMobileAlert(sTitle, secondContent || '出错了', [ { text: '确认', }, ]) } else { warning({ - title: '温馨提示', + title: sTitle, content:
{secondContent || '出错了'}
, - okText: '确认', + okText: okText, zIndex: 1000, width, ...rest, @@ -52,6 +60,11 @@ const openConfirm = (config) => { export const message = { ...antdMessage, error: (content, ...rest) => { - openConfirm({ message: content, ...rest }); + const userinfo = JSON.parse(localStorage.getItem(`${commonConfig.prefix}userinfo`)) || {}; + const language = userinfo.sLanguage || 'sChinese'; // 默认简体中文 + const requiredText = language === 'sEnglish' ? 'is Required' : + (language === 'sBig5' ? '為必填項' : '为必填项'); + const sContent = content?.replace('为必填项', requiredText); + openConfirm({ message: sContent, ...rest }); }, };