Merge remote-tracking branch 'origin/master'

jero-web/src/views/projectManagement/components/listOfRegulations.vue

@@ -64,41 +64,48 @@
         </div>
       </div>
       <div style="float: right;margin-top: 1px" v-if="isDisplay">
-        <div class="operator-text" v-has="'document:importZip'">
+        <a-popconfirm overlayClassName='popconfirm' placement="bottomRight">
+          <template slot="title" id="popconfirm">
+            <div class="operator-text-title">
               <ImportFile :url="url" :isTrue="true" :accept="'.xls'" @getList="getPersonnelList"/>
             </div>
-        <div @click="handleModule" class="operator-text">
+            <div @click="handleModule" class="operator-text-title">
               <a-icon type="download"/>
               {{ $t('templateDownload') }}
             </div>
-        <div @click="handleExport" class="operator-text">
+            <div @click="handleExport" class="operator-text-title">
               <a-icon type="export" :rotate="-90"/>
               {{ $t('export') }}
             </div>
+            <div @click="handleDel" class="operator-text-title">
+              <a-icon type="delete"/>
+              {{ $t('BatchDelete') }}
+            </div>
+            <div class="operator-text-title" @click="bringInRelevantPersonnelClick">
+              <a-icon type="user"/>
+              {{ $t('bringInRelevantPersonnel') }}
+            </div>
+          </template>
+          <div class="operator-text" style="position: relative">
+            <span style="position: absolute;left: -13px;top: -4px">...</span>{{ $t('more') }}
+          </div>
+        </a-popconfirm>
+        <div @click="transferClick" class="operator-text">
+          <a-icon type="profile"/>
+          {{ $t('Transfer') }}
+        </div>
         <div @click="copyClick" class="operator-text">
           <a-icon type="copy"/>
           {{ $t('copy') }}
         </div>
-        <div @click="transferClick" class="operator-text">
-          <a-icon type="profile"/>
-          {{ $t('Transfer') }}
-        </div>
         <div @click="handleAdd" class="operator-text">
           <a-icon type="plus"/>
           {{ $t('add') }}
         </div>
-        <div @click="handleDel" class="operator-text">
-          <a-icon type="delete"/>
-          {{ $t('BatchDelete') }}
-        </div>
         <div class="operator-text" @click="batSettingClick">
           <a-icon type="setting"/>
           {{ $t('batSetting') }}
         </div>
-        <div class="operator-text" @click="bringInRelevantPersonnelClick">
-          <a-icon type="user"/>
-          {{ $t('bringInRelevantPersonnel') }}
-        </div>
       </div>
       <div v-if="!isDisplay" style="float: right;margin-top: 1px;margin-bottom: 19px">
         <div class="operator-text" @click="submitClick(0)">
@@ -1032,6 +1039,19 @@ export default {
     cursor: pointer;
     border-radius: 4px;
   }
+
+  /deep/ .ant-popover-buttons {
+    display: none !important;
+  }
+
+  .operator-text-title {
+    cursor: pointer;
+    margin-right: 22px;
+    font-size: 14px;
+    font-weight: 400;
+    color: #040B29;
+    margin-bottom: 22px;
+  }
 </style>
 <style>
   .box-input .ant-select-selection {
@@ -1041,4 +1061,12 @@ export default {
   .box-input .ant-select-selection__rendered {
     line-height: 38px;
   }
+
+  .popconfirm .ant-popover-buttons {
+    display: none !important;
+  }
+
+  .popconfirm .anticon-exclamation-circle {
+    display: none !important;
+  }
 </style>