Merge branch 'master' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui

src/components/TableHead/src/TableHead.vue

@@ -170,16 +170,13 @@ watch(
   }
 .tableNavLeftBtns{
   display: flex;
-  ::v-deep(>div){
+  
   margin-left: -5px;
-  }
 }
   .tableNavRightBtns{
     display: flex;
     margin-left: 10px;
-    ::v-deep(>div){
     margin-right: -5px;
   }
-  }
 }
 </style>

src/components/XButton/src/ButtonBase.vue

@@ -89,5 +89,8 @@ const updataTableColumns = (val) => {
   ::v-deep(.el-button){
     margin: 0px 5px;
   }
+  ::v-deep(.el-button.is-link){
+    margin: 0px;
+  }
 }
 </style>