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,28 +3621,33 @@ export default {
   }
 }
 
-.standard-content {
+.search-drawer{
-  height: 100%;
+  .standard-content {
-  padding: 10px 0 0;
+    height: 92%;
-
+    padding: 10px 0 0;
-  .content {
+    
-    height: 100%;
+    .content {
-    display: flex;
+      height: 100%;
-    flex-direction: column;
+      display: flex;
-    padding: 0 10px;
+      flex-direction: column;
-
+      padding: 0 10px;
-    .standard-table-wrap {
+      
-      flex: auto;
+      .standard-table-wrap {
-      overflow-y: auto;
+        flex: auto;
-    }
+        overflow-y: auto;
-
+      }
-    .pagination {
+      
-      position: static;
+      .pagination {
-
+        position: static;
-      /deep/ .pagination-slot {
+        
-        padding: 0;
+        /deep/ .pagination-slot {
+          padding: 0;
+        }
       }
     }
   }
+  .demo-drawer-footer{
+    height: 8%;
+  }
 }
 </style>