Commit 1daf925c authored by 李晓静's avatar 李晓静

回滚

parent 2786ca69
......@@ -37,7 +37,7 @@ function reduceDimension(arr) {
// userTree/orgTree数据转成{id,name}
function formatUser(obj) {
let name = obj.label;
if(!name){
if (!name) {
return undefined;
}
if (typeof name !== 'string') {
......@@ -451,11 +451,12 @@ export default class DataView extends React.Component {
search() {
const { beforeSearch } = this.props;
window.history.replaceState(
{ pageNum: 1 },
'',
`${window.location.search && window.location.search.indexOf('?pageNum') < 0 ? `${window.location.search}&` : '?'}pageNum=1`,
);
window.history.replaceState({ pageNum: 1 }, '', `?pageNum=${1}`);
// window.history.replaceState(
// { pageNum: 1 },
// '',
// `${window.location.search && window.location.search.indexOf('?pageNum') < 0 ? `${window.location.search}&` : '?'}pageNum=1`,
// );
if (typeof beforeSearch === 'function') {
beforeSearch();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment