Merge branch 'master' of https://github.com/metersphere/server

backend/src/main/java/io/metersphere/xpack

@@ -1 +1 @@
-Subproject commit e51e5704f9d7fbfb030a8a7d67d0094a9f36c23d
+Subproject commit 141ee64787b4a28ef108c5fa4dde90446de01887

frontend/src/business/components/api/test/components/request/condition/IfController.vue

@@ -6,12 +6,13 @@
         <el-input size="small" v-model="controller.variable" :placeholder="$t('api_test.request.condition_variable')"/>
       </el-col>
       <el-col :span="5">
-        <el-select v-model="controller.operator" :placeholder="$t('commons.please_select')" size="small">
+        <el-select v-model="controller.operator" :placeholder="$t('commons.please_select')" size="small"
+                   @change="change">
           <el-option v-for="o in operators" :key="o.value" :label="$t(o.label)" :value="o.value"/>
         </el-select>
       </el-col>
       <el-col :span="6">
-        <el-input size="small" v-model="controller.value" :placeholder="$t('api_test.value')"/>
+        <el-input size="small" v-model="controller.value" :placeholder="$t('api_test.value')" v-if="!hasNullOperator"/>
       </el-col>
       <el-col :span="4">
         <el-switch v-model="controller.enable" :inactive-text="$t('api_test.scenario.enable_disable')"/>
@@ -58,6 +59,14 @@ export default {
         LT: {
           label: "commons.adv_search.operators.lt",
           value: "<"
+        },
+        IS_NULL: {
+          label: "commons.adv_search.operators.is_null",
+          value: "is null"
+        },
+        IS_NOT_NULL: {
+          label: "commons.adv_search.operators.is_not_null",
+          value: "is not null"
         }
       }
     }
@@ -78,6 +87,16 @@ export default {
     remove() {
       this.controller = new IfController();
       this.visible = false;
+    },
+    change(value) {
+      if (value.indexOf("null") > 0) {
+        this.controller.value = "";
+      }
+    }
+  },
+  computed: {
+    hasNullOperator() {
+      return !!this.controller.operator && this.controller.operator.indexOf("null") > 0;
     }
   }
 }

frontend/src/business/components/api/test/model/ScenarioModel.js

@@ -873,14 +873,17 @@ export class IfController extends Controller {
   }
 
   isValid() {
+    if (!!this.operator && this.operator.indexOf("null") > 0) {
+      return !!this.variable && !!this.operator;
+    }
     return !!this.variable && !!this.operator && !!this.value;
   }
 
   label() {
     if (this.isValid()) {
       let label = this.variable;
-      label += " " + this.operator;
+      if (this.operator) label += " " + this.operator;
-      label += " " + this.value;
+      if (this.value) label += " " + this.value;
       return label;
     }
     return "";
@@ -1234,6 +1237,18 @@ class JMXGenerator {
           value = "\".*" + value + ".*\"";
         }
 
+        if (operator === "is null") {
+          variable = "empty(\"" + variable + "\")";
+          operator = "";
+          value = "";
+        }
+
+        if (operator === "is not null") {
+          variable = "!empty(\"" + variable + "\")";
+          operator = "";
+          value = "";
+        }
+
         let condition = "${__jexl3(" + variable + operator + value + ")}";
         let controller = new JMXIfController(name, {condition: condition});
         controller.put(sampler);

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

@@ -71,7 +71,9 @@
                   </template>
                 </el-table-column>
               </el-table>
+              <div style="padding-top: 20px;">
                 <el-button type="primary" @click="saveNotice">{{ $t('commons.save') }}</el-button>
+              </div>
             </template>
           </el-tab-pane>
         </el-tabs>

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

@@ -113,6 +113,7 @@
   import MsTableButton from '../../../../components/common/components/MsTableButton';
   import {listenGoBack, removeGoBackListener} from "../../../../../common/js/utils";
   import {TokenKey, WORKSPACE_ID} from '../../../../../common/js/constants';
+  import axios from "axios";
 
   export default {
     name: "TestCaseImport",
@@ -188,7 +189,14 @@
         this.$fileDownload('/test/case/export/template');
       },
       downloadXmindTemplate() {
-        this.$fileDownload('/test/case/export/xmindTemplate');
+        axios.get('/test/case/export/xmindTemplate', {responseType: 'blob'})
+          .then(response => {
+            let fileName = window.decodeURI(response.headers['content-disposition'].split('=')[1]);
+            let link = document.createElement("a");
+            link.href = window.URL.createObjectURL(new Blob([response.data]));
+            link.download = fileName;
+            link.click();
+          });
       },
       upload(file) {
         this.isLoading = false;

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

@@ -29,17 +29,6 @@
 
                     <el-col :span="12" class="head-right">
 
-                <span class="head-right-tip" v-if="index + 1 === testCases.length">
-                  {{ $t('test_track.plan_view.pre_case') }} : {{
-                    testCases[index - 1] ? testCases[index - 1].name : ''
-                  }}
-                </span>
-                      <span class="head-right-tip" v-if="index + 1 !== testCases.length">
-                  {{ $t('test_track.plan_view.next_case') }} : {{
-                          testCases[index + 1] ? testCases[index + 1].name : ''
-                        }}
-                </span>
-
                       <el-button plain size="mini" icon="el-icon-arrow-up"
                                  :disabled="index + 1 <= 1"
                                  @click="handlePre()"/>

frontend/src/common/js/ajax.js

@@ -136,7 +136,7 @@ export default {
         .then(response => {
           let fileName = window.decodeURI(response.headers['content-disposition'].split('=')[1]);
           let link = document.createElement("a");
-          link.href = window.URL.createObjectURL(new Blob([response.data]));
+          link.href = window.URL.createObjectURL(new Blob([response.data], {type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8"}));
           link.download = fileName;
           link.click();
         });

frontend/src/i18n/en-US.js

@@ -142,6 +142,8 @@ export default {
       and: 'All',
       or: 'any one',
       operators: {
+        is_null: "Is null",
+        is_not_null: "Is not null",
         like: "Contains",
         not_like: "Not included",
         in: "Belong to",

frontend/src/i18n/zh-CN.js

@@ -142,6 +142,8 @@ export default {
       and: '所有',
       or: '任意一个',
       operators: {
+        is_null: "空",
+        is_not_null: "非空",
         like: "包含",
         not_like: "不包含",
         in: "属于",

frontend/src/i18n/zh-TW.js

@@ -142,6 +142,8 @@ export default {
       and: '所有',
       or: '任意壹個',
       operators: {
+        is_null: "空",
+        is_not_null: "非空",
         like: "包含",
         not_like: "不包含",
         in: "屬於",