feature: 1、审计日志中新增人员全名列&导出列表优化 TencentBlueKing#618 2、通过excel导入用户组织支持全…

…量更新 TencentBlueKing#728 (TencentBlueKing#855) Co-authored-by: huacao <[email protected]>
houming818 · Dec 16, 2022 · a11c21c · a11c21c
1 parent 42e889a
commit a11c21c
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 5 deletions.
diff --git a/src/pages/src/components/catalog/home/ImportUser.vue b/src/pages/src/components/catalog/home/ImportUser.vue
@@ -48,6 +48,13 @@
       <span class="text">{{$t('仅支持xls、xlsx格式文件')}}</span>
       <span class="template" @click="downloadTemplate"><i class="icon-user-download"></i>{{$t('下载模板')}}</span>
     </p>
+    <p class="tip-wrapper">
+      <bk-checkbox
+        v-model="uploadInfo.isOverwrite">
+        允许对同名用户覆盖更新
+      </bk-checkbox>
+      <i class="tip-icon icon-user--l" v-bk-tooltips="{ width: 310, content: $t('导入覆盖提升') }"></i>
+    </p>
   </div>
 </template>
 
@@ -69,6 +76,7 @@ export default {
         name: '',
         size: '',
         type: false,
+        isOverwrite: false,
       },
     };
   },
@@ -116,6 +124,7 @@ export default {
         name: '',
         size: '',
         type: false,
+        isOverwrite: false,
       };
     },
     // 上传
@@ -307,4 +316,12 @@ export default {
     cursor: pointer;
   }
 }
+
+.tip-wrapper {
+  margin-top: 10px;
+  .tip-icon {
+    display: inline-block;
+    transform: translateY(4px);
+  }
+}
 </style>
diff --git a/src/pages/src/store/modules/catalog.js b/src/pages/src/store/modules/catalog.js
@@ -78,7 +78,7 @@ export default {
     },
     // eslint-disable-next-line no-unused-vars
     ajaxImportUser(_context, params, _config = {}) {
-      return http.post(`api/v1/web/categories/${params.id}/operations/sync_or_import/`, params.data);
+      return http.post(`api/v1/web/categories/${params.id}/operations/sync_or_import/?is_overwrite=${params.isOverwrite}`, params.data);
       // const mockUrl = `?mock-file=catalog`
       // return http.get(mockUrl, config)
     },

diff --git a/src/pages/src/views/audit/index.vue b/src/pages/src/views/audit/index.vue
@@ -39,7 +39,7 @@
         v-if="panelActive === 'operate'"
         class="king-input-search"
         style="width: 400px;"
-        :placeholder="$t('搜索操作人员、操作对象、操作类型')"
+        :placeholder="$t('搜索操作用户、操作对象、操作类型')"
         :clearable="true"
         :left-icon="'bk-icon icon-search'"
         @clear="handleClear"
@@ -71,6 +71,7 @@
                 <tr v-for="(item, index) in auditList" :key="index">
                   <template v-if="isOperate">
                     <td><div class="text-overflow-hidden" v-bk-overflow-tips>{{item.operator}}</div></td>
+                    <td><div class="text-overflow-hidden" v-bk-overflow-tips>{{item.display_name || '--'}}</div></td>
                     <td><div class="text-overflow-hidden">{{item.datetime | convertIsoTime}}</div></td>
                     <td><div class="text-overflow-hidden" v-bk-overflow-tips>{{item.client_ip}}</div></td>
                     <td><div class="text-overflow-hidden">{{item.operation}}</div></td>
@@ -79,6 +80,7 @@
                   </template>
                   <template v-else>
                     <td><div class="text-overflow-hidden">{{item.username}}</div></td>
+                    <td><div class="text-overflow-hidden">{{item.display_name || '--'}}</div></td>
                     <td><div class="text-overflow-hidden">{{item.datetime | convertIsoTime}}</div></td>
                     <td><div class="text-overflow-hidden">{{item.client_ip}}</div></td>
                     <td><div class="text-overflow-hidden" v-bk-tooltips="errorTips(item)">
@@ -191,7 +193,8 @@ export default {
       ],
       panelActive: 'operate',
       auditHead: [
-        { key: 'operater', name: this.$t('操作人员') },
+        { key: 'operater', name: this.$t('操作用户') },
+        { key: 'operater', name: this.$t('用户全名') },
         { key: 'time', name: this.$t('时间') },
         { key: 'IP', name: this.$t('来源 IP') },
         { key: 'type', name: this.$t('操作类型') },
@@ -201,6 +204,7 @@ export default {
       /** 登录审计表头 */
       loginHead: [
         { key: 'user', name: this.$t('登录用户') },
+        { key: 'user', name: this.$t('用户全名') },
         { key: 'time', name: this.$t('登录时间') },
         { key: 'IP', name: this.$t('登录来源IP') },
         { key: 'status', name: this.$t('登录状态') },

diff --git a/src/pages/src/views/catalog/PageHome.vue b/src/pages/src/views/catalog/PageHome.vue
@@ -368,8 +368,9 @@ export default {
         return;
       }
       const formData = new FormData();
-      formData.append('file', this.$refs.importUserRef.uploadInfo.fileInfo);
-      formData.append('file_name', this.$refs.importUserRef.uploadInfo.name);
+      const uploadInfo = this.$refs.importUserRef.uploadInfo;
+      formData.append('file', uploadInfo.fileInfo);
+      formData.append('file_name', uploadInfo.name);
       formData.append('department_id', this.$refs.importUserRef.id);
 
       // 如果同时有两个目录正在导入，this.importId 会变化，影响 splice loading，所以必须加个变量
@@ -380,6 +381,7 @@ export default {
       try {
         await this.$store.dispatch('catalog/ajaxImportUser', {
           id: this.importId,
+          isOverwrite: uploadInfo.isOverwrite,
           data: formData,
         });
         await this.getDepartments();