From 2d9b9787e1a0aa5575619fe8e6017ff724b765e5 Mon Sep 17 00:00:00 2001 From: guy Date: Thu, 22 Jun 2017 09:47:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bi/core.css | 76 +++++++++++++++++++ bi/widget.js | 9 +++ docs/core.css | 76 +++++++++++++++++++ docs/widget.js | 9 +++ src/css/core/utils/common.css | 76 +++++++++++++++++++ src/less/core/utils/common.less | 67 ++++++++++++++++ .../node/node.first.plus.js | 1 + .../node/node.last.plus.js | 1 + .../node/node.mid.plus.js | 1 + .../node/node.first.plus.js | 1 + .../node/node.last.plus.js | 1 + .../node/node.mid.plus.js | 1 + .../treeitem/item.first.treeleaf.js | 1 + .../treeitem/item.last.treeleaf.js | 1 + .../treeitem/item.mid.treeleaf.js | 1 + 15 files changed, 322 insertions(+) diff --git a/bi/core.css b/bi/core.css index c4a24a3ec..5bf17a0d2 100644 --- a/bi/core.css +++ b/bi/core.css @@ -3484,6 +3484,82 @@ i { .bi-theme-dark .bi-list-item-select.disabled:active .bi-high-light { color: #666666 !important; } +.bi-list-item-none:hover, +.bi-list-item-none.hover { + color: inherit; + background-color: inherit; +} +.bi-list-item-none:hover .bi-input, +.bi-list-item-none.hover .bi-input { + color: inherit; +} +.bi-list-item-none:active, +.bi-list-item-none.active { + color: inherit; + background-color: inherit; +} +.bi-list-item-none:active .bi-input, +.bi-list-item-none.active .bi-input { + color: inherit; +} +.bi-list-item-none:active .bi-high-light, +.bi-list-item-none.active .bi-high-light { + color: inherit; +} +.bi-list-item-none.disabled, +.bi-list-item-none.disabled:hover, +.bi-list-item-none.disabled:active { + color: #cccccc !important; + background-color: transparent !important; +} +.bi-list-item-none.disabled .bi-input, +.bi-list-item-none.disabled:hover .bi-input, +.bi-list-item-none.disabled:active .bi-input { + color: #cccccc !important; +} +.bi-list-item-none.disabled .bi-high-light, +.bi-list-item-none.disabled:hover .bi-high-light, +.bi-list-item-none.disabled:active .bi-high-light { + color: #cccccc !important; +} +.bi-theme-dark .bi-list-item-none:hover, +.bi-theme-dark .bi-list-item-none.hover { + color: inherit; + background-color: inherit; +} +.bi-theme-dark .bi-list-item-none:hover .bi-input, +.bi-theme-dark .bi-list-item-none.hover .bi-input { + color: inherit; +} +.bi-theme-dark .bi-list-item-none:active, +.bi-theme-dark .bi-list-item-none.active { + color: inherit; + background-color: inherit; +} +.bi-theme-dark .bi-list-item-none:active .bi-input, +.bi-theme-dark .bi-list-item-none.active .bi-input { + color: inherit; +} +.bi-theme-dark .bi-list-item-none:active .bi-high-light, +.bi-theme-dark .bi-list-item-none.active .bi-high-light { + color: inherit; +} +.bi-theme-dark .bi-list-item-none.disabled, +.bi-theme-dark .bi-list-item-none.disabled:hover, +.bi-theme-dark .bi-list-item-none.disabled:active { + background-color: transparent !important; + color: #666666 !important; +} +.bi-theme-dark .bi-list-item-none.disabled .bi-input, +.bi-theme-dark .bi-list-item-none.disabled:hover .bi-input, +.bi-theme-dark .bi-list-item-none.disabled:active .bi-input { + color: #666666 !important; +} +.bi-theme-dark .bi-list-item-none.disabled .bi-high-light, +.bi-theme-dark .bi-list-item-none.disabled:hover .bi-high-light, +.bi-theme-dark .bi-list-item-none.disabled:active .bi-high-light { + color: #666666 !important; +} /*****************cursor*****************/ .cursor-pointer { cursor: pointer; diff --git a/bi/widget.js b/bi/widget.js index 638fea28d..ba92b624e 100644 --- a/bi/widget.js +++ b/bi/widget.js @@ -8302,6 +8302,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { var self = this, o = this.options; this.node = BI.createWidget({ type: "bi.select_tree_first_plus_group_node", + cls: "bi-list-item-none", stopPropagation: true, logic: { dynamic: true @@ -8395,6 +8396,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { var self = this, o = this.options; this.node = BI.createWidget({ type: "bi.select_tree_last_plus_group_node", + cls: "bi-list-item-none", stopPropagation: true, logic: { dynamic: true @@ -8484,6 +8486,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { var self = this, o = this.options; this.node = BI.createWidget({ type: "bi.select_tree_mid_plus_group_node", + cls: "bi-list-item-none", stopPropagation: true, logic: { dynamic: true @@ -8843,6 +8846,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { var self = this, o = this.options; this.node = BI.createWidget({ type: "bi.first_plus_group_node", + cls: "bi-list-item-none", logic: { dynamic: true }, @@ -8925,6 +8929,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { var self = this, o = this.options; this.node = BI.createWidget({ type: "bi.last_plus_group_node", + cls: "bi-list-item-none", logic: { dynamic: true }, @@ -9007,6 +9012,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { var self = this, o = this.options; this.node = BI.createWidget({ type: "bi.mid_plus_group_node", + cls: "bi-list-item-none", logic: { dynamic: true }, @@ -9089,6 +9095,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, { var self = this, o = this.options; this.item = BI.createWidget({ type: "bi.first_tree_leaf_item", + cls: "bi-list-item-none", logic: { dynamic: true }, @@ -9184,6 +9191,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, { var self = this, o = this.options; this.item = BI.createWidget({ type: "bi.last_tree_leaf_item", + cls: "bi-list-item-none", logic: { dynamic: true }, @@ -9279,6 +9287,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, { var self = this, o = this.options; this.item = BI.createWidget({ type: "bi.mid_tree_leaf_item", + cls: "bi-list-item-none", logic: { dynamic: true }, diff --git a/docs/core.css b/docs/core.css index c4a24a3ec..5bf17a0d2 100644 --- a/docs/core.css +++ b/docs/core.css @@ -3484,6 +3484,82 @@ i { .bi-theme-dark .bi-list-item-select.disabled:active .bi-high-light { color: #666666 !important; } +.bi-list-item-none:hover, +.bi-list-item-none.hover { + color: inherit; + background-color: inherit; +} +.bi-list-item-none:hover .bi-input, +.bi-list-item-none.hover .bi-input { + color: inherit; +} +.bi-list-item-none:active, +.bi-list-item-none.active { + color: inherit; + background-color: inherit; +} +.bi-list-item-none:active .bi-input, +.bi-list-item-none.active .bi-input { + color: inherit; +} +.bi-list-item-none:active .bi-high-light, +.bi-list-item-none.active .bi-high-light { + color: inherit; +} +.bi-list-item-none.disabled, +.bi-list-item-none.disabled:hover, +.bi-list-item-none.disabled:active { + color: #cccccc !important; + background-color: transparent !important; +} +.bi-list-item-none.disabled .bi-input, +.bi-list-item-none.disabled:hover .bi-input, +.bi-list-item-none.disabled:active .bi-input { + color: #cccccc !important; +} +.bi-list-item-none.disabled .bi-high-light, +.bi-list-item-none.disabled:hover .bi-high-light, +.bi-list-item-none.disabled:active .bi-high-light { + color: #cccccc !important; +} +.bi-theme-dark .bi-list-item-none:hover, +.bi-theme-dark .bi-list-item-none.hover { + color: inherit; + background-color: inherit; +} +.bi-theme-dark .bi-list-item-none:hover .bi-input, +.bi-theme-dark .bi-list-item-none.hover .bi-input { + color: inherit; +} +.bi-theme-dark .bi-list-item-none:active, +.bi-theme-dark .bi-list-item-none.active { + color: inherit; + background-color: inherit; +} +.bi-theme-dark .bi-list-item-none:active .bi-input, +.bi-theme-dark .bi-list-item-none.active .bi-input { + color: inherit; +} +.bi-theme-dark .bi-list-item-none:active .bi-high-light, +.bi-theme-dark .bi-list-item-none.active .bi-high-light { + color: inherit; +} +.bi-theme-dark .bi-list-item-none.disabled, +.bi-theme-dark .bi-list-item-none.disabled:hover, +.bi-theme-dark .bi-list-item-none.disabled:active { + background-color: transparent !important; + color: #666666 !important; +} +.bi-theme-dark .bi-list-item-none.disabled .bi-input, +.bi-theme-dark .bi-list-item-none.disabled:hover .bi-input, +.bi-theme-dark .bi-list-item-none.disabled:active .bi-input { + color: #666666 !important; +} +.bi-theme-dark .bi-list-item-none.disabled .bi-high-light, +.bi-theme-dark .bi-list-item-none.disabled:hover .bi-high-light, +.bi-theme-dark .bi-list-item-none.disabled:active .bi-high-light { + color: #666666 !important; +} /*****************cursor*****************/ .cursor-pointer { cursor: pointer; diff --git a/docs/widget.js b/docs/widget.js index 638fea28d..ba92b624e 100644 --- a/docs/widget.js +++ b/docs/widget.js @@ -8302,6 +8302,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { var self = this, o = this.options; this.node = BI.createWidget({ type: "bi.select_tree_first_plus_group_node", + cls: "bi-list-item-none", stopPropagation: true, logic: { dynamic: true @@ -8395,6 +8396,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { var self = this, o = this.options; this.node = BI.createWidget({ type: "bi.select_tree_last_plus_group_node", + cls: "bi-list-item-none", stopPropagation: true, logic: { dynamic: true @@ -8484,6 +8486,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { var self = this, o = this.options; this.node = BI.createWidget({ type: "bi.select_tree_mid_plus_group_node", + cls: "bi-list-item-none", stopPropagation: true, logic: { dynamic: true @@ -8843,6 +8846,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { var self = this, o = this.options; this.node = BI.createWidget({ type: "bi.first_plus_group_node", + cls: "bi-list-item-none", logic: { dynamic: true }, @@ -8925,6 +8929,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { var self = this, o = this.options; this.node = BI.createWidget({ type: "bi.last_plus_group_node", + cls: "bi-list-item-none", logic: { dynamic: true }, @@ -9007,6 +9012,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { var self = this, o = this.options; this.node = BI.createWidget({ type: "bi.mid_plus_group_node", + cls: "bi-list-item-none", logic: { dynamic: true }, @@ -9089,6 +9095,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, { var self = this, o = this.options; this.item = BI.createWidget({ type: "bi.first_tree_leaf_item", + cls: "bi-list-item-none", logic: { dynamic: true }, @@ -9184,6 +9191,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, { var self = this, o = this.options; this.item = BI.createWidget({ type: "bi.last_tree_leaf_item", + cls: "bi-list-item-none", logic: { dynamic: true }, @@ -9279,6 +9287,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, { var self = this, o = this.options; this.item = BI.createWidget({ type: "bi.mid_tree_leaf_item", + cls: "bi-list-item-none", logic: { dynamic: true }, diff --git a/src/css/core/utils/common.css b/src/css/core/utils/common.css index c94dd5a88..0d10234d9 100644 --- a/src/css/core/utils/common.css +++ b/src/css/core/utils/common.css @@ -538,3 +538,79 @@ .bi-theme-dark .bi-list-item-select.disabled:active .bi-high-light { color: #666666 !important; } +.bi-list-item-none:hover, +.bi-list-item-none.hover { + color: inherit; + background-color: inherit; +} +.bi-list-item-none:hover .bi-input, +.bi-list-item-none.hover .bi-input { + color: inherit; +} +.bi-list-item-none:active, +.bi-list-item-none.active { + color: inherit; + background-color: inherit; +} +.bi-list-item-none:active .bi-input, +.bi-list-item-none.active .bi-input { + color: inherit; +} +.bi-list-item-none:active .bi-high-light, +.bi-list-item-none.active .bi-high-light { + color: inherit; +} +.bi-list-item-none.disabled, +.bi-list-item-none.disabled:hover, +.bi-list-item-none.disabled:active { + color: #cccccc !important; + background-color: transparent !important; +} +.bi-list-item-none.disabled .bi-input, +.bi-list-item-none.disabled:hover .bi-input, +.bi-list-item-none.disabled:active .bi-input { + color: #cccccc !important; +} +.bi-list-item-none.disabled .bi-high-light, +.bi-list-item-none.disabled:hover .bi-high-light, +.bi-list-item-none.disabled:active .bi-high-light { + color: #cccccc !important; +} +.bi-theme-dark .bi-list-item-none:hover, +.bi-theme-dark .bi-list-item-none.hover { + color: inherit; + background-color: inherit; +} +.bi-theme-dark .bi-list-item-none:hover .bi-input, +.bi-theme-dark .bi-list-item-none.hover .bi-input { + color: inherit; +} +.bi-theme-dark .bi-list-item-none:active, +.bi-theme-dark .bi-list-item-none.active { + color: inherit; + background-color: inherit; +} +.bi-theme-dark .bi-list-item-none:active .bi-input, +.bi-theme-dark .bi-list-item-none.active .bi-input { + color: inherit; +} +.bi-theme-dark .bi-list-item-none:active .bi-high-light, +.bi-theme-dark .bi-list-item-none.active .bi-high-light { + color: inherit; +} +.bi-theme-dark .bi-list-item-none.disabled, +.bi-theme-dark .bi-list-item-none.disabled:hover, +.bi-theme-dark .bi-list-item-none.disabled:active { + background-color: transparent !important; + color: #666666 !important; +} +.bi-theme-dark .bi-list-item-none.disabled .bi-input, +.bi-theme-dark .bi-list-item-none.disabled:hover .bi-input, +.bi-theme-dark .bi-list-item-none.disabled:active .bi-input { + color: #666666 !important; +} +.bi-theme-dark .bi-list-item-none.disabled .bi-high-light, +.bi-theme-dark .bi-list-item-none.disabled:hover .bi-high-light, +.bi-theme-dark .bi-list-item-none.disabled:active .bi-high-light { + color: #666666 !important; +} diff --git a/src/less/core/utils/common.less b/src/less/core/utils/common.less index 7a8d6dc54..2dd6dcc1a 100644 --- a/src/less/core/utils/common.less +++ b/src/less/core/utils/common.less @@ -551,3 +551,70 @@ } } } + +//去掉list-item效果 +.bi-list-item-none { + &:hover, &.hover { + color: inherit; + & .bi-input { + color: inherit; + } + background-color: inherit; + } + &:active, &.active { + color: inherit; + & .bi-input { + color: inherit; + } + background-color: inherit; + & .bi-high-light { + color: inherit; + } + } + &.disabled { + &, &:hover, &:active { + color: @color-bi-text-disabled !important; + & .bi-input { + color: @color-bi-text-disabled !important; + } + background-color: transparent !important; + & .bi-high-light { + color: @color-bi-text-disabled !important; + } + } + } +} + +.bi-theme-dark { + .bi-list-item-none { + &:hover, &.hover { + color: inherit; + & .bi-input { + color: inherit; + } + background-color: inherit; + } + &:active, &.active { + color: inherit; + & .bi-input { + color: inherit; + } + background-color: inherit; + & .bi-high-light { + color: inherit; + } + } + &.disabled { + &, &:hover, &:active { + background-color: transparent !important; + color: @color-bi-text-disabled-theme-dark !important; + & .bi-input { + color: @color-bi-text-disabled-theme-dark !important; + } + & .bi-high-light { + color: @color-bi-text-disabled-theme-dark !important; + } + } + } + } +} diff --git a/src/widget/multilayerselecttree/node/node.first.plus.js b/src/widget/multilayerselecttree/node/node.first.plus.js index aba0af277..467290106 100644 --- a/src/widget/multilayerselecttree/node/node.first.plus.js +++ b/src/widget/multilayerselecttree/node/node.first.plus.js @@ -23,6 +23,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { var self = this, o = this.options; this.node = BI.createWidget({ type: "bi.select_tree_first_plus_group_node", + cls: "bi-list-item-none", stopPropagation: true, logic: { dynamic: true diff --git a/src/widget/multilayerselecttree/node/node.last.plus.js b/src/widget/multilayerselecttree/node/node.last.plus.js index 4ae2c9dbd..035ddd5e4 100644 --- a/src/widget/multilayerselecttree/node/node.last.plus.js +++ b/src/widget/multilayerselecttree/node/node.last.plus.js @@ -23,6 +23,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { var self = this, o = this.options; this.node = BI.createWidget({ type: "bi.select_tree_last_plus_group_node", + cls: "bi-list-item-none", stopPropagation: true, logic: { dynamic: true diff --git a/src/widget/multilayerselecttree/node/node.mid.plus.js b/src/widget/multilayerselecttree/node/node.mid.plus.js index 4cda2a994..2dcde5142 100644 --- a/src/widget/multilayerselecttree/node/node.mid.plus.js +++ b/src/widget/multilayerselecttree/node/node.mid.plus.js @@ -23,6 +23,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { var self = this, o = this.options; this.node = BI.createWidget({ type: "bi.select_tree_mid_plus_group_node", + cls: "bi-list-item-none", stopPropagation: true, logic: { dynamic: true diff --git a/src/widget/multilayersingletree/node/node.first.plus.js b/src/widget/multilayersingletree/node/node.first.plus.js index 21e9d24b6..4e6255a50 100644 --- a/src/widget/multilayersingletree/node/node.first.plus.js +++ b/src/widget/multilayersingletree/node/node.first.plus.js @@ -22,6 +22,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { var self = this, o = this.options; this.node = BI.createWidget({ type: "bi.first_plus_group_node", + cls: "bi-list-item-none", logic: { dynamic: true }, diff --git a/src/widget/multilayersingletree/node/node.last.plus.js b/src/widget/multilayersingletree/node/node.last.plus.js index 7785ce8dc..085254a61 100644 --- a/src/widget/multilayersingletree/node/node.last.plus.js +++ b/src/widget/multilayersingletree/node/node.last.plus.js @@ -22,6 +22,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { var self = this, o = this.options; this.node = BI.createWidget({ type: "bi.last_plus_group_node", + cls: "bi-list-item-none", logic: { dynamic: true }, diff --git a/src/widget/multilayersingletree/node/node.mid.plus.js b/src/widget/multilayersingletree/node/node.mid.plus.js index 726e10a9a..a540a0e26 100644 --- a/src/widget/multilayersingletree/node/node.mid.plus.js +++ b/src/widget/multilayersingletree/node/node.mid.plus.js @@ -22,6 +22,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { var self = this, o = this.options; this.node = BI.createWidget({ type: "bi.mid_plus_group_node", + cls: "bi-list-item-none", logic: { dynamic: true }, diff --git a/src/widget/multilayersingletree/treeitem/item.first.treeleaf.js b/src/widget/multilayersingletree/treeitem/item.first.treeleaf.js index f7c11ea1b..82c6915d4 100644 --- a/src/widget/multilayersingletree/treeitem/item.first.treeleaf.js +++ b/src/widget/multilayersingletree/treeitem/item.first.treeleaf.js @@ -22,6 +22,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, { var self = this, o = this.options; this.item = BI.createWidget({ type: "bi.first_tree_leaf_item", + cls: "bi-list-item-none", logic: { dynamic: true }, diff --git a/src/widget/multilayersingletree/treeitem/item.last.treeleaf.js b/src/widget/multilayersingletree/treeitem/item.last.treeleaf.js index 5c7bb730a..bece33468 100644 --- a/src/widget/multilayersingletree/treeitem/item.last.treeleaf.js +++ b/src/widget/multilayersingletree/treeitem/item.last.treeleaf.js @@ -22,6 +22,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, { var self = this, o = this.options; this.item = BI.createWidget({ type: "bi.last_tree_leaf_item", + cls: "bi-list-item-none", logic: { dynamic: true }, diff --git a/src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js b/src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js index 4a23ab947..b6ec9bf9b 100644 --- a/src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js +++ b/src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js @@ -22,6 +22,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, { var self = this, o = this.options; this.item = BI.createWidget({ type: "bi.mid_tree_leaf_item", + cls: "bi-list-item-none", logic: { dynamic: true },