From 577174764be1a906c9a90468069cbb456a7e47b8 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Thu, 2 Jul 2020 17:16:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?Revert=20"BI-61057=20refactor:=20=E4=B8=8D?= =?UTF-8?q?=E4=BD=BF=E7=94=A8td=E4=BA=86"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit ee387ca535f772d3c40caa41d8d228697057e647. --- src/widget/multilayerselecttree/node/node.first.plus.js | 4 ++-- src/widget/multilayerselecttree/node/node.last.plus.js | 4 ++-- src/widget/multilayerselecttree/node/node.mid.plus.js | 4 ++-- src/widget/multilayerselecttree/node/node.plus.js | 4 ++-- src/widget/multilayersingletree/node/node.first.plus.js | 4 ++-- src/widget/multilayersingletree/node/node.last.plus.js | 4 ++-- src/widget/multilayersingletree/node/node.mid.plus.js | 4 ++-- src/widget/multilayersingletree/node/node.plus.js | 4 ++-- .../multilayersingletree/treeitem/item.first.treeleaf.js | 4 ++-- .../multilayersingletree/treeitem/item.last.treeleaf.js | 4 ++-- src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/widget/multilayerselecttree/node/node.first.plus.js b/src/widget/multilayerselecttree/node/node.first.plus.js index e7cec6bd7..ab5e47e33 100644 --- a/src/widget/multilayerselecttree/node/node.first.plus.js +++ b/src/widget/multilayerselecttree/node/node.first.plus.js @@ -63,10 +63,10 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { }); items.push(this.node); BI.createWidget({ - type: "bi.horizontal_adapt", + type: "bi.td", element: this, columnSize: BI.makeArray(o.layer, 12), - items: items + items: [items] }); }, diff --git a/src/widget/multilayerselecttree/node/node.last.plus.js b/src/widget/multilayerselecttree/node/node.last.plus.js index facef2034..1e286399b 100644 --- a/src/widget/multilayerselecttree/node/node.last.plus.js +++ b/src/widget/multilayerselecttree/node/node.last.plus.js @@ -63,10 +63,10 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { }); items.push(this.node); BI.createWidget({ - type: "bi.horizontal_adapt", + type: "bi.td", element: this, columnSize: BI.makeArray(o.layer, 12), - items: items + items: [items] }); }, diff --git a/src/widget/multilayerselecttree/node/node.mid.plus.js b/src/widget/multilayerselecttree/node/node.mid.plus.js index b2e94a22a..a7ed22431 100644 --- a/src/widget/multilayerselecttree/node/node.mid.plus.js +++ b/src/widget/multilayerselecttree/node/node.mid.plus.js @@ -63,10 +63,10 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { }); items.push(this.node); BI.createWidget({ - type: "bi.horizontal_adapt", + type: "bi.td", element: this, columnSize: BI.makeArray(o.layer, 12), - items: items + items: [items] }); }, diff --git a/src/widget/multilayerselecttree/node/node.plus.js b/src/widget/multilayerselecttree/node/node.plus.js index 8db2c31d5..bbc34ea5f 100644 --- a/src/widget/multilayerselecttree/node/node.plus.js +++ b/src/widget/multilayerselecttree/node/node.plus.js @@ -63,10 +63,10 @@ BI.MultiLayerSelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { }); items.push(this.node); BI.createWidget({ - type: "bi.horizontal_adapt", + type: "bi.td", element: this, columnSize: BI.makeArray(o.layer, 12), - items: items + items: [items] }); }, diff --git a/src/widget/multilayersingletree/node/node.first.plus.js b/src/widget/multilayersingletree/node/node.first.plus.js index ee9b54775..f72f49ed2 100644 --- a/src/widget/multilayersingletree/node/node.first.plus.js +++ b/src/widget/multilayersingletree/node/node.first.plus.js @@ -42,10 +42,10 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { }); items.push(this.node); BI.createWidget({ - type: "bi.horizontal_adapt", + type: "bi.td", element: this, columnSize: BI.makeArray(o.layer, 12), - items: items + items: [items] }); }, diff --git a/src/widget/multilayersingletree/node/node.last.plus.js b/src/widget/multilayersingletree/node/node.last.plus.js index f7a8e6b20..02a8a26e0 100644 --- a/src/widget/multilayersingletree/node/node.last.plus.js +++ b/src/widget/multilayersingletree/node/node.last.plus.js @@ -42,10 +42,10 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { }); items.push(this.node); BI.createWidget({ - type: "bi.horizontal_adapt", + type: "bi.td", element: this, columnSize: BI.makeArray(o.layer, 12), - items: items + items: [items] }); }, diff --git a/src/widget/multilayersingletree/node/node.mid.plus.js b/src/widget/multilayersingletree/node/node.mid.plus.js index 340305db4..64612ca04 100644 --- a/src/widget/multilayersingletree/node/node.mid.plus.js +++ b/src/widget/multilayersingletree/node/node.mid.plus.js @@ -42,10 +42,10 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { }); items.push(this.node); BI.createWidget({ - type: "bi.horizontal_adapt", + type: "bi.td", element: this, columnSize: BI.makeArray(o.layer, 12), - items: items + items: [items] }); }, diff --git a/src/widget/multilayersingletree/node/node.plus.js b/src/widget/multilayersingletree/node/node.plus.js index bcff49737..b2fbd37e6 100644 --- a/src/widget/multilayersingletree/node/node.plus.js +++ b/src/widget/multilayersingletree/node/node.plus.js @@ -40,10 +40,10 @@ BI.MultiLayerSingleTreePlusGroupNode = BI.inherit(BI.NodeButton, { }); items.push(this.node); BI.createWidget({ - type: "bi.horizontal_adapt", + type: "bi.td", element: this, columnSize: BI.makeArray(o.layer, 12), - items: items + items: [items] }); }, diff --git a/src/widget/multilayersingletree/treeitem/item.first.treeleaf.js b/src/widget/multilayersingletree/treeitem/item.first.treeleaf.js index 39f3f65e2..3537b4f34 100644 --- a/src/widget/multilayersingletree/treeitem/item.first.treeleaf.js +++ b/src/widget/multilayersingletree/treeitem/item.first.treeleaf.js @@ -63,10 +63,10 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, { }); items.push(this.item); BI.createWidget({ - type: "bi.horizontal_adapt", + type: "bi.td", element: this, columnSize: BI.makeArray(o.layer, 12), - items: items + items: [items] }); }, diff --git a/src/widget/multilayersingletree/treeitem/item.last.treeleaf.js b/src/widget/multilayersingletree/treeitem/item.last.treeleaf.js index 0dc5390d2..5a66b762c 100644 --- a/src/widget/multilayersingletree/treeitem/item.last.treeleaf.js +++ b/src/widget/multilayersingletree/treeitem/item.last.treeleaf.js @@ -62,10 +62,10 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, { }); items.push(this.item); BI.createWidget({ - type: "bi.horizontal_adapt", + type: "bi.td", element: this, columnSize: BI.makeArray(o.layer, 12), - items: items + items: [items] }); }, diff --git a/src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js b/src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js index 97bea42dd..86372cda4 100644 --- a/src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js +++ b/src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js @@ -62,10 +62,10 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, { }); items.push(this.item); BI.createWidget({ - type: "bi.horizontal_adapt", + type: "bi.td", element: this, columnSize: BI.makeArray(o.layer, 12), - items: items + items: [items] }); }, From 14ac082b6e12029b0dcf41700ac4d03435467c99 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Thu, 2 Jul 2020 19:26:16 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E6=94=AF?= =?UTF-8?q?=E6=8C=81setTipType?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/single/single.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/base/single/single.js b/src/base/single/single.js index c178bb0b9..15504359f 100644 --- a/src/base/single/single.js +++ b/src/base/single/single.js @@ -162,6 +162,10 @@ BI.Single = BI.inherit(BI.Widget, { } }, + setTipType: function (type) { + this.options.tipType = type; + }, + getTipType: function () { return this.options.tipType; }, From 3d88b3ff2b76be483ae6fc0364a8c3e8714404e3 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Thu, 2 Jul 2020 20:00:19 +0800 Subject: [PATCH 3/3] update --- src/case/button/node/node.multilayer.icon.arrow.js | 4 ++-- src/case/button/treeitem/item.multilayer.icon.treeleaf.js | 4 ++-- src/widget/multilayerselecttree/node/node.first.plus.js | 4 ++-- src/widget/multilayerselecttree/node/node.last.plus.js | 4 ++-- src/widget/multilayerselecttree/node/node.mid.plus.js | 4 ++-- src/widget/multilayerselecttree/node/node.plus.js | 4 ++-- src/widget/multilayersingletree/node/node.first.plus.js | 4 ++-- src/widget/multilayersingletree/node/node.last.plus.js | 4 ++-- src/widget/multilayersingletree/node/node.mid.plus.js | 4 ++-- src/widget/multilayersingletree/node/node.plus.js | 4 ++-- .../multilayersingletree/treeitem/item.first.treeleaf.js | 4 ++-- .../multilayersingletree/treeitem/item.last.treeleaf.js | 4 ++-- src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js | 4 ++-- 13 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/case/button/node/node.multilayer.icon.arrow.js b/src/case/button/node/node.multilayer.icon.arrow.js index c77c0fc07..a6e1ddfa4 100644 --- a/src/case/button/node/node.multilayer.icon.arrow.js +++ b/src/case/button/node/node.multilayer.icon.arrow.js @@ -46,10 +46,10 @@ BI.MultiLayerIconArrowNode = BI.inherit(BI.NodeButton, { }); items.push(this.node); BI.createWidget({ - type: "bi.td", + type: "bi.horizontal_adapt", element: this, columnSize: BI.makeArray(o.layer, 15), - items: [items] + items: items }); }, diff --git a/src/case/button/treeitem/item.multilayer.icon.treeleaf.js b/src/case/button/treeitem/item.multilayer.icon.treeleaf.js index d2f93adc4..f5f581473 100644 --- a/src/case/button/treeitem/item.multilayer.icon.treeleaf.js +++ b/src/case/button/treeitem/item.multilayer.icon.treeleaf.js @@ -48,10 +48,10 @@ BI.MultiLayerIconTreeLeafItem = BI.inherit(BI.BasicButton, { }); items.push(this.item); BI.createWidget({ - type: "bi.td", + type: "bi.horizontal_adapt", element: this, columnSize: BI.makeArray(o.layer, 15), - items: [items] + items: items }); }, diff --git a/src/widget/multilayerselecttree/node/node.first.plus.js b/src/widget/multilayerselecttree/node/node.first.plus.js index ab5e47e33..e7cec6bd7 100644 --- a/src/widget/multilayerselecttree/node/node.first.plus.js +++ b/src/widget/multilayerselecttree/node/node.first.plus.js @@ -63,10 +63,10 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { }); items.push(this.node); BI.createWidget({ - type: "bi.td", + type: "bi.horizontal_adapt", element: this, columnSize: BI.makeArray(o.layer, 12), - items: [items] + items: items }); }, diff --git a/src/widget/multilayerselecttree/node/node.last.plus.js b/src/widget/multilayerselecttree/node/node.last.plus.js index 1e286399b..facef2034 100644 --- a/src/widget/multilayerselecttree/node/node.last.plus.js +++ b/src/widget/multilayerselecttree/node/node.last.plus.js @@ -63,10 +63,10 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { }); items.push(this.node); BI.createWidget({ - type: "bi.td", + type: "bi.horizontal_adapt", element: this, columnSize: BI.makeArray(o.layer, 12), - items: [items] + items: items }); }, diff --git a/src/widget/multilayerselecttree/node/node.mid.plus.js b/src/widget/multilayerselecttree/node/node.mid.plus.js index a7ed22431..b2e94a22a 100644 --- a/src/widget/multilayerselecttree/node/node.mid.plus.js +++ b/src/widget/multilayerselecttree/node/node.mid.plus.js @@ -63,10 +63,10 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { }); items.push(this.node); BI.createWidget({ - type: "bi.td", + type: "bi.horizontal_adapt", element: this, columnSize: BI.makeArray(o.layer, 12), - items: [items] + items: items }); }, diff --git a/src/widget/multilayerselecttree/node/node.plus.js b/src/widget/multilayerselecttree/node/node.plus.js index bbc34ea5f..8db2c31d5 100644 --- a/src/widget/multilayerselecttree/node/node.plus.js +++ b/src/widget/multilayerselecttree/node/node.plus.js @@ -63,10 +63,10 @@ BI.MultiLayerSelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { }); items.push(this.node); BI.createWidget({ - type: "bi.td", + type: "bi.horizontal_adapt", element: this, columnSize: BI.makeArray(o.layer, 12), - items: [items] + items: items }); }, diff --git a/src/widget/multilayersingletree/node/node.first.plus.js b/src/widget/multilayersingletree/node/node.first.plus.js index f72f49ed2..ee9b54775 100644 --- a/src/widget/multilayersingletree/node/node.first.plus.js +++ b/src/widget/multilayersingletree/node/node.first.plus.js @@ -42,10 +42,10 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { }); items.push(this.node); BI.createWidget({ - type: "bi.td", + type: "bi.horizontal_adapt", element: this, columnSize: BI.makeArray(o.layer, 12), - items: [items] + items: items }); }, diff --git a/src/widget/multilayersingletree/node/node.last.plus.js b/src/widget/multilayersingletree/node/node.last.plus.js index 02a8a26e0..f7a8e6b20 100644 --- a/src/widget/multilayersingletree/node/node.last.plus.js +++ b/src/widget/multilayersingletree/node/node.last.plus.js @@ -42,10 +42,10 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { }); items.push(this.node); BI.createWidget({ - type: "bi.td", + type: "bi.horizontal_adapt", element: this, columnSize: BI.makeArray(o.layer, 12), - items: [items] + items: items }); }, diff --git a/src/widget/multilayersingletree/node/node.mid.plus.js b/src/widget/multilayersingletree/node/node.mid.plus.js index 64612ca04..340305db4 100644 --- a/src/widget/multilayersingletree/node/node.mid.plus.js +++ b/src/widget/multilayersingletree/node/node.mid.plus.js @@ -42,10 +42,10 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { }); items.push(this.node); BI.createWidget({ - type: "bi.td", + type: "bi.horizontal_adapt", element: this, columnSize: BI.makeArray(o.layer, 12), - items: [items] + items: items }); }, diff --git a/src/widget/multilayersingletree/node/node.plus.js b/src/widget/multilayersingletree/node/node.plus.js index b2fbd37e6..bcff49737 100644 --- a/src/widget/multilayersingletree/node/node.plus.js +++ b/src/widget/multilayersingletree/node/node.plus.js @@ -40,10 +40,10 @@ BI.MultiLayerSingleTreePlusGroupNode = BI.inherit(BI.NodeButton, { }); items.push(this.node); BI.createWidget({ - type: "bi.td", + type: "bi.horizontal_adapt", element: this, columnSize: BI.makeArray(o.layer, 12), - items: [items] + items: items }); }, diff --git a/src/widget/multilayersingletree/treeitem/item.first.treeleaf.js b/src/widget/multilayersingletree/treeitem/item.first.treeleaf.js index 3537b4f34..39f3f65e2 100644 --- a/src/widget/multilayersingletree/treeitem/item.first.treeleaf.js +++ b/src/widget/multilayersingletree/treeitem/item.first.treeleaf.js @@ -63,10 +63,10 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, { }); items.push(this.item); BI.createWidget({ - type: "bi.td", + type: "bi.horizontal_adapt", element: this, columnSize: BI.makeArray(o.layer, 12), - items: [items] + items: items }); }, diff --git a/src/widget/multilayersingletree/treeitem/item.last.treeleaf.js b/src/widget/multilayersingletree/treeitem/item.last.treeleaf.js index 5a66b762c..0dc5390d2 100644 --- a/src/widget/multilayersingletree/treeitem/item.last.treeleaf.js +++ b/src/widget/multilayersingletree/treeitem/item.last.treeleaf.js @@ -62,10 +62,10 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, { }); items.push(this.item); BI.createWidget({ - type: "bi.td", + type: "bi.horizontal_adapt", element: this, columnSize: BI.makeArray(o.layer, 12), - items: [items] + items: items }); }, diff --git a/src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js b/src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js index 86372cda4..97bea42dd 100644 --- a/src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js +++ b/src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js @@ -62,10 +62,10 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, { }); items.push(this.item); BI.createWidget({ - type: "bi.td", + type: "bi.horizontal_adapt", element: this, columnSize: BI.makeArray(o.layer, 12), - items: [items] + items: items }); },