From c9c2f318249666ad948d19252f7fe1805cc6b140 Mon Sep 17 00:00:00 2001 From: alan Date: Fri, 1 Nov 2019 09:29:13 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20BI-54743=20=E4=BF=AE=E6=94=B9=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=BF=9E=E6=8E=A5=E8=87=AA=E5=8A=A8=E5=91=BD=E5=90=8D?= =?UTF-8?q?=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/pages/maintain/forms/form.ts | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/modules/pages/maintain/forms/form.ts b/src/modules/pages/maintain/forms/form.ts index d288fce..ee0459a 100644 --- a/src/modules/pages/maintain/forms/form.ts +++ b/src/modules/pages/maintain/forms/form.ts @@ -210,19 +210,13 @@ export class MaintainForm extends BI.Widget { } private getConnectionName(name = BI.i18nText('Dec-Dcm_Data_Connections')) { - const connections = this.model.connections.filter(item => item.connectionName.startsWith(name)); + const defaultName = name.replace(/\d+$/, ''); + const connections = this.model.connections.filter(item => item.connectionName.startsWith(defaultName)); if (connections.length === 0) { return name; } - let index = 0; - connections.forEach(item => { - const num = parseFloat(item.connectionName.replace(name, '')); - if (num > index) { - index = num; - } - }); - return `${name}${index + 1}`; + return BI.Func.createDistinctName(connections.map(item => item.connectionName), defaultName); } private testConnection() {