diff --git a/demo/js/case/list/demo.select_list.js b/demo/js/case/list/demo.select_list.js index 1e3d83bfb..f32d426be 100644 --- a/demo/js/case/list/demo.select_list.js +++ b/demo/js/case/list/demo.select_list.js @@ -18,8 +18,7 @@ Demo.Func = BI.inherit(BI.Widget, { } }, items: BI.createItems(BI.deepClone(Demo.CONSTANTS.SIMPLE_ITEMS), { - type: "bi.multi_select_item", - height: 30 + type: "bi.multi_select_item" }) }); } diff --git a/demo/js/core/abstract/combination/demo.combo.js b/demo/js/core/abstract/combination/demo.combo.js index 7fbb2fbb6..e849a1824 100644 --- a/demo/js/core/abstract/combination/demo.combo.js +++ b/demo/js/core/abstract/combination/demo.combo.js @@ -152,7 +152,7 @@ Demo.Func = BI.inherit(BI.Widget, { type: "bi.button_group", items: BI.createItems(BI.deepClone(this.years), { type: "bi.single_select_radio_item", - height: 30, + height: 25, handler: function (v) { } diff --git a/demo/js/core/layout/demo.absolute.js b/demo/js/core/layout/demo.absolute.js index 3a58108c8..2137c24df 100644 --- a/demo/js/core/layout/demo.absolute.js +++ b/demo/js/core/layout/demo.absolute.js @@ -5,16 +5,15 @@ Demo.AbsoluteLayout = BI.inherit(BI.Widget, { render: function () { return { type: "bi.absolute", - scrollx: true, items: [{ el: { type: "bi.label", text: "绝对布局", cls: "layout-bg1", - width: 800, + width: 300, height: 200 }, - right: 100, + left: 100, top: 100 }] }; diff --git a/demo/js/widget/basewidget/demo.items.js b/demo/js/widget/basewidget/demo.items.js index 7130c7311..0562519b3 100644 --- a/demo/js/widget/basewidget/demo.items.js +++ b/demo/js/widget/basewidget/demo.items.js @@ -16,11 +16,9 @@ Demo.Items = BI.inherit(BI.Widget, { text: "单选item" }, { type: "bi.single_select_item", - height: 30, text: "单选项" }, { type: "bi.single_select_radio_item", - height: 30, text: "单选项" }, { type: "bi.label", @@ -28,7 +26,6 @@ Demo.Items = BI.inherit(BI.Widget, { text: "复选item" }, { type: "bi.multi_select_item", - height: 30, text: "复选项" }, { type: "bi.switch", diff --git a/dist/images/1x/icon/dark/tree_collapse_1.png b/dist/images/1x/icon/dark/tree_collapse_1.png index b0f79d361..9297ac164 100644 Binary files a/dist/images/1x/icon/dark/tree_collapse_1.png and b/dist/images/1x/icon/dark/tree_collapse_1.png differ diff --git a/dist/images/1x/icon/dark/tree_collapse_2.png b/dist/images/1x/icon/dark/tree_collapse_2.png index 2f752d854..0b901c254 100644 Binary files a/dist/images/1x/icon/dark/tree_collapse_2.png and b/dist/images/1x/icon/dark/tree_collapse_2.png differ diff --git a/dist/images/1x/icon/dark/tree_collapse_3.png b/dist/images/1x/icon/dark/tree_collapse_3.png index bb3d88bbb..337b009b6 100644 Binary files a/dist/images/1x/icon/dark/tree_collapse_3.png and b/dist/images/1x/icon/dark/tree_collapse_3.png differ diff --git a/dist/images/1x/icon/dark/tree_collapse_4.png b/dist/images/1x/icon/dark/tree_collapse_4.png index 67bdd3d54..6f96e2780 100644 Binary files a/dist/images/1x/icon/dark/tree_collapse_4.png and b/dist/images/1x/icon/dark/tree_collapse_4.png differ diff --git a/dist/images/1x/icon/dark/tree_expand_1.png b/dist/images/1x/icon/dark/tree_expand_1.png index c695fb452..8cf6cc33a 100644 Binary files a/dist/images/1x/icon/dark/tree_expand_1.png and b/dist/images/1x/icon/dark/tree_expand_1.png differ diff --git a/dist/images/1x/icon/dark/tree_expand_2.png b/dist/images/1x/icon/dark/tree_expand_2.png index 6d46d8969..f428db79a 100644 Binary files a/dist/images/1x/icon/dark/tree_expand_2.png and b/dist/images/1x/icon/dark/tree_expand_2.png differ diff --git a/dist/images/1x/icon/dark/tree_expand_3.png b/dist/images/1x/icon/dark/tree_expand_3.png index e5e25e568..9d8e9836c 100644 Binary files a/dist/images/1x/icon/dark/tree_expand_3.png and b/dist/images/1x/icon/dark/tree_expand_3.png differ diff --git a/dist/images/1x/icon/dark/tree_expand_4.png b/dist/images/1x/icon/dark/tree_expand_4.png index 26a90a077..4d35967d7 100644 Binary files a/dist/images/1x/icon/dark/tree_expand_4.png and b/dist/images/1x/icon/dark/tree_expand_4.png differ diff --git a/dist/images/1x/icon/dark/tree_vertical_line_1.png b/dist/images/1x/icon/dark/tree_vertical_line_1.png index b6e1f7305..3f74de38a 100644 Binary files a/dist/images/1x/icon/dark/tree_vertical_line_1.png and b/dist/images/1x/icon/dark/tree_vertical_line_1.png differ diff --git a/dist/images/1x/icon/dark/tree_vertical_line_2.png b/dist/images/1x/icon/dark/tree_vertical_line_2.png index 3a2b4fa28..d2c3a3dbe 100644 Binary files a/dist/images/1x/icon/dark/tree_vertical_line_2.png and b/dist/images/1x/icon/dark/tree_vertical_line_2.png differ diff --git a/dist/images/1x/icon/dark/tree_vertical_line_3.png b/dist/images/1x/icon/dark/tree_vertical_line_3.png index 1ad0a9c65..f35521ea8 100644 Binary files a/dist/images/1x/icon/dark/tree_vertical_line_3.png and b/dist/images/1x/icon/dark/tree_vertical_line_3.png differ diff --git a/dist/images/1x/icon/dark/tree_vertical_line_4.png b/dist/images/1x/icon/dark/tree_vertical_line_4.png index 81d482749..ec9142e58 100644 Binary files a/dist/images/1x/icon/dark/tree_vertical_line_4.png and b/dist/images/1x/icon/dark/tree_vertical_line_4.png differ diff --git a/dist/images/1x/icon/dark/tree_vertical_line_5.png b/dist/images/1x/icon/dark/tree_vertical_line_5.png index fe4be5c8c..5c9867342 100644 Binary files a/dist/images/1x/icon/dark/tree_vertical_line_5.png and b/dist/images/1x/icon/dark/tree_vertical_line_5.png differ diff --git a/dist/images/1x/icon/tree_collapse_1.png b/dist/images/1x/icon/tree_collapse_1.png index e0c3cce8c..6bf0ae233 100644 Binary files a/dist/images/1x/icon/tree_collapse_1.png and b/dist/images/1x/icon/tree_collapse_1.png differ diff --git a/dist/images/1x/icon/tree_collapse_2.png b/dist/images/1x/icon/tree_collapse_2.png index b0e426aa8..063fe11e4 100644 Binary files a/dist/images/1x/icon/tree_collapse_2.png and b/dist/images/1x/icon/tree_collapse_2.png differ diff --git a/dist/images/1x/icon/tree_collapse_3.png b/dist/images/1x/icon/tree_collapse_3.png index 924895f44..535d9f793 100644 Binary files a/dist/images/1x/icon/tree_collapse_3.png and b/dist/images/1x/icon/tree_collapse_3.png differ diff --git a/dist/images/1x/icon/tree_collapse_4.png b/dist/images/1x/icon/tree_collapse_4.png index a3a29ae3f..35466d2ce 100644 Binary files a/dist/images/1x/icon/tree_collapse_4.png and b/dist/images/1x/icon/tree_collapse_4.png differ diff --git a/dist/images/1x/icon/tree_expand_1.png b/dist/images/1x/icon/tree_expand_1.png index a65ecb8b4..824493548 100644 Binary files a/dist/images/1x/icon/tree_expand_1.png and b/dist/images/1x/icon/tree_expand_1.png differ diff --git a/dist/images/1x/icon/tree_expand_2.png b/dist/images/1x/icon/tree_expand_2.png index fff764515..72057ac8b 100644 Binary files a/dist/images/1x/icon/tree_expand_2.png and b/dist/images/1x/icon/tree_expand_2.png differ diff --git a/dist/images/1x/icon/tree_expand_3.png b/dist/images/1x/icon/tree_expand_3.png index ae16937c5..a4780e525 100644 Binary files a/dist/images/1x/icon/tree_expand_3.png and b/dist/images/1x/icon/tree_expand_3.png differ diff --git a/dist/images/1x/icon/tree_expand_4.png b/dist/images/1x/icon/tree_expand_4.png index a5cdaaeb4..c1a306396 100644 Binary files a/dist/images/1x/icon/tree_expand_4.png and b/dist/images/1x/icon/tree_expand_4.png differ diff --git a/dist/images/1x/icon/tree_vertical_line_1.png b/dist/images/1x/icon/tree_vertical_line_1.png index 9137f76e8..8f57c9542 100644 Binary files a/dist/images/1x/icon/tree_vertical_line_1.png and b/dist/images/1x/icon/tree_vertical_line_1.png differ diff --git a/dist/images/1x/icon/tree_vertical_line_2.png b/dist/images/1x/icon/tree_vertical_line_2.png index 317d309ff..98e2ab6bd 100644 Binary files a/dist/images/1x/icon/tree_vertical_line_2.png and b/dist/images/1x/icon/tree_vertical_line_2.png differ diff --git a/dist/images/1x/icon/tree_vertical_line_3.png b/dist/images/1x/icon/tree_vertical_line_3.png index 63a0aa51f..013ebf818 100644 Binary files a/dist/images/1x/icon/tree_vertical_line_3.png and b/dist/images/1x/icon/tree_vertical_line_3.png differ diff --git a/dist/images/1x/icon/tree_vertical_line_4.png b/dist/images/1x/icon/tree_vertical_line_4.png index 2b83c23e5..d752b0e06 100644 Binary files a/dist/images/1x/icon/tree_vertical_line_4.png and b/dist/images/1x/icon/tree_vertical_line_4.png differ diff --git a/dist/images/1x/icon/tree_vertical_line_5.png b/dist/images/1x/icon/tree_vertical_line_5.png index 0714ee954..69e6e408d 100644 Binary files a/dist/images/1x/icon/tree_vertical_line_5.png and b/dist/images/1x/icon/tree_vertical_line_5.png differ diff --git a/dist/images/2x/icon/dark/tree_collapse_1.png b/dist/images/2x/icon/dark/tree_collapse_1.png index 36d99d6d6..7b5616709 100644 Binary files a/dist/images/2x/icon/dark/tree_collapse_1.png and b/dist/images/2x/icon/dark/tree_collapse_1.png differ diff --git a/dist/images/2x/icon/dark/tree_collapse_2.png b/dist/images/2x/icon/dark/tree_collapse_2.png index f745a6469..dc32ec75c 100644 Binary files a/dist/images/2x/icon/dark/tree_collapse_2.png and b/dist/images/2x/icon/dark/tree_collapse_2.png differ diff --git a/dist/images/2x/icon/dark/tree_collapse_3.png b/dist/images/2x/icon/dark/tree_collapse_3.png index ff860dbc6..3eb3bd4f9 100644 Binary files a/dist/images/2x/icon/dark/tree_collapse_3.png and b/dist/images/2x/icon/dark/tree_collapse_3.png differ diff --git a/dist/images/2x/icon/dark/tree_collapse_4.png b/dist/images/2x/icon/dark/tree_collapse_4.png index b9b6464fd..5cd345b39 100644 Binary files a/dist/images/2x/icon/dark/tree_collapse_4.png and b/dist/images/2x/icon/dark/tree_collapse_4.png differ diff --git a/dist/images/2x/icon/dark/tree_expand_1.png b/dist/images/2x/icon/dark/tree_expand_1.png index 5e343ab47..18ecccb9e 100644 Binary files a/dist/images/2x/icon/dark/tree_expand_1.png and b/dist/images/2x/icon/dark/tree_expand_1.png differ diff --git a/dist/images/2x/icon/dark/tree_expand_2.png b/dist/images/2x/icon/dark/tree_expand_2.png index 27a9457e9..0a2dfe193 100644 Binary files a/dist/images/2x/icon/dark/tree_expand_2.png and b/dist/images/2x/icon/dark/tree_expand_2.png differ diff --git a/dist/images/2x/icon/dark/tree_expand_3.png b/dist/images/2x/icon/dark/tree_expand_3.png index 7631b315d..595638455 100644 Binary files a/dist/images/2x/icon/dark/tree_expand_3.png and b/dist/images/2x/icon/dark/tree_expand_3.png differ diff --git a/dist/images/2x/icon/dark/tree_expand_4.png b/dist/images/2x/icon/dark/tree_expand_4.png index 9c2e7958d..e6892387c 100644 Binary files a/dist/images/2x/icon/dark/tree_expand_4.png and b/dist/images/2x/icon/dark/tree_expand_4.png differ diff --git a/dist/images/2x/icon/dark/tree_vertical_line_1.png b/dist/images/2x/icon/dark/tree_vertical_line_1.png index 1d75547b1..1b2e7181f 100644 Binary files a/dist/images/2x/icon/dark/tree_vertical_line_1.png and b/dist/images/2x/icon/dark/tree_vertical_line_1.png differ diff --git a/dist/images/2x/icon/dark/tree_vertical_line_2.png b/dist/images/2x/icon/dark/tree_vertical_line_2.png index 9c9959e50..4939be6d1 100644 Binary files a/dist/images/2x/icon/dark/tree_vertical_line_2.png and b/dist/images/2x/icon/dark/tree_vertical_line_2.png differ diff --git a/dist/images/2x/icon/dark/tree_vertical_line_3.png b/dist/images/2x/icon/dark/tree_vertical_line_3.png index 46c468dbf..af6886917 100644 Binary files a/dist/images/2x/icon/dark/tree_vertical_line_3.png and b/dist/images/2x/icon/dark/tree_vertical_line_3.png differ diff --git a/dist/images/2x/icon/dark/tree_vertical_line_4.png b/dist/images/2x/icon/dark/tree_vertical_line_4.png index 24d5e260f..b4e7977ed 100644 Binary files a/dist/images/2x/icon/dark/tree_vertical_line_4.png and b/dist/images/2x/icon/dark/tree_vertical_line_4.png differ diff --git a/dist/images/2x/icon/dark/tree_vertical_line_5.png b/dist/images/2x/icon/dark/tree_vertical_line_5.png index dc61baa27..331ee4d12 100644 Binary files a/dist/images/2x/icon/dark/tree_vertical_line_5.png and b/dist/images/2x/icon/dark/tree_vertical_line_5.png differ diff --git a/dist/images/2x/icon/tree_collapse_1.png b/dist/images/2x/icon/tree_collapse_1.png index fda6e4884..cbb052d19 100644 Binary files a/dist/images/2x/icon/tree_collapse_1.png and b/dist/images/2x/icon/tree_collapse_1.png differ diff --git a/dist/images/2x/icon/tree_collapse_2.png b/dist/images/2x/icon/tree_collapse_2.png index 89649e721..b9dd88467 100644 Binary files a/dist/images/2x/icon/tree_collapse_2.png and b/dist/images/2x/icon/tree_collapse_2.png differ diff --git a/dist/images/2x/icon/tree_collapse_3.png b/dist/images/2x/icon/tree_collapse_3.png index 0bb8e69f5..4e6b9a70e 100644 Binary files a/dist/images/2x/icon/tree_collapse_3.png and b/dist/images/2x/icon/tree_collapse_3.png differ diff --git a/dist/images/2x/icon/tree_collapse_4.png b/dist/images/2x/icon/tree_collapse_4.png index 28eaf8d3b..fb04c9274 100644 Binary files a/dist/images/2x/icon/tree_collapse_4.png and b/dist/images/2x/icon/tree_collapse_4.png differ diff --git a/dist/images/2x/icon/tree_expand_1.png b/dist/images/2x/icon/tree_expand_1.png index 40d6d192f..5f2f41111 100644 Binary files a/dist/images/2x/icon/tree_expand_1.png and b/dist/images/2x/icon/tree_expand_1.png differ diff --git a/dist/images/2x/icon/tree_expand_2.png b/dist/images/2x/icon/tree_expand_2.png index 9066c8323..addbe513f 100644 Binary files a/dist/images/2x/icon/tree_expand_2.png and b/dist/images/2x/icon/tree_expand_2.png differ diff --git a/dist/images/2x/icon/tree_expand_3.png b/dist/images/2x/icon/tree_expand_3.png index 08c47be7f..8ebec5d39 100644 Binary files a/dist/images/2x/icon/tree_expand_3.png and b/dist/images/2x/icon/tree_expand_3.png differ diff --git a/dist/images/2x/icon/tree_expand_4.png b/dist/images/2x/icon/tree_expand_4.png index 69c8010ee..e6ad9ac56 100644 Binary files a/dist/images/2x/icon/tree_expand_4.png and b/dist/images/2x/icon/tree_expand_4.png differ diff --git a/dist/images/2x/icon/tree_vertical_line_1.png b/dist/images/2x/icon/tree_vertical_line_1.png index 545b1cbb4..c3393797e 100644 Binary files a/dist/images/2x/icon/tree_vertical_line_1.png and b/dist/images/2x/icon/tree_vertical_line_1.png differ diff --git a/dist/images/2x/icon/tree_vertical_line_2.png b/dist/images/2x/icon/tree_vertical_line_2.png index 06548083b..3c55ad9ce 100644 Binary files a/dist/images/2x/icon/tree_vertical_line_2.png and b/dist/images/2x/icon/tree_vertical_line_2.png differ diff --git a/dist/images/2x/icon/tree_vertical_line_3.png b/dist/images/2x/icon/tree_vertical_line_3.png index 667a7c1ae..e7fc65c63 100644 Binary files a/dist/images/2x/icon/tree_vertical_line_3.png and b/dist/images/2x/icon/tree_vertical_line_3.png differ diff --git a/dist/images/2x/icon/tree_vertical_line_4.png b/dist/images/2x/icon/tree_vertical_line_4.png index f08cd60dd..c9570ffad 100644 Binary files a/dist/images/2x/icon/tree_vertical_line_4.png and b/dist/images/2x/icon/tree_vertical_line_4.png differ diff --git a/dist/images/2x/icon/tree_vertical_line_5.png b/dist/images/2x/icon/tree_vertical_line_5.png index 1f743333b..cd4537025 100644 Binary files a/dist/images/2x/icon/tree_vertical_line_5.png and b/dist/images/2x/icon/tree_vertical_line_5.png differ diff --git a/src/case/button/node/node.arrow.js b/src/case/button/node/node.arrow.js index 2bc7b2876..1955eafd7 100644 --- a/src/case/button/node/node.arrow.js +++ b/src/case/button/node/node.arrow.js @@ -12,7 +12,7 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -65,7 +65,7 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, { BI.ArrowNode.superclass.doClick.apply(this, arguments); this.checkbox.setSelected(this.isOpened()); }, - + setText: function (text) { BI.ArrowNode.superclass.setText.apply(this, arguments); this.text.setText(text); diff --git a/src/case/button/node/node.first.plus.js b/src/case/button/node/node.first.plus.js index 293fd1ab0..bb1f9c2dc 100644 --- a/src/case/button/node/node.first.plus.js +++ b/src/case/button/node/node.first.plus.js @@ -15,7 +15,7 @@ BI.FirstPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { diff --git a/src/case/button/node/node.icon.arrow.js b/src/case/button/node/node.icon.arrow.js index f315fae11..17fbd733a 100644 --- a/src/case/button/node/node.icon.arrow.js +++ b/src/case/button/node/node.icon.arrow.js @@ -17,7 +17,7 @@ BI.IconArrowNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30, + height: 24, iconHeight: 12, iconWidth: 12, iconCls: "" diff --git a/src/case/button/node/node.last.plus.js b/src/case/button/node/node.last.plus.js index 2771cdb00..acc72d6a3 100644 --- a/src/case/button/node/node.last.plus.js +++ b/src/case/button/node/node.last.plus.js @@ -15,7 +15,7 @@ BI.LastPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { diff --git a/src/case/button/node/node.mid.plus.js b/src/case/button/node/node.mid.plus.js index 34efa1b39..4615ce7b9 100644 --- a/src/case/button/node/node.mid.plus.js +++ b/src/case/button/node/node.mid.plus.js @@ -15,7 +15,7 @@ BI.MidPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { diff --git a/src/case/button/node/node.multilayer.icon.arrow.js b/src/case/button/node/node.multilayer.icon.arrow.js index b484867c4..1559db2cf 100644 --- a/src/case/button/node/node.multilayer.icon.arrow.js +++ b/src/case/button/node/node.multilayer.icon.arrow.js @@ -7,7 +7,7 @@ BI.MultiLayerIconArrowNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30, + height: 24, iconHeight: 16, iconWidth: 16, iconCls: "" diff --git a/src/case/button/node/node.plus.js b/src/case/button/node/node.plus.js index a881754b0..16b78b8f1 100644 --- a/src/case/button/node/node.plus.js +++ b/src/case/button/node/node.plus.js @@ -15,7 +15,7 @@ BI.PlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { diff --git a/src/case/button/treeitem/item.first.treeleaf.js b/src/case/button/treeitem/item.first.treeleaf.js index d2a0865f7..4db068ab8 100644 --- a/src/case/button/treeitem/item.first.treeleaf.js +++ b/src/case/button/treeitem/item.first.treeleaf.js @@ -13,7 +13,7 @@ BI.FirstTreeLeafItem = BI.inherit(BI.BasicButton, { id: "", pId: "", layer: 0, - height: 30 + height: 24 }); }, _init: function () { @@ -42,19 +42,19 @@ 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: 12, el: { type: "bi.layout", cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 15, + width: 12, height: o.height } }), { - width: 30, + width: 24, el: { type: "bi.layout", cls: "first-line-conn-background", - width: 30, + width: 24, height: o.height } }, { diff --git a/src/case/button/treeitem/item.icon.treeleaf.js b/src/case/button/treeitem/item.icon.treeleaf.js index 58698e88e..a7a18358b 100644 --- a/src/case/button/treeitem/item.icon.treeleaf.js +++ b/src/case/button/treeitem/item.icon.treeleaf.js @@ -5,7 +5,7 @@ BI.IconTreeLeafItem = BI.inherit(BI.BasicButton, { logic: { dynamic: false }, - height: 30, + height: 24, iconWidth: 16, iconHeight: 16, iconCls: "" diff --git a/src/case/button/treeitem/item.last.treeleaf.js b/src/case/button/treeitem/item.last.treeleaf.js index 6f815bfe9..8f3f8e54a 100644 --- a/src/case/button/treeitem/item.last.treeleaf.js +++ b/src/case/button/treeitem/item.last.treeleaf.js @@ -13,7 +13,7 @@ BI.LastTreeLeafItem = BI.inherit(BI.BasicButton, { id: "", pId: "", layer: 0, - height: 30 + height: 24 }); }, _init: function () { @@ -42,19 +42,19 @@ 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: 12, el: { type: "bi.layout", cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 15, + width: 12, height: o.height } }), { - width: 30, + width: 24, el: { type: "bi.layout", cls: "last-line-conn-background", - width: 30, + width: 24, 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..8b41612b0 100644 --- a/src/case/button/treeitem/item.mid.treeleaf.js +++ b/src/case/button/treeitem/item.mid.treeleaf.js @@ -13,7 +13,7 @@ BI.MidTreeLeafItem = BI.inherit(BI.BasicButton, { id: "", pId: "", layer: 0, - height: 30 + height: 24 }); }, _init: function () { @@ -42,19 +42,19 @@ 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: 12, el: { type: "bi.layout", cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 15, + width: 12, height: o.height } }), { - width: 30, + width: 24, el: { type: "bi.layout", cls: "mid-line-conn-background", - width: 30, + width: 24, height: o.height } }, { diff --git a/src/case/button/treeitem/item.multilayer.icon.treeleaf.js b/src/case/button/treeitem/item.multilayer.icon.treeleaf.js index 92a8b876a..f4fcafea7 100644 --- a/src/case/button/treeitem/item.multilayer.icon.treeleaf.js +++ b/src/case/button/treeitem/item.multilayer.icon.treeleaf.js @@ -7,7 +7,7 @@ BI.MultiLayerIconTreeLeafItem = BI.inherit(BI.BasicButton, { return BI.extend(BI.MultiLayerIconTreeLeafItem.superclass._defaultConfig.apply(this, arguments), { extraCls: "bi-multilayer-icon-tree-leaf-item bi-list-item-active", layer: 0, - height: 30, + height: 24, iconCls: "", iconHeight: 16, iconWidth: 16 diff --git a/src/case/button/treeitem/item.treetextleaf.js b/src/case/button/treeitem/item.treetextleaf.js index 3dd9e3a5a..d2e2cf9d0 100644 --- a/src/case/button/treeitem/item.treetextleaf.js +++ b/src/case/button/treeitem/item.treetextleaf.js @@ -10,7 +10,7 @@ BI.TreeTextLeafItem = BI.inherit(BI.BasicButton, { extraCls: "bi-tree-text-leaf-item bi-list-item-active", id: "", pId: "", - height: 30, + height: 24, hgap: 0, lgap: 0, rgap: 0 diff --git a/src/case/calendar/calendar.js b/src/case/calendar/calendar.js index 5f61d7421..71d267776 100644 --- a/src/case/calendar/calendar.js +++ b/src/case/calendar/calendar.js @@ -112,7 +112,7 @@ BI.Calendar = BI.inherit(BI.Widget, { whiteSpace: "normal", once: false, forceSelected: true, - height: 30, + height: 24, value: o.year + "-" + month + "-" + td.text, disabled: td.lastMonth || td.nextMonth || td.disabled, lgap: 5, @@ -129,7 +129,7 @@ BI.Calendar = BI.inherit(BI.Widget, { columns: 7, rows: 6, columnSize: [1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7], - rowSize: 30, + rowSize: 24, vgap: 10 }))] }); diff --git a/src/case/calendar/calendar.year.js b/src/case/calendar/calendar.year.js index 078d1c2bf..cd70532be 100644 --- a/src/case/calendar/calendar.year.js +++ b/src/case/calendar/calendar.year.js @@ -67,7 +67,7 @@ BI.YearCalendar = BI.inherit(BI.Widget, { whiteSpace: "normal", once: false, forceSelected: true, - height: 30, + height: 24, width: 45, value: td.text, disabled: td.disabled @@ -83,7 +83,7 @@ BI.YearCalendar = BI.inherit(BI.Widget, { columns: 2, rows: 6, columnSize: [1 / 2, 1 / 2], - rowSize: 30 + rowSize: 24 })), { type: "bi.center_adapt", vgap: 1 diff --git a/src/case/checkbox/check.first.treenode.js b/src/case/checkbox/check.first.treenode.js index 71618353e..572908d8d 100644 --- a/src/case/checkbox/check.first.treenode.js +++ b/src/case/checkbox/check.first.treenode.js @@ -7,8 +7,8 @@ BI.FirstTreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend( BI.FirstTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: "tree-collapse-icon-type2", - iconWidth: 30, - iconHeight: 30 + iconWidth: 24, + iconHeight: 24 }); }, diff --git a/src/case/checkbox/check.last.treenode.js b/src/case/checkbox/check.last.treenode.js index a0f9eee6e..e0a9f621d 100644 --- a/src/case/checkbox/check.last.treenode.js +++ b/src/case/checkbox/check.last.treenode.js @@ -7,8 +7,8 @@ BI.LastTreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend(BI.LastTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: "tree-collapse-icon-type4", - iconWidth: 30, - iconHeight: 30 + iconWidth: 24, + iconHeight: 24 }); }, diff --git a/src/case/checkbox/check.mid.treenode.js b/src/case/checkbox/check.mid.treenode.js index 8543513a5..7679b466e 100644 --- a/src/case/checkbox/check.mid.treenode.js +++ b/src/case/checkbox/check.mid.treenode.js @@ -7,8 +7,8 @@ BI.MidTreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend( BI.MidTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: "tree-collapse-icon-type3", - iconWidth: 30, - iconHeight: 30 + iconWidth: 24, + iconHeight: 24 }); }, diff --git a/src/case/checkbox/check.treenode.js b/src/case/checkbox/check.treenode.js index 7e9dae5a3..b5642aae4 100644 --- a/src/case/checkbox/check.treenode.js +++ b/src/case/checkbox/check.treenode.js @@ -7,8 +7,8 @@ BI.TreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend( BI.TreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: "tree-collapse-icon-type1", - iconWidth: 30, - iconHeight: 30 + iconWidth: 24, + iconHeight: 24 }); }, diff --git a/src/case/combo/iconcombo/popup.iconcombo.js b/src/case/combo/iconcombo/popup.iconcombo.js index 9c2ebaa26..3cc4fcd32 100644 --- a/src/case/combo/iconcombo/popup.iconcombo.js +++ b/src/case/combo/iconcombo/popup.iconcombo.js @@ -19,7 +19,7 @@ BI.IconComboPopup = BI.inherit(BI.Pane, { type: "bi.button_group", items: BI.createItems(o.items, { type: "bi.single_select_icon_text_item", - height: 30 + height: 24 }), chooseType: o.chooseType, layouts: [{ @@ -47,7 +47,7 @@ BI.IconComboPopup = BI.inherit(BI.Pane, { BI.IconComboPopup.superclass.populate.apply(this, arguments); items = BI.createItems(items, { type: "bi.single_select_icon_text_item", - height: 30 + height: 24 }); this.popup.populate(items); }, diff --git a/src/case/combo/icontextvaluecombo/combo.icontextvalue.js b/src/case/combo/icontextvaluecombo/combo.icontextvalue.js index 373f0d44b..d5600eb98 100644 --- a/src/case/combo/icontextvaluecombo/combo.icontextvalue.js +++ b/src/case/combo/icontextvaluecombo/combo.icontextvalue.js @@ -57,7 +57,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, { el: this.trigger, popup: { el: this.popup, - maxHeight: 300 + maxHeight: 240 } }); if (BI.isKey(o.value)) { diff --git a/src/case/combo/icontextvaluecombo/popup.icontextvalue.js b/src/case/combo/icontextvaluecombo/popup.icontextvalue.js index fdba4ca9b..13813a515 100644 --- a/src/case/combo/icontextvaluecombo/popup.icontextvalue.js +++ b/src/case/combo/icontextvaluecombo/popup.icontextvalue.js @@ -15,7 +15,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, { type: "bi.button_group", items: BI.createItems(o.items, { type: "bi.single_select_icon_text_item", - height: 30, + height: 24, iconHeight: o.iconHeight, iconWidth: o.iconWidth, iconWrapperWidth: o.iconWrapperWidth @@ -54,7 +54,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, { var o = this.options; items = BI.createItems(items, { type: "bi.single_select_icon_text_item", - height: 30, + height: 24, iconWrapperWidth: o.iconWrapperWidth, iconHeight: o.iconHeight, iconWidth: o.iconWidth diff --git a/src/case/combo/textvaluecheckcombo/popup.textvaluecheck.js b/src/case/combo/textvaluecheckcombo/popup.textvaluecheck.js index 175859db0..f5678d870 100644 --- a/src/case/combo/textvaluecheckcombo/popup.textvaluecheck.js +++ b/src/case/combo/textvaluecheckcombo/popup.textvaluecheck.js @@ -39,7 +39,7 @@ BI.TextValueCheckComboPopup = BI.inherit(BI.Pane, { return BI.extend({ type: "bi.single_select_item", cls: "bi-list-item", - height: 30 + height: 24 }, item); }); }, diff --git a/src/case/combo/textvaluecombo/combo.textvalue.js b/src/case/combo/textvaluecombo/combo.textvalue.js index 41cc1dd60..45773ca73 100644 --- a/src/case/combo/textvaluecombo/combo.textvalue.js +++ b/src/case/combo/textvaluecombo/combo.textvalue.js @@ -52,7 +52,7 @@ BI.TextValueCombo = BI.inherit(BI.Widget, { el: this.trigger, popup: { el: this.popup, - maxHeight: 300 + maxHeight: 240 } }); if(BI.isKey(o.value)) { diff --git a/src/case/combo/textvaluecombo/combo.textvaluesmall.js b/src/case/combo/textvaluecombo/combo.textvaluesmall.js index 56f81f80a..f7bffa627 100644 --- a/src/case/combo/textvaluecombo/combo.textvaluesmall.js +++ b/src/case/combo/textvaluecombo/combo.textvaluesmall.js @@ -45,7 +45,7 @@ BI.SmallTextValueCombo = BI.inherit(BI.Widget, { el: this.trigger, popup: { el: this.popup, - maxHeight: 300 + maxHeight: 240 } }); }, diff --git a/src/case/combo/textvaluecombo/popup.textvalue.js b/src/case/combo/textvaluecombo/popup.textvalue.js index 7898f4a7e..cf68deefa 100644 --- a/src/case/combo/textvaluecombo/popup.textvalue.js +++ b/src/case/combo/textvaluecombo/popup.textvalue.js @@ -14,7 +14,7 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, { items: BI.createItems(o.items, { type: "bi.single_select_item", textAlign: o.textAlign, - height: 30 + height: 24 }), chooseType: o.chooseType, layouts: [{ @@ -43,7 +43,7 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, { BI.TextValueComboPopup.superclass.populate.apply(this, arguments); items = BI.createItems(items, { type: "bi.single_select_item", - height: 30 + height: 24 }); this.popup.populate(items); }, diff --git a/src/css/base/tree/ztree.css b/src/css/base/tree/ztree.css index efe4551d1..9de3dfe23 100644 --- a/src/css/base/tree/ztree.css +++ b/src/css/base/tree/ztree.css @@ -23,7 +23,7 @@ padding: 1px 3px 0 0; margin: 0; cursor: pointer; - height: 30px; + height: 24px; background-color: transparent; text-decoration: none; vertical-align: top; @@ -65,7 +65,7 @@ *border: 0px; } .ztree li span { - line-height: 30px; + line-height: 24px; margin-right: 2px; } .ztree li span.button { diff --git a/src/less/base/tree/ztree.less b/src/less/base/tree/ztree.less index 26f2146d4..5e65dfb63 100644 --- a/src/less/base/tree/ztree.less +++ b/src/less/base/tree/ztree.less @@ -29,7 +29,7 @@ padding: 1px 3px 0 0; margin: 0; cursor: pointer; - height: 30px; + height: 24px; background-color: transparent; text-decoration: none; vertical-align: top; @@ -82,7 +82,7 @@ } .ztree li span { - line-height: 30px; + line-height: 24px; margin-right: 2px } diff --git a/src/widget/downlist/item.downlist.js b/src/widget/downlist/item.downlist.js index 6154d84a0..f05fa2e5d 100644 --- a/src/widget/downlist/item.downlist.js +++ b/src/widget/downlist/item.downlist.js @@ -4,7 +4,7 @@ BI.DownListItem = BI.inherit(BI.BasicButton, { return BI.extend(conf, { baseCls: "bi-down-list-item bi-list-item-active", cls: "", - height: 30, + height: 24, logic: { dynamic: true }, diff --git a/src/widget/downlist/popup.downlist.js b/src/widget/downlist/popup.downlist.js index a4bb2ec75..94edd62d7 100644 --- a/src/widget/downlist/popup.downlist.js +++ b/src/widget/downlist/popup.downlist.js @@ -6,7 +6,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, { constants: { nextIcon: "pull-right-e-font", - height: 30, + height: 24, iconHeight: 12, iconWidth: 12, hgap: 0, diff --git a/src/widget/multilayerdownlist/popup.downlist.js b/src/widget/multilayerdownlist/popup.downlist.js index 4262c066a..d0b6b0d63 100644 --- a/src/widget/multilayerdownlist/popup.downlist.js +++ b/src/widget/multilayerdownlist/popup.downlist.js @@ -6,7 +6,7 @@ BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, { constants: { nextIcon: "pull-right-e-font", - height: 30, + height: 25, iconHeight: 12, iconWidth: 12, hgap: 0, diff --git a/src/widget/multilayerselecttree/node/node.first.plus.js b/src/widget/multilayerselecttree/node/node.first.plus.js index b54c986e2..aadd455c2 100644 --- a/src/widget/multilayerselecttree/node/node.first.plus.js +++ b/src/widget/multilayerselecttree/node/node.first.plus.js @@ -15,7 +15,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -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: 12, height: o.height }); }); @@ -64,7 +64,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, diff --git a/src/widget/multilayerselecttree/node/node.last.plus.js b/src/widget/multilayerselecttree/node/node.last.plus.js index 3795754e1..a48e14767 100644 --- a/src/widget/multilayerselecttree/node/node.last.plus.js +++ b/src/widget/multilayerselecttree/node/node.last.plus.js @@ -15,7 +15,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -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: 12, height: o.height }); }); @@ -64,7 +64,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, diff --git a/src/widget/multilayerselecttree/node/node.mid.plus.js b/src/widget/multilayerselecttree/node/node.mid.plus.js index 05988523d..a80610160 100644 --- a/src/widget/multilayerselecttree/node/node.mid.plus.js +++ b/src/widget/multilayerselecttree/node/node.mid.plus.js @@ -15,7 +15,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -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: 12, height: o.height }); }); @@ -64,7 +64,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, diff --git a/src/widget/multilayerselecttree/node/node.plus.js b/src/widget/multilayerselecttree/node/node.plus.js index 57f02ee20..bfde57f66 100644 --- a/src/widget/multilayerselecttree/node/node.plus.js +++ b/src/widget/multilayerselecttree/node/node.plus.js @@ -15,7 +15,7 @@ BI.MultiLayerSelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -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: 12, height: o.height }); }); @@ -64,7 +64,7 @@ BI.MultiLayerSelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, diff --git a/src/widget/multilayersingletree/node/node.first.plus.js b/src/widget/multilayersingletree/node/node.first.plus.js index 8165397ab..f72f49ed2 100644 --- a/src/widget/multilayersingletree/node/node.first.plus.js +++ b/src/widget/multilayersingletree/node/node.first.plus.js @@ -14,7 +14,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -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: 12, height: o.height }); }); @@ -44,7 +44,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, diff --git a/src/widget/multilayersingletree/node/node.last.plus.js b/src/widget/multilayersingletree/node/node.last.plus.js index 943b91d79..02a8a26e0 100644 --- a/src/widget/multilayersingletree/node/node.last.plus.js +++ b/src/widget/multilayersingletree/node/node.last.plus.js @@ -14,7 +14,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -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: 12, height: o.height }); }); @@ -44,7 +44,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, diff --git a/src/widget/multilayersingletree/node/node.mid.plus.js b/src/widget/multilayersingletree/node/node.mid.plus.js index 7fe025d52..64612ca04 100644 --- a/src/widget/multilayersingletree/node/node.mid.plus.js +++ b/src/widget/multilayersingletree/node/node.mid.plus.js @@ -14,7 +14,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -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: 12, height: o.height }); }); @@ -44,7 +44,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, diff --git a/src/widget/multilayersingletree/node/node.plus.js b/src/widget/multilayersingletree/node/node.plus.js index 11e4006c7..b2fbd37e6 100644 --- a/src/widget/multilayersingletree/node/node.plus.js +++ b/src/widget/multilayersingletree/node/node.plus.js @@ -12,7 +12,7 @@ BI.MultiLayerSingleTreePlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30 + height: 24 }); }, _init: function () { @@ -34,7 +34,7 @@ BI.MultiLayerSingleTreePlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ type: "bi.layout", cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background", - width: 16, + width: 12, 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..3537b4f34 100644 --- a/src/widget/multilayersingletree/treeitem/item.first.treeleaf.js +++ b/src/widget/multilayersingletree/treeitem/item.first.treeleaf.js @@ -14,7 +14,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, { layer: 0, id: "", pId: "", - height: 30 + height: 24 }); }, _init: function () { @@ -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: 12, height: o.height }); }); @@ -65,7 +65,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, diff --git a/src/widget/multilayersingletree/treeitem/item.last.treeleaf.js b/src/widget/multilayersingletree/treeitem/item.last.treeleaf.js index 4d639f1a5..5a66b762c 100644 --- a/src/widget/multilayersingletree/treeitem/item.last.treeleaf.js +++ b/src/widget/multilayersingletree/treeitem/item.last.treeleaf.js @@ -14,7 +14,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, { layer: 0, id: "", pId: "", - height: 30 + height: 24 }); }, _init: function () { @@ -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: 12, height: o.height }); }); @@ -64,7 +64,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, diff --git a/src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js b/src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js index c1e14f9a6..86372cda4 100644 --- a/src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js +++ b/src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js @@ -14,7 +14,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, { layer: 0, id: "", pId: "", - height: 30 + height: 24 }); }, _init: function () { @@ -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: 12, height: o.height }); }); @@ -64,7 +64,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 15), + columnSize: BI.makeArray(o.layer, 12), items: [items] }); }, diff --git a/src/widget/multiselect/multiselect.loader.js b/src/widget/multiselect/multiselect.loader.js index 8e6fd24d5..53e4466b6 100644 --- a/src/widget/multiselect/multiselect.loader.js +++ b/src/widget/multiselect/multiselect.loader.js @@ -125,7 +125,7 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, { type: "bi.multi_select_item", logic: this.options.logic, cls: "bi-list-item-active", - height: 30, + height: 24, selected: this.isAllSelected(), iconWrapperWidth: 36 }); diff --git a/src/widget/searchmultitextvaluecombo/multitextvalue.loader.search.js b/src/widget/searchmultitextvaluecombo/multitextvalue.loader.search.js index e5bfed36f..8811e5aa7 100644 --- a/src/widget/searchmultitextvaluecombo/multitextvalue.loader.search.js +++ b/src/widget/searchmultitextvaluecombo/multitextvalue.loader.search.js @@ -112,7 +112,7 @@ BI.SearchMultiSelectLoader = BI.inherit(BI.Widget, { type: "bi.multi_select_item", logic: this.options.logic, cls: "bi-list-item-active", - height: 30, + height: 24, selected: this.isAllSelected(), iconWrapperWidth: 36 }); diff --git a/src/widget/selecttree/nodes/node.first.plus.js b/src/widget/selecttree/nodes/node.first.plus.js index 1a29f3ca6..f975ea00e 100644 --- a/src/widget/selecttree/nodes/node.first.plus.js +++ b/src/widget/selecttree/nodes/node.first.plus.js @@ -16,7 +16,7 @@ BI.SelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { diff --git a/src/widget/selecttree/nodes/node.last.plus.js b/src/widget/selecttree/nodes/node.last.plus.js index 1284903fc..0cab47f4b 100644 --- a/src/widget/selecttree/nodes/node.last.plus.js +++ b/src/widget/selecttree/nodes/node.last.plus.js @@ -16,7 +16,7 @@ BI.SelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { diff --git a/src/widget/selecttree/nodes/node.mid.plus.js b/src/widget/selecttree/nodes/node.mid.plus.js index e3af90a1f..b2ec407d0 100644 --- a/src/widget/selecttree/nodes/node.mid.plus.js +++ b/src/widget/selecttree/nodes/node.mid.plus.js @@ -16,7 +16,7 @@ BI.SelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { diff --git a/src/widget/selecttree/nodes/node.plus.js b/src/widget/selecttree/nodes/node.plus.js index 17c68e9ae..e0f8e8632 100644 --- a/src/widget/selecttree/nodes/node.plus.js +++ b/src/widget/selecttree/nodes/node.plus.js @@ -16,7 +16,7 @@ BI.SelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { pId: "", readonly: true, open: false, - height: 30 + height: 24 }); }, _init: function () { diff --git a/src/widget/singleselect/singleselect.loader.js b/src/widget/singleselect/singleselect.loader.js index 55f55d9e1..b69bf5629 100644 --- a/src/widget/singleselect/singleselect.loader.js +++ b/src/widget/singleselect/singleselect.loader.js @@ -105,7 +105,7 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, { type: this.options.allowNoSelect ? "bi.single_select_item" : "bi.single_select_combo_item", logic: this.options.logic, cls: "bi-list-item-active", - height: 30, + height: 24, selected: false }); }, diff --git a/src/widget/year/popup.year.js b/src/widget/year/popup.year.js index b470fe894..032012018 100644 --- a/src/widget/year/popup.year.js +++ b/src/widget/year/popup.year.js @@ -17,7 +17,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, { min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期, width: 180, - height: 276 + height: 240 }, render: function () { diff --git a/src/widget/yearmonth/card.static.yearmonth.js b/src/widget/yearmonth/card.static.yearmonth.js index 4eb6adfca..2f46a05c5 100644 --- a/src/widget/yearmonth/card.static.yearmonth.js +++ b/src/widget/yearmonth/card.static.yearmonth.js @@ -24,7 +24,7 @@ BI.StaticYearMonthCard = BI.inherit(BI.Widget, { whiteSpace: "nowrap", once: false, forceSelected: true, - height: 30, + height: 23, width: 38, value: td, text: td @@ -68,7 +68,7 @@ BI.StaticYearMonthCard = BI.inherit(BI.Widget, { columns: 2, rows: 6, columnSize: [1 / 2, 1 / 2], - rowSize: 30 + rowSize: 25 })), { type: "bi.center_adapt", vgap: 1, diff --git a/src/widget/yearmonth/popup.yearmonth.js b/src/widget/yearmonth/popup.yearmonth.js index df32e7eb9..0f4d2c81e 100644 --- a/src/widget/yearmonth/popup.yearmonth.js +++ b/src/widget/yearmonth/popup.yearmonth.js @@ -17,7 +17,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, { min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期, width: 180, - height: 270 + height: 240 }, render: function () { diff --git a/src/widget/yearquarter/card.static.yearquarter.js b/src/widget/yearquarter/card.static.yearquarter.js index ac7bfc240..de236ccdf 100644 --- a/src/widget/yearquarter/card.static.yearquarter.js +++ b/src/widget/yearquarter/card.static.yearquarter.js @@ -28,7 +28,7 @@ BI.StaticYearQuarterCard = BI.inherit(BI.Widget, { whiteSpace: "nowrap", once: false, forceSelected: true, - height: 30 + height: 24 }); }); }, diff --git a/src/widget/yearquarter/popup.yearquarter.js b/src/widget/yearquarter/popup.yearquarter.js index e49d97260..51a2b42b3 100644 --- a/src/widget/yearquarter/popup.yearquarter.js +++ b/src/widget/yearquarter/popup.yearquarter.js @@ -10,7 +10,7 @@ BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, { min: "1900-01-01", // 最小日期 max: "2099-12-31", // 最大日期, width: 180, - height: 260 + height: 240 }, render: function () {