File tree Expand file tree Collapse file tree 2 files changed +19
-15
lines changed
src/pages/Quark/components Expand file tree Collapse file tree 2 files changed +19
-15
lines changed Original file line number Diff line number Diff line change @@ -51,15 +51,17 @@ const BatchAction: React.FC<Action> = (props) => {
5151 let query = { } ;
5252 var urls = url . split ( "?" ) ;
5353 if ( urls ) {
54- var vars = urls [ 1 ] . split ( "&" ) ;
55- for ( var i = 0 ; i < vars . length ; i ++ ) {
56- var pair = vars [ i ] . split ( "=" ) ;
57- if ( pair [ 1 ] === '{ids}' || pair [ 1 ] === '{id}' ) {
58- pair [ 1 ] = props . selectedRowKeys ;
54+ if ( urls . length > 1 ) {
55+ var vars = urls [ 1 ] . split ( "&" ) ;
56+ for ( var i = 0 ; i < vars . length ; i ++ ) {
57+ var pair = vars [ i ] . split ( "=" ) ;
58+ if ( pair [ 1 ] === '{ids}' || pair [ 1 ] === '{id}' ) {
59+ pair [ 1 ] = props . selectedRowKeys ;
60+ }
61+ query [ pair [ 0 ] ] = pair [ 1 ] ;
5962 }
60- query [ pair [ 0 ] ] = pair [ 1 ] ;
63+ return urls [ 0 ] + '?' + stringify ( query )
6164 }
62- return urls [ 0 ] + '?' + stringify ( query )
6365 }
6466 return url ;
6567 }
Original file line number Diff line number Diff line change @@ -34,17 +34,19 @@ const ToolBarAction: React.FC<Action> = (props) => {
3434 let query = { } ;
3535 var urls = url . split ( "?" ) ;
3636 if ( urls ) {
37- var vars = urls [ 1 ] . split ( "&" ) ;
38- for ( var i = 0 ; i < vars . length ; i ++ ) {
39- var pair = vars [ i ] . split ( "=" ) ;
40- if ( history . location . query . search ) {
41- if ( pair [ 1 ] === '{search}' ) {
42- pair [ 1 ] = history . location . query . search ;
37+ if ( urls . length > 1 ) {
38+ var vars = urls [ 1 ] . split ( "&" ) ;
39+ for ( var i = 0 ; i < vars . length ; i ++ ) {
40+ var pair = vars [ i ] . split ( "=" ) ;
41+ if ( history . location . query . search ) {
42+ if ( pair [ 1 ] === '{search}' ) {
43+ pair [ 1 ] = history . location . query . search ;
44+ }
4345 }
46+ query [ pair [ 0 ] ] = pair [ 1 ] ;
4447 }
45- query [ pair [ 0 ] ] = pair [ 1 ] ;
48+ return urls [ 0 ] + '?' + stringify ( query )
4649 }
47- return urls [ 0 ] + '?' + stringify ( query )
4850 }
4951 return url ;
5052 }
You can’t perform that action at this time.
0 commit comments