Merge branch 'hotfix/2.14.2.2405.02' into release/2.14.3.2406.01

This commit is contained in:
黎永顺 2024-05-28 16:42:39 +08:00
commit c87e62815c
2 changed files with 13 additions and 1 deletions

View File

@ -105,7 +105,7 @@ class SalaryDetails extends Component {
return;
}
WeaLoadingGlobal.start();
const promise = API.exportSalaryList({ ...payload, ids: selectedRowKeys });
const promise = API.exportSalaryList({ ...payload, ids: key === "SELECTED" ? selectedRowKeys : [] });
};
getColumns = () => {
const { attendanceStore: { tableStore } } = this.props;

View File

@ -71,3 +71,15 @@
}
}
}
//公式编辑框样式
.excel-codeBox {
.cm-variable {
}
.cm-string-2 {
color: inherit !important;
}
}