agregar console.log para validar filtrado de datos
This commit is contained in:
parent
b8af03c035
commit
f25448102b
@ -356,18 +356,22 @@ var PivotTableUI = function (_React$PureComponent2) {
|
|||||||
}, {
|
}, {
|
||||||
key: 'componentDidUpdate',
|
key: 'componentDidUpdate',
|
||||||
value: function componentDidUpdate() {
|
value: function componentDidUpdate() {
|
||||||
var _this6 = this;
|
|
||||||
|
|
||||||
console.log(' componentDidUpdate ');
|
console.log(' componentDidUpdate ');
|
||||||
console.log(' componentDidUpdate this.props.data ', this.props.data);
|
console.log(' componentDidUpdate this.props.data ', this.props.data);
|
||||||
console.log(' componentDidUpdate state ', this.state);
|
console.log(' componentDidUpdate state ', this.state);
|
||||||
|
console.log(' componentDidUpdate this.props.valueFilter ', this.props.valueFilter);
|
||||||
|
var _valuefilter = this.props.valueFilter;
|
||||||
|
var keysFilter = Object.keys(_valuefilter);
|
||||||
|
console.log(' componentDidUpdate keysFilter ', keysFilter);
|
||||||
var filteredData = this.props.data.filter(function (row) {
|
var filteredData = this.props.data.filter(function (row) {
|
||||||
var _valuefilter = _this6.props.valueFilter;
|
|
||||||
if (typeof _valuefilter !== 'undefined' && _valuefilter !== null) {
|
if (typeof _valuefilter !== 'undefined' && _valuefilter !== null) {
|
||||||
var keysFilter = Object.keys(_valuefilter);
|
|
||||||
keysFilter.forEach(function (keyF) {
|
keysFilter.forEach(function (keyF) {
|
||||||
var valsFilter = Object.keys(_valuefilter[keyF]);
|
var valsFilter = Object.keys(_valuefilter[keyF]);
|
||||||
|
console.log(' componentDidUpdate keyF ', keyF);
|
||||||
|
console.log(' componentDidUpdate valsFilter ', valsFilter);
|
||||||
valsFilter.forEach(function (valF) {
|
valsFilter.forEach(function (valF) {
|
||||||
|
console.log(' componentDidUpdate valF ', valF);
|
||||||
|
console.log(' componentDidUpdate valF ', row[keyF]);
|
||||||
if (row[keyF] === valF) {
|
if (row[keyF] === valF) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -443,10 +447,10 @@ var PivotTableUI = function (_React$PureComponent2) {
|
|||||||
}, {
|
}, {
|
||||||
key: 'propUpdater',
|
key: 'propUpdater',
|
||||||
value: function propUpdater(key) {
|
value: function propUpdater(key) {
|
||||||
var _this7 = this;
|
var _this6 = this;
|
||||||
|
|
||||||
return function (value) {
|
return function (value) {
|
||||||
return _this7.sendPropUpdate(_defineProperty({}, key, { $set: value }));
|
return _this6.sendPropUpdate(_defineProperty({}, key, { $set: value }));
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}, {
|
}, {
|
||||||
@ -501,7 +505,7 @@ var PivotTableUI = function (_React$PureComponent2) {
|
|||||||
}, {
|
}, {
|
||||||
key: 'makeDnDCell',
|
key: 'makeDnDCell',
|
||||||
value: function makeDnDCell(items, onChange, classes) {
|
value: function makeDnDCell(items, onChange, classes) {
|
||||||
var _this8 = this;
|
var _this7 = this;
|
||||||
|
|
||||||
return _react2.default.createElement(
|
return _react2.default.createElement(
|
||||||
_reactSortablejs2.default,
|
_reactSortablejs2.default,
|
||||||
@ -520,15 +524,15 @@ var PivotTableUI = function (_React$PureComponent2) {
|
|||||||
return _react2.default.createElement(DraggableAttribute, {
|
return _react2.default.createElement(DraggableAttribute, {
|
||||||
name: x,
|
name: x,
|
||||||
key: x,
|
key: x,
|
||||||
attrValues: _this8.state.attrValues[x],
|
attrValues: _this7.state.attrValues[x],
|
||||||
valueFilter: _this8.props.valueFilter[x] || {},
|
valueFilter: _this7.props.valueFilter[x] || {},
|
||||||
sorter: (0, _Utilities.getSort)(_this8.props.sorters, x),
|
sorter: (0, _Utilities.getSort)(_this7.props.sorters, x),
|
||||||
menuLimit: _this8.props.menuLimit,
|
menuLimit: _this7.props.menuLimit,
|
||||||
setValuesInFilter: _this8.setValuesInFilter.bind(_this8),
|
setValuesInFilter: _this7.setValuesInFilter.bind(_this7),
|
||||||
addValuesToFilter: _this8.addValuesToFilter.bind(_this8),
|
addValuesToFilter: _this7.addValuesToFilter.bind(_this7),
|
||||||
moveFilterBoxToTop: _this8.moveFilterBoxToTop.bind(_this8),
|
moveFilterBoxToTop: _this7.moveFilterBoxToTop.bind(_this7),
|
||||||
removeValuesFromFilter: _this8.removeValuesFromFilter.bind(_this8),
|
removeValuesFromFilter: _this7.removeValuesFromFilter.bind(_this7),
|
||||||
zIndex: _this8.state.zIndices[x] || _this8.state.maxZIndex
|
zIndex: _this7.state.zIndices[x] || _this7.state.maxZIndex
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
@ -536,7 +540,7 @@ var PivotTableUI = function (_React$PureComponent2) {
|
|||||||
}, {
|
}, {
|
||||||
key: 'render',
|
key: 'render',
|
||||||
value: function render() {
|
value: function render() {
|
||||||
var _this9 = this;
|
var _this8 = this;
|
||||||
|
|
||||||
var numValsAllowed = this.props.aggregators[this.props.aggregatorName]([])().numInputs || 0;
|
var numValsAllowed = this.props.aggregators[this.props.aggregatorName]([])().numInputs || 0;
|
||||||
|
|
||||||
@ -553,8 +557,8 @@ var PivotTableUI = function (_React$PureComponent2) {
|
|||||||
open: this.isOpen('renderer'),
|
open: this.isOpen('renderer'),
|
||||||
zIndex: this.isOpen('renderer') ? this.state.maxZIndex + 1 : 1,
|
zIndex: this.isOpen('renderer') ? this.state.maxZIndex + 1 : 1,
|
||||||
toggle: function toggle() {
|
toggle: function toggle() {
|
||||||
return _this9.setState({
|
return _this8.setState({
|
||||||
openDropdown: _this9.isOpen('renderer') ? false : 'renderer'
|
openDropdown: _this8.isOpen('renderer') ? false : 'renderer'
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
setValue: this.propUpdater('rendererName')
|
setValue: this.propUpdater('rendererName')
|
||||||
@ -584,8 +588,8 @@ var PivotTableUI = function (_React$PureComponent2) {
|
|||||||
open: this.isOpen('aggregators'),
|
open: this.isOpen('aggregators'),
|
||||||
zIndex: this.isOpen('aggregators') ? this.state.maxZIndex + 1 : 1,
|
zIndex: this.isOpen('aggregators') ? this.state.maxZIndex + 1 : 1,
|
||||||
toggle: function toggle() {
|
toggle: function toggle() {
|
||||||
return _this9.setState({
|
return _this8.setState({
|
||||||
openDropdown: _this9.isOpen('aggregators') ? false : 'aggregators'
|
openDropdown: _this8.isOpen('aggregators') ? false : 'aggregators'
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
setValue: this.propUpdater('aggregatorName')
|
setValue: this.propUpdater('aggregatorName')
|
||||||
@ -596,7 +600,7 @@ var PivotTableUI = function (_React$PureComponent2) {
|
|||||||
role: 'button',
|
role: 'button',
|
||||||
className: 'pvtRowOrder',
|
className: 'pvtRowOrder',
|
||||||
onClick: function onClick() {
|
onClick: function onClick() {
|
||||||
return _this9.propUpdater('rowOrder')(sortIcons[_this9.props.rowOrder].next);
|
return _this8.propUpdater('rowOrder')(sortIcons[_this8.props.rowOrder].next);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
sortIcons[this.props.rowOrder].rowSymbol
|
sortIcons[this.props.rowOrder].rowSymbol
|
||||||
@ -607,7 +611,7 @@ var PivotTableUI = function (_React$PureComponent2) {
|
|||||||
role: 'button',
|
role: 'button',
|
||||||
className: 'pvtColOrder',
|
className: 'pvtColOrder',
|
||||||
onClick: function onClick() {
|
onClick: function onClick() {
|
||||||
return _this9.propUpdater('colOrder')(sortIcons[_this9.props.colOrder].next);
|
return _this8.propUpdater('colOrder')(sortIcons[_this8.props.colOrder].next);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
sortIcons[this.props.colOrder].colSymbol
|
sortIcons[this.props.colOrder].colSymbol
|
||||||
@ -616,19 +620,19 @@ var PivotTableUI = function (_React$PureComponent2) {
|
|||||||
new Array(numValsAllowed).fill().map(function (n, i) {
|
new Array(numValsAllowed).fill().map(function (n, i) {
|
||||||
return [_react2.default.createElement(Dropdown, {
|
return [_react2.default.createElement(Dropdown, {
|
||||||
key: i,
|
key: i,
|
||||||
current: _this9.props.vals[i],
|
current: _this8.props.vals[i],
|
||||||
values: Object.keys(_this9.state.attrValues).filter(function (e) {
|
values: Object.keys(_this8.state.attrValues).filter(function (e) {
|
||||||
return !_this9.props.hiddenAttributes.includes(e) && !_this9.props.hiddenFromAggregators.includes(e);
|
return !_this8.props.hiddenAttributes.includes(e) && !_this8.props.hiddenFromAggregators.includes(e);
|
||||||
}),
|
}),
|
||||||
open: _this9.isOpen('val' + i),
|
open: _this8.isOpen('val' + i),
|
||||||
zIndex: _this9.isOpen('val' + i) ? _this9.state.maxZIndex + 1 : 1,
|
zIndex: _this8.isOpen('val' + i) ? _this8.state.maxZIndex + 1 : 1,
|
||||||
toggle: function toggle() {
|
toggle: function toggle() {
|
||||||
return _this9.setState({
|
return _this8.setState({
|
||||||
openDropdown: _this9.isOpen('val' + i) ? false : 'val' + i
|
openDropdown: _this8.isOpen('val' + i) ? false : 'val' + i
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
setValue: function setValue(value) {
|
setValue: function setValue(value) {
|
||||||
return _this9.sendPropUpdate({
|
return _this8.sendPropUpdate({
|
||||||
vals: { $splice: [[i, 1, value]] }
|
vals: { $splice: [[i, 1, value]] }
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -638,7 +642,7 @@ var PivotTableUI = function (_React$PureComponent2) {
|
|||||||
);
|
);
|
||||||
|
|
||||||
var unusedAttrs = Object.keys(this.state.attrValues).filter(function (e) {
|
var unusedAttrs = Object.keys(this.state.attrValues).filter(function (e) {
|
||||||
return !_this9.props.rows.includes(e) && !_this9.props.cols.includes(e) && !_this9.props.hiddenAttributes.includes(e) && !_this9.props.hiddenFromDragDrop.includes(e);
|
return !_this8.props.rows.includes(e) && !_this8.props.cols.includes(e) && !_this8.props.hiddenAttributes.includes(e) && !_this8.props.hiddenFromDragDrop.includes(e);
|
||||||
}).sort((0, _Utilities.sortAs)(this.state.unusedOrder));
|
}).sort((0, _Utilities.sortAs)(this.state.unusedOrder));
|
||||||
|
|
||||||
var unusedLength = unusedAttrs.reduce(function (r, e) {
|
var unusedLength = unusedAttrs.reduce(function (r, e) {
|
||||||
@ -647,17 +651,17 @@ var PivotTableUI = function (_React$PureComponent2) {
|
|||||||
var horizUnused = unusedLength < this.props.unusedOrientationCutoff;
|
var horizUnused = unusedLength < this.props.unusedOrientationCutoff;
|
||||||
|
|
||||||
var unusedAttrsCell = this.makeDnDCell(unusedAttrs, function (order) {
|
var unusedAttrsCell = this.makeDnDCell(unusedAttrs, function (order) {
|
||||||
return _this9.setState({ unusedOrder: order });
|
return _this8.setState({ unusedOrder: order });
|
||||||
}, 'pvtAxisContainer pvtUnused ' + (horizUnused ? 'pvtHorizList' : 'pvtVertList'));
|
}, 'pvtAxisContainer pvtUnused ' + (horizUnused ? 'pvtHorizList' : 'pvtVertList'));
|
||||||
|
|
||||||
var colAttrs = this.props.cols.filter(function (e) {
|
var colAttrs = this.props.cols.filter(function (e) {
|
||||||
return !_this9.props.hiddenAttributes.includes(e) && !_this9.props.hiddenFromDragDrop.includes(e);
|
return !_this8.props.hiddenAttributes.includes(e) && !_this8.props.hiddenFromDragDrop.includes(e);
|
||||||
});
|
});
|
||||||
|
|
||||||
var colAttrsCell = this.makeDnDCell(colAttrs, this.propUpdater('cols'), 'pvtAxisContainer pvtHorizList pvtCols');
|
var colAttrsCell = this.makeDnDCell(colAttrs, this.propUpdater('cols'), 'pvtAxisContainer pvtHorizList pvtCols');
|
||||||
|
|
||||||
var rowAttrs = this.props.rows.filter(function (e) {
|
var rowAttrs = this.props.rows.filter(function (e) {
|
||||||
return !_this9.props.hiddenAttributes.includes(e) && !_this9.props.hiddenFromDragDrop.includes(e);
|
return !_this8.props.hiddenAttributes.includes(e) && !_this8.props.hiddenFromDragDrop.includes(e);
|
||||||
});
|
});
|
||||||
var rowAttrsCell = this.makeDnDCell(rowAttrs, this.propUpdater('rows'), 'pvtAxisContainer pvtVertList pvtRows');
|
var rowAttrsCell = this.makeDnDCell(rowAttrs, this.propUpdater('rows'), 'pvtAxisContainer pvtVertList pvtRows');
|
||||||
var outputCell = _react2.default.createElement(
|
var outputCell = _react2.default.createElement(
|
||||||
@ -675,7 +679,7 @@ var PivotTableUI = function (_React$PureComponent2) {
|
|||||||
_react2.default.createElement(
|
_react2.default.createElement(
|
||||||
'tbody',
|
'tbody',
|
||||||
{ onClick: function onClick() {
|
{ onClick: function onClick() {
|
||||||
return _this9.setState({ openDropdown: false });
|
return _this8.setState({ openDropdown: false });
|
||||||
} },
|
} },
|
||||||
_react2.default.createElement(
|
_react2.default.createElement(
|
||||||
'tr',
|
'tr',
|
||||||
@ -693,7 +697,7 @@ var PivotTableUI = function (_React$PureComponent2) {
|
|||||||
this.props.hideConfiguration && _react2.default.createElement(
|
this.props.hideConfiguration && _react2.default.createElement(
|
||||||
'tbody',
|
'tbody',
|
||||||
{ onClick: function onClick() {
|
{ onClick: function onClick() {
|
||||||
return _this9.setState({ openDropdown: false });
|
return _this8.setState({ openDropdown: false });
|
||||||
} },
|
} },
|
||||||
_react2.default.createElement(
|
_react2.default.createElement(
|
||||||
'tr',
|
'tr',
|
||||||
@ -704,7 +708,7 @@ var PivotTableUI = function (_React$PureComponent2) {
|
|||||||
!this.props.hideConfiguration && _react2.default.createElement(
|
!this.props.hideConfiguration && _react2.default.createElement(
|
||||||
'tbody',
|
'tbody',
|
||||||
{ onClick: function onClick() {
|
{ onClick: function onClick() {
|
||||||
return _this9.setState({ openDropdown: false });
|
return _this8.setState({ openDropdown: false });
|
||||||
} },
|
} },
|
||||||
_react2.default.createElement(
|
_react2.default.createElement(
|
||||||
'tr',
|
'tr',
|
||||||
@ -734,7 +738,7 @@ var PivotTableUI = function (_React$PureComponent2) {
|
|||||||
this.props.hideConfiguration && _react2.default.createElement(
|
this.props.hideConfiguration && _react2.default.createElement(
|
||||||
'tbody',
|
'tbody',
|
||||||
{ onClick: function onClick() {
|
{ onClick: function onClick() {
|
||||||
return _this9.setState({ openDropdown: false });
|
return _this8.setState({ openDropdown: false });
|
||||||
} },
|
} },
|
||||||
_react2.default.createElement(
|
_react2.default.createElement(
|
||||||
'tr',
|
'tr',
|
||||||
@ -745,7 +749,7 @@ var PivotTableUI = function (_React$PureComponent2) {
|
|||||||
!this.props.hideConfiguration && _react2.default.createElement(
|
!this.props.hideConfiguration && _react2.default.createElement(
|
||||||
'tbody',
|
'tbody',
|
||||||
{ onClick: function onClick() {
|
{ onClick: function onClick() {
|
||||||
return _this9.setState({ openDropdown: false });
|
return _this8.setState({ openDropdown: false });
|
||||||
} },
|
} },
|
||||||
_react2.default.createElement(
|
_react2.default.createElement(
|
||||||
'tr',
|
'tr',
|
||||||
|
File diff suppressed because one or more lines are too long
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "v-react-pivottable",
|
"name": "v-react-pivottable",
|
||||||
"version": "0.11.36",
|
"version": "0.11.37",
|
||||||
"description": "A React-based pivot table",
|
"description": "A React-based pivot table",
|
||||||
"main": "PivotTableUI.js",
|
"main": "PivotTableUI.js",
|
||||||
"files": [
|
"files": [
|
||||||
|
Loading…
Reference in New Issue
Block a user