From 5dd6a58ef965f17c352ef05356fe7d350aa48cd1 Mon Sep 17 00:00:00 2001 From: "Kevin.King" Date: Mon, 7 Nov 2022 10:37:39 +0800 Subject: [PATCH 1/4] =?UTF-8?q?BI-116671=20fix:=E6=95=B0=E6=8D=AE=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E7=AE=A1=E7=90=86-=E6=96=B0=E5=BB=BA=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=BF=9E=E6=8E=A5=E7=95=8C=E9=9D=A2=E5=9C=A8IE?= =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8=E4=B8=8B=E6=9C=89=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=8C=E6=9C=80=E5=8F=B3=E4=BE=A7=E5=8F=96=E6=B6=88=E5=92=8C?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E9=83=A8=E5=88=86=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/title/title.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/title/title.ts b/src/modules/title/title.ts index 73d936b..687e2e8 100644 --- a/src/modules/title/title.ts +++ b/src/modules/title/title.ts @@ -78,6 +78,7 @@ export class Title extends BI.Widget { type: BI.Tab.xtype, height: 40, showIndex: this.model.pageIndex, + width:200, ref: (_ref: Tab) => { this.tab = _ref; }, From e7a20272cfd045a4b82b3901f6d9df035210d944 Mon Sep 17 00:00:00 2001 From: "Aries.lsy" <”Aries.lsy@fanruan.com“> Date: Thu, 24 Nov 2022 16:50:45 +0800 Subject: [PATCH 2/4] =?UTF-8?q?REPORT-85441=20fix:clickhouse=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5url=E6=B7=BB=E5=8A=A0database?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/constants/constant.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/constants/constant.ts b/src/modules/constants/constant.ts index 48b7ded..9f5f5b0 100644 --- a/src/modules/constants/constant.ts +++ b/src/modules/constants/constant.ts @@ -279,7 +279,7 @@ export const DATA_BASE_TYPES = [ text: 'ClickHouse', databaseType: 'clickhouse', driver: 'ru.yandex.clickhouse.ClickHouseDriver', - url: 'jdbc:clickhouse://hostname:port', + url: 'jdbc:clickhouse://hostname:port/database', commonly: false, internal: true, type: 'jdbc', From 75c06d9318e3d9872a2ee20d2c31f9b14d7d50c2 Mon Sep 17 00:00:00 2001 From: "Austin.Duan" Date: Fri, 25 Nov 2022 14:15:27 +0800 Subject: [PATCH 3/4] =?UTF-8?q?REPORT-85619=20feat:=20=E6=8B=93=E5=B1=95?= =?UTF-8?q?=E4=B8=8B=E6=95=B0=E6=8D=AE=E8=BF=9E=E6=8E=A5=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/app.provider.ts | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/src/modules/app.provider.ts b/src/modules/app.provider.ts index f3e9a60..791d2be 100644 --- a/src/modules/app.provider.ts +++ b/src/modules/app.provider.ts @@ -1,10 +1,11 @@ import { CONSTANT_PLUGIN_TYPES } from './app.constant'; +import { DATA_BASE_TYPES } from '@constants/constant'; -BI.provider('dec.connection.provider.datebase', function() { +BI.provider('dec.connection.provider.datebase', function () { this.resolves = {}; // 原service中resolveUrlInfo方法 - function jdbcResolve (url: string) { + function jdbcResolve(url: string) { if (BI.isNull(url)) return {}; const oracleUlr = url.match(/^jdbc:(oracle):(thin:([0-9a-zA-Z/]*)?@|thin:([0-9a-zA-Z/]*)?@\/\/|\/\/|)([0-9a-zA-Z_\\.-]+)(:([0-9|port]+))?(:|\/)([^]+)(.*)/i); if (oracleUlr) { @@ -68,14 +69,35 @@ BI.provider('dec.connection.provider.datebase', function() { }; } + function coverBaseDatabase(config) { + const baseDataBase = DATA_BASE_TYPES.find(item => item.text === config.text); + if (BI.isNotNull(baseDataBase)) { + // 覆盖基础配置 + Object.assign(baseDataBase, config); + + return true; + } + + return false; + } + this.registerDatabaseType = (config: any) => { + if (coverBaseDatabase(config)) return; + BI.config(CONSTANT_PLUGIN_TYPES, connections => BI.concat(connections, config)); }; this.registerJdbcDatabase = (config: any, resolve?: Function) => { - BI.config(CONSTANT_PLUGIN_TYPES, connections => BI.concat(connections, { ...config, type: 'jdbc' })); + config = { + ...config, + type: 'jdbc', + }; BI.isFunction(resolve) && (this.resolves[config.databaseType] = resolve); + + if (coverBaseDatabase(config)) return; + + BI.config(CONSTANT_PLUGIN_TYPES, connections => BI.concat(connections, config)); }; this.$get = () => BI.inherit(BI.OB, { From bd0a0f0e17e609afa433d52bc596e0d8e7710cda Mon Sep 17 00:00:00 2001 From: "Aries.lsy" <”Aries.lsy@fanruan.com“> Date: Fri, 25 Nov 2022 14:57:12 +0800 Subject: [PATCH 4/4] =?UTF-8?q?REPORT-85200=20fix:=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E3=80=8C=E5=88=9D=E5=A7=8B=E5=8C=96=E8=BF=9E=E6=8E=A5=E6=95=B0?= =?UTF-8?q?=E3=80=8D=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/pages/maintain/forms/components/form.jdbc.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/pages/maintain/forms/components/form.jdbc.ts b/src/modules/pages/maintain/forms/components/form.jdbc.ts index 277f1a7..90ea1b2 100644 --- a/src/modules/pages/maintain/forms/components/form.jdbc.ts +++ b/src/modules/pages/maintain/forms/components/form.jdbc.ts @@ -1001,7 +1001,8 @@ export class FormJdbc extends BI.Widget { { el: { type: BI.VerticalLayout.xtype, - bgap: vgap, + vgap: vgap, + top: -15, invisible: true, ref: (_ref: VerticalLayout) => { this.advancedSet = _ref;