Merge remote-tracking branch 'origin/dev' into dev

src/assets/sass/sidebar.scss

@@ -1,8 +1,7 @@
 #app {
-
   .main-container {
     min-height: 100%;
-    transition: margin-left .28s;
+    transition: margin-left 0.28s;
     margin-left: $sideBarWidth;
     position: relative;
   }
@@ -150,7 +149,7 @@
     }
 
     .sidebar-container {
-      transition: transform .28s;
+      transition: transform 0.28s;
       width: $sideBarWidth !important;
     }
 
@@ -164,7 +163,6 @@
   }
 
   .withoutAnimation {
-
     .main-container,
     .sidebar-container {
       transition: none;

src/assets/sass/variables.scss

@@ -18,24 +18,7 @@ $width-list: 5 8 10 20 30 40 50 60 65 70 80 86 100 110 120 140 150 155 160 180 1
 
 // 内外边距列表
 $distance-list: 0 1 2 5 6 8 9 10 12 15 20 25 30 35 40 45 50 60 80 86 90 100 120 140;
-$distance-class-list: m,
+$distance-class-list: m, mv, mh, mt, ml, mr, mb, p, pv, ph, pt, pl, pr, pb, top, left, right, bottom;
-mv,
-mh,
-mt,
-ml,
-mr,
-mb,
-p,
-pv,
-ph,
-pt,
-pl,
-pr,
-pb,
-top,
-left,
-right,
-bottom;
 
 //圆角弧度
 $radius: 1 2 3 4 5 6 7 8 9 10 12 13 14 15 18 20 50 100;

src/views/dify/index.vue

@@ -1,5 +1,4 @@
 <script>
-
 export default {
   name: 'dify',
   data() {
@@ -13,9 +12,7 @@ export default {
 </script>
 
 <template>
-  <div class="container">
+  <div class="container"></div>
-
-  </div>
 </template>
 
 <style lang="scss" scoped></style>

vue.config.js

@@ -38,7 +38,7 @@ module.exports = {
         target: 'http://localhost:3000',
         changeOrigin: true,
         onProxyRes: (proxyRes, req, res) => {
-          delete proxyRes.headers['x-frame-options'];
+          delete proxyRes.headers['x-frame-options']
         },
         pathRewrite: {
           // '^/app': '/'
@@ -49,7 +49,7 @@ module.exports = {
         target: 'http://localhost:3000',
         changeOrigin: true,
         onProxyRes: (proxyRes, req, res) => {
-          delete proxyRes.headers['x-frame-options'];
+          delete proxyRes.headers['x-frame-options']
         },
         pathRewrite: {
           // '^/_next': '/'