1.完善系统多语言翻译

Min
1 parent 01c13ae9
Showing 9 changed files with 79 additions and 49 deletions
src/components/Common/CommonComponent/index.js
src/components/Common/CommonListSelectTree/index.js
src/components/Common/CommonListTreeSelect/index.js
src/components/Common/CommonView/index.js
src/components/Common/PersonCenter/PersonCenter.js
src/components/Common/commonBusiness.js
src/components/Manufacture/ProcessCardPackTableTreeNew/index.js
src/components/Manufacture/WorkOrderPackTableTreeNew/index.js
src/utils/common/message.js
 import moment from 'moment';
 import React, { Component, createRef } from 'react';
 import reactComponentDebounce from '@/components/Common/ReactDebounce';
+import * as commonFunc from '@/components/Common//commonFunc';/* 通用单据方法 */ /* 通用单据方法 */
 // import '@ant-design/compatible/assets/index.css';
 import {
   InputNumber,
@@ -1010,10 +1011,14 @@ export default class CommonComponent extends Component {
   };
   getSearchProps = () => {
+    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 <Select ref={(ref) => { this.selectTableRef = ref; }} {...this.getSelectTableProps()}>{this.getSelectTableOption()}</Select>;
     }
@@ -1251,7 +1260,7 @@ export default class CommonComponent extends Component {
         return <Select {...this.getSelectProps()} >{this.getSelectOption()}</Select>;
       }
     } else if (this.state.enabled && commonUtils.isNotEmptyObject(this.props.showConfig.sName) && this.props.showConfig.sDropDownType === 'popup') { /* 通用弹窗 */
-      return (<Search placeholder="选择" defaultValue="选择" {...this.getSearchProps()} onSearch={this.onFieldPopupModal.bind(this, this.props.showConfig, this.props.name)} />);
+      return (<Search placeholder={chooseTitle} defaultValue={chooseTitle}  {...this.getSearchProps()} onSearch={this.onFieldPopupModal.bind(this, this.props.showConfig, this.props.name)} />);
     } else if (this.firstDataIndex === 'i' || this.firstDataIndex === 'd') { /*   数字输入框(整形i和浮点型d)   */
       return innerInputProps.readOnly ? <span onKeyDown={this.onKeyDown} suppressContentEditableWarning contentEditable="true"><InputNumberA {...innerInputProps} /></span> :
         location.pathname.includes('quotationPackTableTree') && this.props.name === 'control' && this.props.showConfig.sName === 'dSinglePQty' ? <span style={{ position: 'relative' }}><InputNumberA {...innerInputProps} /><span onClick={this.handleViewClick} style={{ position: 'absolute', right: '2px' }}><EyeOutlined /></span></span> : <InputNumberA {...innerInputProps} style={{ width: '100%' }} />;
@@ -627,7 +627,8 @@ const CommonListComponent = Form.create({
       enabled: true,
     };
   }
-
+  const BtnSure =commonFunc.showMessage(app.commonConst, 'BtnSure') || '确认';
+  const BtnCancel  =commonFunc.showMessage(app.commonConst, 'BtnCancel') || '取消';
   if (commonUtils.isNotEmptyObject(app.currentPane) && commonUtils.isNotEmptyObject(app.currentPane.name) && app.currentPane.bEdit) {
     tableFilterProps = {
       ...tableFilterProps,
@@ -747,8 +748,8 @@ const CommonListComponent = Form.create({
               width: '50%', textAlign: 'right', marginRight: '9px', marginBottom: '9px',
             }}
             >
-              <Button key="back" style={{ marginRight: '8px' }} onClick={props.onCancel}>取消</Button>
-              <Button type="primary" onClick={props.onSelect}>确认</Button>
+              <Button key="back" style={{ marginRight: '8px' }} onClick={props.onCancel}> {BtnCancel}</Button>
+              <Button type="primary" onClick={props.onSelect}> {BtnSure}</Button>
             </div>
           </div>
         </Layout>
@@ -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 (
-    <Form >
+    <Form>
       <Layout>
         <Layout>
           <div id="modalTreeChooseProcess">
@@ -609,8 +612,8 @@ const CommonListComponent = Form.create({
               }
             </div>
             <div style={{ textAlign: 'right', marginRight: '9px', marginBottom: '9px' }}>
-              <Button key="back" style={{ marginRight: '8px' }} onClick={props.onCancel}>取消</Button>
-              <Button type="primary" onClick={props.onSelect}>确认</Button>
+              <Button key="back" style={{ marginRight: '8px' }} onClick={props.onCancel}>{BtnCancel}</Button>
+              <Button type="primary" onClick={props.onSelect}>     {BtnSure}</Button>
             </div>
           </div> : ''
         }
@@ -9,6 +9,7 @@ import ShowType from &#39;@/components/Common/CommonComponent&#39;;
 import AntdDraggableModal from '@/components/Common/AntdDraggableModal';
 import CommonListSelectTree from '@/components/Common/CommonListSelectTree';
 import * as commonUtils from '@/utils/utils';/* 通用方法 */
+import * as commonFunc from '@/components/Common/commonFunc';/* 单据业务功能 */
 const FormItem = Form.Item;
 // const EachInputHeight = 32;
@@ -291,6 +292,8 @@ export default class CommonView extends Component {
         expanded: true,
       });
     }
+    const afterSave = commonFunc.showMessage(this.props.app.commonConst, 'afterSave') ||
+    '保存后自动生成';/* 保存后自动生成 */
     return (
       <Tooltip title="master" placement="topLeft" visible={this.props.showTableName}>
@@ -475,7 +478,7 @@ export default class CommonView extends Component {
                       ].includes(child.sName)
                     ) ?
                       <Col style={{ display: enabled ? 'block' : 'none' }} className="speacialNote" key={child.sId} span="12">
-                        {sModelsType !== 'smg/sendMailMsg' ? '保存后自动生成' : '发送消息无需生成单据号'}
+                        {sModelsType !== 'smg/sendMailMsg' ? afterSave : afterSave}
                       </Col> : '' }
                   </Col>
                 );
@@ -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 (
     <div>
-      {
-        onlineUserVisible ?
-          <AntdDraggableModal
-            title={title}
-            width="80%"
-            visible={onlineUserVisible}
-            onCancel={handleCancel}
-            afterClose={handleCancel}
-            footer={null}
+      {onlineUserVisible ? (
+        <AntdDraggableModal title={title} width="80%" visible={onlineUserVisible} onCancel={handleCancel} afterClose={handleCancel} footer={null}>
+          <div
+            style={{ width: "100%", height: tableHeight + "px" }}
+            ref={ref => {
+              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';
+                //   }
+                // });
+              }
+            }}
           >
-            <div
-              style={{ width: '100%', height: tableHeight + 'px' }}
-              ref={(ref) => {
-                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';
-                  //   }
-                  // });
-                }
-              }}
-            >
-              <StaticEditTable {...onlineUserProps} setOpterationColumn="Y" noVlist />
-            </div>
-            <div className='ant-modal-footer' style={{ padding: '8px 0 0 0' }}>
-              <Button key="back" onClick={handleCancel}>取消</Button>
-              <Button key="submit" type="primary" onClick={handleCancel}>确认</Button>
-            </div>
-          </AntdDraggableModal>
-          : ''
-      }
+            <StaticEditTable {...onlineUserProps} setOpterationColumn="Y" noVlist />
+          </div>
+          <div className="ant-modal-footer" style={{ padding: "8px 0 0 0" }}>
+            <Button key="back" onClick={handleCancel}>
+              {BtnCancel}
+            </Button>
+            <Button key="submit" type="primary" onClick={handleCancel}>
+              {BtnSure}
+            </Button>
+          </div>
+        </AntdDraggableModal>
+      ) : (
+        ""
+      )}
     </div>
   );
 });
@@ -23,6 +23,8 @@ import imgCheckingEnglish from &#39;../../assets/hasChecking_english.png&#39;; /* 审核
 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';
 // -----------------------------------------------------------------------
@@ -174,7 +176,7 @@ export function handleAddIcon(masterData, sModelsType, app = {}) {
     } else if (sStatus === '2') {
       imgSrc = isEnglish ? imgCheckingEnglish : (isTraditionalChinese ? imgCheckingBig5 : imgChecking);
     } else if (bSubmit) {
-      imgSrc = imgSubmit;
+      imgSrc = isEnglish ? imgSubmitEnglish : (isTraditionalChinese ? imgSubmitBig5 : imgSubmit);
     }
   }
   return imgSrc;
@@ -3581,7 +3581,7 @@ const ToolBarComponent = props =&gt; {
 // 审核状态
 const AvatarComponent = props => {
-  const { masterData, sModelsType, app } = this.props;
+  const { masterData, sModelsType, app } = props;
   const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app);
   if (!imgSrc) return "";
   return (
@@ -4048,7 +4048,7 @@ const ToolBarComponent = props =&gt; {
 // 审核状态
 const AvatarComponent = props => {
-  const { masterData, sModelsType, app } = this.props;
+  const { masterData, sModelsType, app } = props;
   const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app);
   if (!imgSrc) return "";
   return (
 /* 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) =&gt; {
   };
   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: <div style={{ maxHeight: '50vh', overflowY: 'auto' }} >{secondContent || '出错了'}</div>,
-        okText: '确认',
+        okText: okText,
         zIndex: 1000,
         width,
         ...rest,
@@ -52,6 +60,11 @@ const openConfirm = (config) =&gt; {
 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 });
   },
 };