From 37df6807b58174e7562adf574cdbe8e20fac9a64 Mon Sep 17 00:00:00 2001
From: YaChengMu <1140049363@qq.com>
Date: Wed, 24 Apr 2024 04:05:34 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9FormContainer=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=A0=B7=E5=BC=8F=EF=BC=8C=E8=87=AA=E9=80=82=E5=BA=94?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E5=92=8C=E6=8A=BD=E5=B1=89=EF=BC=8C=E6=97=A0?=
 =?UTF-8?q?=E9=9C=80=E5=9C=A8el-form=E4=B8=AD=E5=86=8D=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20class=3D"-mt-25px"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: YaChengMu <1140049363@qq.com>
---
 .../components/Form/FormContainer/index.vue   | 27 ++++++++++++-------
 .../user/components/form/index.vue            |  1 -
 .../views/sys/limit/menu/components/form.vue  |  1 -
 .../views/sys/limit/spa/components/form.vue   |  1 -
 .../user/components/form/index.vue            |  1 -
 5 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/web/src/components/Form/FormContainer/index.vue b/web/src/components/Form/FormContainer/index.vue
index 9c845ce..bf17d2d 100644
--- a/web/src/components/Form/FormContainer/index.vue
+++ b/web/src/components/Form/FormContainer/index.vue
@@ -4,14 +4,16 @@
  * @Date: 2023-12-15 15:38:02
 !-->
 <template>
-  <!-- 抽屉 -->
-  <el-drawer v-if="globalStore.drawerForm" v-model="visible" :destroy-on-close="true" :size="formProps.formSize" v-bind="$attrs" @close="close">
-    <template v-for="slotKey in slotKeys" #[slotKey]> <slot :name="slotKey" /></template>
-  </el-drawer>
-  <!-- 对话框 -->
-  <el-dialog v-else top="50px" :visible="visible" :destroy-on-close="true" draggable v-bind="$attrs" @close="close" :width="formProps.formSize">
-    <template v-for="slotKey in slotKeys" #[slotKey]> <slot :name="slotKey" /></template>
-  </el-dialog>
+  <div class="form-container">
+    <!-- 抽屉 -->
+    <el-drawer v-if="globalStore.drawerForm" v-model="visible" :destroy-on-close="true" :size="formProps.formSize" v-bind="$attrs" @close="close">
+      <template v-for="slotKey in slotKeys" #[slotKey]> <slot :name="slotKey" /></template>
+    </el-drawer>
+    <!-- 对话框 -->
+    <el-dialog v-else top="50px" :visible="visible" :destroy-on-close="true" draggable v-bind="$attrs" @close="close" :width="formProps.formSize">
+      <template v-for="slotKey in slotKeys" #[slotKey]> <slot :name="slotKey" /></template>
+    </el-dialog>
+  </div>
 </template>
 
 <script setup lang="ts" name="FormContainer">
@@ -38,7 +40,12 @@ function close() {
 </script>
 
 <style lang="scss" scoped>
-:deep(.el-dialog__body) {
-  margin-top: 20px;
+.form-container {
+  :deep(.el-dialog__body) {
+    margin-top: 0;
+  }
+  :deep(.el-drawer__body) {
+    margin-top: -20px;
+  }
 }
 </style>
diff --git a/web/src/views/biz/organization/user/components/form/index.vue b/web/src/views/biz/organization/user/components/form/index.vue
index 31cb7ae..d0b7cf0 100644
--- a/web/src/views/biz/organization/user/components/form/index.vue
+++ b/web/src/views/biz/organization/user/components/form/index.vue
@@ -14,7 +14,6 @@
         :hide-required-asterisk="sysUserProps.disabled"
         label-width="auto"
         label-suffix=" :"
-        class="-mt-25px"
       >
         <el-tabs v-model="activeName">
           <Basic v-model="sysUserProps.record"></Basic>
diff --git a/web/src/views/sys/limit/menu/components/form.vue b/web/src/views/sys/limit/menu/components/form.vue
index e598830..1750cd9 100644
--- a/web/src/views/sys/limit/menu/components/form.vue
+++ b/web/src/views/sys/limit/menu/components/form.vue
@@ -13,7 +13,6 @@
       :hide-required-asterisk="menuProps.disabled"
       label-width="auto"
       label-suffix=" :"
-      class="-mt-25px"
     >
       <!-- 基本设置 -->
       <el-divider content-position="left">基本设置</el-divider>
diff --git a/web/src/views/sys/limit/spa/components/form.vue b/web/src/views/sys/limit/spa/components/form.vue
index bde73e8..c3df94b 100644
--- a/web/src/views/sys/limit/spa/components/form.vue
+++ b/web/src/views/sys/limit/spa/components/form.vue
@@ -13,7 +13,6 @@
       :hide-required-asterisk="spaProps.disabled"
       label-width="auto"
       label-suffix=" :"
-      class="-mt-25px"
     >
       <!-- 基本设置 -->
       <el-divider content-position="left">基本设置</el-divider>
diff --git a/web/src/views/sys/organization/user/components/form/index.vue b/web/src/views/sys/organization/user/components/form/index.vue
index bc55e63..1d3c804 100644
--- a/web/src/views/sys/organization/user/components/form/index.vue
+++ b/web/src/views/sys/organization/user/components/form/index.vue
@@ -14,7 +14,6 @@
         :hide-required-asterisk="sysUserProps.disabled"
         label-width="auto"
         label-suffix=" :"
-        class="-mt-25px"
       >
         <el-tabs v-model="activeName">
           <Basic v-model="sysUserProps.record"></Basic>
-- 
Gitee