Merge pull request #8378 in DEC/decision-webui-dcm from final/11.0 to persist/11.0

* commit '9328204fdcfcf1582a5505afa3e1a9ae087141a5':
  REPORT-102763 fix:数据连接支持对接业务系统-接口补充
  REPORT-108103 Starrocks数据连接解析不包含catalog的数据连接出错
  REPORT-108103 Starrocks数据连接解析不包含catalog的数据连接出错
  REPORT-99289 删除代码中的debugger
  REPORT-99289 数据连接适配加一个catalog配置项
  REPORT-105428 fix: 移除SSH主机校验

src/modules/app.provider.ts

@@ -6,25 +6,50 @@ BI.provider('dec.connection.provider.datebase', function () {
 
     function starRocksResolve(url: string) {
         // 处理starRocks数据连接常规模式
-        const result = url.match(/^jdbc:mysql:\/\/([0-9a-zA-Z_\\.-]+):([0-9a-zA-Z_\\.-]+)\/([0-9a-zA-Z_\\.-]+)\.([^]+)(.*)/i);
+        let result = url.match(/^jdbc:mysql:\/\/([0-9a-zA-Z_\\.-]+):([0-9a-zA-Z_\\.-]+)\/([0-9a-zA-Z_\\.-]+)\.([^]+)(.*)/i);
         if (result) {
             return {
                 host: result[1],
                 port: result[2] === 'port' ? '' : result[2],
-                databaseName: result[4] || '',
+                catalog: result[3],
+                databaseName: result[4],
                 urlInfo: result[0],
             };
+        } else {
+            // 兼容老数据库里面没有catalog的情况
+            result = url.match(/^jdbc:mysql:\/\/([0-9a-zA-Z_\\.-]+):([0-9a-zA-Z_\\.-]+)\/([^]+)(.*)/i);
+            if (result) {
+                return {
+                    host: result[1],
+                    port: result[2] === 'port' ? '' : result[2],
+                    catalog: '',
+                    databaseName: result[3],
+                    urlInfo: result[0],
+                };
+            }
         }
         // 处理starRocks数据连接负载均衡模式
-        const loadBalance = url.match(/^jdbc:mysql:loadbalance:\/\/[^/]+\/([^/]+)\.([^/]+)/i);
-        if (loadBalance){
-            const database: string = loadBalance[2];
+        let loadBalance = url.match(/^jdbc:mysql:loadbalance:\/\/[^/]+\/([^/]+)\.([^/]+)/i);
+        if (loadBalance) {
             return {
                 host: '',
                 port: '',
-                databaseName: database,
+                catalog: loadBalance[1],
+                databaseName: loadBalance[2],
                 urlInfo: loadBalance[0],
             }
+        } else {
+            // 兼容老数据库里面没有catalog的情况
+            loadBalance = url.match(/^jdbc:mysql:loadbalance:\/\/[^/]+\/([^/]+)([^/]+)/i);
+            if (loadBalance) {
+                return {
+                    host: '',
+                    port: '',
+                    catalog: '',
+                    databaseName: loadBalance[1],
+                    urlInfo: loadBalance[0],
+                }
+            }
         }
         return {
             host: '',

src/modules/app.service.ts

@@ -61,7 +61,7 @@ export function resolveUrlInfo(url: string, database?: string) {
 }
 
 // 拼接url
-export function splitUrl(host: string, port: string, database: string, baseUrl: string) {
+export function splitUrl(host: string, port: string, catalog: string, database: string, baseUrl: string, databaseType: string) {
     if (baseUrl.startsWith('jdbc:sqlserver')) {
         return baseUrl.replace('hostname', host).replace(':port', port ? `:${port}` : '')
             .replace('=database', `=${database}`);
@@ -75,6 +75,17 @@ export function splitUrl(host: string, port: string, database: string, baseUrl:
             .replace(':INFORMIXSERVER={server}', '');
     }
 
+    if (databaseType === 'starrocks') {
+        let databaseStr = '';
+        if (!catalog || !database) {
+            databaseStr = catalog + database;
+        } else {
+            databaseStr = catalog + '.' + database;
+        }
+        return baseUrl.replace('hostname', host).replace(':port', port ? `:${port}` : '')
+            .replace('default_catalog.database', databaseStr);
+    }
+
     return baseUrl.replace('hostname', host).replace(':port', port ? `:${port}` : '')
         .replace('/database', `/${database}`)
         .replace(':database', `:${database}`)

src/modules/constants/constant.ts

@@ -722,7 +722,7 @@ export const DATA_BASE_TYPES = [
         databaseType: 'starrocks',
         driver: 'com.mysql.jdbc.Driver',
         drivers: ['com.mysql.jdbc.Driver'],
-        url: 'jdbc:mysql://hostname:port/database',
+        url: 'jdbc:mysql://hostname:port/default_catalog.database',
         commonly: false,
         internal: true,
         type: 'jdbc',

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

@@ -57,7 +57,7 @@ export class ConnectionJdbc extends BI.Widget {
             hdfs,
         } = connectionData;
         const databaseType = getJdbcDatabaseType(database, driver);
-        const { host, port, databaseName, version } = resolveUrlInfo(url, database);
+        const { host, port, catalog, databaseName, version } = resolveUrlInfo(url, database);
         this.version = !BI.isUndefined(databaseType.versions) ? (version ?? databaseType.versions[0]) : version;
         const { hgap, vgap } = CONNECTION_LAYOUT;
 
@@ -78,6 +78,12 @@ export class ConnectionJdbc extends BI.Widget {
                     name: BI.i18nText('Dec-Dcm_Connection_Form_Driver'),
                     value: BI.isKey(driverSource) ? `${driver} (${driverSource})` : driver,
                 },
+                {
+                    type: FormItem.xtype,
+                    name: 'catalog',
+                    invisible: database !== 'starrocks',
+                    value: catalog,
+                },
                 {
                     type: FormItem.xtype,
                     name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Name'),

src/modules/pages/connection/list/list.model.ts

@@ -20,8 +20,9 @@ export class ConnectionListModel extends Model<{
 
     actions = {
         setConnections: ():Promise<void> => api.getConnectionList().then(data => {
+            data.data.push(...BI.Constants.getConstant('dec.constant.connection.list'));
             if (BI.size(data.data) > 0) {
-                this.model.connections = data.data.concat(BI.Constants.getConstant('dec.constant.connection.list'));
+                this.model.connections = data.data;
                 this.model.connections.forEach(item => {
                 // 后端传过来的是字符串，转为对象
                     BI.isString(item.connectionData) && (item.connectionData = JSON.parse(item.connectionData as string));

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

@@ -51,6 +51,7 @@ export class FormJdbc extends BI.Widget {
         connectionName: null,
         version: null,
         driver: null,
+        catalog: null,
         database: null,
         host: null,
         port: null,
@@ -160,7 +161,7 @@ export class FormJdbc extends BI.Widget {
         } = connectionPoolAttr as ConnectionPoolJDBC;
         const databaseType = getJdbcDatabaseType(database, driver);
         this.databaseType = databaseType;
-        const { host, port, databaseName, version } = resolveUrlInfo(url, database);
+        const { host, port, catalog, databaseName, version } = resolveUrlInfo(url, database);
         this.version = !BI.isUndefined(databaseType.versions) ? (version ?? databaseType.versions[0]) : version;
         const { hgap, vgap } = CONNECTION_LAYOUT;
 
@@ -262,6 +263,33 @@ export class FormJdbc extends BI.Widget {
                         },
                     ],
                 },
+                // catalog
+                {
+                    type: FormItem.xtype,
+                    name: 'catalog',
+                    invisible: database !== 'starrocks',
+                    forms: [
+                        {
+                            type: BI.TextEditor.xtype,
+                            $value: 'database-catalog',
+                            width: EDITOR_WIDTH,
+                            allowBlank: true,
+                            watermark: 'catalog',
+                            value: catalog,
+                            ref: (_ref: any) => {
+                                this.form.catalog = _ref;
+                            },
+                            listeners: [
+                                {
+                                    eventName: BI.Editor.EVENT_CHANGE,
+                                    action: () => {
+                                        this.onHostPortChange(databaseType);
+                                    },
+                                },
+                            ],
+                        },
+                    ],
+                },
                 // 数据库名称
                 {
                     type: FormItem.xtype,
@@ -843,6 +871,7 @@ export class FormJdbc extends BI.Widget {
                                     action: () => {
                                         const urlInfo = resolveUrlInfo(this.form.url.getValue(), database);
                                         this.form.host.setValue(urlInfo.host);
+                                        this.form.catalog.setValue(urlInfo.catalog);
                                         this.form.database.setValue(urlInfo.databaseName);
                                         this.form.port.setValue(urlInfo.port);
                                     },
@@ -1572,14 +1601,15 @@ export class FormJdbc extends BI.Widget {
         ];
     }
 
-    private onHostPortChange(databaseType) {
-        const { urls, url } = databaseType;
+    private onHostPortChange(database) {
+        const { urls, url, databaseType } = database;
         const driver = this.form.driver.getValue();
         const selectUrl = BI.get(urls, driver.driver) || url;
         const host = this.form.host.getValue();
         const port = this.form.port.getValue();
-        const database = this.form.database.getValue();
-        this.form.url.setValue(splitUrl(host, port, database, selectUrl));
+        const catalog = this.form.catalog.getValue();
+        const databaseName = this.form.database.getValue();
+        this.form.url.setValue(splitUrl(host, port, catalog, databaseName, selectUrl, databaseType));
     }
 
     private onSshTypeChange(sshType) {

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

@@ -34,6 +34,7 @@ export class MaintainForm extends BI.Widget {
             if (sonSave) {
                 sonSave().then((success: boolean) => {
                     if (success) {
+                        this.store.goFirstPage();
                         BI.Msg.toast(BI.i18nText("Dec-Basic_Save_Success"), {
                             level: "success",
                         });