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

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

@@ -317,6 +317,15 @@
           case 'coverage':
             this.condition.apiCaseCoverage = 'coverage';
             break;
+          case 'Prepare':
+            this.condition.filters.status = [this.selectDataRange];
+            break;
+          case 'Completed':
+            this.condition.filters.status = [this.selectDataRange];
+            break;
+          case 'Underway':
+            this.condition.filters.status = [this.selectDataRange];
+            break;
         }
         if (this.condition.projectId) {
           this.result = this.$post("/api/definition/list/" + this.currentPage + "/" + this.pageSize, this.condition, response => {

frontend/src/business/components/api/test/components/processor/Jsr233Processor.vue

@@ -93,11 +93,13 @@ export default {
       ],
       isCodeEditAlive: true,
       languages: [
-        'beanshell', "python"
+        'beanshell', "python", "groovy", "javascript"
       ],
       codeEditModeMap: {
         beanshell: 'java',
-        python: 'python'
+        python: 'python',
+        groovy: 'java',
+        javascript: 'javascript',
       }
     }
   },

frontend/src/business/components/api/test/components/request/ApiDubboRequestForm.vue

@@ -65,7 +65,7 @@
   import MsDubboRegistryCenter from "@/business/components/api/test/components/request/dubbo/RegistryCenter";
   import MsDubboConfigCenter from "@/business/components/api/test/components/request/dubbo/ConfigCenter";
   import MsDubboConsumerService from "@/business/components/api/test/components/request/dubbo/ConsumerAndService";
-  import MsJsr233Processor from "../../../automation/scenario/component/Jsr233Processor";
+  import MsJsr233Processor from "../processor/Jsr233Processor";
 
   export default {
     name: "MsApiDubboRequestForm",

frontend/src/business/components/api/test/components/request/ApiHttpRequestForm.vue

@@ -94,7 +94,7 @@ import ApiRequestMethodSelect from "../collapse/ApiRequestMethodSelect";
 import {REQUEST_HEADERS} from "@/common/js/constants";
 import MsApiVariable from "@/business/components/api/test/components/ApiVariable";
 import MsApiAdvancedConfig from "../ApiAdvancedConfig";
-import MsJsr233Processor from "../../../automation/scenario/component/Jsr233Processor";
+import MsJsr233Processor from "../processor/Jsr233Processor";
 
 export default {
   name: "MsApiHttpRequestForm",

frontend/src/business/components/api/test/components/request/ApiSqlRequestForm.vue

@@ -78,7 +78,7 @@
   import MsDubboConsumerService from "@/business/components/api/test/components/request/dubbo/ConsumerAndService";
   import MsCodeEdit from "../../../../common/components/MsCodeEdit";
   import MsApiScenarioVariables from "../ApiScenarioVariables";
-  import MsJsr233Processor from "../../../automation/scenario/component/Jsr233Processor";
+  import MsJsr233Processor from "../processor/Jsr233Processor";
 
   export default {
     name: "MsApiSqlRequestForm",

frontend/src/business/components/api/test/components/request/ApiTcpRequestForm.vue

@@ -120,7 +120,7 @@ import {Scenario, TCPConfig, TCPRequest} from "@/business/components/api/test/mo
 import MsApiAssertions from "@/business/components/api/test/components/assertion/ApiAssertions";
 import MsApiExtract from "@/business/components/api/test/components/extract/ApiExtract";
 import MsCodeEdit from "@/business/components/common/components/MsCodeEdit";
-import MsJsr233Processor from "../../../automation/scenario/component/Jsr233Processor";
+import MsJsr233Processor from "../processor/Jsr233Processor";
 
 export default {
   name: "MsApiTcpRequestForm",

frontend/src/business/components/track/common/NodeTree.vue

@@ -137,12 +137,6 @@ export default {
       return false;
     },
     filter(val) {
-      if (!val) {
-        val = this.filterText;
-      } else {
-        // 记录condition 的 filterText
-        this.filterText = val;
-      }
       this.$nextTick(() => {
         this.$refs.tree.filter(val);
       });

frontend/src/business/components/xpack

@@ -1 +1 @@
-Subproject commit 9e64da846793401150260fc50262d82932cf5d8a
+Subproject commit 5abe43dc1f65b529ad59c17bfdc58aea33d23cad

frontend/src/i18n/en-US.js

@@ -129,6 +129,7 @@ export default {
     validate: "Validate",
     batch_add: "Batch add",
     check_project_tip: "Create or select the project first",
+    auth_redirect_tip: 'Jump to the authentication source page for authentication',
     table: {
       select_tip: "Item {0} data is selected"
     },
@@ -831,8 +832,8 @@ export default {
       swagger_export_tip: "Export jSON-formatted files via Swagger website",
       suffixFormatErr: "The file format does not meet the requirements",
       swagger_url_import: "Import using URL",
-      timing_synchronization:"Timing synchronization",
+      timing_synchronization: "Timing synchronization",
-      next_synchronization_time:"Next synchronization time",
+      next_synchronization_time: "Next synchronization time",
 
     },
     home_page: {
@@ -1493,6 +1494,6 @@ export default {
     format: "Output format",
   },
   auth_source: {
-    delete_prompt:'This operation will delete the authentication source, do you want to continue? '
+    delete_prompt: 'This operation will delete the authentication source, do you want to continue? '
   }
 };

frontend/src/i18n/zh-CN.js

@@ -129,6 +129,7 @@ export default {
     validate: "校验",
     batch_add: "批量添加",
     check_project_tip: "请先创建或选择项目",
+    auth_redirect_tip: '即将跳转到认证源页面进行认证',
     table: {
       select_tip: "已选中 {0} 条数据"
     },
@@ -833,8 +834,8 @@ export default {
       swagger_export_tip: "通过 Swagger 页面导出",
       suffixFormatErr: "文件格式不符合要求",
       swagger_url_import: "使用URL导入",
-      timing_synchronization:"定时同步",
+      timing_synchronization: "定时同步",
-      next_synchronization_time:"下次同步时间"
+      next_synchronization_time: "下次同步时间"
 
 
     },

frontend/src/i18n/zh-TW.js

@@ -129,6 +129,7 @@ export default {
     validate: "校驗",
     batch_add: "批量添加",
     check_project_tip: "請先創建或選擇項目",
+    auth_redirect_tip: '即將跳轉到認證源頁面進行認證',
     table: {
       select_tip: "已选中 {0} 条数据"
     },
@@ -256,8 +257,8 @@ export default {
       nail_robot: '釘釘機器人',
       enterprise_wechat_robot: '企業微信機器人',
       notes: '1.釘釘和企業群裏新建壹個自定義機器人，然後復制 webhook 地址在我們平臺上;\n' +
-      '       2.機器人選擇為群機器人，安全驗證選擇“自定義關鍵詞” ："任務通知";\n' +
+        '       2.機器人選擇為群機器人，安全驗證選擇“自定義關鍵詞” ："任務通知";\n' +
-      '       3.選擇接收人時必須是妳所建的群裏包含的人,接收人手機號為必填項且為釘釘企業所使用的手機號,',
+        '       3.選擇接收人時必須是妳所建的群裏包含的人,接收人手機號為必填項且為釘釘企業所使用的手機號,',
       message: '事件，接收人，接收方式為必填項',
       message_webhook: '接收方式為釘釘和企業機器人時，webhook為必填項',
       template: "模版"
@@ -832,8 +833,8 @@ export default {
       swagger_export_tip: "通過 Swagger 頁面導出",
       suffixFormatErr: "文件格式不符合要求",
       swagger_url_import: "使用URL導入",
-      timing_synchronization:"定時同步",
+      timing_synchronization: "定時同步",
-      next_synchronization_time:"下次同步時間",
+      next_synchronization_time: "下次同步時間",
 
     },
     home_page: {

frontend/src/login/Login.vue

@@ -174,25 +174,9 @@ export default {
       }
     },
     redirectAuth(authId) {
-      if (authId === 'LDAP' || authId === 'LOCAL') {
+      if (auth.default) {
-        return;
+        auth.default.redirectAuth(this, authId);
       }
-      let source = this.authSources.filter(auth => auth.id === authId)[0];
-      if (source.type === 'CAS') {
-        return;
-      }
-      this.$confirm(this.$t('即将跳转到认证源页面进行认证'), '', {
-        confirmButtonText: this.$t('commons.confirm'),
-        cancelButtonText: this.$t('commons.cancel'),
-        type: 'warning'
-      }).then(() => {
-        let config = JSON.parse(source.configuration);
-        let url = config.authUrl + "/auth?client_id=" + config.clientId + "&redirect_uri=" + config.redirectUrl +
-          "&response_type=code&scope=openid+profile+email+offline_access&state=" + authId;
-        window.location.href = url;
-      }).catch(() => {
-        this.form.authenticate = 'LOCAL';
-      });
     }
   }
 }