Merge remote-tracking branch 'origin/dev' into dev

frontend/package.json

@@ -14,13 +14,14 @@
     "@fortawesome/vue-fontawesome": "^0.1.9",
     "axios": "^0.19.0",
     "core-js": "^3.4.3",
+    "echarts": "^4.6.0",
     "element-ui": "^2.13.0",
     "vue": "^2.6.10",
+    "vue-echarts": "^4.1.0",
     "vue-i18n": "^8.15.3",
     "vue-router": "^3.1.3",
-    "vuex": "^3.1.2",
-    "echarts": "^4.6.0",
-    "vue-echarts": "^4.1.0"
+    "vuedraggable": "^2.23.2",
+    "vuex": "^3.1.2"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^4.1.0",
@@ -42,7 +43,7 @@
     ],
     "rules": {
       "vue/no-unused-components": "off",
-      "no-console":"off",
+      "no-console": "off",
       "no-unused-vars": "off"
     },
     "parserOptions": {

frontend/src/business/components/common/components/MsTableOperator.vue

+<template>
+  <span>
+    <ms-table-operator-button icon="el-icon-edit"
+                              @click="editClick" @click.stop="editClickStop"/>
+    <ms-table-operator-button icon="el-icon-delete" type="danger"
+                              @click="deletClick" @click.stop="deleteClickStop"/>
+  </span>
+
+</template>
+
+<script>
+    import MsTableOperatorButton from "./MsTableOperatorButton";
+    export default {
+      name: "MsTableOperator",
+      components: {MsTableOperatorButton},
+      methods: {
+        editClick() {
+          this.$emit('editClick');
+        },
+        editClickStop() {
+          this.$emit('editClickStop');
+        },
+        deletClick() {
+          this.$emit('deleteClick');
+        },
+        deleteClickStop() {
+          this.$emit('deleteClickStop');
+        }
+      }
+    }
+</script>
+
+<style scoped>
+
+</style>

frontend/src/business/components/common/components/MsTableOperatorButton.vue

+<template>
+  <el-button @click="click"
+             @click.stop="clickStop" :type="type"
+             :icon="icon" size="mini" circle/>
+</template>
+
+<script>
+  import MsTableButton from "./MsTableButton";
+  export default {
+    name: "MsTableOperatorButton",
+    components: {MsTableButton},
+    props: {
+      icon: {
+        type: String,
+        default: 'el-icon-question'
+      },
+      type: {
+        type: String,
+        default: 'primary'
+      }
+    },
+    methods: {
+      click() {
+        this.$emit('click');
+      },
+      clickStop() {
+        this.$emit('clickStop');
+      }
+    }
+  }
+</script>
+
+<style scoped>
+</style>

frontend/src/business/components/common/router/router.js

@@ -26,7 +26,7 @@ import PerformanceReportView from "../../performance/report/PerformanceReportVie
 import ApiReportView from "../../api/report/ApiReportView";
 import TrackHome from "../../track/home/TrackHome";
 import TestPlan from "../../track/plan/TestPlan";
-import TestPlanView from "../../track/plan/TestPlanView";
+import TestPlanView from "../../track/plan/view/TestPlanView";
 import TestCase from "../../track/case/TestCase";
 import TestTrack from "../../track/TestTrack";
 

frontend/src/business/components/project/MsProject.vue

@@ -12,8 +12,7 @@
           <el-table-column prop="workspaceName" label="所属工作空间"/>
           <el-table-column>
             <template v-slot:default="scope">
-              <el-button @click="edit(scope.row)" type="primary" icon="el-icon-edit" size="mini" circle/>
-              <el-button @click="del(scope.row)" type="danger" icon="el-icon-delete" size="mini" circle/>
+              <ms-table-operator @editClick="edit(scope.row)" @deleteClick="del(scope.row)"/>
             </template>
           </el-table-column>
         </el-table>
@@ -48,10 +47,11 @@
   import {TokenKey} from "../../../common/js/constants";
   import MsTablePagination from "../common/pagination/TablePagination";
   import MsTableHeader from "../common/components/MsTableHeader";
+  import MsTableOperator from "../common/components/MsTableOperator";
 
   export default {
     name: "MsProject",
-    components: {MsCreateBox, MsTablePagination, MsTableHeader},
+    components: {MsTableOperator, MsCreateBox, MsTablePagination, MsTableHeader},
     data() {
       return {
         createVisible: false,

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

@@ -79,8 +79,7 @@
         <el-table-column
           :label="$t('commons.operating')">
           <template v-slot:default="scope">
-            <el-button @click="handleEdit(scope.row)" type="primary" icon="el-icon-edit" size="mini" circle/>
-            <el-button @click="handleDelete(scope.row)" type="danger" icon="el-icon-delete" size="mini" circle/>
+            <ms-table-operator @editClick="handleEdit(scope.row)" @deleteClick="handleDelete(scope.row)"/>
           </template>
         </el-table-column>
       </el-table>
@@ -103,10 +102,12 @@
   import PriorityTableItem from "../../common/TableItems/PriorityTableItem";
   import TypeTableItem from "../../common/TableItems/TypeTableItem";
   import MethodTableItem from "../../common/TableItems/MethodTableItem";
+  import MsTableOperator from "../../../common/components/MsTableOperator";
 
   export default {
     name: "TestCaseList",
     components: {
+      MsTableOperator,
       MethodTableItem,
       TypeTableItem,
       PriorityTableItem,

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

@@ -63,12 +63,7 @@
           <el-table-column
             :label="$t('commons.operating')">
             <template v-slot:default="scope">
-              <el-button @click="handleEdit(scope.row)"
-                         @click.stop="deleteVisible = true" type="primary"
-                         icon="el-icon-edit" size="mini" circle/>
-              <el-button @click="handleDelete(scope.row)"
-                         @click.stop="deleteVisible = true" type="danger"
-                         icon="el-icon-delete" size="mini" circle/>
+              <ms-table-operator @editClick="handleEdit(scope.row)" @deleteClick="handleDelete(scope.row)"/>
             </template>
           </el-table-column>
         </el-table>
@@ -85,10 +80,13 @@
   import MsCreateBox from '../../../settings/CreateBox';
   import MsTablePagination from '../../../../components/common/pagination/TablePagination';
   import MsTableHeader from "../../../common/components/MsTableHeader";
+  import MsDialogFooter from "../../../common/components/MsDialogFooter";
+  import MsTableOperatorButton from "../../../common/components/MsTableOperatorButton";
+  import MsTableOperator from "../../../common/components/MsTableOperator";
 
   export default {
       name: "TestPlanList",
-      components: {MsTableHeader, MsCreateBox, MsTablePagination},
+      components: {MsTableOperator, MsTableOperatorButton, MsDialogFooter, MsTableHeader, MsCreateBox, MsTablePagination},
       data() {
         return {
           result: {},

frontend/src/business/components/track/plan/TestPlanView.vue → frontend/src/business/components/track/plan/view/TestPlanView.vue

@@ -37,10 +37,10 @@
 
 <script>
 
-    import NodeTree from "../common/NodeTree";
-    import TestPlanTestCaseList from "./components/TestPlanTestCaseList";
-    import TestCaseRelevance from "./components/TestCaseRelevance";
-    import SelectMenu from "../common/SelectMenu";
+    import NodeTree from "../../common/NodeTree";
+    import TestPlanTestCaseList from "./comonents/TestPlanTestCaseList";
+    import TestCaseRelevance from "./comonents/TestCaseRelevance";
+    import SelectMenu from "../../common/SelectMenu";
 
     export default {
       name: "TestPlanView",

frontend/src/business/components/track/plan/components/ExecutorEdit.vue → frontend/src/business/components/track/plan/view/comonents/ExecutorEdit.vue

@@ -20,8 +20,8 @@
 </template>
 
 <script>
-    import {WORKSPACE_ID} from '../../../../../common/js/constants'
-    import MsDialogFooter from '../../../common/components/MsDialogFooter'
+    import {WORKSPACE_ID} from '../../../../../../common/js/constants'
+    import MsDialogFooter from '../../../../common/components/MsDialogFooter'
 
     export default {
       name: "executorEdit",

frontend/src/business/components/track/plan/components/StatusEdit.vue → frontend/src/business/components/track/plan/view/comonents/StatusEdit.vue

@@ -19,8 +19,8 @@
 </template>
 
 <script>
-  import TestPlanTestCaseStatusButton from '../common/TestPlanTestCaseStatusButton';
-  import MsDialogFooter from '../../../common/components/MsDialogFooter'
+  import TestPlanTestCaseStatusButton from '../../common/TestPlanTestCaseStatusButton';
+  import MsDialogFooter from '../../../../common/components/MsDialogFooter'
 
     export default {
       name: "statusEdit",

frontend/src/business/components/track/plan/components/TestCaseRelevance.vue → frontend/src/business/components/track/plan/view/comonents/TestCaseRelevance.vue

@@ -54,8 +54,8 @@
 
 <script>
 
-  import NodeTree from '../../common/NodeTree';
-  import MsDialogFooter from '../../../common/components/MsDialogFooter'
+  import NodeTree from '../../../common/NodeTree';
+  import MsDialogFooter from '../../../../common/components/MsDialogFooter'
 
   export default {
       name: "TestCaseRelevance",

frontend/src/business/components/track/plan/components/TestPlanTestCaseEdit.vue → frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue

@@ -165,7 +165,7 @@
 </template>
 
 <script>
-  import TestPlanTestCaseStatusButton from '../common/TestPlanTestCaseStatusButton';
+  import TestPlanTestCaseStatusButton from '../../common/TestPlanTestCaseStatusButton';
 
   export default {
     name: "TestPlanTestCaseEdit",

frontend/src/business/components/track/plan/components/TestPlanTestCaseList.vue → frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseList.vue

@@ -89,8 +89,7 @@
         <el-table-column
           :label="$t('commons.operating')">
           <template v-slot:default="scope">
-            <el-button @click="handleEdit(scope.row, scope.$index)" type="primary" icon="el-icon-edit" size="mini" circle/>
-            <el-button @click="handleDelete(scope.row)" type="danger" icon="el-icon-unlock" size="mini" circle/>
+            <ms-table-operator @editClick="handleEdit(scope.row, scope.$index)" @deleteClick="handleDelete(scope.row)"/>
           </template>
         </el-table-column>
       </el-table>
@@ -109,23 +108,25 @@
 <script>
   import ExecutorEdit from './ExecutorEdit';
   import StatusEdit from './StatusEdit';
-  import TestPlanTestCaseEdit from "../components/TestPlanTestCaseEdit";
-  import MsTipButton from '../../../../components/common/components/MsTipButton';
-  import MsTablePagination from '../../../../components/common/pagination/TablePagination';
-  import MsTableHeader from '../../../../components/common/components/MsTableHeader';
-  import MsTableButton from '../../../../components/common/components/MsTableButton';
-  import NodeBreadcrumb from '../../common/NodeBreadcrumb';
+  import TestPlanTestCaseEdit from "./TestPlanTestCaseEdit";
+  import MsTipButton from '../../../../common/components/MsTipButton';
+  import MsTablePagination from '../../../../common/pagination/TablePagination';
+  import MsTableHeader from '../../../../common/components/MsTableHeader';
+  import MsTableButton from '../../../../common/components/MsTableButton';
+  import NodeBreadcrumb from '../../../common/NodeBreadcrumb';
 
-  import {TokenKey} from '../../../../../common/js/constants';
-  import {tableFilter} from '../../../../../common/js/utils';
-  import PriorityTableItem from "../../common/TableItems/PriorityTableItem";
-  import StatusTableItem from "../../common/TableItems/StatusTableItem";
-  import TypeTableItem from "../../common/TableItems/TypeTableItem";
-  import MethodTableItem from "../../common/TableItems/MethodTableItem";
+  import {TokenKey} from '../../../../../../common/js/constants';
+  import {tableFilter} from '../../../../../../common/js/utils';
+  import PriorityTableItem from "../../../common/TableItems/PriorityTableItem";
+  import StatusTableItem from "../../../common/TableItems/StatusTableItem";
+  import TypeTableItem from "../../../common/TableItems/TypeTableItem";
+  import MethodTableItem from "../../../common/TableItems/MethodTableItem";
+  import MsTableOperator from "../../../../common/components/MsTableOperator";
 
   export default {
       name: "TestPlanTestCaseList",
       components: {
+        MsTableOperator,
         MethodTableItem,
         TypeTableItem,
         StatusTableItem,