Pull request #3821: DEC-21782 feat: 适配dremio数据源

Merge in DEC/decision-webui-dcm from ~DAILER/decision-webui-dcm:feature/x to feature/x

* commit '7c727e4e373484408d83dcd9572eb9918b251645':
  DEC-21809 fix: 【迭代】【连接池配置优化】最大空闲连接数未删除
  DEC-21782 feat: 适配dremio数据源

src/modules/constants/constant.ts

@@ -583,6 +583,17 @@ export const DATA_BASE_TYPES = [
         type: 'jdbc',
         hasSchema: true,
         kerberos: true,
+    }, {
+        text: 'dremio',
+        databaseType: 'dremio',
+        driver: 'com.dremio.jdbc.Driver',
+        drivers: ['com.dremio.jdbc.Driver'],
+        url: 'jdbc:dremio:direct=hostname:31010',
+        commonly: false,
+        internal: true,
+        type: 'jdbc',
+        hasSchema: true,
+        kerberos: true,
     }, {
         text: 'Presto',
         databaseType: 'presto',

src/modules/pages/connection/connection_jdbc/connection_jdbc.ts

@@ -109,7 +109,7 @@ export class ConnectionJdbc extends BI.Widget {
                 },
                 {
                     type: FormItem.xtype,
-                    name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Validation_Query'),
+                    name: BI.i18nText('Dec-Dcm_Connection_Form_SQL_Validation_Query'),
                     value: api.getPlain(connectionPoolAttr.validationQuery || ''),
                 },
                 {
@@ -121,7 +121,7 @@ export class ConnectionJdbc extends BI.Widget {
                 {
                     type: Collapse.xtype,
                     width: 70,
-                    name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Advanced_Setting'),
+                    name: BI.i18nText('Dec-Dcm_Connection_Form_Database_More_Setting'),
                     listeners: [
                         {
                             eventName: EVENT_CHANGE,
@@ -145,11 +145,6 @@ export class ConnectionJdbc extends BI.Widget {
                             name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Initial_Size'),
                             value: connectionPoolAttr.initialSize,
                         },
-                        {
-                            type: FormItem.xtype,
-                            name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Max_Idle'),
-                            value: connectionPoolAttr.maxIdle,
-                        },
                         {
                             type: FormItem.xtype,
                             name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Min_Idle'),

src/modules/pages/maintain/forms/components/form.jdbc.ts

@@ -54,7 +54,6 @@ export class FormJdbc extends BI.Widget {
         url: null,
         initialSize: null,
         maxActive: null,
-        maxIdle: null,
         maxWait: null,
         validationQuery: null,
         testOnBorrow: null,
@@ -87,7 +86,6 @@ export class FormJdbc extends BI.Widget {
         const {
             initialSize,
             maxActive,
-            maxIdle,
             maxWait,
             validationQuery,
             testOnBorrow,
@@ -481,7 +479,7 @@ export class FormJdbc extends BI.Widget {
                         $value: 'validation-query',
                         cls: 'bi-border',
                         allowBlank: true,
-                        watermark: BI.i18nText('Dec-Dcm_Connection_Form_Place_Input'),
+                        watermark: BI.i18nText('Dec-Dcm_Connection_Form_SQL_Validation_Query_Watermark'),
                         value: api.getPlain(validationQuery || ''),
                         width: 300,
                         height: 100,
@@ -522,7 +520,7 @@ export class FormJdbc extends BI.Widget {
                     type: Collapse.xtype,
                     bgap: -15,
                     width: 70,
-                    name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Advanced_Setting'),
+                    name: BI.i18nText('Dec-Dcm_Connection_Form_Database_More_Setting'),
                     listeners: [
                         {
                             eventName: EVENT_CHANGE,
@@ -562,26 +560,6 @@ export class FormJdbc extends BI.Widget {
                                 },
                             }],
                         },
-                        {
-                            type: FormItem.xtype,
-                            name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Max_Idle'),
-                            forms: [{
-                                type: TextChecker.xtype,
-                                $value: 'max-idle',
-                                width: 300,
-                                allowBlank: false,
-                                value: maxIdle,
-                                watermark: BI.i18nText('Dec-Dcm_Connection_Form_Database_Max_Idle'),
-                                validationChecker: [{
-                                    errorText: BI.i18nText('Dec-Dcm_Connection_Check_Integer'),
-                                    checker: (value: string) => this.checkInteger(value),
-                                    autoFix: true,
-                                }, valueRangeConfig],
-                                ref: (_ref: TextChecker) => {
-                                    this.form.maxIdle = _ref;
-                                },
-                            }],
-                        },
                         {
                             type: FormItem.xtype,
                             name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Min_Idle'),
@@ -862,7 +840,6 @@ export class FormJdbc extends BI.Widget {
                 connectionPoolAttr: {
                     initialSize: this.form.initialSize.getValue(),
                     maxActive: this.form.maxActive.getValue(),
-                    maxIdle: this.form.maxIdle.getValue(),
                     minIdle: this.form.minIdle.getValue(),
                     maxWait: this.form.maxWait.getValue(),
                     validationQuery: api.getCipher(this.form.validationQuery.getValue()),