From ee75344a33ce1864e1f0b4e3cb2a6796ddb15b81 Mon Sep 17 00:00:00 2001 From: alan Date: Thu, 30 May 2019 15:39:41 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=B8=85=E7=90=86=E4=B8=8D?= =?UTF-8?q?=E5=BF=85=E8=A6=81=E7=9A=84=20cursor-pointer=EF=BC=8C=20?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=20hover-visible?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/connection/left/item/left_item.less | 16 +--------------- src/app/connection/left/item/left_item.ts | 2 +- src/app/connection/left/left.ts | 2 +- src/app/connection/more/item/more_link_item.ts | 2 +- src/app/status/left/left.ts | 2 +- src/app/status/left/left_item.less | 9 --------- src/app/status/left/left_item.ts | 3 +-- src/app/title/item/title_item.ts | 2 +- src/less/var.less | 1 + 9 files changed, 8 insertions(+), 31 deletions(-) delete mode 100644 src/app/status/left/left_item.less diff --git a/src/app/connection/left/item/left_item.less b/src/app/connection/left/item/left_item.less index 998a760..a3d0766 100644 --- a/src/app/connection/left/item/left_item.less +++ b/src/app/connection/left/item/left_item.less @@ -1,18 +1,4 @@ @import '../../../../less/index.less'; .dec-webui-dcm-connection-left-item{ - &-selected{ - background-color: @background-color-blue-transparent; - .link-title{ - color: @font-color-highlight; - } - } - &:hover{ - background-color: @background-color-blue-transparent; - .link-item-icon{ - visibility: visible; - } - } - .link-item-icon{ - visibility: hidden; - } + .hover-visible(link-item-icon); } \ No newline at end of file diff --git a/src/app/connection/left/item/left_item.ts b/src/app/connection/left/item/left_item.ts index 48680fc..ba31418 100644 --- a/src/app/connection/left/item/left_item.ts +++ b/src/app/connection/left/item/left_item.ts @@ -19,7 +19,7 @@ const Widget: WidgetType = { return { type: LeftRightVerticalAdapt, - cls: `cursor-pointer`, + cls: 'bi-list-item-active', height: 24, items: { left: [ diff --git a/src/app/connection/left/left.ts b/src/app/connection/left/left.ts index afcf09f..d9c2b85 100644 --- a/src/app/connection/left/left.ts +++ b/src/app/connection/left/left.ts @@ -27,7 +27,7 @@ const Widget: WidgetType = { return BI.map(linkList, (index: number, item: LinkType) => { return { type: LeftItem, - cls: item.isSelected ? 'dec-webui-dcm-connection-left-item-selected' : '', + selected: item.isSelected, title: item.connectionName, id: item.connectionId, creator: item.creator, diff --git a/src/app/connection/more/item/more_link_item.ts b/src/app/connection/more/item/more_link_item.ts index 9604b42..61e2e17 100644 --- a/src/app/connection/more/item/more_link_item.ts +++ b/src/app/connection/more/item/more_link_item.ts @@ -21,7 +21,7 @@ const Widget: WidgetType = { return { type: Vertical, - cls: 'bi-border cursor-pointer', + cls: 'bi-border', width: 120, height: 117, items: [ diff --git a/src/app/status/left/left.ts b/src/app/status/left/left.ts index cfe6a5e..fa07593 100644 --- a/src/app/status/left/left.ts +++ b/src/app/status/left/left.ts @@ -32,7 +32,7 @@ const Widget: WidgetType = { return BI.map(linkList, (index: number, item: LinkType) => { return { type: LeftItem, - cls: item.connectionName === selectTitle ? 'dec-webui-dcm-status-left-item-selected' : '', + selected: item.connectionName === selectTitle, title: item.connectionName, id: item.connectionId, creator: item.creator, diff --git a/src/app/status/left/left_item.less b/src/app/status/left/left_item.less deleted file mode 100644 index 458769f..0000000 --- a/src/app/status/left/left_item.less +++ /dev/null @@ -1,9 +0,0 @@ -@import '../../../less/index.less'; -.dec-webui-dcm-status-left-item{ - &-selected{ - background-color: @background-color-blue-transparent; - .link-title{ - color: @font-color-highlight; - } - } -} \ No newline at end of file diff --git a/src/app/status/left/left_item.ts b/src/app/status/left/left_item.ts index abc9b9a..fe90df6 100644 --- a/src/app/status/left/left_item.ts +++ b/src/app/status/left/left_item.ts @@ -1,4 +1,3 @@ -import './left_item.less'; import {WidgetType, TextButton, VerticalAdapt} from '@ui'; import Model from './left.model'; const className = 'dec.dcm.component.linkStatus.left.item'; @@ -16,7 +15,7 @@ const Widget: WidgetType = { return { type: VerticalAdapt, - cls: `left-item cursor-pointer`, + cls: 'bi-list-item-active', height: 30, items: [ { diff --git a/src/app/title/item/title_item.ts b/src/app/title/item/title_item.ts index 31fdd44..3690a51 100644 --- a/src/app/title/item/title_item.ts +++ b/src/app/title/item/title_item.ts @@ -20,7 +20,7 @@ const Widget = BI.inherit(BI.BasicButton, { return { type: Label, - cls: 'cursor-pointer bi-font-bold', + cls: 'bi-font-bold', height: 40, hgap: 15, text, diff --git a/src/less/var.less b/src/less/var.less index 964e94b..a324209 100644 --- a/src/less/var.less +++ b/src/less/var.less @@ -1,3 +1,4 @@ @import "../../node_modules/fineui/src/less/var"; +@import '../../node_modules/fineui/src/less/visual.less'; @imageUrl: '/img/'; @image2xUrl: '/img/'; \ No newline at end of file