caoww
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

add

es6
guy 8 years ago
parent
5bbbb8daef
commit
feb353963d
8 changed files with 15 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      bi/base.js
  2. 4
      bi/widget.js
  3. 7
      docs/base.js
  4. 4
      docs/widget.js
  5. 2
      src/base/tree/parttree.js
  6. 5
      src/base/tree/treeview.js
  7. 2
      src/widget/arrangement/arrangement.js
  8. 2
      src/widget/multitree/multi.tree.combo.js

7
bi/base.js
Unescape View File

@ -1742,7 +1742,7 @@ BI.TreeView = BI.inherit(BI.Pane, {
this._buildTree(map, path); this._buildTree(map, path);
return; return;
} }
var storeValues = BI.deepClone(this.options.paras.selectedValues); var storeValues = BI.deepClone(this.selectedValues);
var treeNode = this._getTree(storeValues, path); var treeNode = this._getTree(storeValues, path);
this._addTreeNode(map, parent, this._getNodeValue(node), treeNode); this._addTreeNode(map, parent, this._getNodeValue(node), treeNode);
}, },
@ -1946,14 +1946,13 @@ BI.TreeView = BI.inherit(BI.Pane, {
//设置树节点的状态 //设置树节点的状态
setValue: function (value, param) { setValue: function (value, param) {
this.setSelectedValue(value);
this.checkAll(false); this.checkAll(false);
this.updateValue(value, param); this.updateValue(value, param);
this.refresh(); this.refresh();
}, },
setSelectedValue: function (value) { setSelectedValue: function (value) {
this.options.paras.selectedValues = BI.deepClone(value) || {}; this.options.paras.selectedValues = value || {};
this.selectedValues = BI.deepClone(value) || {}; this.selectedValues = BI.deepClone(value) || {};
}, },
@ -2249,7 +2248,7 @@ BI.PartTree = BI.inherit(BI.AsyncTree, {
_selectTreeNode: function (treeId, treeNode) { _selectTreeNode: function (treeId, treeNode) {
var self = this, o = this.options; var self = this, o = this.options;
var parentValues = BI.deepClone(treeNode.parentValues || self._getParentValues(treeNode)); var parentValues = BI.deepClone(treeNode.parentValues || self._getParentValues(treeNode));
var name = this._getNodeValue(treeNode) var name = this._getNodeValue(treeNode);
// var values = parentValues.concat([name]); // var values = parentValues.concat([name]);
if (treeNode.checked === true) { if (treeNode.checked === true) {
BI.AsyncTree.superclass._selectTreeNode.apply(self, arguments); BI.AsyncTree.superclass._selectTreeNode.apply(self, arguments);

4
bi/widget.js
Unescape View File

@ -3924,7 +3924,7 @@ BI.Arrangement = BI.inherit(BI.Widget, {
BI.Arrangement.EVENT_SCROLL = "EVENT_SCROLL"; BI.Arrangement.EVENT_SCROLL = "EVENT_SCROLL";
BI.extend(BI.Arrangement, { BI.extend(BI.Arrangement, {
PORTION: 24, PORTION: 24,
GRID_HEIGHT: 50, GRID_HEIGHT: 60,
LAYOUT_TYPE: { LAYOUT_TYPE: {
ADAPTIVE: 0, ADAPTIVE: 0,
FREE: 1, FREE: 1,
@ -11721,7 +11721,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
}, { }, {
eventName: BI.MultiTreePopup.EVENT_CLICK_CONFIRM, eventName: BI.MultiTreePopup.EVENT_CLICK_CONFIRM,
action: function () { action: function () {
self._defaultState(); self.combo.hideView();
} }
}, { }, {
eventName: BI.MultiTreePopup.EVENT_CLICK_CLEAR, eventName: BI.MultiTreePopup.EVENT_CLICK_CLEAR,

7
docs/base.js
Unescape View File

@ -1742,7 +1742,7 @@ BI.TreeView = BI.inherit(BI.Pane, {
this._buildTree(map, path); this._buildTree(map, path);
return; return;
} }
var storeValues = BI.deepClone(this.options.paras.selectedValues); var storeValues = BI.deepClone(this.selectedValues);
var treeNode = this._getTree(storeValues, path); var treeNode = this._getTree(storeValues, path);
this._addTreeNode(map, parent, this._getNodeValue(node), treeNode); this._addTreeNode(map, parent, this._getNodeValue(node), treeNode);
}, },
@ -1946,14 +1946,13 @@ BI.TreeView = BI.inherit(BI.Pane, {
//设置树节点的状态 //设置树节点的状态
setValue: function (value, param) { setValue: function (value, param) {
this.setSelectedValue(value);
this.checkAll(false); this.checkAll(false);
this.updateValue(value, param); this.updateValue(value, param);
this.refresh(); this.refresh();
}, },
setSelectedValue: function (value) { setSelectedValue: function (value) {
this.options.paras.selectedValues = BI.deepClone(value) || {}; this.options.paras.selectedValues = value || {};
this.selectedValues = BI.deepClone(value) || {}; this.selectedValues = BI.deepClone(value) || {};
}, },
@ -2249,7 +2248,7 @@ BI.PartTree = BI.inherit(BI.AsyncTree, {
_selectTreeNode: function (treeId, treeNode) { _selectTreeNode: function (treeId, treeNode) {
var self = this, o = this.options; var self = this, o = this.options;
var parentValues = BI.deepClone(treeNode.parentValues || self._getParentValues(treeNode)); var parentValues = BI.deepClone(treeNode.parentValues || self._getParentValues(treeNode));
var name = this._getNodeValue(treeNode) var name = this._getNodeValue(treeNode);
// var values = parentValues.concat([name]); // var values = parentValues.concat([name]);
if (treeNode.checked === true) { if (treeNode.checked === true) {
BI.AsyncTree.superclass._selectTreeNode.apply(self, arguments); BI.AsyncTree.superclass._selectTreeNode.apply(self, arguments);

4
docs/widget.js
Unescape View File

@ -3924,7 +3924,7 @@ BI.Arrangement = BI.inherit(BI.Widget, {
BI.Arrangement.EVENT_SCROLL = "EVENT_SCROLL"; BI.Arrangement.EVENT_SCROLL = "EVENT_SCROLL";
BI.extend(BI.Arrangement, { BI.extend(BI.Arrangement, {
PORTION: 24, PORTION: 24,
GRID_HEIGHT: 50, GRID_HEIGHT: 60,
LAYOUT_TYPE: { LAYOUT_TYPE: {
ADAPTIVE: 0, ADAPTIVE: 0,
FREE: 1, FREE: 1,
@ -11721,7 +11721,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
}, { }, {
eventName: BI.MultiTreePopup.EVENT_CLICK_CONFIRM, eventName: BI.MultiTreePopup.EVENT_CLICK_CONFIRM,
action: function () { action: function () {
self._defaultState(); self.combo.hideView();
} }
}, { }, {
eventName: BI.MultiTreePopup.EVENT_CLICK_CLEAR, eventName: BI.MultiTreePopup.EVENT_CLICK_CLEAR,

2
src/base/tree/parttree.js
Unescape View File

@ -40,7 +40,7 @@ BI.PartTree = BI.inherit(BI.AsyncTree, {
_selectTreeNode: function (treeId, treeNode) { _selectTreeNode: function (treeId, treeNode) {
var self = this, o = this.options; var self = this, o = this.options;
var parentValues = BI.deepClone(treeNode.parentValues || self._getParentValues(treeNode)); var parentValues = BI.deepClone(treeNode.parentValues || self._getParentValues(treeNode));
var name = this._getNodeValue(treeNode) var name = this._getNodeValue(treeNode);
// var values = parentValues.concat([name]); // var values = parentValues.concat([name]);
if (treeNode.checked === true) { if (treeNode.checked === true) {
BI.AsyncTree.superclass._selectTreeNode.apply(self, arguments); BI.AsyncTree.superclass._selectTreeNode.apply(self, arguments);

5
src/base/tree/treeview.js
Unescape View File

@ -241,7 +241,7 @@ BI.TreeView = BI.inherit(BI.Pane, {
this._buildTree(map, path); this._buildTree(map, path);
return; return;
} }
var storeValues = BI.deepClone(this.options.paras.selectedValues); var storeValues = BI.deepClone(this.selectedValues);
var treeNode = this._getTree(storeValues, path); var treeNode = this._getTree(storeValues, path);
this._addTreeNode(map, parent, this._getNodeValue(node), treeNode); this._addTreeNode(map, parent, this._getNodeValue(node), treeNode);
}, },
@ -445,14 +445,13 @@ BI.TreeView = BI.inherit(BI.Pane, {
//设置树节点的状态 //设置树节点的状态
setValue: function (value, param) { setValue: function (value, param) {
this.setSelectedValue(value);
this.checkAll(false); this.checkAll(false);
this.updateValue(value, param); this.updateValue(value, param);
this.refresh(); this.refresh();
}, },
setSelectedValue: function (value) { setSelectedValue: function (value) {
this.options.paras.selectedValues = BI.deepClone(value) || {}; this.options.paras.selectedValues = value || {};
this.selectedValues = BI.deepClone(value) || {}; this.selectedValues = BI.deepClone(value) || {};
}, },

2
src/widget/arrangement/arrangement.js
Unescape View File

@ -2934,7 +2934,7 @@ BI.Arrangement = BI.inherit(BI.Widget, {
BI.Arrangement.EVENT_SCROLL = "EVENT_SCROLL"; BI.Arrangement.EVENT_SCROLL = "EVENT_SCROLL";
BI.extend(BI.Arrangement, { BI.extend(BI.Arrangement, {
PORTION: 24, PORTION: 24,
GRID_HEIGHT: 50, GRID_HEIGHT: 60,
LAYOUT_TYPE: { LAYOUT_TYPE: {
ADAPTIVE: 0, ADAPTIVE: 0,
FREE: 1, FREE: 1,

2
src/widget/multitree/multi.tree.combo.js
Unescape View File

@ -88,7 +88,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
}, { }, {
eventName: BI.MultiTreePopup.EVENT_CLICK_CONFIRM, eventName: BI.MultiTreePopup.EVENT_CLICK_CONFIRM,
action: function () { action: function () {
self._defaultState(); self.combo.hideView();
} }
}, { }, {
eventName: BI.MultiTreePopup.EVENT_CLICK_CLEAR, eventName: BI.MultiTreePopup.EVENT_CLICK_CLEAR,

Write Preview
Loading…
Cancel
Save