Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/views/tool/gen/editTable.vue

@@ -1,16 +1,16 @@
 <template>
   <el-card>
-    <el-row>
-      <el-col :span="1.5">
-        <el-form label-width="100px">
-          <el-form-item style="text-align: center;margin-left:-100px;margin-top:10px;">
+    <el-row type="flex"  justify="space-between" style="margin: 10px 0;">
+      <el-col :span="1.5" style="display: flex; align-items: center;">
+        <el-form label-width="100px" style="display: flex; align-items: center;">
+          <el-form-item style="text-align: center;margin-left:-100px;margin-top:0; margin-bottom: 0;">
             <el-button type="primary" @click="submitForm()">保存</el-button>
             <el-button @click="close()">返回</el-button>
           </el-form-item>
         </el-form>
       </el-col>
-      <el-row type="flex" :gutter="10" class="mb8" justify="end">
-        <el-col :span="1.5">
+      <el-row type="flex" :gutter="10"  justify="end">
+        <el-col :span="1.5" style="display: flex; align-items: center;">
           <el-button
             type="warning"
             plain
@@ -20,7 +20,7 @@
             v-hasPermi="['system:post:add']"
           >新增</el-button>
         </el-col>
-        <el-col :span="1.5">
+        <el-col :span="1.5" style="display: flex; align-items: center;">
           <el-button
             type="danger"
             plain