fix: fix paging selection error

ddnlink · Dec 1, 2020 · 3e088c6 · 3e088c6
1 parent f5e9f53
commit 3e088c6
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 7 deletions.
diff --git a/config/peer.config.js b/config/peer.config.js
@@ -4,13 +4,13 @@
  */
 export default {
   development: {
-    requestUrl: 'http://localhost:4096',
-    // requestUrl: 'http://106.15.227.133:8001',
+    requestUrl: 'http://peer.ddn.link:8000',
+    // requestUrl: 'http://localhost:4096',
   },
   test: {
-    requestUrl: 'http://localhost:8001',
+    requestUrl: 'http://116.62.219.11:8000',
   },
   production: {
-    requestUrl: 'http://106.15.227.133:8001',
+    requestUrl: 'http://peer.ddn.link:8000',
   },
 };
diff --git a/src/pages/Home/Home.js b/src/pages/Home/Home.js
@@ -206,7 +206,7 @@ class Home extends PureComponent {
               action={
                 <span>
                   <span>{formatMessage({ id: 'app.home.unit' })}: </span>
-                  <span>HBL</span>
+                  <span>DDN</span>
                 </span>
               }
               loading={loading}

diff --git a/src/pages/Transfer/Step3.js b/src/pages/Transfer/Step3.js
@@ -65,7 +65,7 @@ class Step3 extends React.PureComponent {
             <Col xs={24} sm={16}>
               <a
               // TODO：抽取为常量
-                href={`http://testnet.ddn.link/transactions/${data.transId}`}
+                href={`http://mainnet.ddn.link/transactions/${data.transId}`}
                 target="_blank"
                 rel="noreferrer noopener"
               >

diff --git a/src/pages/Vote/DelegatesList.js b/src/pages/Vote/DelegatesList.js
@@ -29,6 +29,8 @@ class DelegatesList extends PureComponent {
     selectedRows: [],
     selectedRowKeys: [],
     selectedStandbyRows: [],
+    selectedStandbyRowsAll:[],
+    // selectedRowsAll:[],
     selectedStandbyRowKeys: [],
     visibleDelegate: false,
     curDelegate: {},
@@ -104,16 +106,36 @@ class DelegatesList extends PureComponent {
   };
 
   handleSelectRows = (selectedRowKeys, selectedRows) => {
+    // let selectRows=[]
+    // if(selectedRows.length===selectedRowKeys.length){
+    //   selectRows=selectedRows
+    // }else{
+    //  selectRows= selectedRowKeys.map(key => (
+    //     this.state.selectedRowsAll.find((row) => row.publicKey === key)
+    //     || selectedRows.find((row) => row.publicKey === key)  // 必在两者之中，加感叹号断言（js的去掉这个 "!"）
+    //   ))
+    // }
     this.setState({
       selectedRows,
       selectedRowKeys,
+      // selectedRowsAll:[...this.state.selectedRowsAll,...selectRows]
     });
   };
 
   handleSelectStandbyRows = (selectedStandbyRowKeys, selectedStandbyRows) => {
+    let selectRows=[]
+    if(selectedStandbyRows.length===selectedStandbyRowKeys.length){
+      selectRows=selectedStandbyRows
+    }else{
+     selectRows= selectedStandbyRowKeys.map(key => (
+        this.state.selectedStandbyRowsAll.find((row) => row.publicKey === key)
+        || selectedStandbyRows.find((row) => row.publicKey === key)  // 必在两者之中，加感叹号断言（js的去掉这个 "!"）
+      ))
+    }
     this.setState({
-      selectedStandbyRows,
+      selectedStandbyRows:selectRows,
       selectedStandbyRowKeys,
+      selectedStandbyRowsAll:[...this.state.selectedStandbyRowsAll,...selectedStandbyRows]
     });
   };
 
@@ -199,6 +221,8 @@ class DelegatesList extends PureComponent {
         disabled: record.voted,
       }),
     };
+    console.log('selectrows,selectkeys',selectedStandbyRows,
+    selectedStandbyRowKeys,this.state.selectedStandbyRowsAll)
 
     return (
       <div>