修复 Form Actions 取消按钮事件

Author: SmallRuralDog

public/app.js

@@ -1,5 +1,5 @@
 {
-    "/app.js": "/app.js?id=bd89b077f08d1b3fe3c8",
+    "/app.js": "/app.js?id=56b921be10395873e06e",
     "/manifest.js": "/manifest.js?id=8991394a854ee5cdffc3",
     "/vendor.js": "/vendor.js?id=df0be4950fcb717193ba"
 }

public/mix-manifest.json

@@ -152,7 +152,7 @@
         </el-footer>
       </el-container>
     </el-container>
-    <el-backtop :bottom="80"></el-backtop>
+    <el-backtop></el-backtop>
     <el-drawer :visible.sync="showAdminSet" size="250px">
       <div style="padding:0 10px;">
         <el-divider>主题风格</el-divider>

resources/js/components/Root.vue

@@ -100,7 +100,10 @@
             </template>
           </component>
         </component>
-        <component :is="attrs.actions.fixed?'Affix':'div'" :offset-bottom="2">
+        <component
+          :is="attrs.actions.fixed ? 'Affix' : 'div'"
+          :offset-bottom="20"
+        >
           <div
             class="form-bottom-actions flex padding-tb"
             :class="{ 'form-bottom-actions-fixedxxx': attrs.actions.fixed }"
@@ -133,7 +136,7 @@
                 :icon="attrs.actions.cancelButton.icon"
                 :autofocus="attrs.actions.cancelButton.autofocus"
                 :loading="loading"
-                @click="attrs.attrs.isDialog ? closeDialog : $router.go(-1)"
+                @click="onCancel"
                 ><template v-if="attrs.actions.cancelButton.content">{{
                   attrs.actions.cancelButton.content
                 }}</template>
@@ -299,6 +302,9 @@ export default {
     resetForm(formName) {
       this.$refs[formName].resetFields();
     },
+    onCancel() {
+      this.attrs.attrs.isDialog ? this.closeDialog() : this.$router.go(-1);
+    },
     closeDialog() {
       this.$bus.emit("showDialogGridFrom", { isShow: false });
     },
@@ -318,14 +324,15 @@ export default {
     align-items: center;
     justify-content: space-between;
   }
-  .form-bottom-actions-fixed {
-    position: fixed;
-    bottom: 15px;
-    left: 0;
-    right: 0;
-    padding: 15px;
-    background: #ffffff;
+  .admin-affix {
+    .form-bottom-actions {
+      padding: 6px;
+      background: #ffffff;
+      border-radius: 4px;
+      border: 1px solid #EBEEF5;
+    }
   }
+
   .form-item-help {
     color: #999;
   }