From feb353963d0db780d1b4f1277392a5b34078103c Mon Sep 17 00:00:00 2001 From: guy Date: Sun, 28 May 2017 23:21:30 +0800 Subject: [PATCH] add --- bi/base.js | 7 +++---- bi/widget.js | 4 ++-- docs/base.js | 7 +++---- docs/widget.js | 4 ++-- src/base/tree/parttree.js | 2 +- src/base/tree/treeview.js | 5 ++--- src/widget/arrangement/arrangement.js | 2 +- src/widget/multitree/multi.tree.combo.js | 2 +- 8 files changed, 15 insertions(+), 18 deletions(-) diff --git a/bi/base.js b/bi/base.js index b92b70061..785c8ad4d 100644 --- a/bi/base.js +++ b/bi/base.js @@ -1742,7 +1742,7 @@ BI.TreeView = BI.inherit(BI.Pane, { this._buildTree(map, path); return; } - var storeValues = BI.deepClone(this.options.paras.selectedValues); + var storeValues = BI.deepClone(this.selectedValues); var treeNode = this._getTree(storeValues, path); this._addTreeNode(map, parent, this._getNodeValue(node), treeNode); }, @@ -1946,14 +1946,13 @@ BI.TreeView = BI.inherit(BI.Pane, { //设置树节点的状态 setValue: function (value, param) { - this.setSelectedValue(value); this.checkAll(false); this.updateValue(value, param); this.refresh(); }, setSelectedValue: function (value) { - this.options.paras.selectedValues = BI.deepClone(value) || {}; + this.options.paras.selectedValues = value || {}; this.selectedValues = BI.deepClone(value) || {}; }, @@ -2249,7 +2248,7 @@ BI.PartTree = BI.inherit(BI.AsyncTree, { _selectTreeNode: function (treeId, treeNode) { var self = this, o = this.options; var parentValues = BI.deepClone(treeNode.parentValues || self._getParentValues(treeNode)); - var name = this._getNodeValue(treeNode) + var name = this._getNodeValue(treeNode); // var values = parentValues.concat([name]); if (treeNode.checked === true) { BI.AsyncTree.superclass._selectTreeNode.apply(self, arguments); diff --git a/bi/widget.js b/bi/widget.js index 43536e4f7..c8304eb1b 100644 --- a/bi/widget.js +++ b/bi/widget.js @@ -3924,7 +3924,7 @@ BI.Arrangement = BI.inherit(BI.Widget, { BI.Arrangement.EVENT_SCROLL = "EVENT_SCROLL"; BI.extend(BI.Arrangement, { PORTION: 24, - GRID_HEIGHT: 50, + GRID_HEIGHT: 60, LAYOUT_TYPE: { ADAPTIVE: 0, FREE: 1, @@ -11721,7 +11721,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, { }, { eventName: BI.MultiTreePopup.EVENT_CLICK_CONFIRM, action: function () { - self._defaultState(); + self.combo.hideView(); } }, { eventName: BI.MultiTreePopup.EVENT_CLICK_CLEAR, diff --git a/docs/base.js b/docs/base.js index b92b70061..785c8ad4d 100644 --- a/docs/base.js +++ b/docs/base.js @@ -1742,7 +1742,7 @@ BI.TreeView = BI.inherit(BI.Pane, { this._buildTree(map, path); return; } - var storeValues = BI.deepClone(this.options.paras.selectedValues); + var storeValues = BI.deepClone(this.selectedValues); var treeNode = this._getTree(storeValues, path); this._addTreeNode(map, parent, this._getNodeValue(node), treeNode); }, @@ -1946,14 +1946,13 @@ BI.TreeView = BI.inherit(BI.Pane, { //设置树节点的状态 setValue: function (value, param) { - this.setSelectedValue(value); this.checkAll(false); this.updateValue(value, param); this.refresh(); }, setSelectedValue: function (value) { - this.options.paras.selectedValues = BI.deepClone(value) || {}; + this.options.paras.selectedValues = value || {}; this.selectedValues = BI.deepClone(value) || {}; }, @@ -2249,7 +2248,7 @@ BI.PartTree = BI.inherit(BI.AsyncTree, { _selectTreeNode: function (treeId, treeNode) { var self = this, o = this.options; var parentValues = BI.deepClone(treeNode.parentValues || self._getParentValues(treeNode)); - var name = this._getNodeValue(treeNode) + var name = this._getNodeValue(treeNode); // var values = parentValues.concat([name]); if (treeNode.checked === true) { BI.AsyncTree.superclass._selectTreeNode.apply(self, arguments); diff --git a/docs/widget.js b/docs/widget.js index 43536e4f7..c8304eb1b 100644 --- a/docs/widget.js +++ b/docs/widget.js @@ -3924,7 +3924,7 @@ BI.Arrangement = BI.inherit(BI.Widget, { BI.Arrangement.EVENT_SCROLL = "EVENT_SCROLL"; BI.extend(BI.Arrangement, { PORTION: 24, - GRID_HEIGHT: 50, + GRID_HEIGHT: 60, LAYOUT_TYPE: { ADAPTIVE: 0, FREE: 1, @@ -11721,7 +11721,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, { }, { eventName: BI.MultiTreePopup.EVENT_CLICK_CONFIRM, action: function () { - self._defaultState(); + self.combo.hideView(); } }, { eventName: BI.MultiTreePopup.EVENT_CLICK_CLEAR, diff --git a/src/base/tree/parttree.js b/src/base/tree/parttree.js index d628cd72c..6d4fe6f58 100644 --- a/src/base/tree/parttree.js +++ b/src/base/tree/parttree.js @@ -40,7 +40,7 @@ BI.PartTree = BI.inherit(BI.AsyncTree, { _selectTreeNode: function (treeId, treeNode) { var self = this, o = this.options; var parentValues = BI.deepClone(treeNode.parentValues || self._getParentValues(treeNode)); - var name = this._getNodeValue(treeNode) + var name = this._getNodeValue(treeNode); // var values = parentValues.concat([name]); if (treeNode.checked === true) { BI.AsyncTree.superclass._selectTreeNode.apply(self, arguments); diff --git a/src/base/tree/treeview.js b/src/base/tree/treeview.js index 0326b38ae..045388c4d 100644 --- a/src/base/tree/treeview.js +++ b/src/base/tree/treeview.js @@ -241,7 +241,7 @@ BI.TreeView = BI.inherit(BI.Pane, { this._buildTree(map, path); return; } - var storeValues = BI.deepClone(this.options.paras.selectedValues); + var storeValues = BI.deepClone(this.selectedValues); var treeNode = this._getTree(storeValues, path); this._addTreeNode(map, parent, this._getNodeValue(node), treeNode); }, @@ -445,14 +445,13 @@ BI.TreeView = BI.inherit(BI.Pane, { //设置树节点的状态 setValue: function (value, param) { - this.setSelectedValue(value); this.checkAll(false); this.updateValue(value, param); this.refresh(); }, setSelectedValue: function (value) { - this.options.paras.selectedValues = BI.deepClone(value) || {}; + this.options.paras.selectedValues = value || {}; this.selectedValues = BI.deepClone(value) || {}; }, diff --git a/src/widget/arrangement/arrangement.js b/src/widget/arrangement/arrangement.js index 8bedd4259..96514ce62 100644 --- a/src/widget/arrangement/arrangement.js +++ b/src/widget/arrangement/arrangement.js @@ -2934,7 +2934,7 @@ BI.Arrangement = BI.inherit(BI.Widget, { BI.Arrangement.EVENT_SCROLL = "EVENT_SCROLL"; BI.extend(BI.Arrangement, { PORTION: 24, - GRID_HEIGHT: 50, + GRID_HEIGHT: 60, LAYOUT_TYPE: { ADAPTIVE: 0, FREE: 1, diff --git a/src/widget/multitree/multi.tree.combo.js b/src/widget/multitree/multi.tree.combo.js index d2bd72edf..3c98f2c52 100644 --- a/src/widget/multitree/multi.tree.combo.js +++ b/src/widget/multitree/multi.tree.combo.js @@ -88,7 +88,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, { }, { eventName: BI.MultiTreePopup.EVENT_CLICK_CONFIRM, action: function () { - self._defaultState(); + self.combo.hideView(); } }, { eventName: BI.MultiTreePopup.EVENT_CLICK_CLEAR,