From e7bfc7f8319c129c8f9e3cb81586e05f260a2be8 Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Mon, 13 May 2024 16:49:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B2=97=E4=BD=8D=E8=81=8C?=
 =?UTF-8?q?=E8=B4=A3=E6=8D=A2=E8=A1=8C=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawer/index.jsx | 11 ++++++++---
 src/components/topBar/index.jsx |  2 +-
 src/util/i18n.js                |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/components/drawer/index.jsx b/src/components/drawer/index.jsx
index 762e4a0..5908be5 100644
--- a/src/components/drawer/index.jsx
+++ b/src/components/drawer/index.jsx
@@ -80,7 +80,7 @@ export default class DrawerComponents extends React.Component {
   //获取数据
   getDeatilDatas(params, type = 'chart', showJob = '1') {
     const { language } = this.props;
-    this.setState({ spinning: true, data: [] });
+    this.setState({ spinning: true, data: [], dataSource: [] });
     d3.json(
       '/api/bs/hrmorganization/orgchart/getDepartmentDetail?' +
         qs.stringify({ detauleType: type, ...params, showJob }),
@@ -131,7 +131,11 @@ export default class DrawerComponents extends React.Component {
             title: `${i18n.table.mobile[language]}`,
           },
         ];
-        this.setState({ dataSource: data.dataSource, columns: columns });
+        this.setState({
+          dataSource: data.dataSource,
+          columns: columns,
+          spinning: false,
+        });
       }
     });
   }
@@ -500,6 +504,7 @@ export default class DrawerComponents extends React.Component {
               dataSource={dataSource}
               columns={columns}
               scroll={{ y: 500 }}
+              loading={spinning}
               pagination={{
                 locale: {
                   // 翻页文本替换
@@ -539,7 +544,7 @@ export default class DrawerComponents extends React.Component {
             </Button>,
           ]}
         >
-          <p>{jobResponsibility}</p>
+          <div style={{ whiteSpace: 'pre-line' }}>{jobResponsibility}</div>
         </Modal>
       </Drawer>
     );
diff --git a/src/components/topBar/index.jsx b/src/components/topBar/index.jsx
index 74c3d80..03a4057 100644
--- a/src/components/topBar/index.jsx
+++ b/src/components/topBar/index.jsx
@@ -358,7 +358,7 @@ export class TopBar extends React.Component {
             ''
           )}
           <Col span={6}>
-            {i18n.level[language]}：
+            {i18n.deptLevel[language]}：
             <Select
               style={{ width: 140 }}
               value={this.state.requestData.level}
diff --git a/src/util/i18n.js b/src/util/i18n.js
index 16ffde6..3dbfd93 100644
--- a/src/util/i18n.js
+++ b/src/util/i18n.js
@@ -2,7 +2,7 @@ export const i18n = {
   fclass: { cn: '维度', en: 'Organizational type' },
   companyRoot: { cn: '分部根节点', en: 'Company' },
   deptRoot: { cn: '部门根节点', en: 'Department' },
-  level: { cn: '部门层级', en: 'Hierarchy' },
+  deptLevel: { cn: '部门层级', en: 'Hierarchy' },
   search: { cn: '查询', en: 'Search' },
   export: { cn: '导出', en: 'Export' },
   exportImage: { cn: '导出图片', en: ' Export Image' },