From 0e6c33e42422d300e8ed66aa9ead526a6915c767 Mon Sep 17 00:00:00 2001 From: zsmj1994 Date: Thu, 18 Jun 2020 16:57:15 +0800 Subject: [PATCH] =?UTF-8?q?BI-66943=20fix:=20=E3=80=90513=E3=80=91?= =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=9B=B4=E6=96=B0=E8=AE=BE=E7=BD=AE=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E6=9B=B4=E6=96=B0=EF=BC=8C=E6=98=8E=E7=BB=86=E9=A2=91?= =?UTF-8?q?=E7=8E=87=E6=89=A7=E8=A1=8C=EF=BC=8C=E5=BA=94=E8=AF=A5=E5=8F=AA?= =?UTF-8?q?=E6=9C=89=E9=80=89=E9=A1=B9=E5=89=8D=E9=9D=A2=E7=9A=84=E9=80=89?= =?UTF-8?q?=E9=A1=B9=E6=98=AF=E5=8B=BE=E9=80=89=E7=8A=B6=E6=80=81=EF=BC=8C?= =?UTF-8?q?=E6=95=B4=E4=B8=80=E8=A1=8C=E6=B2=A1=E6=9C=89=E8=93=9D=E8=89=B2?= =?UTF-8?q?=E9=80=89=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/connection/list/list_item/list_item.ts | 16 ++++++++-------- .../pages/connection_pool/list_item/list_item.ts | 2 +- src/modules/pages/database/filter/filter.less | 6 ------ src/modules/pages/database/filter/filter.ts | 5 ++--- 4 files changed, 11 insertions(+), 18 deletions(-) delete mode 100644 src/modules/pages/database/filter/filter.less diff --git a/src/modules/pages/connection/list/list_item/list_item.ts b/src/modules/pages/connection/list/list_item/list_item.ts index be73a60..70489bd 100644 --- a/src/modules/pages/connection/list/list_item/list_item.ts +++ b/src/modules/pages/connection/list/list_item/list_item.ts @@ -16,7 +16,7 @@ export class ListItem extends BI.BasicButton { creator: '', databaseType: '', height: 25, - baseCls: 'dec-dcm-connection-list-item bi-list-item-active', + baseCls: 'dec-dcm-connection-list-item bi-list-item-active2', } store: ListItemModel['store']; @@ -39,7 +39,7 @@ export class ListItem extends BI.BasicButton { render() { const { name, databaseType } = this.options; - + return { type: Htape, items: [{ @@ -80,7 +80,7 @@ export class ListItem extends BI.BasicButton { this.store.setIsEdit(false, name); this.nameLabel.setText(name); this.nameEditor.setValue(name); - + return; } this.store.changeName(name, newName).then(re => { @@ -124,10 +124,10 @@ export class ListItem extends BI.BasicButton { this.downListCombo.setValue(''); }, }], - + } : { - type: Layout, - }, + type: Layout, + }, width: 25, }], }; @@ -153,7 +153,7 @@ export class ListItem extends BI.BasicButton { if (!isRegistered) { return [otherIcons]; } - + return [ [ { @@ -211,7 +211,7 @@ export class ListItem extends BI.BasicButton { this.store.setPageIndex(PAGE_INDEX.MAINTAIN); this.store.setDatebaseTypeSelected(''); }) - .catch(() => {}); + .catch(() => { }); }, changeName: () => { this.store.setIsEdit(true, name); diff --git a/src/modules/pages/connection_pool/list_item/list_item.ts b/src/modules/pages/connection_pool/list_item/list_item.ts index 814255e..54a498e 100644 --- a/src/modules/pages/connection_pool/list_item/list_item.ts +++ b/src/modules/pages/connection_pool/list_item/list_item.ts @@ -8,7 +8,7 @@ export class ListItem extends BI.BasicButton { props = { name: '', height: 25, - baseCls: 'dec-dcm-connection-pool-list-item bi-list-item-active', + baseCls: 'dec-dcm-connection-pool-list-item bi-list-item-active2', } store: ListItemModel['store']; diff --git a/src/modules/pages/database/filter/filter.less b/src/modules/pages/database/filter/filter.less deleted file mode 100644 index daeacb4..0000000 --- a/src/modules/pages/database/filter/filter.less +++ /dev/null @@ -1,6 +0,0 @@ -@import "../../../../less/index.less"; -.bi-list-item-active{ - &:active, &.active { - background-color: @color-bi-light-blue-60; - } -} \ No newline at end of file diff --git a/src/modules/pages/database/filter/filter.ts b/src/modules/pages/database/filter/filter.ts index b4ea449..2f6e819 100644 --- a/src/modules/pages/database/filter/filter.ts +++ b/src/modules/pages/database/filter/filter.ts @@ -1,7 +1,6 @@ import { shortcut, store } from '@core/core'; import { Label } from 'ui'; import { FilterModel, FilterModelXtype } from './filter.model'; -import './filter.less'; export const FilterXtype = 'dec.dcm.datebase.filter'; @shortcut(FilterXtype) @@ -11,12 +10,12 @@ export class Filter extends BI.BasicButton { props = { text: '', value: '', - baseCls: 'bi-list-item-active', + baseCls: 'bi-list-item-active2', } render() { const { text } = this.options; - + return { type: Label, textAlign: 'left',