优化返回分页数据 为空的情况下 设置默认值

src/components/History.vue

@@ -21,8 +21,8 @@ export default {
     tx: undefined,
     query: {
       tx: {
-        block: '',
-        hash: process.env.NODE_ENV === 'development' ? '0xfd316d85bfb0fc08746dad2665b0463456425f17da04e81878cc4f89b6d14747' : '',
+        block:  process.env.NODE_ENV === 'development' ? '27133171' : '',
+        hash: process.env.NODE_ENV === 'development' ? '' : '',
         from: '',
         to: ''
       },
@@ -43,7 +43,7 @@ export default {
       groupDesc: true,
       sortBy: ['blockNumber', 'index'],
       sortDesc: [true, false],
-      pageSize: process.env.NODE_ENV === 'development' ? 100 : 200,
+      pageSize: process.env.NODE_ENV === 'development' ? 10 : 200,
       pageNum: 1,
       pageLength:99,
       data: [],
@@ -77,6 +77,7 @@ export default {
 
       if (rst.state) {
         this.table.data = TxModel.parseLocalRecordList(rst.data)
+        console.log("???", this.table.data)
         this.$msgkit.success(rst.msg)
       } else {
         this.$msgkit.error(rst.msg)

src/components/Pending.vue

@@ -21,7 +21,7 @@ export default {
     tx: undefined,
     query: {
       tx: {
-        block: '',
+        block: process.env.NODE_ENV === 'development' ? '27133638' : '',
         hash: '',
         from: '',
         to: ''
@@ -43,7 +43,7 @@ export default {
       groupDesc: true,
       sortBy: ['blockNumber', 'gasPrice', 'timestamp'],
       sortDesc: [true, true, false],
-      pageSize: process.env.NODE_ENV === 'development' ? 100 : 200,
+      pageSize: process.env.NODE_ENV === 'development' ? 10 : 200,
       pageNum: 1,
       pageLength: 99,
       data: [],
@@ -76,6 +76,7 @@ export default {
 
       if (rst.state) {
         this.table.data = TxModel.parseLocalRecordList(rst.data)
+        console.log("??",  this.table.data)
         this.$msgkit.success(rst.msg)
       } else {
         this.$msgkit.error(rst.msg)

src/components/viewer/history/Table.vue

@@ -104,7 +104,7 @@
           </v-chip>
         </template>
         <template v-slot:item.gasPrice="{ item }">
-          <div  v-if="item.gasPrice != -1">
+          <div  v-if="item.gasPrice != -1 && item.gasPrice !== undefined">
             {{ item.gasPrice }}
           </div>
           <div v-else>
@@ -112,7 +112,7 @@
           </div>
         </template>
         <template v-slot:item.type="{ item }">
-          <div v-if="item.type !== undefined && item.type !== '' && item.type !== NaN && item.type !== null">
+          <div v-if="item.type !== '' && item.type !== undefined">
             {{ item.type }}
           </div>
           <div v-else>
@@ -120,7 +120,7 @@
           </div>
         </template>
         <template v-slot:item.index="{ item }">
-          <div v-if="item.index !== -1">
+          <div v-if="item.index !== '' && item.index !== undefined">
             {{ item.index }}
           </div>
           <div v-else>
@@ -128,7 +128,7 @@
           </div>
         </template>
         <template v-slot:item.status="{ item }">
-          <div v-if="item.status !== undefined">
+          <div v-if="item.status !== '' && item.status !== undefined">
             {{ item.status }}
           </div>
           <div v-else>

src/components/viewer/pending/Table.vue

@@ -104,7 +104,7 @@
         </template>
 
         <template v-slot:item.gasPrice="{ item }">
-          <div  v-if="item.gasPrice != -1">
+          <div  v-if="item.gasPrice != -1 && item.gasPrice !== undefined">
             {{ item.gasPrice }}
           </div>
           <div v-else>
@@ -113,7 +113,7 @@
         </template>
 
         <template v-slot:item.type="{ item }">
-          <div v-if="item.type !== undefined && item.type !== '' && item.type !== NaN && item.type !== null">
+          <div v-if="item.type !== '' && item.type !== undefined">
             {{ item.type }}
           </div>
           <div v-else>
@@ -121,7 +121,7 @@
           </div>
         </template>
         <template v-slot:item.index="{ item }">
-          <div v-if="item.index !== -1">
+          <div v-if="item.index !== '' && item.index !== undefined">
             {{ item.index }}
           </div>
           <div v-else>
@@ -129,7 +129,7 @@
           </div>
         </template>
         <template v-slot:item.status="{ item }">
-          <div v-if="item.status !== undefined">
+          <div v-if="item.status !== '' && item.status !== undefined">
             {{ item.status }}
           </div>
           <div v-else>
@@ -322,7 +322,6 @@ export default {
 
       if (rst1.state && rst2.state && rst3.state) {
         this.$msgkit.success('更新成功')
-
         this.editDialog.visible = false
       } else {
         this.$msgkit.error(`rst1: ${rst1.msg}, rst2: ${rst2.msg}, rst3: ${rst3.msg}`)

src/plugins/model/TxModel.js

@@ -77,25 +77,26 @@ export default class TxModel {
     }
 
     static parseLocalRecord(remoteRecord) {
+        //需要对每种数据做 验证没有，则需要做默认属性值
         try {
             let localRecord = {}
 
-            localRecord.hash = remoteRecord.hash
+            localRecord.hash = (remoteRecord.hash === null ? '' : remoteRecord.hash)
             localRecord.blockNumber = (remoteRecord.blockNumber === null ? 0 : remoteRecord.blockNumber)
-            localRecord.comment = remoteRecord.comment
-            localRecord.from = remoteRecord.fromAddress
-            localRecord.to = remoteRecord.toAddress
-            localRecord.gasPrice = TxModel.parseGasPrice(remoteRecord.gasPriceStr)
-            localRecord.timestamp = remoteRecord.timestamp ? remoteRecord.timestamp : 0
-            localRecord.transferList = remoteRecord.transferList
+            localRecord.comment = (remoteRecord.comment === null ? '' : remoteRecord.comment)
+            localRecord.from = (remoteRecord.fromAddress === null ? '' : remoteRecord.fromAddress)
+            localRecord.to = (remoteRecord.toAddress === null ? '' : remoteRecord.toAddress)
+            localRecord.gasPrice = TxModel.parseGasPrice((remoteRecord.gasPriceStr === null ? '' : remoteRecord.gasPriceStr))
+            localRecord.timestamp = remoteRecord.timestamp === null ? 0 : remoteRecord.timestamp
+            localRecord.transferList = (remoteRecord.transferList === null ? {} : remoteRecord.transferList)
             localRecord.fromName = remoteRecord.fromName
             localRecord.toName = remoteRecord.toName
-            localRecord.status = parseInt(remoteRecord.status)
-            localRecord.index = parseInt(remoteRecord.transactionIndex === null ? "-1" : remoteRecord.transactionIndex)
-            localRecord.type = remoteRecord.tradeType
+            localRecord.status = (remoteRecord.status === null ? '' : parseInt(remoteRecord.status))
+            localRecord.index = remoteRecord.transactionIndex === null ? '' : parseInt(remoteRecord.transactionIndex)
+            localRecord.type = (remoteRecord.tradeType === null ? '' : remoteRecord.tradeType)
             // if (isNaN(localRecord.type))
-            if (localRecord.type === NaN || localRecord.type === null || localRecord.type === undefined)
-                localRecord.type = ''
+            // if (localRecord.type === NaN || localRecord.type === null || localRecord.type === undefined)
+            //     localRecord.type = ''
 
 
             // transferList的format
@@ -115,12 +116,13 @@ export default class TxModel {
 
             return localRecord
         } catch (e) {
+            console.log('数据解析出现异常：', e)
             return undefined
         }
     }
 
     static parseGasPrice(gasPriceStr) {
-        if (!gasPriceStr) {
+        if (gasPriceStr == '') {
             return -1
         }