diff --git a/demo/js/case/list/demo.select_list.js b/demo/js/case/list/demo.select_list.js index f32d426bee..1e3d83bfb8 100644 --- a/demo/js/case/list/demo.select_list.js +++ b/demo/js/case/list/demo.select_list.js @@ -18,7 +18,8 @@ Demo.Func = BI.inherit(BI.Widget, { } }, items: BI.createItems(BI.deepClone(Demo.CONSTANTS.SIMPLE_ITEMS), { - type: "bi.multi_select_item" + type: "bi.multi_select_item", + height: 30 }) }); } diff --git a/demo/js/core/abstract/combination/demo.combo.js b/demo/js/core/abstract/combination/demo.combo.js index e849a18249..7fbb2fbb69 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: 25, + height: 30, handler: function (v) { } diff --git a/demo/js/core/layout/demo.absolute.js b/demo/js/core/layout/demo.absolute.js index 2137c24dfa..3a58108c8c 100644 --- a/demo/js/core/layout/demo.absolute.js +++ b/demo/js/core/layout/demo.absolute.js @@ -5,15 +5,16 @@ Demo.AbsoluteLayout = BI.inherit(BI.Widget, { render: function () { return { type: "bi.absolute", + scrollx: true, items: [{ el: { type: "bi.label", text: "绝对布局", cls: "layout-bg1", - width: 300, + width: 800, height: 200 }, - left: 100, + right: 100, top: 100 }] }; diff --git a/demo/js/widget/basewidget/demo.items.js b/demo/js/widget/basewidget/demo.items.js index 0562519b3d..7130c73119 100644 --- a/demo/js/widget/basewidget/demo.items.js +++ b/demo/js/widget/basewidget/demo.items.js @@ -16,9 +16,11 @@ 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", @@ -26,6 +28,7 @@ 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 9297ac164f..b0f79d3619 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 0b901c254c..2f752d8549 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 337b009b6a..bb3d88bbb3 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 6f96e27808..67bdd3d54d 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 8cf6cc33a3..c695fb4522 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 f428db79ae..6d46d8969e 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 9d8e9836c3..e5e25e5689 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 4d35967d78..26a90a0773 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 3f74de38a8..b6e1f73056 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 d2c3a3dbe8..3a2b4fa28e 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 f35521ea8e..1ad0a9c65f 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 ec9142e58c..81d482749b 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 5c9867342f..fe4be5c8c2 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 6bf0ae2337..e0c3cce8ce 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 063fe11e4e..b0e426aa8f 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 535d9f793c..924895f440 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 35466d2cea..a3a29ae3f3 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 824493548a..a65ecb8b44 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 72057ac8b4..fff7645155 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 a4780e525d..ae16937c56 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 c1a3063968..a5cdaaeb43 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 8f57c95421..9137f76e8a 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 98e2ab6bd8..317d309ff1 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 013ebf818f..63a0aa51fc 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 d752b0e063..2b83c23e5e 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 69e6e408d8..0714ee954e 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 7b56167096..36d99d6d66 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 dc32ec75cd..f745a6469c 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 3eb3bd4f9e..ff860dbc62 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 5cd345b391..b9b6464fdf 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 18ecccb9e8..5e343ab47e 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 0a2dfe193e..27a9457e9f 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 595638455e..7631b315d9 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 e6892387c9..9c2e7958df 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 1b2e7181f0..1d75547b1e 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 4939be6d1b..9c9959e502 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 af68869171..46c468dbfe 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 b4e7977ed3..24d5e260f6 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 331ee4d12b..dc61baa271 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 cbb052d199..fda6e4884b 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 b9dd884676..89649e7211 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 4e6b9a70ed..0bb8e69f5a 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 fb04c92741..28eaf8d3b4 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 5f2f411113..40d6d192fc 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 addbe513fc..9066c83232 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 8ebec5d39a..08c47be7f8 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 e6ad9ac563..69c8010eea 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 c3393797e5..545b1cbb4a 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 3c55ad9ce8..06548083b8 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 e7fc65c635..667a7c1ae7 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 c9570ffadb..f08cd60dd1 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 cd4537025e..1f743333b3 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/public/css/background.css b/public/css/background.css index 1440b98542..f136e84640 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/base/combination/combo.js b/src/base/combination/combo.js index aa3aecb118..c8faff2a55 100644 --- a/src/base/combination/combo.js +++ b/src/base/combination/combo.js @@ -505,14 +505,13 @@ BI.Combo = BI.inherit(BI.Widget, { this._toggle(); }, - destroy: function () { + destroyed: function () { BI.Widget._renderEngine.createElement(document).unbind("mousedown." + this.getName()) .unbind("mousewheel." + this.getName()) .unbind("mouseenter." + this.getName()) .unbind("mousemove." + this.getName()) .unbind("mouseleave." + this.getName()); BI.Resizers.remove(this.getName()); - BI.Combo.superclass.destroy.apply(this, arguments); } }); BI.Combo.EVENT_TRIGGER_CHANGE = "EVENT_TRIGGER_CHANGE"; diff --git a/src/base/combination/searcher.js b/src/base/combination/searcher.js index 9b2cd5b8ea..07423dc240 100644 --- a/src/base/combination/searcher.js +++ b/src/base/combination/searcher.js @@ -295,9 +295,8 @@ BI.Searcher = BI.inherit(BI.Widget, { this.popupView && this.popupView.empty(); }, - destroy: function () { + destroyed: function () { BI.Maskers.remove(this.getName()); - BI.Searcher.superclass.destroy.apply(this, arguments); } }); BI.Searcher.EVENT_CHANGE = "EVENT_CHANGE"; diff --git a/src/case/button/node/node.arrow.js b/src/case/button/node/node.arrow.js index 1955eafd73..2bc7b28761 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: 24 + height: 30 }); }, _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 bb1f9c2dc0..293fd1ab0c 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: 24 + height: 30 }); }, _init: function () { diff --git a/src/case/button/node/node.icon.arrow.js b/src/case/button/node/node.icon.arrow.js index 17fbd733ab..f315fae115 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: 24, + height: 30, 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 acc72d6a3e..2771cdb009 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: 24 + height: 30 }); }, _init: function () { diff --git a/src/case/button/node/node.mid.plus.js b/src/case/button/node/node.mid.plus.js index 4615ce7b93..34efa1b39c 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: 24 + height: 30 }); }, _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 1559db2cfc..b484867c41 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: 24, + height: 30, iconHeight: 16, iconWidth: 16, iconCls: "" diff --git a/src/case/button/node/node.plus.js b/src/case/button/node/node.plus.js index 16b78b8f13..a881754b0d 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: 24 + height: 30 }); }, _init: function () { diff --git a/src/case/button/treeitem/item.first.treeleaf.js b/src/case/button/treeitem/item.first.treeleaf.js index 4db068ab8a..89c0f3884a 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: 24 + height: 30 }); }, _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: 12, + width: 16, el: { type: "bi.layout", cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 12, + width: 16, height: o.height } }), { - width: 24, + width: 30, el: { type: "bi.layout", cls: "first-line-conn-background", - width: 24, + width: 30, height: o.height } }, { diff --git a/src/case/button/treeitem/item.icon.treeleaf.js b/src/case/button/treeitem/item.icon.treeleaf.js index a7a18358b7..58698e88eb 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: 24, + height: 30, 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 8f3f8e54af..557efa5b0d 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: 24 + height: 30 }); }, _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: 12, + width: 16, el: { type: "bi.layout", cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 12, + width: 16, height: o.height } }), { - width: 24, + width: 30, el: { type: "bi.layout", cls: "last-line-conn-background", - width: 24, + width: 30, height: o.height } }, { diff --git a/src/case/button/treeitem/item.mid.treeleaf.js b/src/case/button/treeitem/item.mid.treeleaf.js index 8b41612b01..0dbafcefd6 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: 24 + height: 30 }); }, _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: 12, + width: 16, el: { type: "bi.layout", cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 12, + width: 16, height: o.height } }), { - width: 24, + width: 30, el: { type: "bi.layout", cls: "mid-line-conn-background", - width: 24, + width: 30, 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 f4fcafea75..92a8b876a5 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: 24, + height: 30, iconCls: "", iconHeight: 16, iconWidth: 16 diff --git a/src/case/button/treeitem/item.treetextleaf.js b/src/case/button/treeitem/item.treetextleaf.js index d2e2cf9d09..3dd9e3a5a2 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: 24, + height: 30, hgap: 0, lgap: 0, rgap: 0 diff --git a/src/case/calendar/calendar.js b/src/case/calendar/calendar.js index 71d267776a..5f61d7421f 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: 24, + height: 30, 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: 24, + rowSize: 30, vgap: 10 }))] }); diff --git a/src/case/calendar/calendar.year.js b/src/case/calendar/calendar.year.js index cd70532beb..078d1c2bf5 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: 24, + height: 30, 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: 24 + rowSize: 30 })), { 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 572908d8d7..71618353e2 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: 24, - iconHeight: 24 + iconWidth: 30, + iconHeight: 30 }); }, diff --git a/src/case/checkbox/check.last.treenode.js b/src/case/checkbox/check.last.treenode.js index e0a9f621d3..a0f9eee6ed 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: 24, - iconHeight: 24 + iconWidth: 30, + iconHeight: 30 }); }, diff --git a/src/case/checkbox/check.mid.treenode.js b/src/case/checkbox/check.mid.treenode.js index 7679b466e0..8543513a51 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: 24, - iconHeight: 24 + iconWidth: 30, + iconHeight: 30 }); }, diff --git a/src/case/checkbox/check.treenode.js b/src/case/checkbox/check.treenode.js index b5642aae4b..7e9dae5a33 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: 24, - iconHeight: 24 + iconWidth: 30, + iconHeight: 30 }); }, diff --git a/src/case/combo/iconcombo/popup.iconcombo.js b/src/case/combo/iconcombo/popup.iconcombo.js index 3cc4fcd32f..9c2ebaa26b 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: 24 + height: 30 }), 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: 24 + height: 30 }); this.popup.populate(items); }, diff --git a/src/case/combo/icontextvaluecombo/combo.icontextvalue.js b/src/case/combo/icontextvaluecombo/combo.icontextvalue.js index d5600eb988..373f0d44b7 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: 240 + maxHeight: 300 } }); if (BI.isKey(o.value)) { diff --git a/src/case/combo/icontextvaluecombo/popup.icontextvalue.js b/src/case/combo/icontextvaluecombo/popup.icontextvalue.js index 13813a5156..fdba4ca9ba 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: 24, + height: 30, 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: 24, + height: 30, 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 f5678d8709..175859db07 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: 24 + height: 30 }, item); }); }, diff --git a/src/case/combo/textvaluecombo/combo.textvalue.js b/src/case/combo/textvaluecombo/combo.textvalue.js index 45773ca73e..41cc1dd600 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: 240 + maxHeight: 300 } }); if(BI.isKey(o.value)) { diff --git a/src/case/combo/textvaluecombo/combo.textvaluesmall.js b/src/case/combo/textvaluecombo/combo.textvaluesmall.js index f7bffa627b..56f81f80ae 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: 240 + maxHeight: 300 } }); }, diff --git a/src/case/combo/textvaluecombo/popup.textvalue.js b/src/case/combo/textvaluecombo/popup.textvalue.js index cf68deefa9..7898f4a7e8 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: 24 + height: 30 }), 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: 24 + height: 30 }); this.popup.populate(items); }, diff --git a/src/css/base/colorchooser/colorpicker/editor.css b/src/css/base/colorchooser/colorpicker/editor.css index ffd4e071e2..770680b915 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 9de3dfe235..c538f84b05 100644 --- a/src/css/base/tree/ztree.css +++ b/src/css/base/tree/ztree.css @@ -17,13 +17,13 @@ } .ztree li ul { margin: 0; - padding: 0 0 0 18px; + padding: 0 0 0 22px; } .ztree li a { padding: 1px 3px 0 0; margin: 0; cursor: pointer; - height: 24px; + height: 30px; background-color: transparent; text-decoration: none; vertical-align: top; @@ -65,7 +65,7 @@ *border: 0px; } .ztree li span { - line-height: 24px; + line-height: 30px; margin-right: 2px; } .ztree li span.button { @@ -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 1adb7984d1..3309361275 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 5e65dfb63d..c60e186296 100644 --- a/src/less/base/tree/ztree.less +++ b/src/less/base/tree/ztree.less @@ -22,14 +22,14 @@ .ztree li ul { margin: 0; - padding: 0 0 0 18px + padding: 0 0 0 22px } .ztree li a { padding: 1px 3px 0 0; margin: 0; cursor: pointer; - height: 24px; + height: 30px; background-color: transparent; text-decoration: none; vertical-align: top; @@ -82,7 +82,7 @@ } .ztree li span { - line-height: 24px; + line-height: 30px; margin-right: 2px } @@ -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 e1eb69d358..120593e342 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/datetime/datetime.combo.js b/src/widget/datetime/datetime.combo.js index 600a28242e..8f18d8c41a 100644 --- a/src/widget/datetime/datetime.combo.js +++ b/src/widget/datetime/datetime.combo.js @@ -4,7 +4,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, { constants: { popupHeight: 290, - popupWidth: 270, + popupWidth: 310, comboAdjustHeight: 1, border: 1 }, diff --git a/src/widget/datetime/datetime.popup.js b/src/widget/datetime/datetime.popup.js index 7102fbc417..3a19b61f64 100644 --- a/src/widget/datetime/datetime.popup.js +++ b/src/widget/datetime/datetime.popup.js @@ -5,8 +5,8 @@ BI.DateTimePopup = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.DateTimePopup.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-date-time-popup", - width: 268, - height: 374 + width: 310, + height: 410 }); }, _init: function () { diff --git a/src/widget/downlist/item.downlist.js b/src/widget/downlist/item.downlist.js index f05fa2e5d0..6154d84a0f 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: 24, + height: 30, logic: { dynamic: true }, diff --git a/src/widget/downlist/popup.downlist.js b/src/widget/downlist/popup.downlist.js index 94edd62d76..a4bb2ec753 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: 24, + height: 30, iconHeight: 12, iconWidth: 12, hgap: 0, diff --git a/src/widget/dynamicdate/dynamicdate.popup.js b/src/widget/dynamicdate/dynamicdate.popup.js index bb5e0e5fbb..68e3af28e2 100644 --- a/src/widget/dynamicdate/dynamicdate.popup.js +++ b/src/widget/dynamicdate/dynamicdate.popup.js @@ -6,8 +6,8 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, { props: { baseCls: "bi-dynamic-date-popup", - width: 248, - height: 344 + width: 290, + height: 380 }, _init: function () { diff --git a/src/widget/dynamicdatetime/dynamicdatetime.popup.js b/src/widget/dynamicdatetime/dynamicdatetime.popup.js index 2bdde53d4f..02be3f56fe 100644 --- a/src/widget/dynamicdatetime/dynamicdatetime.popup.js +++ b/src/widget/dynamicdatetime/dynamicdatetime.popup.js @@ -6,8 +6,8 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, { props: { baseCls: "bi-dynamic-date-time-popup", - width: 248, - height: 385 + width: 290, + height: 421 }, _init: function () { diff --git a/src/widget/month/popup.month.js b/src/widget/month/popup.month.js index 658642b210..caeca72dcb 100644 --- a/src/widget/month/popup.month.js +++ b/src/widget/month/popup.month.js @@ -36,7 +36,7 @@ BI.MonthPopup = BI.inherit(BI.Widget, { whiteSpace: "nowrap", once: false, forceSelected: true, - height: 23, + height: 30, width: 38, value: td, text: td @@ -55,7 +55,7 @@ BI.MonthPopup = BI.inherit(BI.Widget, { columns: 2, rows: 6, columnSize: [1 / 2, 1 / 2], - rowSize: 25 + rowSize: 30 })), { type: "bi.center_adapt", vgap: 1, diff --git a/src/widget/multilayerdownlist/popup.downlist.js b/src/widget/multilayerdownlist/popup.downlist.js index d0b6b0d631..4262c066a8 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: 25, + height: 30, 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 aadd455c27..fa7e372436 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: 24 + height: 30 }); }, _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: 12, + width: 16, 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, 12), + columnSize: BI.makeArray(o.layer, 15), items: [items] }); }, diff --git a/src/widget/multilayerselecttree/node/node.last.plus.js b/src/widget/multilayerselecttree/node/node.last.plus.js index a48e14767f..d3a6a99003 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: 24 + height: 30 }); }, _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: 12, + width: 16, 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, 12), + columnSize: BI.makeArray(o.layer, 15), items: [items] }); }, diff --git a/src/widget/multilayerselecttree/node/node.mid.plus.js b/src/widget/multilayerselecttree/node/node.mid.plus.js index a80610160c..9466654d09 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: 24 + height: 30 }); }, _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: 12, + width: 16, 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, 12), + columnSize: BI.makeArray(o.layer, 15), items: [items] }); }, diff --git a/src/widget/multilayerselecttree/node/node.plus.js b/src/widget/multilayerselecttree/node/node.plus.js index bfde57f662..8d1a3679a4 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: 24 + height: 30 }); }, _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: 12, + width: 16, 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, 12), + columnSize: BI.makeArray(o.layer, 15), items: [items] }); }, diff --git a/src/widget/multilayersingletree/node/node.first.plus.js b/src/widget/multilayersingletree/node/node.first.plus.js index f72f49ed2a..5024d2904d 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: 24 + height: 30 }); }, _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: 12, + width: 16, 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, 12), + columnSize: BI.makeArray(o.layer, 15), items: [items] }); }, diff --git a/src/widget/multilayersingletree/node/node.last.plus.js b/src/widget/multilayersingletree/node/node.last.plus.js index 02a8a26e08..1d00ad20fd 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: 24 + height: 30 }); }, _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: 12, + width: 16, 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, 12), + columnSize: BI.makeArray(o.layer, 15), items: [items] }); }, diff --git a/src/widget/multilayersingletree/node/node.mid.plus.js b/src/widget/multilayersingletree/node/node.mid.plus.js index 64612ca048..3d0a6eb17b 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: 24 + height: 30 }); }, _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: 12, + width: 16, 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, 12), + columnSize: BI.makeArray(o.layer, 15), items: [items] }); }, diff --git a/src/widget/multilayersingletree/node/node.plus.js b/src/widget/multilayersingletree/node/node.plus.js index b2fbd37e61..11e4006c71 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: 24 + height: 30 }); }, _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: 12, + 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 3537b4f34d..9ad705a676 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: 24 + height: 30 }); }, _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: 12, + width: 16, 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, 12), + columnSize: BI.makeArray(o.layer, 15), items: [items] }); }, diff --git a/src/widget/multilayersingletree/treeitem/item.last.treeleaf.js b/src/widget/multilayersingletree/treeitem/item.last.treeleaf.js index 5a66b762c6..3edfc4865a 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: 24 + height: 30 }); }, _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: 12, + width: 16, 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, 12), + columnSize: BI.makeArray(o.layer, 15), items: [items] }); }, diff --git a/src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js b/src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js index 86372cda49..ce65c03f5e 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: 24 + height: 30 }); }, _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: 12, + width: 16, 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, 12), + columnSize: BI.makeArray(o.layer, 15), items: [items] }); }, diff --git a/src/widget/multiselect/multiselect.loader.js b/src/widget/multiselect/multiselect.loader.js index 53e4466b6d..8e6fd24d51 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: 24, + height: 30, selected: this.isAllSelected(), iconWrapperWidth: 36 }); diff --git a/src/widget/quarter/popup.quarter.js b/src/widget/quarter/popup.quarter.js index 474799141d..387db9b12d 100644 --- a/src/widget/quarter/popup.quarter.js +++ b/src/widget/quarter/popup.quarter.js @@ -39,7 +39,7 @@ BI.QuarterPopup = BI.inherit(BI.Widget, { whiteSpace: "nowrap", once: false, forceSelected: true, - height: 25 + height: 30 }); }); diff --git a/src/widget/searchmultitextvaluecombo/multitextvalue.loader.search.js b/src/widget/searchmultitextvaluecombo/multitextvalue.loader.search.js index 8811e5aa7d..e5bfed36f7 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: 24, + height: 30, 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 f975ea00e6..1a29f3ca62 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: 24 + height: 30 }); }, _init: function () { diff --git a/src/widget/selecttree/nodes/node.last.plus.js b/src/widget/selecttree/nodes/node.last.plus.js index 0cab47f4bf..1284903fca 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: 24 + height: 30 }); }, _init: function () { diff --git a/src/widget/selecttree/nodes/node.mid.plus.js b/src/widget/selecttree/nodes/node.mid.plus.js index b2ec407d01..e3af90a1f1 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: 24 + height: 30 }); }, _init: function () { diff --git a/src/widget/selecttree/nodes/node.plus.js b/src/widget/selecttree/nodes/node.plus.js index e0f8e8632c..17c68e9ae7 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: 24 + height: 30 }); }, _init: function () { diff --git a/src/widget/singleselect/singleselect.loader.js b/src/widget/singleselect/singleselect.loader.js index b69bf56294..55f55d9e18 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: 24, + height: 30, selected: false }); }, diff --git a/src/widget/year/popup.year.js b/src/widget/year/popup.year.js index 0320120188..b470fe8944 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: 240 + height: 276 }, render: function () { diff --git a/src/widget/yearmonth/card.static.yearmonth.js b/src/widget/yearmonth/card.static.yearmonth.js index 2f46a05c50..4eb6adfca7 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: 23, + height: 30, 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: 25 + rowSize: 30 })), { type: "bi.center_adapt", vgap: 1, diff --git a/src/widget/yearmonth/popup.yearmonth.js b/src/widget/yearmonth/popup.yearmonth.js index 0f4d2c81ee..df32e7eb97 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: 240 + height: 270 }, render: function () { diff --git a/src/widget/yearquarter/card.static.yearquarter.js b/src/widget/yearquarter/card.static.yearquarter.js index de236ccdf0..ac7bfc240d 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: 24 + height: 30 }); }); }, diff --git a/src/widget/yearquarter/popup.yearquarter.js b/src/widget/yearquarter/popup.yearquarter.js index 51a2b42b3f..e49d972602 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: 240 + height: 260 }, render: function () { diff --git a/ui/css/background.css b/ui/css/background.css index be8d957f19..82c81f2c32 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;