update 抽屉样式调整

src/assets/less/common.less

@@ -474,31 +474,39 @@
   width: 100%;
 }
 
+.ant-tree li .ant-tree-node-content-wrapper.ant-tree-node-selected {
+  background-color: #ffd9d1 !important;
+}
+
 /*抽屉样式修改*/
-.ant-drawer-body {
+.custom-drawer-style {
-  height: calc(100vh - 55px);
-  padding: 24px 0;
-
-  .ant-spin-container {
   height: 100%;
-  }
-
-  .drawer-container {
-    height: calc(100% - 52px);
   overflow: auto;
-    padding: 0 24px;
+
+  .ant-drawer-body {
+    height: calc(100% - 55px);
+    padding: 0;
   }
 
-  .drawer-footer {
+  &-scroll {
-    margin-top: 20px;
+    height: calc(100% - 61px);
-    height: 32px;
+    overflow: auto;
-    display: flex;
+    padding: 24px;
-    justify-content: center;
+  }
+
+  &-bottom-btn {
+    height: 60px;
+    padding: 12px 24px;
+    opacity: 1;
+    border-top: 1px solid #E5E6EB;
+    text-align: right;
 
     .ant-btn {
-      margin-left: 30px;
+      margin-left: 12px;
-      margin-bottom: 30px;
+    }
-      float: right;
+
+    .ant-btn:first-child {
+      margin-left: 0;
     }
   }
 }

src/components/selection/StandardSelectionModal.vue

@@ -7,8 +7,8 @@
     :closable="true"
     @close="handleCancel"
     :visible="visible"
-    style="height: 100%;overflow: auto;padding-bottom: 53px;">
+    class="custom-drawer-style">
-    <div style="margin-bottom: 60px">
+    <div class="custom-drawer-style-scroll">
       <div class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
@@ -44,8 +44,8 @@
       </a-table>
     </div>
 
-    <div class="drawer-bootom-button">
+    <div class="custom-drawer-style-bottom-btn">
-      <a-button @click="handleCancel" style="margin-right: 16px">{{$t('cancel')}}</a-button>
+      <a-button @click="handleCancel" >{{$t('cancel')}}</a-button>
       <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
     </div>
   </a-drawer>
@@ -128,7 +128,6 @@ export default {
       this.selectedRowKeys = []
       this.loading = true
       getStandardList(query).then((res) => {
-        this.loading = false
         if (res.success) {
           this.dataList = res.result.records
           this.ipagination.total = res.result.total
@@ -136,6 +135,8 @@ export default {
         } else {
           this.dataList = []
         }
+      }).finally(() => {
+        this.loading = false
       })
     },
     searchQuery () {

src/views/system/tags/modules/ClauseSplittingDrawer.vue

@@ -8,10 +8,10 @@
     @close="onClose"
     :visible="visible"
     :maskClosable="false"
-    style="height: 100%;overflow: auto;"
+    class="custom-drawer-style">
-  >
+
-    <a-spin :spinning="confirmLoading" style="width: 100%;height:100%">
+    <div class="custom-drawer-style-scroll">
-      <div class="drawer-container">
+      <a-spin :spinning="confirmLoading">
         <a-form-model
           :model="form"
           :rules="validatorRules"
@@ -113,14 +113,14 @@
             </a-form-model-item>
           </template>
         </a-form-model>
-        <div class="drawer-footer">
+      </a-spin>
-          <a-button @click="handleOk" type="primary" style="margin-bottom: 0;">
+    </div>
+    <div class="custom-drawer-style-bottom-btn">
+      <a-button @click="handleCancel" style="margin-bottom: 0;" :loading="confirmLoading">{{ $t('close') }}</a-button>
+      <a-button @click="handleOk" type="primary" style="margin-bottom: 0;" :loading="confirmLoading">
         {{ $t('preservation') }}
       </a-button>
-          <a-button @click="handleCancel" style="margin-bottom: 0;">{{ $t('close') }}</a-button>
     </div>
-      </div>
-    </a-spin>
   </a-drawer>
 </template>
 

src/views/system/tags/modules/StandardDrawer.vue

@@ -1,6 +1,5 @@
 <!--国内法规新增字段-->
 <template>
-  <div class="domestic-drawer-div">
   <a-drawer
     :title="title"
     :width="width"
@@ -9,10 +8,10 @@
     @close="onClose"
     :visible="visible"
     :maskClosable="false"
-      style="height: 100%;overflow: auto;"
+    class="custom-drawer-style"
   >
-      <a-spin :spinning="confirmLoading" style="width: 100%;height:100%">
+    <div class="custom-drawer-style-scroll">
-        <div class="drawer-container">
+      <a-spin :spinning="confirmLoading">
         <a-form-model
           :model="form"
           :rules="validatorRules"
@@ -173,16 +172,15 @@
             </template>
           </a-row>
         </a-form-model>
+      </a-spin>
     </div>
-        <div class="drawer-footer">
+    <div class="custom-drawer-style-bottom-btn">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">{{ $t('close') }}</a-button>
       <a-button @click="handleOk" type="primary" style="margin-bottom: 0;">
         {{ $t('preservation') }}
       </a-button>
-          <a-button @click="handleCancel" style="margin-bottom: 0;">{{ $t('close') }}</a-button>
     </div>
-      </a-spin>
   </a-drawer>
-  </div>
 </template>
 
 <script>