From f156b08ec29a6aac0f671ce53a2433a66b0e8113 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= <zhaoxiaox0053@163.com>
Date: Thu, 7 Sep 2023 11:35:43 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=8A=BD=E5=B1=89=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/less/common.less                   |  40 ++-
 .../selection/StandardSelectionModal.vue      |  11 +-
 .../tags/modules/ClauseSplittingDrawer.vue    |  24 +-
 .../system/tags/modules/StandardDrawer.vue    | 338 +++++++++---------
 4 files changed, 210 insertions(+), 203 deletions(-)

diff --git a/src/assets/less/common.less b/src/assets/less/common.less
index 58c7d88d..36dfc7a8 100644
--- a/src/assets/less/common.less
+++ b/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 {
-  height: calc(100vh - 55px);
-  padding: 24px 0;
+.custom-drawer-style {
+  height: 100%;
+  overflow: auto;
 
-  .ant-spin-container {
-    height: 100%;
+  .ant-drawer-body {
+    height: calc(100% - 55px);
+    padding: 0;
   }
 
-  .drawer-container {
-    height: calc(100% - 52px);
+  &-scroll {
+    height: calc(100% - 61px);
     overflow: auto;
-    padding: 0 24px;
+    padding: 24px;
   }
 
-  .drawer-footer {
-    margin-top: 20px;
-    height: 32px;
-    display: flex;
-    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-bottom: 30px;
-      float: right;
+      margin-left: 12px;
+    }
+
+    .ant-btn:first-child {
+      margin-left: 0;
     }
   }
 }
diff --git a/src/components/selection/StandardSelectionModal.vue b/src/components/selection/StandardSelectionModal.vue
index 50aab14b..bca8a2e8 100644
--- a/src/components/selection/StandardSelectionModal.vue
+++ b/src/components/selection/StandardSelectionModal.vue
@@ -7,8 +7,8 @@
     :closable="true"
     @close="handleCancel"
     :visible="visible"
-    style="height: 100%;overflow: auto;padding-bottom: 53px;">
-    <div style="margin-bottom: 60px">
+    class="custom-drawer-style">
+    <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">
-      <a-button @click="handleCancel" style="margin-right: 16px">{{$t('cancel')}}</a-button>
+    <div class="custom-drawer-style-bottom-btn">
+      <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 () {
diff --git a/src/views/system/tags/modules/ClauseSplittingDrawer.vue b/src/views/system/tags/modules/ClauseSplittingDrawer.vue
index cb2046fb..ca332642 100644
--- a/src/views/system/tags/modules/ClauseSplittingDrawer.vue
+++ b/src/views/system/tags/modules/ClauseSplittingDrawer.vue
@@ -8,10 +8,10 @@
     @close="onClose"
     :visible="visible"
     :maskClosable="false"
-    style="height: 100%;overflow: auto;"
-  >
-    <a-spin :spinning="confirmLoading" style="width: 100%;height:100%">
-      <div class="drawer-container">
+    class="custom-drawer-style">
+
+    <div class="custom-drawer-style-scroll">
+      <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-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>
-      </div>
-    </a-spin>
+      </a-spin>
+    </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>
+    </div>
   </a-drawer>
 </template>
 
diff --git a/src/views/system/tags/modules/StandardDrawer.vue b/src/views/system/tags/modules/StandardDrawer.vue
index 57e9bd59..1cbe0cfc 100644
--- a/src/views/system/tags/modules/StandardDrawer.vue
+++ b/src/views/system/tags/modules/StandardDrawer.vue
@@ -1,188 +1,186 @@
 <!--国内法规新增字段-->
 <template>
-  <div class="domestic-drawer-div">
-    <a-drawer
-      :title="title"
-      :width="width"
-      placement="right"
-      :closable="true"
-      @close="onClose"
-      :visible="visible"
-      :maskClosable="false"
-      style="height: 100%;overflow: auto;"
-    >
-      <a-spin :spinning="confirmLoading" style="width: 100%;height:100%">
-        <div class="drawer-container">
-          <a-form-model
-            :model="form"
-            :rules="validatorRules"
-            ref="editForm"
-            :label-col="labelCol"
-            :wrapper-col="wrapperCol"
-          >
-            <a-row>
-              <!--基本信息-->
-              <p class="tag-info">{{ $t('system.tag.essentialInformation') }}</p>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="true"
+    @close="onClose"
+    :visible="visible"
+    :maskClosable="false"
+    class="custom-drawer-style"
+  >
+    <div class="custom-drawer-style-scroll">
+      <a-spin :spinning="confirmLoading">
+        <a-form-model
+          :model="form"
+          :rules="validatorRules"
+          ref="editForm"
+          :label-col="labelCol"
+          :wrapper-col="wrapperCol"
+        >
+          <a-row>
+            <!--基本信息-->
+            <p class="tag-info">{{ $t('system.tag.essentialInformation') }}</p>
+            <a-divider dashed />
+            <!--所属模块-->
+            <a-col :span="24">
+              <a-form-model-item :label="$t('system.tag.module')" prop="isModel">
+                <a-select :placeholder="$t('pleaseSelect') + $t('system.tag.module')" disabled v-model="form.isModel">
+                  <a-select-option v-for="item in moduleArr" :key="item.value" :value="item.value">
+                    {{ translate(item.langKey) }}
+                  </a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </a-col>
+            <!--  属性名称-->
+            <a-col :span="24">
+              <a-form-model-item :label="$t('system.tag.attributeName')" prop="dbFieldTxt">
+                <a-input
+                  v-model="form.dbFieldTxt" :placeholder="$t('pleaseEnter') + $t('system.tag.attributeName')"
+                  @change="event => event.target.value = event.target.value.trim()"
+                  :maxLength="120"
+                ></a-input>
+              </a-form-model-item>
+            </a-col>
+            <!-- 英文名称-->
+            <a-col :span="24">
+              <a-form-model-item :label="$t('system.tag.attributeNameEnglish')" prop="dbFieldEnName">
+                <a-input
+                  v-model="form.dbFieldEnName"
+                  :placeholder="$t('pleaseEnter') + $t('system.tag.attributeNameEnglish')"
+                  @change="event => event.target.value = event.target.value.trim()"
+                  :maxLength="120"
+                ></a-input>
+              </a-form-model-item>
+            </a-col>
+            <!-- 字段名称-->
+            <a-col :span="24">
+              <a-form-model-item :label="$t('system.tag.fieldName')" prop="dbFieldName">
+                <a-input
+                  v-model="form.dbFieldName"
+                  :placeholder="$t('pleaseEnter') + $t('system.tag.fieldName')"
+                  @change="event => event.target.value = event.target.value.trim()"
+                  :maxLength="60"
+                ></a-input>
+              </a-form-model-item>
+            </a-col>
+            <!-- 属性类型-->
+            <a-col :span="24">
+              <a-form-model-item :label="$t('system.tag.attributeType')" prop="fieldShowType">
+                <j-dict-select-tag type="list" v-model="form.fieldShowType" dictCode="field_show_type"
+                                   :placeholder="$t('pleaseSelect') + $t('system.tag.attributeType')"
+                                   :disabled="disabledEdit" />
+              </a-form-model-item>
+            </a-col>
+
+            <!--选项内容-->
+            <a-col :span="24" v-if="isTagContent">
+              <a-form-model-item :label="$t('system.tag.optionContent')" prop="dictId" key="dictId">
+                <template>
+                  <a-select :placeholder="$t('pleaseSelect') + $t('system.tag.optionContent')" v-model="form.dictId">
+                    <a-select-option v-for="item in contentOption" :key="item.id" :value="item.id">
+                      {{ item.dictName }}
+                    </a-select-option>
+                  </a-select>
+                </template>
+              </a-form-model-item>
+            </a-col>
+            <!--字段长度 key 值必须加，解决验证错位的问题-->
+            <a-col :span="24" v-if="isLength">
+              <a-form-model-item :label="$t('system.tag.fieldLength')" prop="dbLength" key="dbLength">
+                <a-input-number v-model="form.dbLength" :min="1" :max="200"
+                                :placeholder="$t('pleaseEnter') + $t('system.tag.fieldLength')"
+                                style="width: 100%" :formatter="limitNumber" :parser="limitNumber" />
+              </a-form-model-item>
+            </a-col>
+            <!--展示顺序-->
+            <a-col :span="24">
+              <a-form-model-item :label="$t('system.tag.displayOrder')" prop="orderNum">
+                <a-input-number v-model="form.orderNum"
+                                :placeholder="$t('pleaseEnter') + $t('system.tag.displayOrder')" style="width: 100%"
+                                :min="1" :max="99999" :formatter="limitNumber" :parser="limitNumber" />
+              </a-form-model-item>
+            </a-col>
+            <!--是否必填-->
+            <a-col :span="24">
+              <a-form-model-item :label="$t('system.tag.required')" prop="fieldMustInput">
+                <j-dict-select-tag type="list" v-model="form.fieldMustInput" dictCode="yn"
+                                   :placeholder="$t('pleaseSelect') + $t('system.tag.required')" />
+              </a-form-model-item>
+            </a-col>
+
+            <template>
+              <!--文档库模块展示-->
+              <p class="tag-info">{{ $t('system.tag.documentLibraryModuleDisplay') }}</p>
               <a-divider dashed />
-              <!--所属模块-->
               <a-col :span="24">
-                <a-form-model-item :label="$t('system.tag.module')" prop="isModel">
-                  <a-select :placeholder="$t('pleaseSelect') + $t('system.tag.module')" disabled v-model="form.isModel">
-                    <a-select-option v-for="item in moduleArr" :key="item.value" :value="item.value">
-                      {{ translate(item.langKey) }}
+                <a-form-model-item :label="$t('system.tag.documentLibraryListDisplay')" prop="isShowList">
+                  <j-dict-select-tag type="list" v-model="form.isShowList" dictCode="yn"
+                                     :placeholder="$t('system.tag.selectWhetherDisplayList')" />
+                </a-form-model-item>
+              </a-col>
+              <!--详情页展示-->
+              <a-col :span="24">
+                <a-form-model-item :label="$t('system.tag.isShowDetail')" prop="isShowForm">
+                  <j-dict-select-tag type="list" v-model="form.isShowForm" dictCode="yn"
+                                     :placeholder="$t('system.tag.isShowDetailMessage')" />
+                </a-form-model-item>
+              </a-col>
+              <!--展示区域-->
+              <a-col :span="24">
+                <a-form-model-item :label="$t('system.tag.showArea')" prop="showArea">
+                  <a-select :placeholder="$t('pleaseSelect') + $t('system.tag.showArea')" v-model="form.showArea">
+                    <a-select-option v-for="(item) in areaOptions" :key="item.id" :value="item.id">
+                      {{ item.showArea }}
                     </a-select-option>
                   </a-select>
                 </a-form-model-item>
               </a-col>
-              <!--  属性名称-->
+              <!--是否搜索-->
+              <a-col :span="24" v-if="isSearch">
+                <a-form-model-item :label="$t('system.tag.search')" prop="isQuery" key="isQuery">
+                  <j-dict-select-tag type="list" v-model="form.isQuery" dictCode="yn"
+                                     :placeholder="$t('pleaseSelect') + $t('system.tag.search')" />
+                </a-form-model-item>
+              </a-col>
+              <!--是否排序-->
+              <a-col :span="24" v-if="isSearch">
+                <a-form-model-item :label="$t('system.tag.isSort')" prop="sortFlag" key="sortFlag">
+                  <j-dict-select-tag type="list" v-model="form.sortFlag" dictCode="yn"
+                                     :placeholder="$t('pleaseSelect') + $t('system.tag.isSort')" />
+                </a-form-model-item>
+              </a-col>
+            </template>
+            <!--其它模块展示-->
+            <template>
+              <p class="tag-info">{{ $t('system.tag.displayOtherModules') }}</p>
+              <a-divider dashed />
               <a-col :span="24">
-                <a-form-model-item :label="$t('system.tag.attributeName')" prop="dbFieldTxt">
-                  <a-input
-                    v-model="form.dbFieldTxt" :placeholder="$t('pleaseEnter') + $t('system.tag.attributeName')"
-                    @change="event => event.target.value = event.target.value.trim()"
-                    :maxLength="120"
-                  ></a-input>
+                <a-form-model-item :label="$t('system.tag.regulationsListDisplay')" prop="isShowLawsList">
+                  <j-dict-select-tag type="list" v-model="form.isShowLawsList" dictCode="yn"
+                                     :placeholder="$t('system.tag.selectDisplayListRegulations')" />
                 </a-form-model-item>
               </a-col>
-              <!-- 英文名称-->
+              <!--搜索中心展示-->
               <a-col :span="24">
-                <a-form-model-item :label="$t('system.tag.attributeNameEnglish')" prop="dbFieldEnName">
-                  <a-input
-                    v-model="form.dbFieldEnName"
-                    :placeholder="$t('pleaseEnter') + $t('system.tag.attributeNameEnglish')"
-                    @change="event => event.target.value = event.target.value.trim()"
-                    :maxLength="120"
-                  ></a-input>
+                <a-form-model-item :label="$t('system.tag.searchCenterDisplay')" prop="isShowSearch">
+                  <j-dict-select-tag type="list" v-model="form.isShowSearch" dictCode="yn"
+                                     :placeholder="$t('system.tag.selectSearchCenterDisplayed')" />
                 </a-form-model-item>
               </a-col>
-              <!-- 字段名称-->
-              <a-col :span="24">
-                <a-form-model-item :label="$t('system.tag.fieldName')" prop="dbFieldName">
-                  <a-input
-                    v-model="form.dbFieldName"
-                    :placeholder="$t('pleaseEnter') + $t('system.tag.fieldName')"
-                    @change="event => event.target.value = event.target.value.trim()"
-                    :maxLength="60"
-                  ></a-input>
-                </a-form-model-item>
-              </a-col>
-              <!-- 属性类型-->
-              <a-col :span="24">
-                <a-form-model-item :label="$t('system.tag.attributeType')" prop="fieldShowType">
-                  <j-dict-select-tag type="list" v-model="form.fieldShowType" dictCode="field_show_type"
-                                     :placeholder="$t('pleaseSelect') + $t('system.tag.attributeType')"
-                                     :disabled="disabledEdit" />
-                </a-form-model-item>
-              </a-col>
-
-              <!--选项内容-->
-              <a-col :span="24" v-if="isTagContent">
-                <a-form-model-item :label="$t('system.tag.optionContent')" prop="dictId" key="dictId">
-                  <template>
-                    <a-select :placeholder="$t('pleaseSelect') + $t('system.tag.optionContent')" v-model="form.dictId">
-                      <a-select-option v-for="item in contentOption" :key="item.id" :value="item.id">
-                        {{ item.dictName }}
-                      </a-select-option>
-                    </a-select>
-                  </template>
-                </a-form-model-item>
-              </a-col>
-              <!--字段长度 key 值必须加，解决验证错位的问题-->
-              <a-col :span="24" v-if="isLength">
-                <a-form-model-item :label="$t('system.tag.fieldLength')" prop="dbLength" key="dbLength">
-                  <a-input-number v-model="form.dbLength" :min="1" :max="200"
-                                  :placeholder="$t('pleaseEnter') + $t('system.tag.fieldLength')"
-                                  style="width: 100%" :formatter="limitNumber" :parser="limitNumber" />
-                </a-form-model-item>
-              </a-col>
-              <!--展示顺序-->
-              <a-col :span="24">
-                <a-form-model-item :label="$t('system.tag.displayOrder')" prop="orderNum">
-                  <a-input-number v-model="form.orderNum"
-                                  :placeholder="$t('pleaseEnter') + $t('system.tag.displayOrder')" style="width: 100%"
-                                  :min="1" :max="99999" :formatter="limitNumber" :parser="limitNumber" />
-                </a-form-model-item>
-              </a-col>
-              <!--是否必填-->
-              <a-col :span="24">
-                <a-form-model-item :label="$t('system.tag.required')" prop="fieldMustInput">
-                  <j-dict-select-tag type="list" v-model="form.fieldMustInput" dictCode="yn"
-                                     :placeholder="$t('pleaseSelect') + $t('system.tag.required')" />
-                </a-form-model-item>
-              </a-col>
-
-              <template>
-                <!--文档库模块展示-->
-                <p class="tag-info">{{ $t('system.tag.documentLibraryModuleDisplay') }}</p>
-                <a-divider dashed />
-                <a-col :span="24">
-                  <a-form-model-item :label="$t('system.tag.documentLibraryListDisplay')" prop="isShowList">
-                    <j-dict-select-tag type="list" v-model="form.isShowList" dictCode="yn"
-                                       :placeholder="$t('system.tag.selectWhetherDisplayList')" />
-                  </a-form-model-item>
-                </a-col>
-                <!--详情页展示-->
-                <a-col :span="24">
-                  <a-form-model-item :label="$t('system.tag.isShowDetail')" prop="isShowForm">
-                    <j-dict-select-tag type="list" v-model="form.isShowForm" dictCode="yn"
-                                       :placeholder="$t('system.tag.isShowDetailMessage')" />
-                  </a-form-model-item>
-                </a-col>
-                <!--展示区域-->
-                <a-col :span="24">
-                  <a-form-model-item :label="$t('system.tag.showArea')" prop="showArea">
-                    <a-select :placeholder="$t('pleaseSelect') + $t('system.tag.showArea')" v-model="form.showArea">
-                      <a-select-option v-for="(item) in areaOptions" :key="item.id" :value="item.id">
-                        {{ item.showArea }}
-                      </a-select-option>
-                    </a-select>
-                  </a-form-model-item>
-                </a-col>
-                <!--是否搜索-->
-                <a-col :span="24" v-if="isSearch">
-                  <a-form-model-item :label="$t('system.tag.search')" prop="isQuery" key="isQuery">
-                    <j-dict-select-tag type="list" v-model="form.isQuery" dictCode="yn"
-                                       :placeholder="$t('pleaseSelect') + $t('system.tag.search')" />
-                  </a-form-model-item>
-                </a-col>
-                <!--是否排序-->
-                <a-col :span="24" v-if="isSearch">
-                  <a-form-model-item :label="$t('system.tag.isSort')" prop="sortFlag" key="sortFlag">
-                    <j-dict-select-tag type="list" v-model="form.sortFlag" dictCode="yn"
-                                       :placeholder="$t('pleaseSelect') + $t('system.tag.isSort')" />
-                  </a-form-model-item>
-                </a-col>
-              </template>
-              <!--其它模块展示-->
-              <template>
-                <p class="tag-info">{{ $t('system.tag.displayOtherModules') }}</p>
-                <a-divider dashed />
-                <a-col :span="24">
-                  <a-form-model-item :label="$t('system.tag.regulationsListDisplay')" prop="isShowLawsList">
-                    <j-dict-select-tag type="list" v-model="form.isShowLawsList" dictCode="yn"
-                                       :placeholder="$t('system.tag.selectDisplayListRegulations')" />
-                  </a-form-model-item>
-                </a-col>
-                <!--搜索中心展示-->
-                <a-col :span="24">
-                  <a-form-model-item :label="$t('system.tag.searchCenterDisplay')" prop="isShowSearch">
-                    <j-dict-select-tag type="list" v-model="form.isShowSearch" dictCode="yn"
-                                       :placeholder="$t('system.tag.selectSearchCenterDisplayed')" />
-                  </a-form-model-item>
-                </a-col>
-              </template>
-            </a-row>
-          </a-form-model>
-        </div>
-        <div class="drawer-footer">
-          <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>
+            </template>
+          </a-row>
+        </a-form-model>
       </a-spin>
-    </a-drawer>
-  </div>
+    </div>
+    <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>
+    </div>
+  </a-drawer>
 </template>
 
 <script>