refactor(案例评审，场景): 评审评论可以增加图片、表头操作列增加创建时间并存储上一次的排序方式、场景增加批量复制按钮、负责人将名称和ID位置互换

评审评论可以增加图片、表头操作列增加创建时间并存储上一次的排序方式、场景增加批量复制按钮、负责人将名称和ID位置互换

backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java

@@ -10,20 +10,16 @@ import io.metersphere.api.service.ApiAutomationService;
 import io.metersphere.base.domain.ApiScenario;
 import io.metersphere.base.domain.ApiScenarioWithBLOBs;
 import io.metersphere.base.domain.Schedule;
-import io.metersphere.base.domain.UserGroup;
 import io.metersphere.commons.constants.ApiRunMode;
 import io.metersphere.commons.constants.OperLogConstants;
 import io.metersphere.commons.constants.PermissionConstants;
 import io.metersphere.commons.constants.TriggerMode;
 import io.metersphere.commons.utils.PageUtils;
 import io.metersphere.commons.utils.Pager;
-import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.controller.request.ScheduleRequest;
 import io.metersphere.log.annotation.MsAuditLog;
 import io.metersphere.track.request.testcase.ApiCaseRelevanceRequest;
 import io.metersphere.track.request.testplan.FileOperationRequest;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
@@ -32,9 +28,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import java.util.HashMap;
 import java.util.List;
-import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping(value = "/api/automation")
@@ -251,6 +245,11 @@ public class ApiAutomationController {
     public List<JmxInfoDTO> batchGenPerformanceTestJmx(@RequestBody ApiScenarioBatchRequest request) {
         return apiAutomationService.batchGenPerformanceTestJmx(request);
     }
+    @PostMapping("/batchCopy")
+    public void batchCopy(@RequestBody ApiScenarioBatchRequest request) {
+        apiAutomationService.batchCopy(request);
+    }
+
 
     @PostMapping("/file/download")
     public ResponseEntity<byte[]> download(@RequestBody FileOperationRequest fileOperationRequest) {

backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java

@@ -315,6 +315,20 @@ public class ApiAutomationService {
         }
     }
 
+    private boolean isCustomNumExist(ApiScenarioWithBLOBs blobs) {
+        ApiScenarioExample example = new ApiScenarioExample();
+        example.createCriteria()
+                .andCustomNumEqualTo(blobs.getCustomNum())
+                .andProjectIdEqualTo(blobs.getProjectId())
+                .andIdNotEqualTo(blobs.getId());
+        List<ApiScenario> list = apiScenarioMapper.selectByExample(example);
+        if (CollectionUtils.isNotEmpty(list)) {
+            return true;
+        }else {
+            return false;
+        }
+    }
+
     private int getNextNum(String projectId) {
         ApiScenario apiScenario = extApiScenarioMapper.getNextNum(projectId);
         if (apiScenario == null) {
@@ -2149,4 +2163,51 @@ public class ApiAutomationService {
             return returnList;
         }
     }
+
+    public void batchCopy(ApiScenarioBatchRequest batchRequest) {
+
+        ServiceUtils.getSelectAllIds(batchRequest, batchRequest.getCondition(),
+                (query) -> extApiScenarioMapper.selectIdsByQuery((ApiScenarioRequest) query));
+        List<ApiScenarioWithBLOBs> apiScenarioList = extApiScenarioMapper.selectIds(batchRequest.getIds());
+        for (ApiScenarioWithBLOBs apiModel:apiScenarioList) {
+            ApiScenarioWithBLOBs newModel = apiModel;
+            newModel.setId(UUID.randomUUID().toString());
+            newModel.setName("copy_"+apiModel.getName());
+            newModel.setCreateTime(System.currentTimeMillis());
+            newModel.setNum(getNextNum(newModel.getProjectId()));
+
+            ApiScenarioExample example = new ApiScenarioExample();
+            example.createCriteria().andNameEqualTo(newModel.getName()).
+                    andProjectIdEqualTo(newModel.getProjectId()).andStatusNotEqualTo("Trash").andIdNotEqualTo(newModel.getId());
+            if (apiScenarioMapper.countByExample(example) > 0) {
+                continue;
+            }else {
+                boolean insertFlag = true;
+                if (StringUtils.isNotBlank(newModel.getCustomNum())) {
+                    insertFlag = false;
+                    String projectId = newModel.getProjectId();
+                    Project project = projectMapper.selectByPrimaryKey(projectId);
+                    if (project != null) {
+                        Boolean customNum = project.getScenarioCustomNum();
+                        // 未开启自定义ID
+                        if (!customNum) {
+                            insertFlag = true;
+                            newModel.setCustomNum(null);
+                        } else {
+                            boolean isCustomNumExist = true;
+                            try {
+                                isCustomNumExist = this.isCustomNumExist(newModel);
+                            }catch (Exception e){}
+                            insertFlag = !isCustomNumExist;
+                        }
+                    }
+                }
+
+                if(insertFlag){
+                    apiScenarioMapper.insert(newModel);
+                }
+            }
+        }
+//        uploadFiles(request, bodyFiles, scenarioFiles);
+    }
 }

backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml

@@ -374,7 +374,6 @@
         from api_scenario
         left join project on api_scenario.project_id = project.id
         <include refid="queryWhereCondition"/>
-        <include refid="io.metersphere.base.mapper.ext.ExtBaseMapper.orders"/>
     </select>
     <select id="listReview" resultMap="BaseResultMap">
         select api_scenario.id, api_scenario.project_id, api_scenario.tags, api_scenario.user_id, api_scenario.num,

backend/src/main/resources/permission.json

@@ -714,6 +714,11 @@
       "name": "批量创建性能测试",
       "resourceId": "PROJECT_API_SCENARIO"
     },
+    {
+      "id": "PROJECT_API_SCENARIO:READ+BATCH_COPY",
+      "name": "批量复制",
+      "resourceId": "PROJECT_API_SCENARIO"
+    },
     {
       "id": "PROJECT_API_REPORT:READ",
       "name": "查询报告",

frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue

@@ -14,11 +14,12 @@
         :batch-operators="buttons"
         :total="total"
         :fields.sync="fields"
-        field-key="API_SCENARIO"
+        :field-key=tableHeaderKey
         operator-width="200"
         @refresh="search(projectId)"
         @callBackSelectAll="callBackSelectAll"
         @callBackSelect="callBackSelect"
+        @saveSortField="saveSortField"
         ref="scenarioTable">
 
         <span v-for="(item) in fields" :key="item.key">
@@ -119,6 +120,17 @@
               <span>{{ scope.row.updateTime | timestampFormatDate }}</span>
             </template>
           </ms-table-column >
+          <ms-table-column prop="createTime"
+                           :field="item"
+                           :fields-width="fieldsWidth"
+                           :label="$t('commons.create_time')"
+                           sortable
+                           min-width="180px">
+            <template v-slot:default="scope">
+              <span>{{ scope.row.createTime | timestampFormatDate }}</span>
+            </template>
+          </ms-table-column >
+
           <ms-table-column prop="stepTotal"
                            :field="item"
                            :fields-width="fieldsWidth"
@@ -202,7 +214,7 @@ import MsRunMode from "./common/RunMode";
 import MsTaskCenter from "../../../task/TaskCenter";
 
 import {
-  getCustomTableHeader, getCustomTableWidth,
+  getCustomTableHeader, getCustomTableWidth,getLastTableSortField,saveLastTableSortField
 } from "@/common/js/tableUtils";
 import HeaderCustom from "@/business/components/common/head/HeaderCustom";
 import HeaderLabelOperate from "@/business/components/common/head/HeaderLabelOperate";
@@ -275,6 +287,7 @@ export default {
   data() {
     return {
       result: {},
+      tableHeaderKey:"API_SCENARIO",
       type: API_SCENARIO_LIST,
       fields: getCustomTableHeader('API_SCENARIO'),
       fieldsWidth: getCustomTableWidth('API_SCENARIO'),
@@ -376,6 +389,11 @@ export default {
           handleClick: this.batchCreatePerformance,
           permissions: ['PROJECT_API_SCENARIO:READ+CREATE_PERFORMANCE_BATCH']
         },
+        {
+          name: this.$t('api_test.batch_copy'),
+          handleClick: this.batchCopy,
+          permissions: ['PROJECT_API_SCENARIO:READ+BATCH_COPY']
+        },
         {
           name: this.$t('test_track.case.batch_move_case'),
           handleClick: this.handleBatchMove,
@@ -421,8 +439,13 @@ export default {
     this.operators = this.unTrashOperators;
     this.buttons = this.unTrashButtons;
     this.condition.filters = {status: ["Prepare", "Underway", "Completed"]};
+    let orderArr = this.getSortField();
+    if(orderArr){
+      this.condition.orders = orderArr;
+    }
     this.search();
     this.getPrincipalOptions([]);
+
   },
   watch: {
     selectNodeIds() {
@@ -864,6 +887,37 @@ export default {
         }
       });
     },
+    batchCopy(){
+      this.$alert(this.$t('api_test.definition.request.batch_copy_confirm') + " ？", '', {
+        confirmButtonText: this.$t('commons.confirm'),
+        callback: (action) => {
+          if (action === 'confirm') {
+            this.infoDb = false;
+            let param = {};
+            this.buildBatchParam(param);
+            this.$post('/api/automation/batchCopy', param, response => {
+              this.$success(this.$t('api_test.definition.request.batch_copy_end'));
+              this.search();
+            });
+          }
+        }
+      });
+    },
+    saveSortField(key,orders){
+      saveLastTableSortField(key,JSON.stringify(orders));
+    },
+    getSortField(){
+      let orderJsonStr = getLastTableSortField(this.tableHeaderKey);
+      let returnObj = null;
+      if(orderJsonStr){
+        try {
+          returnObj = JSON.parse(orderJsonStr);
+        }catch (e){
+          return null;
+        }
+      }
+      return returnObj;
+    }
   }
 };
 </script>

frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue

@@ -14,7 +14,8 @@
                 :batch-operators="buttons"
                 :screenHeight="screenHeight"
                 :fields.sync="fields"
-                field-key="API_CASE"
+                :field-key="tableHeaderKey"
+                @saveSortField="saveSortField"
                 operator-width="170px"
                 @refresh="initTable"
                 ref="caseTable"
@@ -96,6 +97,16 @@
               <span>{{ scope.row.updateTime | timestampFormatDate }}</span>
             </template>
           </ms-table-column>
+          <ms-table-column prop="createTime"
+                           :field="item"
+                           :fields-width="fieldsWidth"
+                           :label="$t('commons.create_time')"
+                           sortable
+                           min-width="180px">
+            <template v-slot:default="scope">
+              <span>{{ scope.row.createTime | timestampFormatDate }}</span>
+            </template>
+          </ms-table-column >
         </span>
 
         <template v-slot:opt-behind="scope">
@@ -155,7 +166,7 @@ import {
   _filter,
   _sort,
   getCustomTableHeader,
-  getCustomTableWidth,
+  getCustomTableWidth,saveLastTableSortField,getLastTableSortField
 } from "@/common/js/tableUtils";
 import {API_CASE_LIST} from "@/common/js/constants";
 import HeaderLabelOperate from "@/business/components/common/head/HeaderLabelOperate";
@@ -186,6 +197,7 @@ export default {
   data() {
     return {
       type: API_CASE_LIST,
+      tableHeaderKey:"API_CASE",
       fields: getCustomTableHeader('API_CASE'),
       fieldsWidth: getCustomTableWidth('API_CASE'),
       condition: {
@@ -280,6 +292,10 @@ export default {
     planId: String
   },
   created: function () {
+    let orderArr = this.getSortField();
+    if(orderArr){
+      this.condition.orders = orderArr;
+    }
     this.initTable();
     // this.$nextTick(() => {
     //   this.$refs.caseTable.bodyWrapper.scrollTop = 5
@@ -577,6 +593,21 @@ export default {
       column.width = finalWidth;
       column.realWidth = finalWidth;
     },
+    saveSortField(key,orders){
+      saveLastTableSortField(key,JSON.stringify(orders));
+    },
+    getSortField(){
+      let orderJsonStr = getLastTableSortField(this.tableHeaderKey);
+      let returnObj = null;
+      if(orderJsonStr){
+        try {
+          returnObj = JSON.parse(orderJsonStr);
+        }catch (e){
+          return null;
+        }
+      }
+      return returnObj;
+    },
     createPerformance(row, environment) {
       /**
        * 思路：调用后台创建性能测试的方法，把当前案例的hashTree在后台转化为jmx并文件创建性能测试。

frontend/src/business/components/api/definition/components/list/ApiList.vue

@@ -15,7 +15,8 @@
                 @refresh="initTable"
                 :fields.sync="fields"
                 :table-is-loading="this.result.loading"
-                field-key="API_DEFINITION"
+                :field-key="tableHeaderKey"
+                @saveSortField="saveSortField"
                 ref="table">
 
         <span v-for="(item) in fields" :key="item.key">
@@ -114,6 +115,16 @@
             <span>{{ scope.row.updateTime | timestampFormatDate }}</span>
           </template>
         </ms-table-column>
+        <ms-table-column prop="createTime"
+                         :field="item"
+                         :fields-width="fieldsWidth"
+                         :label="$t('commons.create_time')"
+                         sortable
+                         min-width="180px">
+          <template v-slot:default="scope">
+            <span>{{ scope.row.createTime | timestampFormatDate }}</span>
+          </template>
+        </ms-table-column >
 
         <ms-table-column
           prop="caseTotal"
@@ -177,7 +188,8 @@ import MsTipButton from "@/business/components/common/components/MsTipButton";
 import CaseBatchMove from "@/business/components/api/definition/components/basis/BatchMove";
 import {
   initCondition,
-  getCustomTableHeader, getCustomTableWidth, buildBatchParam, checkTableRowIsSelected
+  getCustomTableHeader, getCustomTableWidth, buildBatchParam, checkTableRowIsSelected,
+  saveLastTableSortField,getLastTableSortField
 } from "@/common/js/tableUtils";
 import HeaderLabelOperate from "@/business/components/common/head/HeaderLabelOperate";
 import {Body} from "@/business/components/api/definition/model/ApiTestModel";
@@ -209,6 +221,7 @@ export default {
   data() {
     return {
       type: API_LIST,
+      tableHeaderKey:"API_DEFINITION",
       fields: getCustomTableHeader('API_DEFINITION'),
       fieldsWidth: getCustomTableWidth('API_DEFINITION'),
       condition: {
@@ -406,6 +419,10 @@ export default {
       this.tableOperatorButtons = this.tableUsualOperatorButtons;
       this.condition.filters = {status: ["Prepare", "Underway", "Completed"]};
     }
+    let orderArr = this.getSortField();
+    if(orderArr){
+      this.condition.orders = orderArr;
+    }
     this.initTable();
     this.getMaintainerOptions();
   },
@@ -794,6 +811,21 @@ export default {
         this.$emit('updateInitApiTableOpretion','0');
         return false;
       }
+    },
+    saveSortField(key,orders){
+      saveLastTableSortField(key,JSON.stringify(orders));
+    },
+    getSortField(){
+      let orderJsonStr = getLastTableSortField(this.tableHeaderKey);
+      let returnObj = null;
+      if(orderJsonStr){
+        try {
+          returnObj = JSON.parse(orderJsonStr);
+        }catch (e){
+          return null;
+        }
+      }
+      return returnObj;
     }
   },
 };

frontend/src/business/components/common/components/table/MsTable.vue

@@ -249,6 +249,7 @@ export default {
         this.condition.orders = [];
       }
       _sort(column, this.condition);
+      this.$emit("saveSortField", this.fieldKey,this.condition.orders);
       this.handleRefresh();
     },
     handleBatchEdit() {

frontend/src/business/components/performance/report/PerformanceTestReportList.vue

@@ -136,7 +136,7 @@ import ReportTriggerModeItem from "../../common/tableItem/ReportTriggerModeItem"
 import {REPORT_CONFIGS} from "../../common/components/search/search-components";
 import MsTableHeader from "../../common/components/MsTableHeader";
 import ShowMoreBtn from "../../track/case/components/ShowMoreBtn";
-import {_filter, _sort} from "@/common/js/tableUtils";
+import {_filter, _sort,saveLastTableSortField,getLastTableSortField} from "@/common/js/tableUtils";
 import MsDialogFooter from "@/business/components/common/components/MsDialogFooter";
 import SameTestReports from "@/business/components/performance/report/components/SameTestReports";
 
@@ -160,6 +160,7 @@ export default {
   },
   data() {
     return {
+      tableHeaderKey:"PERFORMANCE_REPORT_TABLE",
       result: {},
       deletePath: "/performance/report/delete/",
       condition: {
@@ -250,6 +251,10 @@ export default {
       } else {
         this.condition.testId = null;
       }
+      let orderArr = this.getSortField();
+      if(orderArr){
+        this.condition.orders = orderArr;
+      }
       if (!getCurrentProjectID()) {
         return;
       }
@@ -324,7 +329,12 @@ export default {
       });
     },
     sort(column) {
+      // 每次只对一个字段排序
+      if (this.condition.orders) {
+        this.condition.orders = [];
+      }
       _sort(column, this.condition);
+      this.saveSortField(this.tableHeaderKey,this.condition.orders);
       this.initTableData();
     },
     filter(filters) {
@@ -340,6 +350,21 @@ export default {
         this.selectRows.add(row);
       }
     },
+    saveSortField(key,orders){
+      saveLastTableSortField(key,JSON.stringify(orders));
+    },
+    getSortField(){
+      let orderJsonStr = getLastTableSortField(this.tableHeaderKey);
+      let returnObj = null;
+      if(orderJsonStr){
+        try {
+          returnObj = JSON.parse(orderJsonStr);
+        }catch (e){
+          return null;
+        }
+      }
+      return returnObj;
+    },
     handleSelectAll(selection) {
       if (selection.length > 0) {
         this.tableData.forEach(item => {

frontend/src/business/components/performance/test/PerformanceTestList.vue

@@ -101,7 +101,7 @@ import MsTableOperators from "../../common/components/MsTableOperators";
 import {getCurrentProjectID, getCurrentWorkspaceId} from "@/common/js/utils";
 import MsTableHeader from "../../common/components/MsTableHeader";
 import {TEST_CONFIGS} from "../../common/components/search/search-components";
-import {_filter, _sort} from "@/common/js/tableUtils";
+import {_filter, _sort,saveLastTableSortField,getLastTableSortField} from "@/common/js/tableUtils";
 
 export default {
   components: {
@@ -115,6 +115,7 @@ export default {
   },
   data() {
     return {
+      tableHeaderKey:"PERFORMANCE_TEST_TABLE",
       result: {},
       deletePath: "/performance/delete",
       condition: {
@@ -179,6 +180,10 @@ export default {
       });
     },
     initTableData() {
+      let orderArr = this.getSortField();
+      if(orderArr){
+        this.condition.orders = orderArr;
+      }
       this.condition.projectId = getCurrentProjectID();
       this.condition.workspaceId = getCurrentWorkspaceId();
       this.result = this.$post(this.buildPagePath('/performance/list'), this.condition, response => {
@@ -234,7 +239,12 @@ export default {
       });
     },
     sort(column) {
+      // 每次只对一个字段排序
+      if (this.condition.orders) {
+        this.condition.orders = [];
+      }
       _sort(column, this.condition);
+      this.saveSortField(this.tableHeaderKey,this.condition.orders);
       this.initTableData();
     },
     filter(filters) {
@@ -257,6 +267,21 @@ export default {
         return;
       }
       this.$router.push('/performance/test/create');
+    },
+    saveSortField(key,orders){
+      saveLastTableSortField(key,JSON.stringify(orders));
+    },
+    getSortField(){
+      let orderJsonStr = getLastTableSortField(this.tableHeaderKey);
+      let returnObj = null;
+      if(orderJsonStr){
+        try {
+          returnObj = JSON.parse(orderJsonStr);
+        }catch (e){
+          return null;
+        }
+      }
+      return returnObj;
     }
   }
 };

frontend/src/business/components/settings/workspace/template/CustomFiledComponent.vue

@@ -74,7 +74,7 @@
        <el-option
          v-for="(item) in memberOptions"
          :key="item.id"
-         :label="item.id + ' (' + item.name + ')'"
+         :label="item.name + ' (' + item.id + ')'"
          :value="item.id">
        </el-option>
     </el-select>

frontend/src/business/components/track/case/components/TestCaseList.vue

@@ -17,8 +17,9 @@
       @handlePageChange="initTableData"
       @handleRowClick="handleEdit"
       :fields.sync="fields"
-      field-key="TRACK_TEST_CASE"
+      :field-key="tableHeaderKey"
       @refresh="initTableData"
+      @saveSortField="saveSortField"
       :custom-fields="testCaseTemplate.customFields"
       ref="table">
 
@@ -102,6 +103,16 @@
             <span>{{ scope.row.updateTime | timestampFormatDate }}</span>
           </template>
         </ms-table-column>
+        <ms-table-column prop="createTime"
+                         :field="item"
+                         :fields-width="fieldsWidth"
+                         :label="$t('commons.create_time')"
+                         sortable
+                         min-width="150px">
+          <template v-slot:default="scope">
+            <span>{{ scope.row.createTime | timestampFormatDate }}</span>
+          </template>
+        </ms-table-column >
 
         <ms-table-column v-for="field in testCaseTemplate.customFields" :key="field.id"
                          :filters="field.name === '用例等级' ? priorityFilters : null"
@@ -163,10 +174,10 @@ import {
   deepClone,
   getCustomFieldBatchEditOption,
   getCustomFieldValue,
-  getCustomTableWidth,
+  getCustomTableWidth, getLastTableSortField,
   getPageInfo,
   getTableHeaderWithCustomFields,
-  initCondition,
+  initCondition, saveLastTableSortField,
 } from "@/common/js/tableUtils";
 import HeaderLabelOperate from "@/business/components/common/head/HeaderLabelOperate";
 import PlanStatusTableItem from "@/business/components/track/common/tableItems/plan/PlanStatusTableItem";
@@ -207,6 +218,7 @@ export default {
   data() {
     return {
       type: TEST_CASE_LIST,
+      tableHeaderKey:"TRACK_TEST_CASE",
       screenHeight: 'calc(100vh - 310px)',
       tableLabel: [],
       deletePath: "/test/case/delete",
@@ -307,6 +319,10 @@ export default {
   created: function () {
     this.$emit('setCondition', this.condition);
     this.condition.filters = {reviewStatus: ["Prepare", "Pass", "UnPass"]};
+    let orderArr = this.getSortField();
+    if(orderArr){
+      this.condition.orders = orderArr;
+    }
     this.initTableData();
     let redirectParam = this.$route.query.dataSelectRange;
     this.checkRedirectEditPage(redirectParam);
@@ -599,6 +615,21 @@ export default {
         this.$refs.testBatchMove.close();
         this.refresh();
       });
+    },
+    saveSortField(key,orders){
+      saveLastTableSortField(key,JSON.stringify(orders));
+    },
+    getSortField(){
+      let orderJsonStr = getLastTableSortField(this.tableHeaderKey);
+      let returnObj = null;
+      if(orderJsonStr){
+        try {
+          returnObj = JSON.parse(orderJsonStr);
+        }catch (e){
+          return null;
+        }
+      }
+      return returnObj;
     }
   }
 };

frontend/src/business/components/track/issue/IssueList.vue

@@ -20,7 +20,8 @@
           :screen-height="screenHeight"
           @handlePageChange="getIssues"
           :fields.sync="fields"
-          field-key="ISSUE_LIST"
+          :field-key="tableHeaderKey"
+          @saveSortField="saveSortField"
           @refresh="getIssues"
           :custom-fields="issueTemplate.customFields"
           ref="table"
@@ -77,6 +78,17 @@
             </span>
             </template>
           </ms-table-column>
+        <ms-table-column prop="createTime"
+                       :field="item"
+                       :fields-width="fieldsWidth"
+                       :label="$t('commons.create_time')"
+                       sortable
+                       min-width="180px">
+            <template v-slot:default="scope">
+              <span>{{ scope.row.createTime | timestampFormatDate }}</span>
+            </template>
+          </ms-table-column >
+
 
           <issue-description-table-item :fields-width="fieldsWidth" :field="item"/>
 
@@ -128,7 +140,7 @@ import {getIssues} from "@/network/Issue";
 import {
   getCustomFieldValue,
   getCustomTableWidth,
-  getPageInfo, getTableHeaderWithCustomFields,
+  getPageInfo, getTableHeaderWithCustomFields,saveLastTableSortField,getLastTableSortField
 } from "@/common/js/tableUtils";
 import MsContainer from "@/business/components/common/components/MsContainer";
 import MsMainContainer from "@/business/components/common/components/MsMainContainer";
@@ -150,6 +162,7 @@ export default {
     return {
       page: getPageInfo(),
       fields: [],
+      tableHeaderKey:"ISSUE_LIST",
       fieldsWidth: getCustomTableWidth('ISSUE_LIST'),
       screenHeight: 'calc(100vh - 290px)',
       operators: [
@@ -211,6 +224,10 @@ export default {
     },
     getIssues() {
       this.page.condition.projectId = this.projectId;
+      let orderArr = this.getSortField();
+      if(orderArr){
+        this.page.condition.orders = orderArr;
+      }
       this.page.result = getIssues(this.page);
     },
     handleEdit(data) {
@@ -237,6 +254,21 @@ export default {
         return false;
       }
       return true;
+    },
+    saveSortField(key,orders){
+      saveLastTableSortField(key,JSON.stringify(orders));
+    },
+    getSortField(){
+      let orderJsonStr = getLastTableSortField(this.tableHeaderKey);
+      let returnObj = null;
+      if(orderJsonStr){
+        try {
+          returnObj = JSON.parse(orderJsonStr);
+        }catch (e){
+          return null;
+        }
+      }
+      return returnObj;
     }
   }
 };

frontend/src/business/components/track/plan/components/TestPlanList.vue

@@ -239,7 +239,14 @@ import TestReportTemplateList from "../view/comonents/TestReportTemplateList";
 import TestCaseReportView from "../view/comonents/report/TestCaseReportView";
 import MsDeleteConfirm from "../../../common/components/MsDeleteConfirm";
 import {TEST_PLAN_CONFIGS} from "../../../common/components/search/search-components";
-import {_filter, _sort, deepClone, getLabel} from "@/common/js/tableUtils";
+import {
+  _filter,
+  _sort,
+  deepClone,
+  getLabel,
+  getLastTableSortField,
+  saveLastTableSortField
+} from "@/common/js/tableUtils";
 import {TEST_PLAN_LIST} from "@/common/js/constants";
 import {Test_Plan_List} from "@/business/components/common/model/JsonData";
 import HeaderCustom from "@/business/components/common/head/HeaderCustom";
@@ -267,6 +274,7 @@ export default {
       createUser: "",
       type: TEST_PLAN_LIST,
       headerItems: Test_Plan_List,
+      tableHeaderKey:"TEST_PLAN_LIST",
       tableLabel: [],
       result: {},
       cardResult: {},
@@ -308,6 +316,10 @@ export default {
       this.projectId = getCurrentProjectID();
     }
     this.hasEditPermission = hasPermission('PROJECT_TRACK_PLAN:READ+EDIT');
+    let orderArr = this.getSortField();
+    if(orderArr){
+      this.condition.orders = orderArr;
+    }
     this.initTableData();
   },
   methods: {
@@ -412,7 +424,12 @@ export default {
       this.initTableData();
     },
     sort(column) {
+      // 每次只对一个字段排序
+      if (this.condition.orders) {
+        this.condition.orders = [];
+      }
       _sort(column, this.condition);
+      this.saveSortField(this.tableHeaderKey,this.condition.orders);
       this.initTableData();
     },
     openTestReportTemplate(data) {
@@ -427,6 +444,21 @@ export default {
       row.redirectFrom = "testPlan";
       this.$refs.scheduleMaintain.open(row);
     },
+    saveSortField(key,orders){
+      saveLastTableSortField(key,JSON.stringify(orders));
+    },
+    getSortField(){
+      let orderJsonStr = getLastTableSortField(this.tableHeaderKey);
+      let returnObj = null;
+      if(orderJsonStr){
+        try {
+          returnObj = JSON.parse(orderJsonStr);
+        }catch (e){
+          return null;
+        }
+      }
+      return returnObj;
+    }
   }
 };
 </script>

frontend/src/business/components/track/report/components/TestPlanReportList.vue

@@ -89,7 +89,7 @@ import {
   _sort, checkTableRowIsSelect,
   getSelectDataCounts,
   initCondition,
-  setUnSelectIds, toggleAllSelection,
+  setUnSelectIds, toggleAllSelection,saveLastTableSortField,getLastTableSortField
 } from "@/common/js/tableUtils";
 import MsTableHeaderSelectPopover from "@/business/components/common/components/table/MsTableHeaderSelectPopover";
 import {getCurrentProjectID} from "@/common/js/utils";
@@ -107,6 +107,7 @@ export default {
     return {
       result: {},
       enableDeleteTip: false,
+      tableHeaderKey:"TRACK_REPORT_TABLE",
       queryPath: "/test/plan/report/list",
       condition: {
         components: TEST_PLAN_REPORT_CONFIGS
@@ -147,11 +148,16 @@ export default {
       this.projectId = getCurrentProjectID();
     }
     this.isTestManagerOrTestUser = true;
+
     this.initTableData();
   },
   methods: {
     initTableData() {
       initCondition(this.condition, this.condition.selectAll);
+      let orderArr = this.getSortField();
+      if(orderArr){
+        this.condition.orders = orderArr;
+      }
       this.selectRows = new Set();
       if (this.planId) {
         this.condition.planId = this.planId;
@@ -232,7 +238,12 @@ export default {
       this.initTableData();
     },
     sort(column) {
+      // 每次只对一个字段排序
+      if (this.condition.orders) {
+        this.condition.orders = [];
+      }
       _sort(column, this.condition);
+      this.saveSortField(this.tableHeaderKey,this.condition.orders);
       this.initTableData();
     },
     openReport(planId) {
@@ -251,6 +262,21 @@ export default {
       //更新统计信息
       this.selectDataCounts = getSelectDataCounts(this.condition, this.total, this.selectRows);
     },
+    saveSortField(key,orders){
+      saveLastTableSortField(key,JSON.stringify(orders));
+    },
+    getSortField(){
+      let orderJsonStr = getLastTableSortField(this.tableHeaderKey);
+      let returnObj = null;
+      if(orderJsonStr){
+        try {
+          returnObj = JSON.parse(orderJsonStr);
+        }catch (e){
+          return null;
+        }
+      }
+      return returnObj;
+    }
   }
 }
 </script>

frontend/src/business/components/track/review/commom/ReviewComment.vue

@@ -1,8 +1,7 @@
 <template>
   <div v-loading="result.loading">
     <div class="comment-list">
-      <review-comment-item v-for="(comment,index) in comments"
+      <review-comment-item v-for="(comment) in comments" v-bind:key="comment.id"
-                           :key="index"
                            :comment="comment"
                            @refresh="refresh"
                            :review-status="reviewStatus"/>
@@ -15,20 +14,10 @@
       </div>
     </div>
     <div>
-      <el-input
+      <div>
-        v-permission="['PROJECT_TRACK_REVIEW:READ+COMMENT']"
+        <mavon-editor v-if="showEditor" @imgAdd="imgAdd" :default-open="'edit'" class="mavon-editor" :imageFilter="imageFilter"
-        ref="test"
+                      :toolbars="richDataToolbars"  @imgDel="imgDel" v-model="textarea"  ref="md"/>
-        type="textarea"
+      </div>
-        :placeholder="$t('test_track.comment.send_comment')"
-        v-model.trim="textarea"
-        maxlength="180"
-        show-word-limt
-        resize="none"
-        :autosize="{ minRows: 4, maxRows: 4}"
-        @keyup.ctrl.enter.native="sendComment"
-        :disabled="isReadOnly"
-      >
-      </el-input>
       <el-button type="primary" size="mini" class="send-btn"
                  v-permission="['PROJECT_TRACK_REVIEW:READ+COMMENT']"
                  @click="sendComment" :disabled="isReadOnly">
@@ -40,10 +29,12 @@
 
 <script>
 import ReviewCommentItem from "./ReviewCommentItem";
+import FormRichTextItem from "@/business/components/track/case/components/FormRichTextItem";
+import {getUUID} from "@/common/js/utils";
 
 export default {
   name: "ReviewComment",
-  components: {ReviewCommentItem},
+  components: {ReviewCommentItem,FormRichTextItem},
   props: {
     caseId: String,
     comments: Array,
@@ -54,12 +45,54 @@ export default {
     return {
       result: {},
       textarea: '',
-      isReadOnly: false
+      loadCommenItem:true,
+      labelWidth: '120px',
+      showEditor:true,
+      isReadOnly: false,
+      richDataToolbars: {
+        bold: false, // 粗体
+        italic: false, // 斜体
+        header: false, // 标题
+        underline: false, // 下划线
+        strikethrough: false, // 中划线
+        mark: false, // 标记
+        superscript: false, // 上角标
+        subscript: false, // 下角标
+        quote: false, // 引用
+        ol: false, // 有序列表
+        ul: false, // 无序列表
+        link: false, // 链接
+        imagelink: true, // 图片链接
+        code: false, // code
+        table: false, // 表格
+        fullscreen: false, // 全屏编辑
+        readmodel: false, // 沉浸式阅读
+        htmlcode: false, // 展示html源码
+        help: true, // 帮助
+        /* 1.3.5 */
+        undo: false, // 上一步
+        redo: false, // 下一步
+        trash: false, // 清空
+        save: false, // 保存（触发events中的save事件）
+        /* 1.4.2 */
+        navigation: false, // 导航目录
+        /* 2.1.8 */
+        alignleft: false, // 左对齐
+        aligncenter: false, // 居中
+        alignright: false, // 右对齐
+        /* 2.2.1 */
+        subfield: false, // 单双栏模式
+        preview: false, // 预览
+      }
     };
   },
   created() {
     this.isReadOnly = false;
   },
+  watch:{
+    comments(){
+    }
+  },
   methods: {
     sendComment() {
       let comment = {};
@@ -74,7 +107,7 @@ export default {
       this.result = this.$post('/test/case/comment/save', comment, () => {
         this.$success(this.$t('test_track.comment.send_success'));
         this.refresh();
-        this.textarea = '';
+        this.$refs.md.toolbar_left_click('trash');
       });
     },
     inputLight() {
@@ -83,6 +116,42 @@ export default {
     refresh() {
       this.$emit('getComments');
     },
+    //富文本框
+    imgAdd(pos, file){
+      let param = {
+        id: getUUID().substring(0, 8)
+      };
+
+      file.prefix = param.id;
+      this.result = this.$fileUpload('/resource/md/upload', file, null, param, () => {
+        this.$success(this.$t('commons.save_success'));
+        this.$refs.md.$img2Url(pos, '/resource/md/get/'  + param.id+"_"+file.name);
+        this.sendComment();
+      });
+      this.$emit('imgAdd', file);
+    },
+    imageFilter(file){
+      let isImg = false;
+      if(file){
+        if(file.name){
+          if (file.name.indexOf("[")> 0 || file.name.indexOf("]") > 0||file.name.indexOf("([)")> 0 || file.name.indexOf(")") > 0){
+            this.$error("图片名称不能含有特殊字符");
+            isImg = false;
+          }else {
+            isImg = true;
+          }
+        }
+      }
+      return isImg;
+    },
+    imgDel(file) {
+      if (file && !this.clearImg) {
+        this.$get('/resource/md/delete/' + file[1].prefix + "_" + file[1].name);
+      }
+    },
+    alertComment(){
+      alert(JSON.stringify(this.comments))
+    }
   }
 };
 </script>
@@ -95,6 +164,6 @@ export default {
 
 .comment-list {
   overflow-y: scroll;
-  height: calc(100vh - 250px);
+  height: calc(100vh - 450px);
 }
 </style>

frontend/src/business/components/track/review/commom/ReviewCommentItem.vue

@@ -19,13 +19,26 @@
          </el-button>
       </span>
       <span class="comment-delete">
-        <el-link icon="el-icon-edit" style="font-size: 9px;margin-right: 6px;" @click="openEdit" :disabled="readOnly"/>
+        <el-link icon="el-icon-edit" v-if="!isImage" style="font-size: 9px;margin-right: 6px;" @click="openEdit" :disabled="readOnly"/>
         <el-link icon="el-icon-close" @click="deleteComment" :disabled="readOnly"/>
       </span>
       <br/>
-      <div class="comment-desc" style="font-size: 10px;color: #303133">
+<!--      <div  class="comment-desc" style="font-size: 10px;color: #303133">-->
+<!--        <pre>{{ comment.description }}</pre>-->
+<!--      </div>-->
+      <div  v-if="!isImage" class="comment-desc" style="font-size: 10px;color: #303133">
         <pre>{{ comment.description }}</pre>
       </div>
+      <div v-if="isImage" class="demo-image__preview">
+        <pre>{{ imgDescription }}</pre>
+        <el-image
+            :z-index="imageIndex"
+            style="width: 100px; height: 100px;"
+            fit="contain"
+            :src="src"
+            :preview-src-list="srcList">
+        </el-image>
+      </div>
     </div>
 
     <el-dialog
@@ -68,7 +81,18 @@ export default {
   data() {
     return {
       visible: false,
-      description: ""
+      imgDescription: "",
+      imageIndex:99999,
+      src:"",
+      srcList:[],
+      imgNameList:[],
+      description: "",
+      imageMatchPattern:"(\\!\\[)\\S+]\\(\\S+\\)",
+    }
+  },
+  computed:{
+    isImage(){
+      return this.checkImage(this.comment.description);
     }
   },
   methods: {
@@ -77,10 +101,15 @@ export default {
         this.$warning(this.$t('test_track.comment.cannot_delete'));
         return;
       }
-      this.$parent.result = this.$get("/test/case/comment/delete/" + this.comment.id, () => {
+      this.$get("/test/case/comment/delete/" + this.comment.id, () => {
         this.$success(this.$t('commons.delete_success'));
         this.$emit("refresh");
       });
+      if(this.imgNameList.length > 0){
+        this.imgNameList.forEach(imgName => {
+          this.$get('/resource/md/delete/' + imgName);
+        });
+      }
     },
     openEdit() {
       if (getCurrentUser().id !== this.comment.author) {
@@ -96,7 +125,50 @@ export default {
         this.$success(this.$t('commons.modify_success'));
         this.$emit("refresh");
       });
-    }
+    },
+    checkImage(){
+      let param = this.comment.description;
+      let returnFlag = false;
+      if(param){
+        let message = param+"";
+        let messageSplitArr = message.split("](/resource/md/get/");
+        let matchIndex = message.indexOf("](/resource/md/get/");
+        if(matchIndex > 0){
+          for(let itemIndex = 0;itemIndex < messageSplitArr.length; itemIndex ++){
+            let itemStr = messageSplitArr[itemIndex];
+            let picNameIndex = itemStr.indexOf("![");
+            if( picNameIndex < 0){
+              let endUrlIndex = itemStr.indexOf(")");
+              if( endUrlIndex > 0){
+                let itemStrArr = itemStr.substr(0,endUrlIndex);
+                //if(imgNameList.)
+                if(this.imgNameList.indexOf(itemStrArr) < 0){
+                  this.imgNameList.push(itemStrArr);
+                }
+
+                let imgUrl = "/resource/md/get/"+itemStrArr;
+                this.src = imgUrl;
+
+                if(this.srcList.indexOf(itemStrArr) < 0){
+                  this.srcList.push(imgUrl);
+                }
+              }
+            }else{
+              let inputStr = itemStr.substr(0,picNameIndex);
+              if(this.imgDescription === ""){
+                this.imgDescription = inputStr;
+              }else {
+                this.imgDescription = "\n" + inputStr;
+              }
+            }
+          }
+        }
+        if(this.srcList.length > 0){
+          returnFlag = true;
+        }
+      }
+      return returnFlag;
+    },
   }
 }
 </script>

frontend/src/business/components/track/review/components/TestCaseReviewList.vue

@@ -126,7 +126,7 @@ import MsTableHeader from "../../../common/components/MsTableHeader";
 import MsCreateBox from "../../../settings/CreateBox";
 import MsTablePagination from "../../../common/pagination/TablePagination";
 import {getCurrentProjectID, getCurrentWorkspaceId} from "@/common/js/utils";
-import {_filter, _sort, deepClone, getLabel} from "@/common/js/tableUtils";
+import {_filter, _sort, deepClone, getLabel, getLastTableSortField,saveLastTableSortField} from "@/common/js/tableUtils";
 import PlanStatusTableItem from "../../common/tableItems/plan/PlanStatusTableItem";
 import {Test_Case_Review} from "@/business/components/common/model/JsonData";
 import {TEST_CASE_REVIEW_LIST} from "@/common/js/constants";
@@ -154,6 +154,7 @@ export default {
       type: TEST_CASE_REVIEW_LIST,
       headerItems: Test_Case_Review,
       tableLabel: [],
+      tableHeaderKey:"TEST_CASE_REVIEW",
       result: {},
       condition: {},
       tableData: [],
@@ -178,6 +179,10 @@ export default {
   },
   created() {
     this.isTestManagerOrTestUser = true;
+    let orderArr = this.getSortField();
+    if(orderArr){
+      this.condition.orders = orderArr;
+    }
     this.initTableData();
   },
   computed: {
@@ -256,9 +261,29 @@ export default {
       this.initTableData();
     },
     sort(column) {
+      // 每次只对一个字段排序
+      if (this.condition.orders) {
+        this.condition.orders = [];
+      }
       _sort(column, this.condition);
+      this.saveSortField(this.tableHeaderKey,this.condition.orders);
       this.initTableData();
     },
+    saveSortField(key,orders){
+      saveLastTableSortField(key,JSON.stringify(orders));
+    },
+    getSortField(){
+      let orderJsonStr = getLastTableSortField(this.tableHeaderKey);
+      let returnObj = null;
+      if(orderJsonStr){
+        try {
+          returnObj = JSON.parse(orderJsonStr);
+        }catch (e){
+          return null;
+        }
+      }
+      return returnObj;
+    }
   }
 };
 </script>

frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue

@@ -389,7 +389,11 @@ export default {
         id = this.testCase.caseId;
       }
       this.result = this.$get('/test/case/comment/list/' + id, res => {
-        this.comments = res.data;
+        if(res.data){
+          this.comments = null;
+          this.comments = res.data;
+        }
+
       })
     },
     initData(testCase) {

frontend/src/common/js/default-table-header.js

@@ -44,7 +44,8 @@ export const CUSTOM_TABLE_HEADER = {
     {id: 'caseTotal', key: '8', label: i18n.t('api_test.definition.api_case_number')},
     {id: 'caseStatus', key: '9', label: i18n.t('api_test.definition.api_case_status')},
     {id: 'casePassingRate', key: 'a', label: i18n.t('api_test.definition.api_case_passing_rate')},
-    {id: 'status', key: 'b', label: i18n.t('api_test.definition.api_status')}
+    {id: 'status', key: 'b', label: i18n.t('api_test.definition.api_status')},
+    {id: 'createTime', key: 'c', label: i18n.t('commons.create_time')},
   ],
 //接口用例
   API_CASE: [
@@ -56,6 +57,7 @@ export const CUSTOM_TABLE_HEADER = {
     {id: 'tags', key: '6', label: i18n.t('commons.tag')},
     {id: 'createUser', key: '7', label: "创建人"},
     {id: 'updateTime', key: '8', label: i18n.t('api_test.definition.api_last_time')},
+    {id: 'createTime', key: '9', label: i18n.t('commons.create_time')},
   ],
   //场景测试
   API_SCENARIO: [
@@ -70,6 +72,7 @@ export const CUSTOM_TABLE_HEADER = {
     {id: 'stepTotal', key: '9', label: i18n.t('api_test.automation.step')},
     {id: 'lastResult', key: 'a', label: i18n.t('api_test.automation.last_result')},
     {id: 'passRate', key: 'b', label: i18n.t('api_test.automation.passing_rate')},
+    {id: 'createTime', key: 'c', label: i18n.t('commons.create_time')},
   ],
   //用例评审
   TEST_CASE_REVIEW: [
@@ -171,6 +174,7 @@ export const CUSTOM_TABLE_HEADER = {
     {id: 'nodePath', key: '5', label: i18n.t('test_track.case.module')},
     {id: 'updateTime', key: '6', label: i18n.t('commons.update_time')},
     {id: 'createUser', key: '7', label: i18n.t('commons.create_user')},
+    {id: 'createTime', key: '8', label: i18n.t('commons.create_time')},
   ],
   //缺陷列表
   ISSUE_LIST: [
@@ -181,7 +185,7 @@ export const CUSTOM_TABLE_HEADER = {
     {id: 'creatorName', key: '5', label: i18n.t('custom_field.issue_creator')},
     {id: 'resourceName', key: '6', label: i18n.t('test_track.issue.issue_resource')},
     {id: 'description', key: '7', label: i18n.t('test_track.issue.description')},
-
+    {id: 'createTime', key: '8', label: i18n.t('commons.create_time')},
   ]
 
 }

frontend/src/common/js/tableUtils.js

@@ -353,6 +353,21 @@ export function saveCustomTableHeader(key, fields) {
   }
   localStorage.setItem(key, result);
 }
+/**
+ * 将上一次的表格排序字段存在 localStorage
+ * @param key
+ * @param fields
+ */
+export function saveLastTableSortField(key, field) {
+  let result = field;
+  localStorage.setItem(key+"_SORT", result);
+}
+
+export function getLastTableSortField(key) {
+  let fieldStr = localStorage.getItem(key+"_SORT");
+  return fieldStr;
+}
+
 
 /**
  * 获取对应表格的列宽

frontend/src/i18n/en-US.js

@@ -685,6 +685,7 @@ export default {
     value: "Value",
     create_performance_test: "Create Performance Test",
     create_performance_test_batch: "Batch Create Performance Test",
+    batch_copy: "Batch Copy",
     export_config: "Export",
     enable_validate_tip: "No request available",
     copy: "Copy Test",
@@ -777,6 +778,8 @@ export default {
         batch_delete: "Batch deletion",
         delete_confirm: "Confirm deletion",
         batch_to_performance_confirm: "Confirm Batch Create Performance Test",
+        batch_copy_confirm:"Confirm batch copy",
+        batch_copy_end:"Batch Copy Over",
         delete_case_confirm: "Confirm case deletion",
         delete_confirm_step: "Confirm deletion step",
         assertions_rule: "Assertion rule",

frontend/src/i18n/zh-CN.js

@@ -684,6 +684,7 @@ export default {
     value: "值",
     create_performance_test: "创建性能测试",
     create_performance_test_batch: "批量创建性能测试",
+    batch_copy: "批量复制",
     export_config: "导出",
     enable_validate_tip: "没有可用请求",
     copy: "复制测试",
@@ -777,6 +778,8 @@ export default {
         batch_delete: "批量删除",
         delete_confirm: "确认删除接口",
         batch_to_performance_confirm: "确认批量创建性能测试",
+        batch_copy_confirm:"确定要进行批量复制吗",
+        batch_copy_end:"批量复制完成",
         delete_case_confirm: "确认删除用例",
         delete_confirm_step: "确认删除步骤",
         assertions_rule: "断言规则",

frontend/src/i18n/zh-TW.js

@@ -684,6 +684,7 @@ export default {
     value: "值",
     create_performance_test: "創建性能測試",
     create_performance_test_batch: "批量創建性能測試",
+    batch_copy: "批量複製",
     export_config: "導出",
     enable_validate_tip: "沒有可用請求",
     copy: "復制測試",
@@ -777,6 +778,8 @@ export default {
         batch_delete: "批量刪除",
         delete_confirm: "確認刪除接口",
         batch_to_performance_confirm: "確認批量創建性能測試",
+        batch_copy_confirm:"確認要進行批量複製嗎",
+        batch_copy_end:"批量複製完成",
         delete_case_confirm: "確認刪除用例",
         delete_confirm_step: "確認刪除步驟",
         assertions_rule: "斷言規則",