diff --git a/components/menu/style/index.scss b/components/menu/style/index.scss index 7c794e30b..7e05d0a20 100644 --- a/components/menu/style/index.scss +++ b/components/menu/style/index.scss @@ -325,6 +325,8 @@ &--mini { .hi-menu-item { &--active { + background-color: rgba($value, 0.1); + &::after { background-color: $value; } @@ -336,8 +338,8 @@ box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.15); .hi-menu-item { - &--active { - background-color: rgba($value, 0.15); + &--active:not(.hi-submenu) { + background-color: rgba($value, 0.1); &::after { background-color: $value; @@ -347,7 +349,7 @@ .hi-menu__title { &:hover { - background-color: rgba($value, 0.15); + background-color: rgba($value, 0.1); } } } diff --git a/components/table/style/Table.scss b/components/table/style/Table.scss index 66c56040a..e34d94a77 100644 --- a/components/table/style/Table.scss +++ b/components/table/style/Table.scss @@ -42,7 +42,7 @@ $borderColor: #e6e7e8 !default; position: relative; } - .hi-icon { + .hi-icon.icon-menu { color: #4284f5; } @@ -461,7 +461,7 @@ $borderColor: #e6e7e8 !default; @each $key, $value in $theme-colors { .theme__#{$key}.hi-table { .hi-table-container table th { - background-color: rgba($value, 0.3); + background-color: rgba($value, 0.1); color: #83868c; } @@ -470,7 +470,11 @@ $borderColor: #e6e7e8 !default; color: #83868c; } - .hi-icon { + .hi-table-container table .hi-table-thead tr:hover { + background-color: #fff; + } + + .hi-icon.icon-menu { color: $value; } @@ -494,5 +498,21 @@ $borderColor: #e6e7e8 !default; } } } + + .hi-pagination { + .hi-icon { + color: #666; + } + + .hi-icon:hover { + color: $value; + } + } + + .hi-pagination:hover > span { + .hi-icon { + color: $value; + } + } } } diff --git a/components/tabs/ItemDropdown.js b/components/tabs/ItemDropdown.js index 2c31d2ea4..92dbdee50 100644 --- a/components/tabs/ItemDropdown.js +++ b/components/tabs/ItemDropdown.js @@ -51,7 +51,8 @@ class ItemDropdown extends Component { items, onChoose, localeDatas, - activeId + activeId, + theme } = this.props const { visible @@ -61,7 +62,7 @@ class ItemDropdown extends Component { if (item.tabId === activeId) activeIndex = index }) return ( -
+
{ this.toggleRef = node }} onClick={e => { e.stopPropagation() this.toggle() @@ -80,7 +81,7 @@ class ItemDropdown extends Component { leftGap={-18} topGap={3} > -
+
{ items.map((item, index) => { return ( diff --git a/components/tabs/Tabs.js b/components/tabs/Tabs.js index 3ddb622e0..be3a59352 100644 --- a/components/tabs/Tabs.js +++ b/components/tabs/Tabs.js @@ -213,6 +213,7 @@ class Tabs extends Component { { diff --git a/components/tabs/style/index.scss b/components/tabs/style/index.scss index 3c5741f09..a3df1acc1 100644 --- a/components/tabs/style/index.scss +++ b/components/tabs/style/index.scss @@ -323,4 +323,14 @@ $prefix: 'hi-tabs' !default; } } } + + .theme__#{$key}.hi-tabs-dropdown__items { + .hi-tabs-dropdown__item:hover { + background-color: rgba($value, 0.1); + } + + .hi-tabs-dropdown__item.hi-tabs-dropdown__item--active { + background-color: rgba($value, 0.1); + } + } } diff --git a/components/tree/TreeItem.js b/components/tree/TreeItem.js index ac4d16044..fa6af872c 100644 --- a/components/tree/TreeItem.js +++ b/components/tree/TreeItem.js @@ -57,6 +57,16 @@ class TreeItem extends Component { apperance, theme } = this.props + + const themeColor = { + 'orange': '#f63', + 'cyan': '#46bc99', + 'magenta': '#ff5975', + 'lavender': '#b450de', + 'blue': '#3da8f5', + 'purple': '#8a8acb', + 'hiui-blue': '#4284f5' + } const { nodePlaceholder, confirm, cancel } = localeDatas.tree const treeItem = (
  • node.id === item.id) || {}).title === '' ? { marginRight: 12, color: '#999' } : { cursor: 'pointer', marginRight: 12, color: '#4284F5' }} + style={(editingNodes.find(node => node.id === item.id) || {}).title === '' ? { marginRight: 12, color: '#999', cursor: 'not-allowed' } : { cursor: 'pointer', marginRight: 12, color: themeColor[theme] }} onClick={() => { if ((editingNodes.find(node => node.id === item.id) || {}).title !== '') { saveEditNode(item.id) diff --git a/components/tree/TreeNode.js b/components/tree/TreeNode.js index 23940093f..df9e650b5 100644 --- a/components/tree/TreeNode.js +++ b/components/tree/TreeNode.js @@ -104,6 +104,15 @@ class TreeNode extends Component { // 高亮检索值 highlightData = (data, highlightValue) => { + const themeColor = { + 'orange': '#f63', + 'cyan': '#46bc99', + 'magenta': '#ff5975', + 'lavender': '#b450de', + 'blue': '#3da8f5', + 'purple': '#8a8acb', + 'hiui-blue': '#4284f5' + } return data.map(item => { if (typeof item.title === 'string' && item.title.includes(highlightValue)) { const index = item.title.indexOf(highlightValue) @@ -112,7 +121,7 @@ class TreeNode extends Component { item.title = ( {beforeStr} - {highlightValue} + {highlightValue} {afterStr} ) diff --git a/components/tree/style/index.scss b/components/tree/style/index.scss index 138c87280..92c9b7af7 100644 --- a/components/tree/style/index.scss +++ b/components/tree/style/index.scss @@ -537,6 +537,10 @@ $tree: 'hi-tree' !default; border: 1px solid $value; } + .hi-checkbox-legacy__label.highlight { + color: $value; + } + .hi-checkbox-legacy--checked .hi-checkbox-legacy__input { border: 1px solid $value; }