Merge branch 'main' of http://git.xlyprint.cn/zhangz/xlyUmi into main

陈鑫涛
2 parents f5da3dfc ee61d7ba
Showing 3 changed files with 51 additions and 17 deletions
src/components/Common/CommonBillEvent.js
src/components/Common/CommonTable/index.js
src/components/Common/PersonCenter/PersonCenter.js
@@ -764,8 +764,8 @@ export default (ChildComponent) =&gt; {
     /**   获取主表、从表、审核表数据   */
     handleGetData = async (masterConfig, slaveConfig, checkConfig, bEditClick) => {
-      const { currentId } = this.props; /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : '';
+      const { currentId, masterData = {} } = this.props; /* 当前页签数据 */
+      const sId = currentId || masterData.sId || '';
       this.props.handleGetDataOne({ name: 'master', configData: masterConfig, condition: { sId, pageSize: '', pageNum: '' }, bEditClick, slaveConfig });
       // commonUtils.setStoreDropDownData(sModelsId, 'slave', 'sProductId', []);
       // commonUtils.setStoreDropDownData(sModelsId, 'slave', 'sProductNo', []);
@@ -3227,7 +3227,7 @@ class CommonTableRc extends React.Component {
                 this.props.enabled ?   <UploadOutlined /> :  <UploadOutlined style={{color:'rgb(189, 189, 189)'}} />
               }
                 </a>
-          </Upload></span> : <span> 操作 { headPopup ?  <a {...headProps} onClick={!this.props.bLimitOperate && (props.enabled || this.findIsUpdByControlName(this.props, 'BtnHeadPopup')) ? this.popupModalTbRow : null}>{!props.bLimitOperate && ( props.enabled || this.findIsUpdByControlName(this.props, 'BtnHeadPopup')) ? <SvgIcon iconClass="plus" fill="#1296db" size="14" alt="添加" offsetY="2"></SvgIcon> : <SvgIcon iconClass="plus" fill="rgb(189, 189, 189)" size="14" alt="添加" offsetY="2"></SvgIcon>}</a> : '' } </span>),
+          </Upload></span> : <span> {setOperation}  { headPopup ?  <a {...headProps} onClick={!this.props.bLimitOperate && (props.enabled || this.findIsUpdByControlName(this.props, 'BtnHeadPopup')) ? this.popupModalTbRow : null}>{!props.bLimitOperate && ( props.enabled || this.findIsUpdByControlName(this.props, 'BtnHeadPopup')) ? <SvgIcon iconClass="plus" fill="#1296db" size="14" alt="添加" offsetY="2"></SvgIcon> : <SvgIcon iconClass="plus" fill="rgb(189, 189, 189)" size="14" alt="添加" offsetY="2"></SvgIcon>}</a> : '' } </span>),
         width: operateWidth + 'px',
         // fixed: commonUtils.isNotEmptyObject(this.props.tableProps.AutoTableHeight) ? 'right' : false,
         fixed: 'right',
@@ -356,7 +356,7 @@ class PersonCenter extends Component {
     const ExitLogin = commonFunc.showMessage(props.app.commonConst, 'ExitLogin');/* 退出 */
     const sysadmin = commonFunc.showMessage(props.app.commonConst, 'sysadmin');/* 超级管理员 */
     const General = commonFunc.showMessage(props.app.commonConst, 'General');/* 普通用户 */
-    const OnlineUserName = '在线用户';
+    const OnlineUserName =  commonFunc.showMessage(props.app.commonConst, 'OnlineUsers') || '在线用户';/* 在线用户 */
     const sLookAll = commonUtils.isNotEmptyObject(commonFunc.showMessage(props.app.commonConst, 'sLookAll')) ?
       commonFunc.showMessage(props.app.commonConst, 'sLookAll') : '';
@@ -826,11 +826,12 @@ const PersonCenterAddFace = Form.create({
     handleModalClose,
     addFaceVisible,
   } = props;
+  const GetFace = commonFunc.showMessage(props.app.commonConst, 'GetFace');/* 在线用户 */
   return (
     <div>
       {
         <AntdDraggableModal
-          title="人脸采集"
+          title={GetFace}
           width={400}
           visible={addFaceVisible}
           onCancel={handleCancel}
@@ -858,9 +859,15 @@ const PersonCenterOnlineUser = Form.create({
     onSaveState,
     onlineUserState = {},
     onExitTbRow,
+    app,
   } = props;
+  const { userinfo } = app;
   const OnlineUsers = commonFunc.showMessage(props.app.commonConst, 'OnlineUsers');/* 在线用户 */
-  const OnlineUserName = { OnlineUsers };
+
+  const Website = commonFunc.showMessage(props.app.commonConst, 'Website');/* 站点数 */
+  const ExpirationDate = commonFunc.showMessage(props.app.commonConst, 'ExpirationDate');/* ExpirationDate */
+
+  const OnlineUserName = OnlineUsers;
   // const ModifyPassword = commonFunc.showMessage(app.commonConst, 'ModifyPassword');/* 修改密码 */
   const onlineUserDataNew = commonUtils.isNotEmptyObject(onlineUserData) ? onlineUserData : {};
   const onlineUserConfig = {
@@ -870,21 +877,48 @@ const PersonCenterOnlineUser = Form.create({
   };
   /* eslint-disable */
   const gdsconfigformslave = [
-    { sId: commonUtils.createSid(), sName: 'sId', showName: '主键', bVisible: false, iFitWidth: 0 },
-    { sId: commonUtils.createSid(), sName: 'iRowNum', showName: '行号', bVisible: true, iFitWidth: 60, bNotSort: true },
-    { sId: commonUtils.createSid(), sName: 'sUserNo', showName: '用户号', bVisible: true, iFitWidth: 100, bFind: true },
-    { sId: commonUtils.createSid(), sName: 'sUserName', showName: '用户名', bVisible: true, iFitWidth: 100, bFind: true },
-    { sId: commonUtils.createSid(), sName: 'sEmployeeNo', showName: '员工编号', bVisible: true, iFitWidth: 100, bFind: true },
-    { sId: commonUtils.createSid(), sName: 'sDepartName', showName: '部门', bVisible: true, iFitWidth: 100 },
-    { sId: commonUtils.createSid(), sName: 'sUserType', showName: '用户类型', bVisible: true, iFitWidth: 100 },
-    { sId: commonUtils.createSid(), sName: 'sUserLoginTypeName', showName: '登陆类型', bVisible: true, iFitWidth: 100 },
-    { sId: commonUtils.createSid(), sName: 'tLoginDate', showName: '登陆时间', bVisible: true, iFitWidth: 150 },
+    { sId: commonUtils.createSid(), sName: 'sId', showName: '主键', sChinese: '主键', sEnglishName: 'Primary Key', sBig5Name: '主鍵',  bVisible: false, iFitWidth: 0 },
+    { sId: commonUtils.createSid(), sName: 'iRowNum', showName: '行号',sChinese: '行号', sEnglishName: 'Row Number', sBig5Name: '行号',  bVisible: true, iFitWidth: 60, bNotSort: true },
+    { sId: commonUtils.createSid(), sName: 'sUserNo', showName: '用户号', sChinese: '用户号', sEnglishName: 'User ID', sBig5Name: '用戶号',  bVisible: true, iFitWidth: 100, bFind: true },
+    { sId: commonUtils.createSid(), sName: 'sUserName', showName: '用户名',sChinese: '用户名', sEnglishName: 'User Name',sBig5Name: '用戶名',  bVisible: true, iFitWidth: 100, bFind: true },
+    { sId: commonUtils.createSid(), sName: 'sEmployeeNo', showName: '员工编号', sChinese: '员工编号', sEnglishName: 'Employee ID', sBig5Name: '員工編號', bVisible: true, iFitWidth: 100, bFind: true },
+    { sId: commonUtils.createSid(), sName: 'sDepartName', showName: '部门', sChinese: '部门', sEnglishName: 'Department',sBig5Name: '部門',  bVisible: true, iFitWidth: 100 },
+    { sId: commonUtils.createSid(), sName: 'sUserType', showName: '用户类型',sChinese: '用户类型', sEnglishName: 'User Type', sBig5Name: '用戶類型', bVisible: true, iFitWidth: 100 },
+    { sId: commonUtils.createSid(), sName: 'sUserLoginTypeName', showName: '登陆类型', sChinese: '登陆类型', sEnglishName: 'Login Type',sBig5Name: '登陸類型',  bVisible: true, iFitWidth: 100 },
+    { sId: commonUtils.createSid(), sName: 'tLoginDate', showName: '登陆时间',sChinese: '登陆时间', sEnglishName: 'Login Time', sBig5Name: '登陸時間', bVisible: true, iFitWidth: 150 },
   ];
+    const gdsconfigformslaveNew = gdsconfigformslave.map(column => {
+    const { sLanguage } = userinfo || {};
+    let showName = column.sChinese; // 默认中文
+    
+    if (sLanguage === 'sEnglish' && column.sEnglishName) {
+      showName = column.sEnglishName;
+    } else if (sLanguage === 'sBig5' && column.sBig5Name) {
+      showName = column.sBig5Name;
+    }
+    
+    return {
+      ...column,
+      showName
+    };
+  });
   /* eslint-disable array-callback-return,no-undef,no-unused-vars */
-  onlineUserConfig.gdsconfigformslave = gdsconfigformslave;
+  onlineUserConfig.gdsconfigformslave = gdsconfigformslaveNew;
+
   const headerColumn = commonFunc.getHeaderConfig(onlineUserConfig);
+  const { sLanguage } = userinfo || {};
   const { sType } = props.app?.userinfo || {};
+  // 根据用户语言处理表头显示名称
+  headerColumn.forEach(column => {
+    if (sLanguage === 'sEnglish' && column.sEnglishName) {
+      column.showName = column.sEnglishName; // 使用英文显示名称
+    }else if (sLanguage === 'sBig5' && column.sBig5Name) {
+      column.showName = column.sBig5Name; // 使用繁体显示名称
+    }
+  });
+
+
   const onlineUserProps = {
     ...commonBusiness.getTableTypes('onlineUser', props),
     formId: commonUtils.createSid(),
@@ -900,7 +934,7 @@ const PersonCenterOnlineUser = Form.create({
   };
   const tableHeight = 500;
-  const title = `${OnlineUserName}${commonUtils.isNotEmptyObject(onlineUserDataNew) ? `【 站点数：${onlineUserDataNew.consumerCount}\xa0\xa0\xa0\xa0\xa0软件到期时间：${onlineUserDataNew.afterTime}` : ''} 】`;
+  const title = `${OnlineUserName}${commonUtils.isNotEmptyObject(onlineUserDataNew) ? `【 ${Website}：${onlineUserDataNew.consumerCount}\xa0\xa0\xa0\xa0\xa0${ExpirationDate}：${onlineUserDataNew.afterTime}` : ''} 】`;
   return (
     <div>
       {