From 9d0d04be9d8fe71fce87a818e315202489d500c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 25 Jan 2024 14:44:12 +0800
Subject: [PATCH] hotfix/2.10.1.2401.01

---
 .../components/importDialog/components/impStep2.js       | 5 ++++-
 pc4mobx/hrmSalary/components/importDialog/index.js       | 9 +++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pc4mobx/hrmSalary/components/importDialog/components/impStep2.js b/pc4mobx/hrmSalary/components/importDialog/components/impStep2.js
index 71c6e099..91f3e690 100644
--- a/pc4mobx/hrmSalary/components/importDialog/components/impStep2.js
+++ b/pc4mobx/hrmSalary/components/importDialog/components/impStep2.js
@@ -40,8 +40,11 @@ class ImpStep2 extends Component {
 
   render() {
     const { dataSource, columns, loading } = this.state;
+    const { scrollHeight } = this.props;
     return (
-      <WeaTable dataSource={dataSource} columns={columns} pagination={false} loading={loading} scroll={{ x: 800 }}/>
+      <WeaTable
+        dataSource={dataSource} columns={columns} loading={loading} scroll={{ x: 800, y: `${scrollHeight}px` }}
+      />
     );
   }
 }
diff --git a/pc4mobx/hrmSalary/components/importDialog/index.js b/pc4mobx/hrmSalary/components/importDialog/index.js
index f174e93d..739fbf84 100644
--- a/pc4mobx/hrmSalary/components/importDialog/index.js
+++ b/pc4mobx/hrmSalary/components/importDialog/index.js
@@ -36,8 +36,8 @@ class Index extends Component {
   }
 
   renderChildren = () => {
-    const { current } = this.state;
-    const { importParams, link, excludeKey, importResult, exportDataDom = null } = this.props;
+    const { current } = this.state, { importParams, link, excludeKey, importResult, exportDataDom = null } = this.props;
+    const scrollHeight = this.importRef ? this.importRef.state.height - 232 : 606.6;
     let CurrentDom = null;
     switch (current) {
       case 0:
@@ -45,7 +45,7 @@ class Index extends Component {
                                ref={dom => this.step1Ref = dom}/>;
         break;
       case 1:
-        CurrentDom = <ImpStep2 {...this.props}/>;
+        CurrentDom = <ImpStep2 {...this.props} scrollHeight={scrollHeight}/>;
         if (excludeKey) {
           CurrentDom = <ImpStep3 importResult={importResult}/>;
         }
@@ -127,9 +127,10 @@ class Index extends Component {
               loading={this.props.nextloading}>{getLabel(1402, "下一步")}</Button>,
       <Button type="primary" onClick={() => this.props.onCancel(true)}>{getLabel(555, "完成")}</Button>
     ];
+
     return (
       <WeaDialog
-        {...this.props}
+        {...this.props} ref={dom => this.importRef = dom}
         scalable hasScroll className="importBox" initLoadCss
         buttons={current === 0 ? _.nth(btns, 1) : (!this.props.excludeKey && current === 1) ? _.take(btns, 2) : _.takeRight(btns)}
         style={{