diff --git a/public/css/background.css b/public/css/background.css index 1440b9854..f136e8464 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 1px 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 0 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 1px 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 0 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 d2a0865f7..89c0f3884 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: 15, + width: 16, el: { type: "bi.layout", cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 15, + width: 16, height: o.height } }), { diff --git a/src/case/button/treeitem/item.last.treeleaf.js b/src/case/button/treeitem/item.last.treeleaf.js index 6f815bfe9..557efa5b0 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: 15, + width: 16, el: { type: "bi.layout", cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 15, + width: 16, height: o.height } }), { diff --git a/src/case/button/treeitem/item.mid.treeleaf.js b/src/case/button/treeitem/item.mid.treeleaf.js index d1558e03d..0dbafcefd 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: 15, + width: 16, el: { type: "bi.layout", cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 15, + width: 16, height: o.height } }), { diff --git a/src/css/base/colorchooser/colorpicker/editor.css b/src/css/base/colorchooser/colorpicker/editor.css index ffd4e071e..770680b91 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 1px 0; + background: url('images/1x/icon/tree_vertical_line_1.png') repeat-y 0 0; } .bi-theme-dark .ztree li ul.line { - background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0; + background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 0 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 efe4551d1..c538f84b0 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 18px; + padding: 0 0 0 22px; } .ztree li a { padding: 1px 3px 0 0; @@ -137,8 +137,8 @@ background-position: -42px -56px; } .ztree li span.button.switch { - width: 25px; - height: 25px; + width: 30px; + height: 30px; } .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 1adb7984d..330936127 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 1px 0; + background: url('images/1x/icon/tree_vertical_line_1.png') repeat-y 0 0; } .bi-theme-dark .ztree li ul.line { - background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0; + background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 0 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 26f2146d4..c60e18629 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 18px + padding: 0 0 0 22px } .ztree li a { @@ -181,8 +181,8 @@ } .ztree li span.button.switch { - width: 25px; - height: 25px + width: 30px; + height: 30px } .ztree li span.button.noline_open { diff --git a/src/less/resource/background.less b/src/less/resource/background.less index e1eb69d35..120593e34 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, 1px, repeat-y); + .imagePath(@icon-tree-vertical-line-1, 0, 0, repeat-y); } .bi-theme-dark { .ztree li ul.line { - .imagePath(@icon-tree-vertical-line-1-theme-dark, 0, 1px, repeat-y); + .imagePath(@icon-tree-vertical-line-1-theme-dark, 0, 0, repeat-y); } } diff --git a/src/widget/multilayerselecttree/node/node.first.plus.js b/src/widget/multilayerselecttree/node/node.first.plus.js index b54c986e2..fa7e37243 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: 15, + width: 16, height: o.height }); }); diff --git a/src/widget/multilayerselecttree/node/node.last.plus.js b/src/widget/multilayerselecttree/node/node.last.plus.js index 3795754e1..d3a6a9900 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: 15, + width: 16, height: o.height }); }); diff --git a/src/widget/multilayerselecttree/node/node.mid.plus.js b/src/widget/multilayerselecttree/node/node.mid.plus.js index 05988523d..9466654d0 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: 15, + width: 16, height: o.height }); }); diff --git a/src/widget/multilayerselecttree/node/node.plus.js b/src/widget/multilayerselecttree/node/node.plus.js index 57f02ee20..8d1a3679a 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: 15, + width: 16, height: o.height }); }); diff --git a/src/widget/multilayersingletree/node/node.first.plus.js b/src/widget/multilayersingletree/node/node.first.plus.js index 8165397ab..5024d2904 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: 15, + width: 16, height: o.height }); }); diff --git a/src/widget/multilayersingletree/node/node.last.plus.js b/src/widget/multilayersingletree/node/node.last.plus.js index 943b91d79..1d00ad20f 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: 15, + width: 16, height: o.height }); }); diff --git a/src/widget/multilayersingletree/node/node.mid.plus.js b/src/widget/multilayersingletree/node/node.mid.plus.js index 7fe025d52..3d0a6eb17 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: 15, + width: 16, height: o.height }); }); diff --git a/src/widget/multilayersingletree/treeitem/item.first.treeleaf.js b/src/widget/multilayersingletree/treeitem/item.first.treeleaf.js index be8e3b10e..9ad705a67 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: 15, + width: 16, height: o.height }); }); diff --git a/src/widget/multilayersingletree/treeitem/item.last.treeleaf.js b/src/widget/multilayersingletree/treeitem/item.last.treeleaf.js index 4d639f1a5..3edfc4865 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: 15, + width: 16, height: o.height }); }); diff --git a/src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js b/src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js index c1e14f9a6..ce65c03f5 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: 15, + width: 16, height: o.height }); }); diff --git a/ui/css/background.css b/ui/css/background.css index be8d957f1..82c81f2c3 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 1px 0; + background: url('resources?path=/com/fr/web/ui/images/1x/icon/tree_vertical_line_1.png') repeat-y 0 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 1px 0; + background: url('resources?path=/com/fr/web/ui/images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 0 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;