From 70849f920bb1831f43f9a9f99f259ba660b4159c Mon Sep 17 00:00:00 2001 From: alan Date: Tue, 8 Oct 2019 16:15:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=97=A0jira=E4=BB=BB=E5=8A=A1=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/pages/maintain/forms/form.ts | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/modules/pages/maintain/forms/form.ts b/src/modules/pages/maintain/forms/form.ts index 15e40c2..a3dfccb 100644 --- a/src/modules/pages/maintain/forms/form.ts +++ b/src/modules/pages/maintain/forms/form.ts @@ -3,8 +3,8 @@ import { MaintainFormModelXtype, MaintainFormModel } from './form.model'; import { FormJdbc, FormJdbcXtype } from './components/form.jdbc'; import { FormJndiXtype } from './components/form.jndi'; import { FormPluginXtype } from './components/form.plugin'; -import { connectionType } from '@constants/env'; -import { ConnectionJDBC, Connection } from 'src/modules/crud/crud.typings'; +import { connectionType, errorCode } from '@constants/env'; +import { ConnectionJDBC, Connection, ResultType } from 'src/modules/crud/crud.typings'; import { DEFAULT_JNDI_DATA, DEFAULT_JDBC_POOL, DATEBASE_FILTER_TYPE } from '@constants/constant'; import { getJdbcDatabaseType, getChartLength } from '../../../app.service'; export const MaintainFormXtype = 'dec.dcm.maintain.form'; @@ -33,7 +33,7 @@ export class MaintainForm extends BI.Widget { (value.connectionData as ConnectionJDBC).creator = BI.get(this.getFormData().connectionData, 'creator'); this.store.updateConnection(this.connectionName, value).then(result => { if (result.errorCode) { - this.setFromError(BI.i18nText(result.errorMsg)); + this.showError(result); return; } @@ -44,7 +44,7 @@ export class MaintainForm extends BI.Widget { form.connectionId = this.connectionName; this.store.addConnection(form).then(result => { if (result.errorCode) { - this.setFromError(BI.i18nText(result.errorMsg)); + this.showError(result); return; } @@ -199,6 +199,16 @@ export class MaintainForm extends BI.Widget { return true; } + private showError(result: ResultType) { + result.errorCode === errorCode.DUPLICATE_NAMES ? + this.setFromError(BI.i18nText(result.errorMsg)) : + BI.Msg.toast(BI.i18nText(result.errorMsg), { + level: 'error', + }); + + return; + } + private setFromError(errMsg: string) { this.form.setError ? this.form.setError(errMsg) : null; }