Merge branch 'mergeBranch' into redUrgent

src/components/normal-basic-layout/modules/table.vue

@@ -69,6 +69,11 @@ export default {
       this.$nextTick(() => {
         this.$refs.tables.doLayout()
       });
+    },
+    data(){
+      this.$nextTick(() => {
+        this.$refs.tables.doLayout()
+      });
     }
   },
   methods:{