dehernandezm/v-react-pivottable
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: dehernandezm:fbb9f311b3e292bedf26ae56783a574bdefd4bdc
Branches Tags
dehernandezm:main
dehernandezm:desarrollo
..
compare: dehernandezm:5bb429bfca4e7e508fcf5548200ff251238c0634
Branches Tags
dehernandezm:desarrollo
dehernandezm:main

No commits in common. "fbb9f311b3e292bedf26ae56783a574bdefd4bdc" and "5bb429bfca4e7e508fcf5548200ff251238c0634" have entirely different histories.
fbb9f311b3 ... 5bb429bfca

5 changed files with 17 additions and 130 deletions
Show Stats Expand all files Collapse all files

48
PivotTableUI.js
View File

@ -364,7 +364,6 @@ var PivotTableUI = function (_React$PureComponent2) {
attrValues: {}, attrValues: {},
materializedInput: [], materializedInput: [],
hideConfiguration: false, hideConfiguration: false,
showSubtotales: false,
headerClass: '', headerClass: '',
stylesHeaders: {} stylesHeaders: {}
}; };
@ -573,34 +572,27 @@ var PivotTableUI = function (_React$PureComponent2) {
} }
}, { }, {
key: 'makeDnDCell', key: 'makeDnDCell',
value: function makeDnDCell(items, _onChange, classes, headSlot) { value: function makeDnDCell(items, onChange, classes) {
var _this7 = this; var _this7 = this;
var onChange = function onChange(newArr) {
var _resultArr = newArr.filter(function (item) {
return item !== '[:sub-total:]';
});
_onChange(_resultArr);
};
return _react2.default.createElement( return _react2.default.createElement(
_reactSortablejs2.default, _reactSortablejs2.default,
{ {
options: { options: {
group: 'shared', group: 'shared',
ghostClass: 'pvtPlaceholder', ghostClass: 'pvtPlaceholder',
filter: '.pvtFilterBox, .pvtSubtotalCheck', filter: '.pvtFilterBox',
preventOnFilter: false preventOnFilter: false
}, },
tag: 'td', tag: 'td',
className: classes, className: classes,
onChange: onChange onChange: onChange
}, },
headSlot && typeof headSlot === 'function' && items.length > 1 && headSlot(),
items.map(function (x) { items.map(function (x) {
return _react2.default.createElement(DraggableAttribute, { return _react2.default.createElement(DraggableAttribute, {
name: x, name: x,
key: x, key: x,
attrValues: _this7.state.attrValues[x] || {}, attrValues: _this7.state.attrValues[x],
valueFilter: _this7.props.valueFilter[x] || {}, valueFilter: _this7.props.valueFilter[x] || {},
sorter: (0, _Utilities.getSort)(_this7.props.sorters, x), sorter: (0, _Utilities.getSort)(_this7.props.sorters, x),
menuLimit: _this7.props.menuLimit, menuLimit: _this7.props.menuLimit,
@ -740,35 +732,7 @@ var PivotTableUI = function (_React$PureComponent2) {
var rowAttrs = this.props.rows.filter(function (e) { var rowAttrs = this.props.rows.filter(function (e) {
return !_this8.props.hiddenAttributes.includes(e) && !_this8.props.hiddenFromDragDrop.includes(e); return !_this8.props.hiddenAttributes.includes(e) && !_this8.props.hiddenFromDragDrop.includes(e);
}); });
var toggleSubTotales = function toggleSubTotales() { var rowAttrsCell = this.makeDnDCell(rowAttrs, this.propUpdater('rows'), 'pvtAxisContainer pvtVertList pvtRows');
var _showSubt = _this8.props.showSubtotales === true ? true : false;
_this8.propUpdater('showSubtotales')(!_showSubt);
// this.setState({ showSubtotales: !_showSubt })
};
var renderCheckSubtotal = function renderCheckSubtotal() {
return _react2.default.createElement(
'li',
{ className: 'pvtSubtotalCheck cursor-default', 'data-id': '[:sub-total:]' },
_react2.default.createElement(
'span',
{ className: 'pvtAttr' },
_react2.default.createElement(
'span',
{ className: 'pvtAttrTitle' },
'Subtotales'
),
_react2.default.createElement('input', {
type: 'checkbox',
checked: _this8.props.showSubtotales === true,
className: 'via-checkbox h-5 w-5 cursor-pointer',
onChange: function onChange() {
toggleSubTotales();
}
})
)
);
};
var rowAttrsCell = this.makeDnDCell(rowAttrs, this.propUpdater('rows'), 'pvtAxisContainer pvtVertList pvtRows', renderCheckSubtotal);
var outputCell = _react2.default.createElement( var outputCell = _react2.default.createElement(
'td', 'td',
{ className: 'pvtOutput' }, { className: 'pvtOutput' },
@ -886,7 +850,6 @@ PivotTableUI.propTypes = Object.assign({}, _PivotTable2.default.propTypes, {
unusedOrientationCutoff: _propTypes2.default.number, unusedOrientationCutoff: _propTypes2.default.number,
menuLimit: _propTypes2.default.number, menuLimit: _propTypes2.default.number,
hideConfiguration: _propTypes2.default.bool, hideConfiguration: _propTypes2.default.bool,
showSubtotales: _propTypes2.default.bool,
headerClass: _propTypes2.default.string, headerClass: _propTypes2.default.string,
stylesHeaders: _propTypes2.default.object stylesHeaders: _propTypes2.default.object
}); });
@ -897,8 +860,7 @@ PivotTableUI.defaultProps = Object.assign({}, _PivotTable2.default.defaultProps,
hiddenFromDragDrop: [], hiddenFromDragDrop: [],
unusedOrientationCutoff: 85, unusedOrientationCutoff: 85,
menuLimit: 500, menuLimit: 500,
hideConfiguration: true, hideConfiguration: true
showSubtotales: false
}); });
exports.default = PivotTableUI; exports.default = PivotTableUI;

2
PivotTableUI.js.map
View File

File diff suppressed because one or more lines are too long

93
TableRenderers.js
View File

@ -90,32 +90,6 @@ function makeRenderer() {
var rowAttrs = pivotData.props.rows; var rowAttrs = pivotData.props.rows;
var rowKeys = pivotData.getRowKeys(); var rowKeys = pivotData.getRowKeys();
var colKeys = pivotData.getColKeys(); var colKeys = pivotData.getColKeys();
var rowKeysSub = [];
if (this.props.showSubtotales === true && rowAttrs !== null && rowAttrs.length > 1) {
var beforeFirstKey = null;
for (var idx = 0; idx < rowKeys.length; idx++) {
var arrRowKeys = rowKeys[idx];
var emptyElements = arrRowKeys.length - 2;
var arrEmptyElements = [];
for (var idxEmpt = 0; idxEmpt < emptyElements; idxEmpt++) {
arrEmptyElements.push('');
}
var currentFirstKey = arrRowKeys[0];
if (beforeFirstKey === null) {
beforeFirstKey = currentFirstKey;
}
if (beforeFirstKey !== currentFirstKey) {
rowKeysSub.push([beforeFirstKey].concat(arrEmptyElements, ['[:sub-total:]']));
beforeFirstKey = currentFirstKey;
}
rowKeysSub.push(arrRowKeys);
if (idx === rowKeys.length - 1) {
rowKeysSub.push([currentFirstKey].concat(arrEmptyElements, ['[:sub-total:]']));
}
}
} else {
rowKeysSub = pivotData.getRowKeys();
}
var grandTotalAggregator = pivotData.getAggregator([], []); var grandTotalAggregator = pivotData.getAggregator([], []);
var getStylesHeaders = function getStylesHeaders() { var getStylesHeaders = function getStylesHeaders() {
@ -291,7 +265,7 @@ function makeRenderer() {
var getFormatedValue = function getFormatedValue(aggregator) { var getFormatedValue = function getFormatedValue(aggregator) {
var valToFormat = aggregator.value(); var valToFormat = aggregator.value();
var resultValue = typeof aggregator.format === 'function' ? aggregator.format(valToFormat) : valToFormat; var resultValue = aggregator.format(valToFormat);
var keyColumnaCalculo = isNotNullish(_this2.props.vals) && _this2.props.vals.length ? _this2.props.vals[0] : null; var keyColumnaCalculo = isNotNullish(_this2.props.vals) && _this2.props.vals.length ? _this2.props.vals[0] : null;
if (_this2.props.aggregatorName === 'Conteo') { if (_this2.props.aggregatorName === 'Conteo') {
resultValue = isNotNullish(_this2.props.functions) ? _this2.props.functions.formatedValue(valToFormat, '0,0', 'number', false) : resultValue; resultValue = isNotNullish(_this2.props.functions) ? _this2.props.functions.formatedValue(valToFormat, '0,0', 'number', false) : resultValue;
@ -323,54 +297,6 @@ function makeRenderer() {
return ''; return '';
}; };
var getSubAggregator = function getSubAggregator(rowKey, colKey) {
if (rowKey.includes('[:sub-total:]')) {
var _resultAgg = {};
var _arrRowKeys = rowKeys.filter(function (itmRk) {
return itmRk[0] === rowKey[0];
});
var subTotalBruto = 0;
var subTotalCount = _arrRowKeys.length;
var subTotalMin = null;
var subTotalMax = null;
for (var _idx = 0; _idx < subTotalCount; _idx++) {
var _rowKey = _arrRowKeys[_idx];
var _agg = pivotData.getAggregator(_rowKey, colKey);
var _aggValue = _agg.value();
subTotalBruto = subTotalBruto + _aggValue;
if (_idx === 0) {
subTotalMin = _aggValue;
subTotalMax = _aggValue;
} else {
subTotalMin = _aggValue < subTotalMin ? _aggValue : subTotalMin;
subTotalMax = _aggValue > subTotalMax ? _aggValue : subTotalMax;
}
}
_resultAgg.sum = subTotalBruto;
_resultAgg.count = subTotalCount;
_resultAgg.format = function () {
return 'f';
};
_resultAgg.value = function () {
if (_this2.props.aggregatorName === 'Suma' || _this2.props.aggregatorName === 'Conteo') {
return subTotalBruto;
}
if (_this2.props.aggregatorName === 'Promedio') {
return subTotalBruto / subTotalCount;
}
if (_this2.props.aggregatorName === 'Mínimo') {
return subTotalMin;
}
if (_this2.props.aggregatorName === 'Máximo') {
return subTotalMax;
}
return 0;
};
return _resultAgg;
}
return pivotData.getAggregator(rowKey, colKey);
};
return _react2.default.createElement( return _react2.default.createElement(
'table', 'table',
{ className: 'pvtTable' }, { className: 'pvtTable' },
@ -435,14 +361,13 @@ function makeRenderer() {
_react2.default.createElement( _react2.default.createElement(
'tbody', 'tbody',
null, null,
rowKeysSub.map(function (rowKey, i) { rowKeys.map(function (rowKey, i) {
var isSubTotal = rowKey.includes('[:sub-total:]'); var totalAggregator = pivotData.getAggregator(rowKey, []);
var totalAggregator = getSubAggregator(rowKey, []);
return _react2.default.createElement( return _react2.default.createElement(
'tr', 'tr',
{ key: 'rowKeyRow' + i + ' ' + (isSubTotal ? ' bg-sky-50 ' : '') }, { key: 'rowKeyRow' + i },
rowKey.map(function (txt, j) { rowKey.map(function (txt, j) {
var x = spanSize(rowKeysSub, i, j); var x = spanSize(rowKeys, i, j);
if (x === -1) { if (x === -1) {
return null; return null;
} }
@ -455,15 +380,15 @@ function makeRenderer() {
rowSpan: x, rowSpan: x,
colSpan: j === rowAttrs.length - 1 && colAttrs.length !== 0 ? 2 : 1 colSpan: j === rowAttrs.length - 1 && colAttrs.length !== 0 ? 2 : 1
}, },
isSubTotal ? 'SubTotal' : txt txt
); );
}), }),
colKeys.map(function (colKey, j) { colKeys.map(function (colKey, j) {
var aggregator = getSubAggregator(rowKey, colKey); var aggregator = pivotData.getAggregator(rowKey, colKey);
return _react2.default.createElement( return _react2.default.createElement(
'td', 'td',
{ {
className: 'pvtVal ' + (isSubTotal ? '' : getValueClass(aggregator)) + ' ' + (isSubTotal ? 'pvtSubTotal' : ''), className: 'pvtVal ' + getValueClass(aggregator),
key: 'pvtVal' + i + '-' + j, key: 'pvtVal' + i + '-' + j,
onClick: getClickHandler && getClickHandler(aggregator.value(), rowKey, colKey), onClick: getClickHandler && getClickHandler(aggregator.value(), rowKey, colKey),
style: valueCellColors(rowKey, colKey, aggregator.value()) style: valueCellColors(rowKey, colKey, aggregator.value())
@ -474,7 +399,7 @@ function makeRenderer() {
_react2.default.createElement( _react2.default.createElement(
'td', 'td',
{ {
className: ' pvtTotal ' + (isSubTotal ? 'pvtSubTotal' : '') + ' ', className: 'pvtTotal',
onClick: getClickHandler && getClickHandler(totalAggregator.value(), rowKey, [null]), onClick: getClickHandler && getClickHandler(totalAggregator.value(), rowKey, [null]),
style: colTotalColors(totalAggregator.value()) style: colTotalColors(totalAggregator.value())
}, },

2
TableRenderers.js.map
View File

File diff suppressed because one or more lines are too long

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "v-react-pivottable", "name": "v-react-pivottable",
"version": "0.11.70", "version": "0.11.47",
"description": "A React-based pivot table", "description": "A React-based pivot table",
"main": "PivotTableUI.js", "main": "PivotTableUI.js",
"files": [ "files": [