0.7.0

Author: jiangyitao

src/api/action.js

@@ -31,13 +31,14 @@ export function deleteAction(actionId) {
   })
 }
 
-export function getActionCascader(projectId, platform) {
+export function getActionCascader(projectId, platform, type) {
   return request({
     method: 'get',
     url: '/action/cascader',
     params: {
       projectId: projectId,
-      platform: platform
+      platform: platform,
+      type: type
     }
   })
 }

src/pages/action/components/ActionImportList.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button size="mini" @click="addJavaImport">+</el-button>
-    <el-input v-for="(javaImport, index) in javaImports" :key="index" placeholder="请输入内容" v-model.trim="javaImports[index]" style="margin-top: 3px">
+    <el-input v-for="(javaImport, index) in javaImports" :key="index" placeholder="示例: import java.util.List (不需要';'结尾)" v-model.trim="javaImports[index]" style="margin-top: 3px">
       <el-button slot="append" icon="el-icon-delete" @click="deleteJavaImport(index)" />
     </el-input>
   </div>

src/pages/action/components/ActionStepList.vue

@@ -35,8 +35,6 @@
               <span v-if="data.returnValue">{{ returnValue(data) }}</span>
               <el-divider v-if="data.returnValue" direction="vertical" />
               <span>{{ data.name }}</span>
-              <el-divider v-if="data.params && data.params.length > 0" direction="vertical" />
-              <span v-if="data.params  && data.params.length > 0">{{ params(data) }}</span>
             </template>
           </el-cascader>
         </template>
@@ -113,10 +111,6 @@ import 'codemirror/addon/fold/brace-fold'
 import 'codemirror/addon/fold/comment-fold'
 import ImageInput from '@/components/ImageInput'
 export default {
-  props: {
-    // 当前编辑的actionId
-    curActionId: Number
-  },
   components: {
     ActionDetail,
     ImageInput
@@ -178,11 +172,6 @@ export default {
         }
       }
     },
-    params() {
-      return function(action) {
-        return '(' + action.params.map(p => p.type + ' ' + p.name).join(', ') + ')'
-      }
-    },
     projectId() {
       return this.$store.state.project.id
     },
@@ -258,9 +247,6 @@ export default {
     fetchActionCascader() {
       getActionCascader(this.projectId, this.platform).then(resp => {
         this.selectableActions = resp.data
-        if (this.curActionId) { // 编辑action时，第一次拿不到curActionId
-          this.disableCurActionInSelectableActions(this.curActionId)
-        }
         this.$emit('selectableActionsChange', this.selectableActions)
       })
     },
@@ -302,22 +288,6 @@ export default {
           }
         }
       }
-    },
-    disableAction(actions, actionId) {
-      for (let i = 0; i < actions.length; i++) {
-        if (actions[i].children) {
-          this.disableAction(actions[i].children, actionId)
-        } else {
-          if (actions[i].id === actionId) {
-            console.log('disable action', actions[i].id)
-            actions[i].disabled = true
-          }
-        }
-      }
-    },
-    // 禁用当前编辑的action
-    disableCurActionInSelectableActions(actionId) {
-      this.disableAction(this.selectableActions, actionId)
     }
   }
 }

src/pages/action/components/SaveAction.vue

@@ -91,7 +91,7 @@
     </div>
 
     <div style="margin-top: 5px">
-      <action-step-list ref="stepList" :cur-action-id="saveActionForm.id" @selectableActionsChange="onSelectableActionsChange" />
+      <action-step-list ref="stepList" @selectableActionsChange="onSelectableActionsChange" />
     </div>
   </div>
 </template>
@@ -259,10 +259,7 @@ export default {
       }
     },
     fetchActionCategoryList() {
-      let type = 2
-      if (this.isTestCase) {
-        type = 4
-      }
+      const type = this.isTestCase ? 4 : 2
       getCategoryList({ projectId: this.saveActionForm.projectId, type: type }).then(response => {
         this.categories = response.data
       })

src/pages/action/encapsulation/list.vue

@@ -2,8 +2,7 @@
   <div class="app-container">
     <div style="margin-bottom: 10px">
       <el-button @click="$router.push({ name: 'AddEncapsulationAction' })">添加Action</el-button>
-    </div>
-    <div style="margin-bottom: 10px">
+
       <el-input v-model="queryForm.name" style="width: 200px" placeholder="action名" clearable />
       <el-select v-model="queryForm.pageId" filterable clearable placeholder="选择page">
         <el-option v-for="page in pageList" :key="page.id" :value="page.id" :label="page.name" />

src/pages/action/testcase/list.vue

@@ -2,9 +2,7 @@
   <div class="app-container">
     <div style="margin-bottom: 10px">
       <el-button @click="$router.push({ name: 'AddTestcaseAction' })">添加测试用例</el-button>
-    </div>
 
-    <div style="margin-bottom: 10px">
       <el-input v-model="queryForm.name" style="width: 200px" placeholder="测试用例名" clearable />
       <el-select v-model="queryForm.state" clearable placeholder="状态" style="width: 100px">
         <el-option v-for="state in stateList" :key="state.state" :label="state.name" :value="state.state" />

src/pages/testplan/components/SaveTestPlan.vue

@@ -16,7 +16,7 @@
             filterable
             clearable
             style="width: 60%"
-            @visible-change="actionSelectChange">
+            >
             <template slot-scope="{ node, data }">
               <span v-if="data.returnValue">{{ returnValue(data) }}</span>
               <el-divider v-if="data.returnValue" direction="vertical" />
@@ -33,7 +33,7 @@
             filterable
             clearable
             style="width: 60%"
-            @visible-change="actionSelectChange">
+            >
             <template slot-scope="{ node, data }">
               <span v-if="data.returnValue">{{ returnValue(data) }}</span>
               <el-divider v-if="data.returnValue" direction="vertical" />
@@ -50,7 +50,7 @@
             filterable
             clearable
             style="width: 60%"
-            @visible-change="actionSelectChange">
+            >
             <template slot-scope="{ node, data }">
               <span v-if="data.returnValue">{{ returnValue(data) }}</span>
               <el-divider v-if="data.returnValue" direction="vertical" />
@@ -67,7 +67,7 @@
             filterable
             clearable
             style="width: 60%"
-            @visible-change="actionSelectChange">
+            >
             <template slot-scope="{ node, data }">
               <span v-if="data.returnValue">{{ returnValue(data) }}</span>
               <el-divider v-if="data.returnValue" direction="vertical" />
@@ -228,11 +228,6 @@ export default {
         })
       }
     },
-    actionSelectChange(type) {
-      if (type) {
-        this.fetchActionCascader()
-      }
-    },
     fetchActionCascader() {
       getActionCascader(this.projectId, this.platform).then(response => {
         this.actions = response.data

src/pages/testsuite/components/SaveTestSuite.vue

@@ -15,7 +15,7 @@
         node-key="id"
         :default-checked-keys="testSuite.testcases"
         ref="tree"
-        highlight-current>
+      >
       </el-tree>
     </el-form-item>
 
@@ -69,9 +69,9 @@ export default {
   },
   methods: {
     fetchActionCascader() {
-      getActionCascader(this.projectId, this.platform).then(resp => {
-        const testcases = resp.data.filter(a => a.name === '测试用例')
-        this.treeData = testcases
+      // 3: 测试用例
+      getActionCascader(this.projectId, this.platform, 3).then(resp => {
+        this.treeData = resp.data
       })
     },
     saveTestSuite() {