diff --git a/demo/config.js b/demo/config.js index cc3e5dfe7..35f295624 100644 --- a/demo/config.js +++ b/demo/config.js @@ -1518,13 +1518,17 @@ Demo.CONSTANTS = { }, {pId: "0_1_33", id: "0_1_33_0", text: "重庆市区", value: "重庆市区", open: true}], TREE: [{id: -1, pId: -2, value: "根目录", text: "根目录"}, + {id: -2, pId: -2, value: "根目录", text: "根目录"}, + {id: -3, pId: -2, value: "根目录", text: "根目录"}, + {id: -4, pId: -2, value: "根目录", text: "根目录"}, + {id: -5, pId: -2, value: "根目录", text: "根目录"}, {id: 1, pId: -1, value: "第一级目录1", text: "第一级目录1"}, {id: 11, pId: 1, value: "第二级文件1", text: "第二级文件1"}, {id: 12, pId: 1, value: "第二级目录2", text: "第二级目录2"}, {id: 121, pId: 12, value: "第三级目录1", text: "第三级目录1"}, {id: 122, pId: 12, value: "第三级文件1", text: "第三级文件1"}, {id: 1211, pId: 121, value: "第四级目录1", text: "第四级目录1"}, - {id: 12111, pId: 1211, value: "第五级文件1", text: "第五级文件111111111111111111111111111111111111111111111111111111111111111111111111111111111111111"}, + {id: 12111, pId: 1211, value: "第五级文件1", text: "第五级文件1111111111111111111"}, {id: 2, pId: -1, value: "第一级目录2", text: "第一级目录2"}, {id: 21, pId: 2, value: "第二级目录3", text: "第二级目录3"}, {id: 22, pId: 2, value: "第二级文件2", text: "第二级文件2"}, diff --git a/dist/bundle.js b/dist/bundle.js index e6768630d..15f2b481c 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -72918,7 +72918,7 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, { var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { - width: 25, + width: 24, el: this.checkbox }, this.text); BI.createWidget(BI.extend({ @@ -72969,7 +72969,7 @@ BI.FirstPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 25 + height: 24 }); }, _init: function () { @@ -73002,7 +73002,7 @@ BI.FirstPlusGroupNode = BI.inherit(BI.NodeButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { - width: 25, + width: 24, el: this.checkbox }, this.text); BI.createWidget(BI.extend({ @@ -73151,7 +73151,7 @@ BI.LastPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 25 + height: 24 }); }, _init: function () { @@ -73184,7 +73184,7 @@ BI.LastPlusGroupNode = BI.inherit(BI.NodeButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { - width: 25, + width: 24, el: this.checkbox }, this.text); BI.createWidget(BI.extend({ @@ -73232,7 +73232,7 @@ BI.MidPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 25 + height: 24 }); }, _init: function () { @@ -73265,7 +73265,7 @@ BI.MidPlusGroupNode = BI.inherit(BI.NodeButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { - width: 25, + width: 24, el: this.checkbox }, this.text); BI.createWidget(BI.extend({ @@ -73522,7 +73522,7 @@ BI.FirstTreeLeafItem = BI.inherit(BI.BasicButton, { id: "", pId: "", layer: 0, - height: 25 + height: 24 }); }, _init: function () { @@ -73551,19 +73551,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: 13, + width: 12, el: { type: "bi.layout", cls: "base-line-conn-background", - width: 13, + width: 12, height: o.height } }), { - width: 25, + width: 24, el: { type: "bi.layout", cls: "mid-line-conn-background", - width: 25, + width: 24, height: o.height } }, { @@ -73713,7 +73713,7 @@ BI.LastTreeLeafItem = BI.inherit(BI.BasicButton, { id: "", pId: "", layer: 0, - height: 25 + height: 24 }); }, _init: function () { @@ -73742,19 +73742,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: 13, + width: 12, el: { type: "bi.layout", cls: "base-line-conn-background", - width: 13, + width: 12, height: o.height } }), { - width: 25, + width: 24, el: { type: "bi.layout", cls: "mid-line-conn-background", - width: 25, + width: 24, height: o.height } }, { @@ -73817,7 +73817,7 @@ BI.MidTreeLeafItem = BI.inherit(BI.BasicButton, { id: "", pId: "", layer: 0, - height: 25 + height: 24 }); }, _init: function () { @@ -73846,19 +73846,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: 13, + width: 12, el: { type: "bi.layout", cls: "base-line-conn-background", - width: 13, + width: 12, height: o.height } }), { - width: 25, + width: 24, el: { type: "bi.layout", cls: "mid-line-conn-background", - width: 25, + width: 24, height: o.height } }, { @@ -101323,10 +101323,10 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, { constants: { offset: { - top: 1, - left: 1, - right: 2, - bottom: 33 + top: 0, + left: 0, + right: 0, + bottom: 31 } }, diff --git a/dist/case.js b/dist/case.js index cb6eb310c..eb88bc8ee 100644 --- a/dist/case.js +++ b/dist/case.js @@ -447,7 +447,7 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, { var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { - width: 25, + width: 24, el: this.checkbox }, this.text); BI.createWidget(BI.extend({ @@ -498,7 +498,7 @@ BI.FirstPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 25 + height: 24 }); }, _init: function () { @@ -531,7 +531,7 @@ BI.FirstPlusGroupNode = BI.inherit(BI.NodeButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { - width: 25, + width: 24, el: this.checkbox }, this.text); BI.createWidget(BI.extend({ @@ -680,7 +680,7 @@ BI.LastPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 25 + height: 24 }); }, _init: function () { @@ -713,7 +713,7 @@ BI.LastPlusGroupNode = BI.inherit(BI.NodeButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { - width: 25, + width: 24, el: this.checkbox }, this.text); BI.createWidget(BI.extend({ @@ -761,7 +761,7 @@ BI.MidPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 25 + height: 24 }); }, _init: function () { @@ -794,7 +794,7 @@ BI.MidPlusGroupNode = BI.inherit(BI.NodeButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { - width: 25, + width: 24, el: this.checkbox }, this.text); BI.createWidget(BI.extend({ @@ -1051,7 +1051,7 @@ BI.FirstTreeLeafItem = BI.inherit(BI.BasicButton, { id: "", pId: "", layer: 0, - height: 25 + height: 24 }); }, _init: function () { @@ -1080,19 +1080,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: 13, + width: 12, el: { type: "bi.layout", cls: "base-line-conn-background", - width: 13, + width: 12, height: o.height } }), { - width: 25, + width: 24, el: { type: "bi.layout", cls: "mid-line-conn-background", - width: 25, + width: 24, height: o.height } }, { @@ -1242,7 +1242,7 @@ BI.LastTreeLeafItem = BI.inherit(BI.BasicButton, { id: "", pId: "", layer: 0, - height: 25 + height: 24 }); }, _init: function () { @@ -1271,19 +1271,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: 13, + width: 12, el: { type: "bi.layout", cls: "base-line-conn-background", - width: 13, + width: 12, height: o.height } }), { - width: 25, + width: 24, el: { type: "bi.layout", cls: "mid-line-conn-background", - width: 25, + width: 24, height: o.height } }, { @@ -1346,7 +1346,7 @@ BI.MidTreeLeafItem = BI.inherit(BI.BasicButton, { id: "", pId: "", layer: 0, - height: 25 + height: 24 }); }, _init: function () { @@ -1375,19 +1375,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: 13, + width: 12, el: { type: "bi.layout", cls: "base-line-conn-background", - width: 13, + width: 12, height: o.height } }), { - width: 25, + width: 24, el: { type: "bi.layout", cls: "mid-line-conn-background", - width: 25, + width: 24, height: o.height } }, { diff --git a/dist/demo.js b/dist/demo.js index 6cff1f921..3b8dd9cfb 100644 --- a/dist/demo.js +++ b/dist/demo.js @@ -16354,13 +16354,17 @@ Demo.CONSTANTS = { }, {pId: "0_1_33", id: "0_1_33_0", text: "重庆市区", value: "重庆市区", open: true}], TREE: [{id: -1, pId: -2, value: "根目录", text: "根目录"}, + {id: -2, pId: -2, value: "根目录", text: "根目录"}, + {id: -3, pId: -2, value: "根目录", text: "根目录"}, + {id: -4, pId: -2, value: "根目录", text: "根目录"}, + {id: -5, pId: -2, value: "根目录", text: "根目录"}, {id: 1, pId: -1, value: "第一级目录1", text: "第一级目录1"}, {id: 11, pId: 1, value: "第二级文件1", text: "第二级文件1"}, {id: 12, pId: 1, value: "第二级目录2", text: "第二级目录2"}, {id: 121, pId: 12, value: "第三级目录1", text: "第三级目录1"}, {id: 122, pId: 12, value: "第三级文件1", text: "第三级文件1"}, {id: 1211, pId: 121, value: "第四级目录1", text: "第四级目录1"}, - {id: 12111, pId: 1211, value: "第五级文件1", text: "第五级文件111111111111111111111111111111111111111111111111111111111111111111111111111111111111111"}, + {id: 12111, pId: 1211, value: "第五级文件1", text: "第五级文件1111111111111111111"}, {id: 2, pId: -1, value: "第一级目录2", text: "第一级目录2"}, {id: 21, pId: 2, value: "第二级目录3", text: "第二级目录3"}, {id: 22, pId: 2, value: "第二级文件2", text: "第二级文件2"}, diff --git a/dist/fineui.js b/dist/fineui.js index d0e9b5341..6706595a2 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -73161,7 +73161,7 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, { var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { - width: 25, + width: 24, el: this.checkbox }, this.text); BI.createWidget(BI.extend({ @@ -73212,7 +73212,7 @@ BI.FirstPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 25 + height: 24 }); }, _init: function () { @@ -73245,7 +73245,7 @@ BI.FirstPlusGroupNode = BI.inherit(BI.NodeButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { - width: 25, + width: 24, el: this.checkbox }, this.text); BI.createWidget(BI.extend({ @@ -73394,7 +73394,7 @@ BI.LastPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 25 + height: 24 }); }, _init: function () { @@ -73427,7 +73427,7 @@ BI.LastPlusGroupNode = BI.inherit(BI.NodeButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { - width: 25, + width: 24, el: this.checkbox }, this.text); BI.createWidget(BI.extend({ @@ -73475,7 +73475,7 @@ BI.MidPlusGroupNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 25 + height: 24 }); }, _init: function () { @@ -73508,7 +73508,7 @@ BI.MidPlusGroupNode = BI.inherit(BI.NodeButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { - width: 25, + width: 24, el: this.checkbox }, this.text); BI.createWidget(BI.extend({ @@ -73765,7 +73765,7 @@ BI.FirstTreeLeafItem = BI.inherit(BI.BasicButton, { id: "", pId: "", layer: 0, - height: 25 + height: 24 }); }, _init: function () { @@ -73794,19 +73794,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: 13, + width: 12, el: { type: "bi.layout", cls: "base-line-conn-background", - width: 13, + width: 12, height: o.height } }), { - width: 25, + width: 24, el: { type: "bi.layout", cls: "mid-line-conn-background", - width: 25, + width: 24, height: o.height } }, { @@ -73956,7 +73956,7 @@ BI.LastTreeLeafItem = BI.inherit(BI.BasicButton, { id: "", pId: "", layer: 0, - height: 25 + height: 24 }); }, _init: function () { @@ -73985,19 +73985,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: 13, + width: 12, el: { type: "bi.layout", cls: "base-line-conn-background", - width: 13, + width: 12, height: o.height } }), { - width: 25, + width: 24, el: { type: "bi.layout", cls: "mid-line-conn-background", - width: 25, + width: 24, height: o.height } }, { @@ -74060,7 +74060,7 @@ BI.MidTreeLeafItem = BI.inherit(BI.BasicButton, { id: "", pId: "", layer: 0, - height: 25 + height: 24 }); }, _init: function () { @@ -74089,19 +74089,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: 13, + width: 12, el: { type: "bi.layout", cls: "base-line-conn-background", - width: 13, + width: 12, height: o.height } }), { - width: 25, + width: 24, el: { type: "bi.layout", cls: "mid-line-conn-background", - width: 25, + width: 24, height: o.height } }, { @@ -101566,10 +101566,10 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, { constants: { offset: { - top: 1, - left: 1, - right: 2, - bottom: 33 + top: 0, + left: 0, + right: 0, + bottom: 31 } }, diff --git a/dist/images/1x/icon/dark_tree_collapse_1.png b/dist/images/1x/icon/dark_tree_collapse_1.png new file mode 100644 index 000000000..9297ac164 Binary files /dev/null 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 new file mode 100644 index 000000000..0b901c254 Binary files /dev/null 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 new file mode 100644 index 000000000..337b009b6 Binary files /dev/null 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 new file mode 100644 index 000000000..6f96e2780 Binary files /dev/null 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 new file mode 100644 index 000000000..8cf6cc33a Binary files /dev/null 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 new file mode 100644 index 000000000..f428db79a Binary files /dev/null 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 new file mode 100644 index 000000000..9d8e9836c Binary files /dev/null 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 new file mode 100644 index 000000000..4d35967d7 Binary files /dev/null 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 new file mode 100644 index 000000000..3f74de38a Binary files /dev/null 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 new file mode 100644 index 000000000..d2c3a3dbe Binary files /dev/null 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 new file mode 100644 index 000000000..f35521ea8 Binary files /dev/null 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 new file mode 100644 index 000000000..ec9142e58 Binary files /dev/null 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 new file mode 100644 index 000000000..5c9867342 Binary files /dev/null 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 dfc427ebd..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 8db0aa7e5..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 efbbed940..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 743bf8b6c..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 914e3247c..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 95a8af0bc..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 b1c1e947f..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 67020292b..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 d13fc8d1b..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 ebee98007..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 d2f75950d..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 277d0e5a4..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 85aa1cc2f..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 new file mode 100644 index 000000000..7b5616709 Binary files /dev/null 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 new file mode 100644 index 000000000..dc32ec75c Binary files /dev/null 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 new file mode 100644 index 000000000..3eb3bd4f9 Binary files /dev/null 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 new file mode 100644 index 000000000..5cd345b39 Binary files /dev/null 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 new file mode 100644 index 000000000..18ecccb9e Binary files /dev/null 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 new file mode 100644 index 000000000..0a2dfe193 Binary files /dev/null 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 new file mode 100644 index 000000000..595638455 Binary files /dev/null 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 new file mode 100644 index 000000000..e6892387c Binary files /dev/null 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 new file mode 100644 index 000000000..1b2e7181f Binary files /dev/null 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 new file mode 100644 index 000000000..4939be6d1 Binary files /dev/null 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 new file mode 100644 index 000000000..af6886917 Binary files /dev/null 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 new file mode 100644 index 000000000..b4e7977ed Binary files /dev/null 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 new file mode 100644 index 000000000..331ee4d12 Binary files /dev/null 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 f2d63e282..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 4f8755017..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 88cfeba10..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 31c33b9fb..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 2fb7e3b02..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 9a26edbb1..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 6f6b5a7f9..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 c202c722e..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 e88f2a6ad..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 554d8b351..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 8e7da8aec..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 4645b5296..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 3fd2c5602..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/dist/widget.js b/dist/widget.js index 04c8bfe30..5b28b9a16 100644 --- a/dist/widget.js +++ b/dist/widget.js @@ -13699,10 +13699,10 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, { constants: { offset: { - top: 1, - left: 1, - right: 2, - bottom: 33 + top: 0, + left: 0, + right: 0, + bottom: 31 } }, diff --git a/src/case/button/node/node.arrow.js b/src/case/button/node/node.arrow.js index 77b1fa048..fc5034df6 100644 --- a/src/case/button/node/node.arrow.js +++ b/src/case/button/node/node.arrow.js @@ -45,7 +45,7 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, { var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { - width: 25, + width: 24, el: this.checkbox }, this.text); BI.createWidget(BI.extend({ diff --git a/src/case/button/node/node.first.plus.js b/src/case/button/node/node.first.plus.js index 4774981ed..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: 25 + height: 24 }); }, _init: function () { @@ -48,7 +48,7 @@ BI.FirstPlusGroupNode = BI.inherit(BI.NodeButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { - width: 25, + width: 24, el: this.checkbox }, this.text); BI.createWidget(BI.extend({ diff --git a/src/case/button/node/node.last.plus.js b/src/case/button/node/node.last.plus.js index 6fe8238ac..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: 25 + height: 24 }); }, _init: function () { @@ -48,7 +48,7 @@ BI.LastPlusGroupNode = BI.inherit(BI.NodeButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { - width: 25, + width: 24, el: this.checkbox }, this.text); BI.createWidget(BI.extend({ diff --git a/src/case/button/node/node.mid.plus.js b/src/case/button/node/node.mid.plus.js index c73cc3508..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: 25 + height: 24 }); }, _init: function () { @@ -48,7 +48,7 @@ BI.MidPlusGroupNode = BI.inherit(BI.NodeButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { - width: 25, + width: 24, el: this.checkbox }, this.text); BI.createWidget(BI.extend({ diff --git a/src/case/button/treeitem/item.first.treeleaf.js b/src/case/button/treeitem/item.first.treeleaf.js index f175bd498..e70c98fbc 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: 25 + 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: 13, + width: 12, el: { type: "bi.layout", cls: "base-line-conn-background", - width: 13, + width: 12, height: o.height } }), { - width: 25, + width: 24, el: { type: "bi.layout", cls: "mid-line-conn-background", - width: 25, + width: 24, height: o.height } }, { diff --git a/src/case/button/treeitem/item.last.treeleaf.js b/src/case/button/treeitem/item.last.treeleaf.js index adf6ba803..596873a2c 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: 25 + 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: 13, + width: 12, el: { type: "bi.layout", cls: "base-line-conn-background", - width: 13, + width: 12, height: o.height } }), { - width: 25, + width: 24, el: { type: "bi.layout", cls: "mid-line-conn-background", - width: 25, + 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 50ebb3aae..d320d51c8 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: 25 + 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: 13, + width: 12, el: { type: "bi.layout", cls: "base-line-conn-background", - width: 13, + width: 12, height: o.height } }), { - width: 25, + width: 24, el: { type: "bi.layout", cls: "mid-line-conn-background", - width: 25, + width: 24, height: o.height } }, { diff --git a/src/widget/multitree/multi.tree.combo.js b/src/widget/multitree/multi.tree.combo.js index 911dfb805..2adc073ad 100644 --- a/src/widget/multitree/multi.tree.combo.js +++ b/src/widget/multitree/multi.tree.combo.js @@ -8,10 +8,10 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, { constants: { offset: { - top: 1, - left: 1, - right: 2, - bottom: 33 + top: 0, + left: 0, + right: 0, + bottom: 31 } },