From 64d03f07821e67249b5abd7ece2e56a471a23b15 Mon Sep 17 00:00:00 2001 From: "Austin.Duan" Date: Thu, 4 Jan 2024 18:10:50 +0800 Subject: [PATCH 1/3] =?UTF-8?q?REPORT-112768=20fix:=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=9E=E6=8E=A5=E6=9B=B4=E6=96=B0=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E4=B8=8D=E5=90=8C=E6=AD=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/pages/connection/connection.ts | 10 +++++++--- src/modules/pages/connection/list/list.model.ts | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/modules/pages/connection/connection.ts b/src/modules/pages/connection/connection.ts index f06dcc5..1215974 100644 --- a/src/modules/pages/connection/connection.ts +++ b/src/modules/pages/connection/connection.ts @@ -24,11 +24,15 @@ export class Connection extends BI.Widget { title: HTapeLayout; watch = { - connectionSelected: { + connectionSelectedOne: { immediate: true, - handler: (name: string) => { + handler: (v: Connection) => { BI.nextTick(() => { - name ? this.renderConnectionListView(name) : this.renderEmptyListView(); + const connectionName = v.connectionName; + + connectionName + ? this.renderConnectionListView(connectionName) + : this.renderEmptyListView(); }); }, }, diff --git a/src/modules/pages/connection/list/list.model.ts b/src/modules/pages/connection/list/list.model.ts index 3d30378..b1bc9d2 100644 --- a/src/modules/pages/connection/list/list.model.ts +++ b/src/modules/pages/connection/list/list.model.ts @@ -44,7 +44,7 @@ export class ConnectionListModel extends Model<{ // 仅首次进入时从url中读取参数，其他情况保留选中状态 defaultDatabaseName ||= data.data[0].connectionName; - this.setSelectedConnection(this.model.connectionSelected || defaultDatabaseName); + this.setSelectedConnection(defaultDatabaseName); } return new Promise(resolve => { From ce17bd506c314fd426148dbdc464cec1e3f92171 Mon Sep 17 00:00:00 2001 From: "Austin.Duan" Date: Tue, 9 Jan 2024 14:39:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?FDL-9101=20fix:=20=E4=BF=AE=E5=A4=8Dhana?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=9E=E6=8E=A5url=E8=81=94=E5=8A=A8?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/app.provider.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/app.provider.ts b/src/modules/app.provider.ts index c1b83e2..4ed6284 100644 --- a/src/modules/app.provider.ts +++ b/src/modules/app.provider.ts @@ -92,13 +92,13 @@ BI.provider('dec.connection.provider.datebase', function () { } // 处理SAP HANA数据连接url - const sapHanaUrl = url.match(/^jdbc:(sap):(thin:([0-9a-zA-Z/]*)?@|thin:([0-9a-zA-Z/]*)?@\/\/|\/\/|)([0-9a-zA-Z_\\.-]+)(:([0-9|port]+))?([^]+)?(.*)/i); + const sapHanaUrl = url.match(/^jdbc:(sap):(thin:([0-9a-zA-Z/]*)?@|thin:([0-9a-zA-Z/]*)?@\/\/|\/\/|)([0-9a-zA-Z_\\.-]+)(:([0-9|port]+))?(\?databaseName=)?([^&]+)([^]+)?(.*)/i); if (sapHanaUrl) { return { host: sapHanaUrl[5], port: sapHanaUrl[7] === 'port' ? '' : sapHanaUrl[7], - databaseName: '', - urlInfo: sapHanaUrl[9], + databaseName: sapHanaUrl[9] || '', + urlInfo: sapHanaUrl[10], }; } From 74dd5ba289dbf6056dc02764b679b4ebe4fbd17f Mon Sep 17 00:00:00 2001 From: hans Date: Thu, 25 Jan 2024 15:54:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?REPORT-112276=20=E5=85=AC=E5=85=B1=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=8F=96=E6=95=B0=E7=AE=80=E9=81=93=E4=BA=91=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=BF=9E=E6=8E=A5=E9=83=A8=E5=88=86=E9=80=82=E9=85=8D?= =?UTF-8?q?=20=E8=AE=BE=E8=AE=A1=E4=BC=98=E5=85=88=E7=BA=A7,=E4=BC=98?= =?UTF-8?q?=E5=85=88=E4=BD=BF=E7=94=A8=E5=B9=B3=E5=8F=B0=E5=86=85=E7=BD=AE?= =?UTF-8?q?=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/app.provider.ts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/modules/app.provider.ts b/src/modules/app.provider.ts index 4ed6284..18b2a4a 100644 --- a/src/modules/app.provider.ts +++ b/src/modules/app.provider.ts @@ -135,6 +135,16 @@ BI.provider('dec.connection.provider.datebase', function () { return false; } + function filterPluginDataTypeByPriority() { + const originTypes = [...BI.Constants.getConstant(CONSTANT_PLUGIN_TYPES)]; + const sortDataTypes = BI.sortBy(originTypes, (index, value: any) => { + return value.priority || 0; + }) + return BI.uniqWith(sortDataTypes, (current, other) => { + return current.text == other.text; + }); + } + this.registerDatabaseType = (config: any) => { if (coverBaseDatabase(config)) return; @@ -162,6 +172,6 @@ BI.provider('dec.connection.provider.datebase', function () { } return this.resolves[type] || jdbcResolve }, - customDatabaseType: BI.Constants.getConstant(CONSTANT_PLUGIN_TYPES), + customDatabaseType: filterPluginDataTypeByPriority(), }); });