Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

src/components/normal-basic-layout/details/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div v-if="refreshPage">
     <div style="margin:10px 10px 0 10px;border-radius:5px" class="container normal-panel sticky">
       <div class="flex-align-center flex-between normal-margin">
         <div class="flex-align-center" style="flex:1 0 auto">
@@ -79,7 +79,8 @@ export default {
           }
         }
       },
-      collapse:true
+      collapse:true,
+      refreshPage:true
     }
   },
   computed:{
@@ -107,12 +108,13 @@ export default {
     next () {
       this.rowindex += 1
       this.queryData(this.rowindex)
+      this.refresh()
       
     },
     previous () {
       this.rowindex -= 1
       this.queryData(this.rowindex)
-      
+      this.refresh()
     },
     onSuccess () {
       this.$emit('onEditSuccess')
@@ -165,6 +167,12 @@ export default {
     onCollapse () {
       this.collapse?this.collapse = false:this.collapse = true
     },
+    refresh () {
+      this.refreshPage = false
+      setTimeout(() => {
+        this.refreshPage = true
+      }, 10);
+    },
     refreshTag () {
       this.$refs.tag.queryTag()
     }