From 78863c26f51cdd9b91f99c07c48e93191f03ea2e Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Fri, 28 Jun 2019 11:37:56 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"BI-44244=20=E9=80=82=E9=85=8D?= =?UTF-8?q?=E6=A0=91=E7=9A=84=E9=AB=98=E5=BA=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit cf821cac08ee2203cc1c19b6b08c0b96e824830a. --- public/css/background.css | 4 ++-- src/case/button/treeitem/item.first.treeleaf.js | 4 ++-- src/case/button/treeitem/item.last.treeleaf.js | 4 ++-- src/case/button/treeitem/item.mid.treeleaf.js | 4 ++-- src/css/base/colorchooser/colorpicker/editor.css | 4 ++-- src/css/base/tree/ztree.css | 6 +++--- src/css/resource/background.css | 4 ++-- src/less/base/tree/ztree.less | 6 +++--- src/less/resource/background.less | 4 ++-- src/widget/multilayerselecttree/node/node.first.plus.js | 2 +- src/widget/multilayerselecttree/node/node.last.plus.js | 2 +- src/widget/multilayerselecttree/node/node.mid.plus.js | 2 +- src/widget/multilayerselecttree/node/node.plus.js | 2 +- src/widget/multilayersingletree/node/node.first.plus.js | 2 +- src/widget/multilayersingletree/node/node.last.plus.js | 2 +- src/widget/multilayersingletree/node/node.mid.plus.js | 2 +- .../multilayersingletree/treeitem/item.first.treeleaf.js | 2 +- .../multilayersingletree/treeitem/item.last.treeleaf.js | 2 +- .../multilayersingletree/treeitem/item.mid.treeleaf.js | 2 +- ui/css/background.css | 4 ++-- 20 files changed, 32 insertions(+), 32 deletions(-) diff --git a/public/css/background.css b/public/css/background.css index f136e8464..1440b9854 100644 --- a/public/css/background.css +++ b/public/css/background.css @@ -17,10 +17,10 @@ background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/icon/tree_vertical_line_4.png') no-repeat center center; } .ztree li ul.line { - background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/icon/tree_vertical_line_1.png') repeat-y 0 0; + background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0; } .bi-theme-dark .ztree li ul.line { - background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 0 0; + background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0; } .ztree li span.button.chk.checkbox_false_full { background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/2x/icon/check_box_normal.png') no-repeat center center; diff --git a/src/case/button/treeitem/item.first.treeleaf.js b/src/case/button/treeitem/item.first.treeleaf.js index 89c0f3884..d2a0865f7 100644 --- a/src/case/button/treeitem/item.first.treeleaf.js +++ b/src/case/button/treeitem/item.first.treeleaf.js @@ -42,11 +42,11 @@ BI.FirstTreeLeafItem = BI.inherit(BI.BasicButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : { - width: 16, + width: 15, el: { type: "bi.layout", cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 16, + width: 15, height: o.height } }), { diff --git a/src/case/button/treeitem/item.last.treeleaf.js b/src/case/button/treeitem/item.last.treeleaf.js index 557efa5b0..6f815bfe9 100644 --- a/src/case/button/treeitem/item.last.treeleaf.js +++ b/src/case/button/treeitem/item.last.treeleaf.js @@ -42,11 +42,11 @@ BI.LastTreeLeafItem = BI.inherit(BI.BasicButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : { - width: 16, + width: 15, el: { type: "bi.layout", cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 16, + width: 15, height: o.height } }), { diff --git a/src/case/button/treeitem/item.mid.treeleaf.js b/src/case/button/treeitem/item.mid.treeleaf.js index 0dbafcefd..d1558e03d 100644 --- a/src/case/button/treeitem/item.mid.treeleaf.js +++ b/src/case/button/treeitem/item.mid.treeleaf.js @@ -42,11 +42,11 @@ BI.MidTreeLeafItem = BI.inherit(BI.BasicButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : { - width: 16, + width: 15, el: { type: "bi.layout", cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 16, + width: 15, height: o.height } }), { diff --git a/src/css/base/colorchooser/colorpicker/editor.css b/src/css/base/colorchooser/colorpicker/editor.css index 770680b91..ffd4e071e 100644 --- a/src/css/base/colorchooser/colorpicker/editor.css +++ b/src/css/base/colorchooser/colorpicker/editor.css @@ -17,10 +17,10 @@ background: url('images/1x/icon/tree_vertical_line_4.png') no-repeat center center; } .ztree li ul.line { - background: url('images/1x/icon/tree_vertical_line_1.png') repeat-y 0 0; + background: url('images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0; } .bi-theme-dark .ztree li ul.line { - background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 0 0; + background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0; } .ztree li span.button.chk.checkbox_false_full { background: url('images/2x/icon/check_box_normal.png') no-repeat center center; diff --git a/src/css/base/tree/ztree.css b/src/css/base/tree/ztree.css index c538f84b0..efe4551d1 100644 --- a/src/css/base/tree/ztree.css +++ b/src/css/base/tree/ztree.css @@ -17,7 +17,7 @@ } .ztree li ul { margin: 0; - padding: 0 0 0 22px; + padding: 0 0 0 18px; } .ztree li a { padding: 1px 3px 0 0; @@ -137,8 +137,8 @@ background-position: -42px -56px; } .ztree li span.button.switch { - width: 30px; - height: 30px; + width: 25px; + height: 25px; } .ztree li span.button.noline_open { background-position: -92px -72px; diff --git a/src/css/resource/background.css b/src/css/resource/background.css index 330936127..1adb7984d 100644 --- a/src/css/resource/background.css +++ b/src/css/resource/background.css @@ -17,10 +17,10 @@ background: url('images/1x/icon/tree_vertical_line_4.png') no-repeat center center; } .ztree li ul.line { - background: url('images/1x/icon/tree_vertical_line_1.png') repeat-y 0 0; + background: url('images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0; } .bi-theme-dark .ztree li ul.line { - background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 0 0; + background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0; } .ztree li span.button.chk.checkbox_false_full { background: url('images/2x/icon/check_box_normal.png') no-repeat center center; diff --git a/src/less/base/tree/ztree.less b/src/less/base/tree/ztree.less index c60e18629..26f2146d4 100644 --- a/src/less/base/tree/ztree.less +++ b/src/less/base/tree/ztree.less @@ -22,7 +22,7 @@ .ztree li ul { margin: 0; - padding: 0 0 0 22px + padding: 0 0 0 18px } .ztree li a { @@ -181,8 +181,8 @@ } .ztree li span.button.switch { - width: 30px; - height: 30px + width: 25px; + height: 25px } .ztree li span.button.noline_open { diff --git a/src/less/resource/background.less b/src/less/resource/background.less index 120593e34..e1eb69d35 100644 --- a/src/less/resource/background.less +++ b/src/less/resource/background.less @@ -29,12 +29,12 @@ } .ztree li ul.line { - .imagePath(@icon-tree-vertical-line-1, 0, 0, repeat-y); + .imagePath(@icon-tree-vertical-line-1, 0, 1px, repeat-y); } .bi-theme-dark { .ztree li ul.line { - .imagePath(@icon-tree-vertical-line-1-theme-dark, 0, 0, repeat-y); + .imagePath(@icon-tree-vertical-line-1-theme-dark, 0, 1px, repeat-y); } } diff --git a/src/widget/multilayerselecttree/node/node.first.plus.js b/src/widget/multilayerselecttree/node/node.first.plus.js index fa7e37243..b54c986e2 100644 --- a/src/widget/multilayerselecttree/node/node.first.plus.js +++ b/src/widget/multilayerselecttree/node/node.first.plus.js @@ -56,7 +56,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 15, height: o.height }); }); diff --git a/src/widget/multilayerselecttree/node/node.last.plus.js b/src/widget/multilayerselecttree/node/node.last.plus.js index d3a6a9900..3795754e1 100644 --- a/src/widget/multilayerselecttree/node/node.last.plus.js +++ b/src/widget/multilayerselecttree/node/node.last.plus.js @@ -56,7 +56,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 15, height: o.height }); }); diff --git a/src/widget/multilayerselecttree/node/node.mid.plus.js b/src/widget/multilayerselecttree/node/node.mid.plus.js index 9466654d0..05988523d 100644 --- a/src/widget/multilayerselecttree/node/node.mid.plus.js +++ b/src/widget/multilayerselecttree/node/node.mid.plus.js @@ -56,7 +56,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 15, height: o.height }); }); diff --git a/src/widget/multilayerselecttree/node/node.plus.js b/src/widget/multilayerselecttree/node/node.plus.js index 8d1a3679a..57f02ee20 100644 --- a/src/widget/multilayerselecttree/node/node.plus.js +++ b/src/widget/multilayerselecttree/node/node.plus.js @@ -56,7 +56,7 @@ BI.MultiLayerSelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 15, height: o.height }); }); diff --git a/src/widget/multilayersingletree/node/node.first.plus.js b/src/widget/multilayersingletree/node/node.first.plus.js index 5024d2904..8165397ab 100644 --- a/src/widget/multilayersingletree/node/node.first.plus.js +++ b/src/widget/multilayersingletree/node/node.first.plus.js @@ -36,7 +36,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 15, height: o.height }); }); diff --git a/src/widget/multilayersingletree/node/node.last.plus.js b/src/widget/multilayersingletree/node/node.last.plus.js index 1d00ad20f..943b91d79 100644 --- a/src/widget/multilayersingletree/node/node.last.plus.js +++ b/src/widget/multilayersingletree/node/node.last.plus.js @@ -36,7 +36,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 15, height: o.height }); }); diff --git a/src/widget/multilayersingletree/node/node.mid.plus.js b/src/widget/multilayersingletree/node/node.mid.plus.js index 3d0a6eb17..7fe025d52 100644 --- a/src/widget/multilayersingletree/node/node.mid.plus.js +++ b/src/widget/multilayersingletree/node/node.mid.plus.js @@ -36,7 +36,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 15, height: o.height }); }); diff --git a/src/widget/multilayersingletree/treeitem/item.first.treeleaf.js b/src/widget/multilayersingletree/treeitem/item.first.treeleaf.js index 9ad705a67..be8e3b10e 100644 --- a/src/widget/multilayersingletree/treeitem/item.first.treeleaf.js +++ b/src/widget/multilayersingletree/treeitem/item.first.treeleaf.js @@ -57,7 +57,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 15, height: o.height }); }); diff --git a/src/widget/multilayersingletree/treeitem/item.last.treeleaf.js b/src/widget/multilayersingletree/treeitem/item.last.treeleaf.js index 3edfc4865..4d639f1a5 100644 --- a/src/widget/multilayersingletree/treeitem/item.last.treeleaf.js +++ b/src/widget/multilayersingletree/treeitem/item.last.treeleaf.js @@ -56,7 +56,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 15, height: o.height }); }); diff --git a/src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js b/src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js index ce65c03f5..c1e14f9a6 100644 --- a/src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js +++ b/src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js @@ -56,7 +56,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 15, height: o.height }); }); diff --git a/ui/css/background.css b/ui/css/background.css index 82c81f2c3..be8d957f1 100644 --- a/ui/css/background.css +++ b/ui/css/background.css @@ -17,10 +17,10 @@ background: url('resources?path=/com/fr/web/ui/images/1x/icon/tree_vertical_line_4.png') no-repeat center center; } .ztree li ul.line { - background: url('resources?path=/com/fr/web/ui/images/1x/icon/tree_vertical_line_1.png') repeat-y 0 0; + background: url('resources?path=/com/fr/web/ui/images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0; } .bi-theme-dark .ztree li ul.line { - background: url('resources?path=/com/fr/web/ui/images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 0 0; + background: url('resources?path=/com/fr/web/ui/images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0; } .ztree li span.button.chk.checkbox_false_full { background: url('resources?path=/com/fr/web/ui/images/2x/icon/check_box_normal.png') no-repeat center center;