From 62cf3ac27cbd2c8d270b8bd1ab0ed3ad6a5be557 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 3 Aug 2020 21:40:00 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B=E5=88=97=E8=A1=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=89=B9=E9=87=8F=E6=93=8D=E4=BD=9C=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/case/components/ShowMoreBtn.vue     | 67 +++++++++++++
 .../track/case/components/TestCaseList.vue    | 94 +++++++++++++++----
 frontend/src/i18n/en-US.js                    |  1 +
 frontend/src/i18n/zh-CN.js                    |  1 +
 frontend/src/i18n/zh-TW.js                    |  1 +
 5 files changed, 147 insertions(+), 17 deletions(-)
 create mode 100644 frontend/src/business/components/track/case/components/ShowMoreBtn.vue

diff --git a/frontend/src/business/components/track/case/components/ShowMoreBtn.vue b/frontend/src/business/components/track/case/components/ShowMoreBtn.vue
new file mode 100644
index 0000000000..9f91088917
--- /dev/null
+++ b/frontend/src/business/components/track/case/components/ShowMoreBtn.vue
@@ -0,0 +1,67 @@
+<template>
+  <div v-if="isShow">
+    <el-dropdown placement="bottom" trigger="click" size="medium">
+      <div @click.stop="click" class="show-more-btn">
+        <i class="el-icon-more ms-icon-more"/>
+      </div>
+      <el-dropdown-menu slot="dropdown" class="dropdown-menu-class">
+        <div class="show-more-btn-title">{{$t('test_track.case.batch_handle', [size])}}</div>
+        <el-dropdown-item v-for="(btn,index) in buttons" :key="index" @click.native.stop="clickStop(btn)">
+          {{btn.name}}
+        </el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: "ShowMoreBtn",
+    data() {
+      return {}
+    },
+    methods: {
+      click() {
+        console.log("click");
+      },
+      clickStop(btn) {
+        if (btn.stop instanceof Function) {
+          btn.stop();
+        }
+      }
+    },
+    props: {
+      isShow: {
+        type: Boolean,
+        default: false
+      },
+      buttons: Array,
+      row: Object,
+      size: Number
+    }
+  }
+</script>
+
+<style scoped>
+  .ms-icon-more {
+    transform: rotate(90deg);
+  }
+
+  .show-more-btn {
+    width: 20px;
+    height: 30px;
+    line-height: 30px;
+    background-color: #FFF;
+  }
+
+  .show-more-btn-title {
+    color: #696969;
+    background-color: #C0C0C0;
+    padding: 5px;
+  }
+
+  .dropdown-menu-class {
+    padding: 1px 0;
+    text-align: center;
+  }
+</style>
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index 90a140a28f..b872a03e84 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -39,6 +39,11 @@
         class="test-content adjust-table">
         <el-table-column
           type="selection"/>
+        <el-table-column width="40" :resizable="false" align="center">
+          <template v-slot:default="scope">
+            <show-more-btn :is-show="scope.row.showMore" :buttons="buttons" :size="selectRows.size"/>
+          </template>
+        </el-table-column>
         <el-table-column
           prop="num"
           sortable="custom"
@@ -96,7 +101,7 @@
           </template>
         </el-table-column>
         <el-table-column
-          :label="$t('commons.operating')">
+          :label="$t('commons.operating')" min-width="100">
           <template v-slot:default="scope">
             <ms-table-operator :is-tester-permission="true" @editClick="handleEdit(scope.row)"
                                @deleteClick="handleDelete(scope.row)">
@@ -133,6 +138,7 @@
   import MsTableButton from "../../../common/components/MsTableButton";
   import {_filter, _sort} from "../../../../../common/js/utils";
   import {TEST_CASE_CONFIGS} from "../../../common/components/search/search-components";
+  import ShowMoreBtn from "./ShowMoreBtn";
 
   export default {
     name: "TestCaseList",
@@ -143,7 +149,7 @@
       MethodTableItem,
       TypeTableItem,
       PriorityTableItem,
-      MsCreateBox, TestCaseImport, TestCaseExport, MsTablePagination, NodeBreadcrumb, MsTableHeader
+      MsCreateBox, TestCaseImport, TestCaseExport, MsTablePagination, NodeBreadcrumb, MsTableHeader, ShowMoreBtn
     },
     data() {
       return {
@@ -156,7 +162,8 @@
         currentPage: 1,
         pageSize: 10,
         total: 0,
-        selectIds: new Set(),
+        // selectIds: new Set(),
+        selectRows: new Set(),
         priorityFilters: [
           {text: 'P0', value: 'P0'},
           {text: 'P1', value: 'P1'},
@@ -171,6 +178,16 @@
           {text: this.$t('commons.functional'), value: 'functional'},
           {text: this.$t('commons.performance'), value: 'performance'},
           {text: this.$t('commons.api'), value: 'api'}
+        ],
+        showMore: false,
+        buttons: [
+          {
+            name: '批量编辑用例', stop: this.handleClickStop
+          }, {
+            name: '批量移动用例', stop: this.handleClickStop
+          }, {
+            name: '批量删除用例', stop: this.handleClickStop
+          }
         ]
       }
     },
@@ -212,7 +229,8 @@
             let data = response.data;
             this.total = data.itemCount;
             this.tableData = data.listObject;
-            this.selectIds.clear();
+            // this.selectIds.clear();
+            this.selectRows.clear();
           });
         }
       },
@@ -246,8 +264,15 @@
           confirmButtonText: this.$t('commons.confirm'),
           callback: (action) => {
             if (action === 'confirm') {
-              this.$post('/test/case/batch/delete', {ids: [...this.selectIds]}, () => {
-                this.selectIds.clear();
+              // this.$post('/test/case/batch/delete', {ids: [...this.selectIds]}, () => {
+              //   this.selectIds.clear();
+              //   this.$emit("refresh");
+              //   this.$success(this.$t('commons.delete_success'));
+              // });
+              let ids = Array.from(this.selectRows).map(row => row.id);
+              this.$post('/test/case/batch/delete', {ids: ids}, () => {
+                // this.selectIds.clear();
+                this.selectRows.clear();
                 this.$emit("refresh");
                 this.$success(this.$t('commons.delete_success'));
               });
@@ -264,7 +289,8 @@
       },
       refresh() {
         this.condition = {components: TEST_CASE_CONFIGS};
-        this.selectIds.clear();
+        // this.selectIds.clear();
+        this.selectRows.clear();
         this.$emit('refresh');
       },
       showDetail(row, event, column) {
@@ -272,29 +298,54 @@
       },
       handleSelectAll(selection) {
         if (selection.length > 0) {
-          this.tableData.forEach(item => {
-            this.selectIds.add(item.id);
-          });
+          if (selection.length === 1) {
+            this.selectRows.add(selection[0]);
+          } else {
+            this.tableData.forEach(item => {
+              this.$set(item, "showMore", true);
+              this.selectRows.add(item);
+            });
+          }
         } else {
-          this.selectIds.clear();
+          this.selectRows.clear();
+          this.tableData.forEach(row => {
+            this.$set(row, "showMore", false);
+          })
         }
       },
       handleSelectionChange(selection, row) {
-        if (this.selectIds.has(row.id)) {
-          this.selectIds.delete(row.id);
+        // if (this.selectIds.has(row.id)) {
+        //   this.selectIds.delete(row.id);
+        // } else {
+        //   this.selectIds.add(row.id);
+        // }
+        if (this.selectRows.has(row)) {
+          this.$set(row, "showMore", false);
+          this.selectRows.delete(row);
         } else {
-          this.selectIds.add(row.id);
+          this.selectRows.add(row);
+        }
+
+        if (this.selectRows.size > 1) {
+          Array.from(this.selectRows).forEach(row => {
+            this.$set(row, "showMore", true);
+          })
+        } else if (this.selectRows.size === 1) {
+          let arr = Array.from(this.selectRows);
+          this.$set(arr[0], "showMore", false);
         }
       },
       importTestCase() {
         this.$refs.testCaseImport.open();
       },
       exportTestCase() {
+        let ids = Array.from(this.selectRows).map(row => row.id);
         let config = {
           url: '/test/case/export/testcase',
           method: 'post',
           responseType: 'blob',
-          data: {ids: [...this.selectIds]}
+          // data: {ids: [...this.selectIds]}
+          data: {ids: ids}
         };
         this.result = this.$request(config).then(response => {
           const filename = this.$t('test_track.case.test_case') + ".xlsx";
@@ -311,12 +362,18 @@
         });
       },
       handleBatch(type) {
-        if (this.selectIds.size < 1) {
+        // if (this.selectIds.size < 1) {
+        //   this.$warning(this.$t('test_track.plan_view.select_manipulate'));
+        //   return;
+        // }
+        if (this.selectRows.size < 1) {
           this.$warning(this.$t('test_track.plan_view.select_manipulate'));
           return;
         }
         if (type === 'move') {
-          this.$emit('moveToNode', this.selectIds);
+          let ids = Array.from(this.selectRows).map(row => row.id);
+          // this.$emit('moveToNode', this.selectIds);
+          this.$emit('moveToNode', ids);
         } else if (type === 'delete') {
           this.handleDeleteBatch();
         } else {
@@ -334,6 +391,9 @@
         }
         _sort(column, this.condition);
         this.initTableData();
+      },
+      handleClickStop() {
+        console.log("click stop");
       }
     }
   }
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 9a6a16ebab..ddd0c5db19 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -527,6 +527,7 @@ export default {
       create_module_first: "Please create module first",
       relate_test: "Relate test",
       relate_test_not_find: 'The associated test does not exist, please check the test case',
+      batch_handle: 'Batch processing (select {0} item)',
       import: {
         import: "Import test case",
         case_import: "Import test case",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index a8b85ba5a3..3990ca7db2 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -527,6 +527,7 @@ export default {
       create_module_first: "请先新建模块",
       relate_test: "关联测试",
       relate_test_not_find: '关联的测试不存在,请检查用例',
+      batch_handle: '批量处理 (选中{0}项)',
       import: {
         import: "导入用例",
         case_import: "导入测试用例",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index be04d87ad0..89513489dd 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -526,6 +526,7 @@ export default {
       create_module_first: "請先新建模塊",
       relate_test: "關聯測試",
       relate_test_not_find: '關聯的測試不存在,請檢查用例',
+      batch_handle: '批量處理 (選中{0}項)',
       import: {
         import: "導入用例",
         case_import: "導入測試用例",