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

src/pages/processCenter/pages/creatProcess/bzrk/step1.vue

@@ -1237,6 +1237,7 @@
       size="800px"
       :visible.sync="standardDrawer"
       direction="rtl"
+      class="search-drawer"
       :before-close="handleReviseDrawerClose">
       <div class="standard-content">
         <div class="content">
@@ -3620,8 +3621,9 @@ export default {
   }
 }
 
-.standard-content {
-  height: 100%;
+.search-drawer{
+  .standard-content {
+    height: 92%;
     padding: 10px 0 0;
     
     .content {
@@ -3643,5 +3645,9 @@ export default {
         }
       }
     }
+  }
+  .demo-drawer-footer{
+    height: 8%;
+  }
 }
 </style>