diff --git a/src/components/Common/CommonJurisdictionNewEvent.js b/src/components/Common/CommonJurisdictionNewEvent.js index 499c52b..1feef31 100644 --- a/src/components/Common/CommonJurisdictionNewEvent.js +++ b/src/components/Common/CommonJurisdictionNewEvent.js @@ -348,6 +348,8 @@ export default (ChildComponent) => { } // 模拟config的 gdsconfigformslave 配置 imitateTableConfig = (title, dataIndex, width) => { + console.log('222app',this.props.app); + const {userinfo} = this.props.app; return { bCanInput: false, bFilter: false, @@ -370,8 +372,8 @@ export default (ChildComponent) => { sId: commonUtils.createSid(), sParentId: '11811781131121915102156308120', sSubsidiaryId: '1111111111', - showName: title, - sName: dataIndex, + showName: dataIndex, + sName: userinfo.sLanguage === 'sEnglish' ? dataIndex : title, }; } // 根据模拟列,模拟列配置 diff --git a/src/components/Common/Tree/StaticTree.js b/src/components/Common/Tree/StaticTree.js index 72df452..d7924d8 100644 --- a/src/components/Common/Tree/StaticTree.js +++ b/src/components/Common/Tree/StaticTree.js @@ -12,6 +12,7 @@ import StaticEditTable from '../CommonTable';/* 可编辑表格 */ import * as commonUtils from '../../../utils/utils'; import styles from './Tree.css'; import AntdDraggableModal from '../AntdDraggableModal'; +import * as commonFunc from "@/components/Common/commonFunc"; const SearchModule = Input.Search; @@ -324,6 +325,8 @@ class TreeComponent extends Component { }; render() { const treeProps = this.getTreeProps(); + const PermissionContent = commonFunc.showLocalMessage(this.props, 'PermissionContent', '权限内容'); + return (
@@ -344,7 +347,7 @@ class TreeComponent extends Component { { this.props.isSearch ?
-
this.handleButtonClick(e,e.target.checked ? 'checkedAll' : 'unChecked')} /> 权限内容
+
this.handleButtonClick(e,e.target.checked ? 'checkedAll' : 'unChecked')} /> {PermissionContent}