qt
/
salary-management-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hotfix/2.10.1.2401.01' into release/2.10.1.2401.01

This commit is contained in:
黎永顺 2024-01-25 14:44:39 +08:00
parent a07823c74a 9d0d04be9d
commit c45f1fe066
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pc4mobx/hrmSalary/components/importDialog/components/impStep2.js
View File

@ -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` }}
/>
);
}
}

9
pc4mobx/hrmSalary/components/importDialog/index.js
View File

@ -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={{