Merge remote-tracking branch 'origin/master'

2020-12-18 17:43:25 +08:00 · 2020-12-18 17:43:25 +08:00 · 7e2c7fd5aa
parent 6e13f0b85b 80eaf15b1f
commit 7e2c7fd5aa
21 changed files with 111 additions and 66 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -1,6 +1,6 @@
 [submodule "backend/src/main/java/io/metersphere/xpack"]
 	path = backend/src/main/java/io/metersphere/xpack
-	url = https://github.com/metersphere/xpack-backend.git
+	url = git@github.com:metersphere/xpack-backend.git
 [submodule "frontend/src/business/components/xpack"]
 	path = frontend/src/business/components/xpack
-	url = https://github.com/metersphere/xpack-frontend.git
+	url = git@github.com:metersphere/xpack-frontend.git
--- a/28
+++ b/28
@ -0,0 +1,28 @@
+pipeline {
+    agent {
+        node {
+            label 'master'
+        }
+    }
+    options { quietPeriod(2400) }
+    parameters { 
+        string(name: 'IMAGE_NAME', defaultValue: 'metersphere', description: '构建后的 Docker 镜像名称')
+        string(name: 'IMAGE_FREFIX', defaultValue: 'registry.cn-qingdao.aliyuncs.com/metersphere', description: '构建后的 Docker 镜像带仓库名的前缀')
+    }
+    stages {
+        stage('Build/Test') {
+            steps {
+                configFileProvider([configFile(fileId: 'metersphere-maven', targetLocation: 'settings.xml')]) {
+                    sh "mvn clean package --settings ./settings.xml"
+                }
+            }
+        }
+        stage('Docker build & push') {
+            steps {
+                sh "docker build --build-arg MS_VERSION=\${TAG_NAME:-\$BRANCH_NAME}-b\${BUILD_NUMBER} -t ${IMAGE_NAME}:\${TAG_NAME:-\$BRANCH_NAME} ."
+                sh "docker tag ${IMAGE_NAME}:\${TAG_NAME:-\$BRANCH_NAME} ${IMAGE_FREFIX}/${IMAGE_NAME}:\${TAG_NAME:-\$BRANCH_NAME}"
+                sh "docker push ${IMAGE_FREFIX}/${IMAGE_NAME}:\${TAG_NAME:-\$BRANCH_NAME}"
+            }
+        }
+    }
+}
--- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
@ -280,7 +280,7 @@ public class ApiAutomationService {
        // 调用执行方法
        jMeterService.runDefinition(request.getId(), jmeterTestPlanHashTree, request.getReportId(), ApiRunMode.SCENARIO.name());

-        createAPIReportResult(request.getId(), request.getTriggerMode() == null ? ReportTriggerMode.API.name() : request.getTriggerMode());
+        createAPIReportResult(request.getId(), request.getTriggerMode() == null ? ReportTriggerMode.MANUAL.name() : request.getTriggerMode());
        return request.getId();
    }

@ -303,6 +303,7 @@ public class ApiAutomationService {
        ParameterConfig config = new ParameterConfig();
        config.setConfig(envConfig);
        HashTree hashTree = request.getTestElement().generateHashTree(config);
+        request.getTestElement().getJmx(hashTree);
        // 调用执行方法
        jMeterService.runDefinition(request.getId(), hashTree, request.getReportId(), ApiRunMode.SCENARIO.name());
        createAPIReportResult(request.getId(), ReportTriggerMode.MANUAL.name());
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@ -1 +1 @@
-Subproject commit 61397c16728a63493507679f7e0940d9099f337f
+Subproject commit b5643ac73fb4a2db3f11b23a81848990d8e78703
--- a/frontend/src/business/components/api/automation/scenario/DebugRun.vue
+++ b/frontend/src/business/components/api/automation/scenario/DebugRun.vue
@ -92,7 +92,7 @@
        let testPlan = createComponent('TestPlan');
        let threadGroup = createComponent('ThreadGroup');
        threadGroup.hashTree = [];
-        threadGroup.name = this.runData.name;
+        threadGroup.name = this.runData.name ? this.runData.name : "Debug-Scenario";
        threadGroup.hashTree.push(this.runData);
        testPlan.hashTree.push(threadGroup);
        let reqObj = {id: this.reportId, reportId: this.reportId, environmentId: this.environment, testElement: testPlan};
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@ -157,7 +157,7 @@
              </el-row>
            </div>
            <!-- 场景步骤内容 -->
-            <div style="margin-top: 10px" v-loading="loading">
+            <div v-loading="loading">
              <el-tree node-key="resourceId" :props="props" :data="scenarioDefinition"
                       :default-expanded-keys="expandedNode"
                       :expand-on-click-node="false"
@ -197,37 +197,37 @@
            <el-col :span="3" class="ms-left-cell">
              <el-button type="primary" icon="el-icon-refresh" size="small" @click="showAll">{{$t('commons.show_all')}}</el-button>
              <br/>
-              <div v-if="operatingElements.indexOf('HTTPSamplerProxy')>0 || operatingElements.indexOf('DubboSampler')>0 || operatingElements.indexOf('JDBCSampler')>0 || operatingElements.indexOf('TCPSampler')>0 ">
+              <div v-if="operatingElements.indexOf('HTTPSamplerProxy')!=-1 || operatingElements.indexOf('DubboSampler')!=-1 || operatingElements.indexOf('JDBCSampler')!=-1 || operatingElements.indexOf('TCPSampler')!=-1 ">
                <el-button class="ms-right-buttion ms-btn-1" size="small" @click="apiListImport">+{{$t('api_test.automation.api_list_import')}}</el-button>
              </div>
-              <div v-if="operatingElements.indexOf('OT_IMPORT')>0">
+              <div v-if="operatingElements.indexOf('OT_IMPORT')!=-1">
                <el-button class="ms-right-buttion" size="small" style="color: #409EFF;background-color: #EEF5FE" @click="addComponent('OT_IMPORT')">+{{$t('api_test.automation.external_import')}}</el-button>
              </div>
-              <div v-if="operatingElements.indexOf('ConstantTimer')>0">
+              <div v-if="operatingElements.indexOf('ConstantTimer')!=-1">
                <el-button class="ms-right-buttion ms-btn-3" size="small" @click="addComponent('ConstantTimer')">+{{$t('api_test.automation.wait_controller')}}</el-button>
              </div>
-              <div v-if="operatingElements.indexOf('IfController')>0">
+              <div v-if="operatingElements.indexOf('IfController')!=-1">
                <el-button class="ms-right-buttion ms-btn-4" size="small" @click="addComponent('IfController')">+{{$t('api_test.automation.if_controller')}}</el-button>
              </div>
              <div v-if="operatingElements.indexOf('scenario')===0">
                <el-button class="ms-right-buttion ms-btn-5" size="small" @click="addComponent('scenario')">+{{$t('api_test.automation.scenario_import')}}</el-button>
              </div>
-              <div v-if="operatingElements.indexOf('JSR223Processor')>0">
+              <div v-if="operatingElements.indexOf('JSR223Processor')!=-1">
                <el-button class="ms-right-buttion ms-btn-6" size="small" @click="addComponent('JSR223Processor')">+{{$t('api_test.automation.customize_script')}}</el-button>
              </div>
-              <div v-if="operatingElements.indexOf('CustomizeReq')>0">
+              <div v-if="operatingElements.indexOf('CustomizeReq')!=-1">
                <el-button class="ms-right-buttion ms-btn-7" size="small" @click="addComponent('CustomizeReq')">+{{$t('api_test.automation.customize_req')}}</el-button>
              </div>
-              <div v-if="operatingElements.indexOf('JSR223PreProcessor')>0">
+              <div v-if="operatingElements.indexOf('JSR223PreProcessor')!=-1">
                <el-button class="ms-right-buttion ms-btn-8" size="small" @click="addComponent('JSR223PreProcessor')">+{{$t('api_test.definition.request.pre_script')}}</el-button>
              </div>
-              <div v-if="operatingElements.indexOf('JSR223PostProcessor')>0">
+              <div v-if="operatingElements.indexOf('JSR223PostProcessor')!=-1">
                <el-button class="ms-right-buttion ms-btn-9" size="small" @click="addComponent('JSR223PostProcessor')">+{{$t('api_test.definition.request.post_script')}}</el-button>
              </div>
-              <div v-if="operatingElements.indexOf('Assertions')>0">
+              <div v-if="operatingElements.indexOf('Assertions')!=-1">
                <el-button class="ms-right-buttion ms-btn-10" size="small" @click="addComponent('Assertions')">+{{$t('api_test.definition.request.assertions_rule')}}</el-button>
              </div>
-              <div v-if="operatingElements.indexOf('Extract')>0">
+              <div v-if="operatingElements.indexOf('Extract')!=-1">
                <el-button class="ms-right-buttion ms-btn-11" size="small" @click="addComponent('Extract')">+{{$t('api_test.definition.request.extract_param')}}</el-button>
              </div>
            </el-col>
@ -245,7 +245,6 @@
      <!--自定义接口-->
      <el-drawer :visible.sync="customizeVisible" :destroy-on-close="true" direction="ltr" :withHeader="false" :title="$t('api_test.automation.customize_req')" style="overflow: auto" :modal="false" size="90%">
        <ms-api-customize :request="customizeRequest" @addCustomizeApi="addCustomizeApi"/>
-        <el-button style="float: right;margin: 20px" @click="addCustomizeApi">{{$t('commons.save')}}</el-button>
      </el-drawer>
      <!--场景导入 -->
      <el-drawer :visible.sync="scenarioVisible" :destroy-on-close="true" direction="ltr" :withHeader="false" :title="$t('api_test.automation.scenario_import')" style="overflow: auto" :modal="false" size="90%">
@ -373,6 +372,11 @@
      this.getApiScenario();
      this.getEnvironments();
    },
+    mounted() {
+      document.addEventListener('click', e => {
+        this.showAll();
+      })
+    },
    watch: {},
    methods: {
      addComponent(type) {
@ -486,6 +490,9 @@
        } else {
          request = item.request;
        }
+        if (item.protocol) {
+          request.protocol = item.protocol;
+        }
        request.id = item.id;
        request.name = item.name;
        request.refType = refType;
@ -606,13 +613,16 @@
      environmentConfigClose() {
        this.getEnvironments();
      },
-      allowDrop(draggingNode, dropNode, type) {
-        if (dropNode.data.type === draggingNode.data.type || ELEMENTS.get(dropNode.data.type).indexOf(draggingNode.data.type) != -1) {
+      allowDrop(draggingNode, dropNode, dropType) {
+        if (dropType != "inner") {
+          return true;
+        }
+        else if (dropType === "inner" && ELEMENTS.get(dropNode.data.type).indexOf(draggingNode.data.type) != -1) {
          return true;
        }
        return false;
      },
-      allowDrag() {
+      allowDrag(draggingNode, dropNode, dropType) {
        this.sort();
        this.reload();
      },
--- a/frontend/src/business/components/api/automation/scenario/Setting.js
+++ b/frontend/src/business/components/api/automation/scenario/Setting.js
@ -1,19 +1,19 @@
 export const ELEMENTS = new Map([
-  ['ALL', ["scenario", "HTTPSamplerProxy", "DubboSampler", "JDBCSampler", "TCPSampler", "OT_IMPORT", "IfController", "ConstantTimer", "JSR223Processor", "JSR223PreProcessor", "JSR223PostProcessor", "Assertions", "Extract", "CustomizeReq"]],
-  ['scenario', ["API", "CASE", "OT_IMPORT", "IfController", "ConstantTimer", "JSR223Processor", "JSR223PreProcessor", "JSR223PostProcessor", "Assertions", "Extract", "CustomizeReq"]],
-  ['HTTPSamplerProxy', ["IfController", "ConstantTimer", "JSR223Processor", "JSR223PreProcessor", "JSR223PostProcessor", "Assertions", "Extract"]],
-  ['DubboSampler', ["IfController", "ConstantTimer", "JSR223Processor", "JSR223PreProcessor", "JSR223PostProcessor", "Assertions", "Extract"]],
-  ['JDBCSampler', ["IfController", "ConstantTimer", "JSR223Processor", "JSR223PreProcessor", "JSR223PostProcessor", "Assertions", "Extract"]],
-  ['TCPSampler', ["IfController", "ConstantTimer", "JSR223Processor", "JSR223PreProcessor", "JSR223PostProcessor", "Assertions", "Extract"]],
-  ['OT_IMPORT', []],
-  ['IfController', ["HTTPSamplerProxy", "DubboSampler", "JDBCSampler", "TCPSampler", "OT_IMPORT", "ConstantTimer", "JSR223Processor", "JSR223PreProcessor", "JSR223PostProcessor", "Assertions", "Extract", "CustomizeReq"]],
-  ['ConstantTimer', ["HTTPSamplerProxy", "DubboSampler", "JDBCSampler", "TCPSampler", "OT_IMPORT", "IfController", "JSR223Processor", "JSR223PreProcessor", "JSR223PostProcessor", "Assertions", "Extract", "CustomizeReq"]],
-  ['JSR223Processor', []],
+  ['ALL', ["scenario", "HTTPSamplerProxy", "DubboSampler", "JDBCSampler", "TCPSampler", "OT_IMPORT", "IfController", "ConstantTimer", "JSR223Processor", "CustomizeReq"]],
+  ['scenario', ["HTTPSamplerProxy", "DubboSampler", "JDBCSampler", "TCPSampler", "CASE", "OT_IMPORT", "IfController", "ConstantTimer", "JSR223Processor", "CustomizeReq"]],
+  ['HTTPSamplerProxy', ["ConstantTimer", "JSR223PreProcessor", "JSR223PostProcessor", "Assertions", "Extract"]],
+  ['DubboSampler', ["ConstantTimer", "JSR223PreProcessor", "JSR223PostProcessor", "Assertions", "Extract"]],
+  ['JDBCSampler', ["ConstantTimer", "JSR223PreProcessor", "JSR223PostProcessor", "Assertions", "Extract"]],
+  ['TCPSampler', ["ConstantTimer", "JSR223PreProcessor", "JSR223PostProcessor", "Assertions", "Extract"]],
+  ['OT_IMPORT', ["ConstantTimer", "JSR223PreProcessor", "JSR223PostProcessor", "Assertions", "Extract"]],
+  ['IfController', ["IfController", "HTTPSamplerProxy", "DubboSampler", "JDBCSampler", "TCPSampler", "OT_IMPORT", "ConstantTimer", "JSR223Processor", "JSR223PreProcessor", "JSR223PostProcessor", "Assertions", "Extract", "CustomizeReq"]],
+  ['ConstantTimer', []],
+  ['JSR223Processor', ["ConstantTimer", "JSR223PreProcessor", "JSR223PostProcessor", "Assertions", "Extract"]],
  ['JSR223PreProcessor', []],
  ['JSR223PostProcessor', []],
  ['Assertions', []],
  ['Extract', []],
-  ['CustomizeReq', ["HTTPSamplerProxy", "DubboSampler", "JDBCSampler", "TCPSampler", "OT_IMPORT", "IfController", "ConstantTimer", "JSR223Processor", "JSR223PreProcessor", "JSR223PostProcessor", "Assertions", "Extract"]],
+  ['CustomizeReq', ["ConstantTimer", "JSR223PreProcessor", "JSR223PostProcessor", "Assertions", "Extract"]],
 ])

 export const ELEMENT_TYPE = {
--- a/frontend/src/business/components/api/automation/scenario/api/ApiDefinition.vue
+++ b/frontend/src/business/components/api/automation/scenario/api/ApiDefinition.vue
@ -1,7 +1,7 @@
 <template>
  <ms-container>
    <ms-aside-container>
-      <ms-node-tree @selectModule="selectModule" @getApiModuleTree="initTree" @changeProtocol="changeProtocol"
+      <ms-node-tree @nodeSelectEvent="selectModule" @getApiModuleTree="initTree" @protocolChange="changeProtocol"
                    @refresh="refresh" @saveAsEdit="editApi" @exportAPI="exportAPI"/>
    </ms-aside-container>

@ -85,7 +85,7 @@
        this.isHide = true;
      },
      selectModule(data) {
-        this.currentModule = data;
+        this.currentModule = data.data;
      },
      exportAPI() {
        if (!this.$refs.apiList[0].tableData) {
--- a/frontend/src/business/components/api/automation/scenario/api/ApiList.vue
+++ b/frontend/src/business/components/api/automation/scenario/api/ApiList.vue
@ -76,14 +76,14 @@
            </template>
          </el-table-column>
        </el-table>
-        <ms-table-pagination :change="initApiTable" :current-page.sync="currentPage" :page-size.sync="pageSize"
+        <ms-table-pagination :change="initTable" :current-page.sync="currentPage" :page-size.sync="pageSize"
                             :total="total"/>
      </el-card>
    </div>
    <div id="svgResize"/>
    <div id="svgDown">
      <ms-bottom-container v-bind:enableAsideHidden="isHide">
-        <ms-api-case-list @apiCaseClose="apiCaseClose" @refresh="initApiTable" :visible="visible" :currentRow="currentRow" :api="selectApi"/>
+        <ms-api-case-list @apiCaseClose="apiCaseClose" @refresh="initTable" :visible="visible" :currentRow="currentRow" :api="selectApi"/>
      </ms-bottom-container>
    </div>
  </div>
@ -150,38 +150,35 @@
    },
    created: function () {
      this.projectId = getCurrentProjectID();
-      this.initApiTable();
+      this.initTable();
    },
    mounted() {
      this.dragControllerDiv();
    },
    watch: {
      currentModule() {
-        this.initApiTable();
+        this.initTable();
        this.apiCaseClose();
      },
      visible() {
-        this.initApiTable();
+        this.initTable();
        this.apiCaseClose();
      },
      currentProtocol() {
-        this.initApiTable();
+        this.initTable();
        this.apiCaseClose();
      },
    },
    methods: {
-      initApiTable() {
+      initTable() {
+        this.selectRows = new Set();
        this.condition.filters = ["Prepare", "Underway", "Completed"];
-        if (this.currentModule != null) {
-          if (this.currentModule.id == "root") {
-            this.condition.moduleIds = [];
-          } else if (this.currentModule.id == "gc") {
-            this.condition.moduleIds = [];
-            this.condition.filters = ["Trash"];
-          }
-          else {
-            this.condition.moduleIds = this.currentModule.ids;
-          }
+        if (this.currentModule) {
+          this.condition.moduleIds = [this.currentModule.id];
+        }
+        if (this.trashEnable) {
+          this.condition.filters = ["Trash"];
+          this.condition.moduleIds = [];
        }
        if (this.projectId != null) {
          this.condition.projectId = this.projectId;
@ -193,7 +190,6 @@
          this.total = response.data.itemCount;
          this.tableData = response.data.listObject;
        });
-        this.selectRows = new Set();
      },
      handleSelect(selection, row) {
        row.hashTree = [];
@ -241,7 +237,7 @@
        }
      },
      search() {
-        this.initApiTable();
+        this.initTable();
      },
      buildPagePath(path) {
        return path + "/" + this.currentPage + "/" + this.pageSize;
@ -268,7 +264,7 @@
                let ids = Array.from(this.selectRows).map(row => row.id);
                this.$post('/api/definition/deleteBatch/', ids, () => {
                  this.selectRows.clear();
-                  this.initApiTable();
+                  this.initTable();
                  this.$success(this.$t('commons.delete_success'));
                });
              }
@ -282,7 +278,7 @@
                let ids = Array.from(this.selectRows).map(row => row.id);
                this.$post('/api/definition/removeToGc/', ids, () => {
                  this.selectRows.clear();
-                  this.initApiTable();
+                  this.initTable();
                  this.$success(this.$t('commons.delete_success'));
                });
              }
@ -307,7 +303,7 @@
        if (this.currentModule != undefined && this.currentModule.id == "gc") {
          this.$get('/api/definition/delete/' + api.id, () => {
            this.$success(this.$t('commons.delete_success'));
-            this.initApiTable();
+            this.initTable();
          });
          return;
        }
@ -318,7 +314,7 @@
              let ids = [api.id];
              this.$post('/api/definition/removeToGc/', ids, () => {
                this.$success(this.$t('commons.delete_success'));
-                this.initApiTable();
+                this.initTable();
              });
            }
          }
--- a/frontend/src/business/components/api/definition/components/case/ApiCaseHeader.vue
+++ b/frontend/src/business/components/api/definition/components/case/ApiCaseHeader.vue
@ -20,7 +20,7 @@
          <div>
            <el-select size="small" :placeholder="$t('api_test.definition.request.grade_info')" v-model="condition.priority"
                       :disabled="isCaseEdit"
-                       class="ms-api-header-select" @change="getApiTest">
+                       class="ms-api-header-select" @change="getApiTest" clearable>
              <el-option v-for="grd in priorities" :key="grd.id" :label="grd.name" :value="grd.id"/>
            </el-select>
          </div>
--- a/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue
+++ b/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue
@ -173,7 +173,7 @@

    created() {
      this.getMaintainerOptions();
-      this.httpForm = this.basisData;
+      this.httpForm = JSON.parse(JSON.stringify(this.basisData));
    }
  }
 </script>
--- a/frontend/src/business/components/api/definition/components/debug/DebugHttpPage.vue
+++ b/frontend/src/business/components/api/definition/components/debug/DebugHttpPage.vue
@ -66,6 +66,7 @@
      let validateURL = (rule, value, callback) => {
        try {
          new URL(this.debugForm.url);
+          callback();
        } catch (e) {
          callback(this.$t('api_test.request.url_invalid'));
        }
--- a/frontend/src/business/components/common/head/SearchList.vue
+++ b/frontend/src/business/components/common/head/SearchList.vue
@ -101,6 +101,15 @@ export default {
      this.$post("/user/update/current", {id: this.userId, lastProjectId: projectId}, () => {
        localStorage.setItem(PROJECT_ID, projectId);
        let path = this.$route.matched[0].path ? this.$route.matched[0].path : '/';
+        if (path === '/api') {
+          if (this.$store.state.switch.value === 'new') {
+            path = "/api/home";
+          } else if (this.$store.state.switch.value === 'old') {
+            path = "/api/home_obsolete";
+          } else {
+            path = '/';
+          }
+        }
        this.$router.push(path).then(() => {
          window.location.reload()
        }).catch(err => err);
--- a/frontend/src/business/components/settings/organization/components/JiraSetting.vue
+++ b/frontend/src/business/components/settings/organization/components/JiraSetting.vue
@ -34,7 +34,7 @@
      </div>
      <div>
        2. {{ $t('organization.integration.use_tip_two') }}
-        <router-link to="/track/project/all" style="margin-left: 5px">
+        <router-link to="/setting/project/all" style="margin-left: 5px">
          {{ $t('organization.integration.link_the_project_now') }}
        </router-link>
      </div>
--- a/frontend/src/business/components/settings/organization/components/TapdSetting.vue
+++ b/frontend/src/business/components/settings/organization/components/TapdSetting.vue
@ -28,7 +28,7 @@
      </div>
      <div>
        2. {{ $t('organization.integration.use_tip_two') }}
-        <router-link to="/track/project/all" style="margin-left: 5px">
+        <router-link to="/setting/project/all" style="margin-left: 5px">
          {{ $t('organization.integration.link_the_project_now') }}
        </router-link>
      </div>
--- a/frontend/src/business/components/settings/organization/components/ZentaoSetting.vue
+++ b/frontend/src/business/components/settings/organization/components/ZentaoSetting.vue
@ -31,7 +31,7 @@
      </div>
      <div>
        2. {{ $t('organization.integration.use_tip_two') }}
-        <router-link to="/track/project/all" style="margin-left: 5px">
+        <router-link to="/setting/project/all" style="margin-left: 5px">
          {{ $t('organization.integration.link_the_project_now') }}
        </router-link>
      </div>
--- a/frontend/src/business/components/settings/project/MsProject.vue
+++ b/frontend/src/business/components/settings/project/MsProject.vue
@ -273,6 +273,7 @@ export default {
 <style scoped>
  pre {
    margin: 0 0;
+    font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", Arial, sans-serif;
  }

 </style>
--- a/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
+++ b/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
@ -13,11 +13,10 @@
        <el-row>
          <el-col :span="8" :offset="1">
            <el-form-item
-              :placeholder="$t('test_track.plan.input_name')"
              :label="$t('test_track.plan.plan_name')"
              :label-width="formLabelWidth"
              prop="name">
-              <el-input v-model="form.name"></el-input>
+              <el-input v-model="form.name" :placeholder="$t('test_track.plan.input_plan_name')"></el-input>
            </el-form-item>
          </el-col>

--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@ -499,7 +499,7 @@ export default {
      api_case_passing_rate: "Use case pass rate",
      create_tip: "Note: Detailed interface information can be filled out on the edit page",
      request: {
-        grade_info: "From high to low",
+        grade_info: "Filter by rank",
        run_env: "Operating environment",
        select_case: "Search use cases",
        case: "Case",
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@ -497,7 +497,7 @@ export default {
      api_case_passing_rate: "用例通过率",
      create_tip: "注: 详细的接口信息可以在编辑页面填写",
      request: {
-        grade_info: "按等级从高到低",
+        grade_info: "按等级筛选",
        run_env: "运行环境",
        select_case: "搜索用例",
        case: "用例",
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@ -497,7 +497,7 @@ export default {
      api_case_passing_rate: "用例通過率",
      create_tip: "註: 詳細的接口信息可以在編輯頁面填寫",
      request: {
-        grade_info: "按等級從高到低",
+        grade_info: "按等級筛选",
        run_env: "運行環境",
        select_case: "搜索用例",
        case: "用例",