Merge remote-tracking branch 'origin/master' into master

frontend/src/business/components/api/test/components/request/database/DatabaseFrom.vue

@@ -29,7 +29,7 @@
       </el-form-item>
 
       <el-form-item :label="$t('api_test.request.sql.pool_max')" prop="poolMax">
-        <el-input-number size="small" :disabled="isReadOnly" v-model="currentConfig.poolMax" :placeholder="$t('commons.please_select')" :max="1000*10000000" :min="0"/>
+        <el-input-number size="small" :disabled="isReadOnly" v-model="currentConfig.poolMax" :placeholder="$t('commons.please_select')" :max="100" :min="0"/>
       </el-form-item>
 
 

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

@@ -609,8 +609,8 @@ export class DatabaseConfig extends BaseConfig {
     super();
     this.id = undefined;
     this.name = undefined;
-    this.poolMax = undefined;
-    this.timeout = undefined;
+    this.poolMax = 1;
+    this.timeout = 100000;
     this.driver = undefined;
     this.dbUrl = undefined;
     this.username = undefined;

frontend/src/common/css/main.css

@@ -108,3 +108,11 @@ body {
   margin: 5px 0;
   border-radius: 5px;
 }
+
+/* 修复带长度限制的文本框，内容太长造成的无法查看内容的问题 */
+/*.el-input-padding-fix .el-input__inner {*/
+  /*padding-right: 60px ;*/
+/*}*/
+.el-input__inner[maxlength] {
+  padding-right: 60px ;
+}