merge master

src/views/profile/index.vue

@@ -9,7 +9,6 @@
 
         <el-col :span="18">
           <el-card>
-
             <el-tabs v-model="activeTab">
               <el-tab-pane label="Activity" name="activity">
                 <activity />
@@ -21,7 +20,6 @@
                 <account :user="user" />
               </el-tab-pane>
             </el-tabs>
-
           </el-card>
         </el-col>
 

src/views/table/inline-edit-table.vue

@@ -37,7 +37,13 @@
         <template slot-scope="{row}">
           <template v-if="row.edit">
             <el-input v-model="row.title" class="edit-input" size="small" />
-            <el-button class="cancel-btn" size="small" icon="el-icon-refresh" type="warning" @click="cancelEdit(row)">
+            <el-button
+              class="cancel-btn"
+              size="small"
+              icon="el-icon-refresh"
+              type="warning"
+              @click="cancelEdit(row)"
+            >
               cancel
             </el-button>
           </template>
@@ -47,10 +53,22 @@
 
       <el-table-column align="center" label="Actions" width="120">
         <template slot-scope="{row}">
-          <el-button v-if="row.edit" type="success" size="small" icon="el-icon-circle-check-outline" @click="confirmEdit(row)">
+          <el-button
+            v-if="row.edit"
+            type="success"
+            size="small"
+            icon="el-icon-circle-check-outline"
+            @click="confirmEdit(row)"
+          >
             Ok
           </el-button>
-          <el-button v-else type="primary" size="small" icon="el-icon-edit" @click="row.edit=!row.edit">
+          <el-button
+            v-else
+            type="primary"
+            size="small"
+            icon="el-icon-edit"
+            @click="row.edit=!row.edit"
+          >
             Edit
           </el-button>
         </template>