Merge remote-tracking branch 'origin/v1.1' into v1.1

frontend/src/business/components/settings/system/LdapSetting.vue

@@ -19,7 +19,7 @@
           <el-input v-model="form.filter" :placeholder="$t('ldap.input_filter_placeholder')"></el-input>
         </el-form-item>
         <el-form-item :label="$t('ldap.mapping')" prop="mapping">
-          <el-input v-model="form.mapping" :placeholder="$t('ldap.input_mapping')"></el-input>
+          <el-input v-model="form.mapping" :placeholder="$t('ldap.input_mapping_placeholder')"></el-input>
         </el-form-item>
         <el-form-item :label="$t('ldap.open')" prop="open">
           <el-checkbox v-model="form.open"></el-checkbox>

frontend/src/business/components/track/plan/view/comonents/test/ApiTestDetail.vue

@@ -81,7 +81,7 @@
         });
       },
       runTest() {
-        this.result = this.$post("/api/run", {id: this.test.id}, (response) => {
+        this.result = this.$post("/api/run", {id: this.test.id, triggerMode: 'MANUAL'}, (response) => {
           this.$success(this.$t('api_test.running'));
           this.$emit('runTest', response.data)
         });

frontend/src/i18n/en-US.js

@@ -678,6 +678,7 @@ export default {
     input_url_placeholder: 'Please enter the LDAP address (eg ldap://localhost:389)',
     input_ou_placeholder: 'Enter user OU (use | to separate each OU)',
     input_filter_placeholder: 'Input filter [Possible options are cn or uid or sAMAccountName={0}, eg: (uid={0})]',
+    input_mapping_placeholder: 'eg：{"username":"uid","name":"sn","email":"mail"}, The username mapping option may be cn or uid or sAMAccountName',
     test_connect: 'Test Connection',
     test_login: 'Test Login',
     edit: 'Edit',

frontend/src/i18n/zh-CN.js

@@ -678,6 +678,7 @@ export default {
     input_url_placeholder: '请输入LDAP地址 (如 ldap://localhost:389)',
     input_ou_placeholder: '输入用户OU (使用|分隔各OU)',
     input_filter_placeholder: '输入过滤器 [可能的选项是cn或uid或sAMAccountName={0}, 如：(uid={0})]',
+    input_mapping_placeholder: '如：{"username":"uid","name":"sn","email":"mail"}, username映射的选项可能是cn或uid或sAMAccountName',
     test_connect: '测试连接',
     test_login: '测试登录',
     edit: '编辑',

frontend/src/i18n/zh-TW.js

@@ -676,6 +676,7 @@ export default {
     input_url_placeholder: '請輸入LDAP地址 (如 ldap://localhost:389)',
     input_ou_placeholder: '輸入用戶OU (使用|分隔各OU)',
     input_filter_placeholder: '輸入過濾器 [可能的選項是cn或uid或sAMAccountName={0}, 如：(uid={0})]',
+    input_mapping_placeholder: '如：{"username":"uid","name":"sn","email":"mail"}, username映射的選項可能是cn或uid或sAMAccountName',
     test_connect: '測試連接',
     test_login: '測試登錄',
     edit: '編輯',