guy 7 years ago
parent
commit
60ad3b4bf7
  1. 2
      bi/case.js
  2. 20
      bi/widget.js
  3. 2
      docs/case.js
  4. 20
      docs/widget.js
  5. 2
      src/case/table/table.dynamicsummarylayertree.js
  6. 12
      src/widget/multiselecttree/multiselecttree.js
  7. 2
      src/widget/multiselecttree/multiselecttree.popup.js
  8. 6
      src/widget/multitree/multi.tree.search.pane.js

2
bi/case.js

@ -10395,7 +10395,7 @@ BI.DynamicSummaryLayerTreeTable = BI.inherit(BI.Widget, {
_recomputeColumnSize: function () { _recomputeColumnSize: function () {
var o = this.options; var o = this.options;
o.regionColumnSize = this.table.getRegionColumnSize(); o.regionColumnSize = this.table.getRegionColumnSize();
var columnSize = this.table.getColumnSize(); var columnSize = this.table.getColumnSize().slice();
if (o.freezeCols.length > 1) { if (o.freezeCols.length > 1) {
for (var i = 0; i < o.freezeCols.length - 1; i++) { for (var i = 0; i < o.freezeCols.length - 1; i++) {
columnSize.splice(1, 0, 0); columnSize.splice(1, 0, 0);

20
bi/widget.js

@ -11360,14 +11360,14 @@ BI.MultiSelectTree = BI.inherit(BI.Widget, {
action: function () { action: function () {
self._showSearcherPane(); self._showSearcherPane();
self.storeValue = {value: self.adapter.getValue()}; self.storeValue = {value: self.adapter.getValue()};
self.searcherPane.setValue(self.storeValue); self.searcherPane.setSelectedValue(self.storeValue.value);
} }
}, { }, {
eventName: BI.Searcher.EVENT_STOP, eventName: BI.Searcher.EVENT_STOP,
action: function () { action: function () {
self._showAdapter(); self._showAdapter();
// self.storeValue = {value: self.searcherPane.getValue()}; // self.storeValue = {value: self.searcherPane.getValue()};
self.adapter.setValue(self.storeValue); self.adapter.setSelectedValue(self.storeValue.value);
BI.nextTick(function () { BI.nextTick(function () {
self.adapter.populate(); self.adapter.populate();
}); });
@ -11430,17 +11430,17 @@ BI.MultiSelectTree = BI.inherit(BI.Widget, {
}, },
setSelectedValue: function (v) { setSelectedValue: function (v) {
this.storeValue.value = v || {};
this.adapter.setSelectedValue(v); this.adapter.setSelectedValue(v);
this.trigger.setValue({
value: v || {}
});
}, },
setValue: function (v) { setValue: function (v) {
this.storeValue.value = v || {};
this.adapter.setValue({ this.adapter.setValue({
value: v || {} value: v || {}
}); });
this.trigger.setValue({
value: v || {}
});
}, },
stopSearch: function () { stopSearch: function () {
@ -11497,7 +11497,7 @@ BI.MultiSelectTreePopup = BI.inherit(BI.Widget, {
setValue: function (v) { setValue: function (v) {
v || (v = {}); v || (v = {});
this.popup.setValue(v.value); this.popup.setValue(v);
}, },
setSelectedValue: function (v) { setSelectedValue: function (v) {
@ -12029,8 +12029,12 @@ BI.MultiTreeSearchPane = BI.inherit(BI.Pane, {
}, },
setValue: function (v) { setValue: function (v) {
this.setSelectedValue(v.value);
},
setSelectedValue: function (v) {
v || (v = {}); v || (v = {});
this.partTree.setSelectedValue(v.value); this.partTree.setSelectedValue(v);
}, },
getValue: function () { getValue: function () {

2
docs/case.js

@ -10395,7 +10395,7 @@ BI.DynamicSummaryLayerTreeTable = BI.inherit(BI.Widget, {
_recomputeColumnSize: function () { _recomputeColumnSize: function () {
var o = this.options; var o = this.options;
o.regionColumnSize = this.table.getRegionColumnSize(); o.regionColumnSize = this.table.getRegionColumnSize();
var columnSize = this.table.getColumnSize(); var columnSize = this.table.getColumnSize().slice();
if (o.freezeCols.length > 1) { if (o.freezeCols.length > 1) {
for (var i = 0; i < o.freezeCols.length - 1; i++) { for (var i = 0; i < o.freezeCols.length - 1; i++) {
columnSize.splice(1, 0, 0); columnSize.splice(1, 0, 0);

20
docs/widget.js

@ -11360,14 +11360,14 @@ BI.MultiSelectTree = BI.inherit(BI.Widget, {
action: function () { action: function () {
self._showSearcherPane(); self._showSearcherPane();
self.storeValue = {value: self.adapter.getValue()}; self.storeValue = {value: self.adapter.getValue()};
self.searcherPane.setValue(self.storeValue); self.searcherPane.setSelectedValue(self.storeValue.value);
} }
}, { }, {
eventName: BI.Searcher.EVENT_STOP, eventName: BI.Searcher.EVENT_STOP,
action: function () { action: function () {
self._showAdapter(); self._showAdapter();
// self.storeValue = {value: self.searcherPane.getValue()}; // self.storeValue = {value: self.searcherPane.getValue()};
self.adapter.setValue(self.storeValue); self.adapter.setSelectedValue(self.storeValue.value);
BI.nextTick(function () { BI.nextTick(function () {
self.adapter.populate(); self.adapter.populate();
}); });
@ -11430,17 +11430,17 @@ BI.MultiSelectTree = BI.inherit(BI.Widget, {
}, },
setSelectedValue: function (v) { setSelectedValue: function (v) {
this.storeValue.value = v || {};
this.adapter.setSelectedValue(v); this.adapter.setSelectedValue(v);
this.trigger.setValue({
value: v || {}
});
}, },
setValue: function (v) { setValue: function (v) {
this.storeValue.value = v || {};
this.adapter.setValue({ this.adapter.setValue({
value: v || {} value: v || {}
}); });
this.trigger.setValue({
value: v || {}
});
}, },
stopSearch: function () { stopSearch: function () {
@ -11497,7 +11497,7 @@ BI.MultiSelectTreePopup = BI.inherit(BI.Widget, {
setValue: function (v) { setValue: function (v) {
v || (v = {}); v || (v = {});
this.popup.setValue(v.value); this.popup.setValue(v);
}, },
setSelectedValue: function (v) { setSelectedValue: function (v) {
@ -12029,8 +12029,12 @@ BI.MultiTreeSearchPane = BI.inherit(BI.Pane, {
}, },
setValue: function (v) { setValue: function (v) {
this.setSelectedValue(v.value);
},
setSelectedValue: function (v) {
v || (v = {}); v || (v = {});
this.partTree.setSelectedValue(v.value); this.partTree.setSelectedValue(v);
}, },
getValue: function () { getValue: function () {

2
src/case/table/table.dynamicsummarylayertree.js

@ -160,7 +160,7 @@ BI.DynamicSummaryLayerTreeTable = BI.inherit(BI.Widget, {
_recomputeColumnSize: function () { _recomputeColumnSize: function () {
var o = this.options; var o = this.options;
o.regionColumnSize = this.table.getRegionColumnSize(); o.regionColumnSize = this.table.getRegionColumnSize();
var columnSize = this.table.getColumnSize(); var columnSize = this.table.getColumnSize().slice();
if (o.freezeCols.length > 1) { if (o.freezeCols.length > 1) {
for (var i = 0; i < o.freezeCols.length - 1; i++) { for (var i = 0; i < o.freezeCols.length - 1; i++) {
columnSize.splice(1, 0, 0); columnSize.splice(1, 0, 0);

12
src/widget/multiselecttree/multiselecttree.js

@ -57,14 +57,14 @@ BI.MultiSelectTree = BI.inherit(BI.Widget, {
action: function () { action: function () {
self._showSearcherPane(); self._showSearcherPane();
self.storeValue = {value: self.adapter.getValue()}; self.storeValue = {value: self.adapter.getValue()};
self.searcherPane.setValue(self.storeValue); self.searcherPane.setSelectedValue(self.storeValue.value);
} }
}, { }, {
eventName: BI.Searcher.EVENT_STOP, eventName: BI.Searcher.EVENT_STOP,
action: function () { action: function () {
self._showAdapter(); self._showAdapter();
// self.storeValue = {value: self.searcherPane.getValue()}; // self.storeValue = {value: self.searcherPane.getValue()};
self.adapter.setValue(self.storeValue); self.adapter.setSelectedValue(self.storeValue.value);
BI.nextTick(function () { BI.nextTick(function () {
self.adapter.populate(); self.adapter.populate();
}); });
@ -127,17 +127,17 @@ BI.MultiSelectTree = BI.inherit(BI.Widget, {
}, },
setSelectedValue: function (v) { setSelectedValue: function (v) {
this.storeValue.value = v || {};
this.adapter.setSelectedValue(v); this.adapter.setSelectedValue(v);
this.trigger.setValue({
value: v || {}
});
}, },
setValue: function (v) { setValue: function (v) {
this.storeValue.value = v || {};
this.adapter.setValue({ this.adapter.setValue({
value: v || {} value: v || {}
}); });
this.trigger.setValue({
value: v || {}
});
}, },
stopSearch: function () { stopSearch: function () {

2
src/widget/multiselecttree/multiselecttree.popup.js

@ -34,7 +34,7 @@ BI.MultiSelectTreePopup = BI.inherit(BI.Widget, {
setValue: function (v) { setValue: function (v) {
v || (v = {}); v || (v = {});
this.popup.setValue(v.value); this.popup.setValue(v);
}, },
setSelectedValue: function (v) { setSelectedValue: function (v) {

6
src/widget/multitree/multi.tree.search.pane.js

@ -44,8 +44,12 @@ BI.MultiTreeSearchPane = BI.inherit(BI.Pane, {
}, },
setValue: function (v) { setValue: function (v) {
this.setSelectedValue(v.value);
},
setSelectedValue: function (v) {
v || (v = {}); v || (v = {});
this.partTree.setSelectedValue(v.value); this.partTree.setSelectedValue(v);
}, },
getValue: function () { getValue: function () {

Loading…
Cancel
Save