Skip to content

S
submodule
Commit 1daf925c authored by 李晓静's avatar 李晓静
Browse files
Options

回滚

parent 2786ca69
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 6 deletions
components/DataView/index.js
View file @ 1daf925c
...@@ -37,7 +37,7 @@ function reduceDimension(arr) { ...@@ -37,7 +37,7 @@ function reduceDimension(arr) {
// userTree/orgTree数据转成{id,name} // userTree/orgTree数据转成{id,name}
function formatUser(obj) { function formatUser(obj) {
let name = obj.label; let name = obj.label;
if(!name){ if (!name) {
return undefined; return undefined;
} }
if (typeof name !== 'string') { if (typeof name !== 'string') {
...@@ -451,11 +451,12 @@ export default class DataView extends React.Component { ...@@ -451,11 +451,12 @@ export default class DataView extends React.Component {
search() { search() {
const { beforeSearch } = this.props; const { beforeSearch } = this.props;
window.history.replaceState( window.history.replaceState({ pageNum: 1 }, '', `?pageNum=${1}`);
{ pageNum: 1 }, // window.history.replaceState(
'', // { pageNum: 1 },
`${window.location.search && window.location.search.indexOf('?pageNum') < 0 ? `${window.location.search}&` : '?'}pageNum=1`, // '',
); // `${window.location.search && window.location.search.indexOf('?pageNum') < 0 ? `${window.location.search}&` : '?'}pageNum=1`,
// );
if (typeof beforeSearch === 'function') { if (typeof beforeSearch === 'function') {
beforeSearch(); 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