From 8ca0f899df39b133aceb3eab98e1a13aa8aa0ca1 Mon Sep 17 00:00:00 2001 From: wanghaoo Date: Mon, 17 Dec 2018 11:12:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(=E5=90=88=E8=AE=A1=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E9=87=8D=E6=9E=84):?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/lib/bigData.js | 89 ++++++++++++++++++++++++++++++++++++++++++++ package.json | 2 +- src/lib/bigData.js | 55 +++++++++++++++++++++++++++ 3 files changed, 145 insertions(+), 1 deletion(-) create mode 100644 build/lib/bigData.js create mode 100644 src/lib/bigData.js diff --git a/build/lib/bigData.js b/build/lib/bigData.js new file mode 100644 index 0000000..8c7ebe0 --- /dev/null +++ b/build/lib/bigData.js @@ -0,0 +1,89 @@ +"use strict"; + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; + +exports["default"] = bigData; + +var _react = require("react"); + +var _react2 = _interopRequireDefault(_react); + +var _propTypes = require("prop-types"); + +var _propTypes2 = _interopRequireDefault(_propTypes); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; } + +function _defaults(obj, defaults) { var keys = Object.getOwnPropertyNames(defaults); for (var i = 0; i < keys.length; i++) { var key = keys[i]; var value = Object.getOwnPropertyDescriptor(defaults, key); if (value && value.configurable && obj[key] === undefined) { Object.defineProperty(obj, key, value); } } return obj; } + +function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } + +function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; } + +function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : _defaults(subClass, superClass); } + +var propTypes = { + rowsInView: _propTypes2["default"].number.isRequired +}; +var defaultProps = { + data: undefined, + height: 40, //默认行高 + rowsInView: 25 +}; + +function bigData(Table) { + return function (_Component) { + _inherits(BigData, _Component); + + function BigData(props) { + _classCallCheck(this, BigData); + + var _this = _possibleConstructorReturn(this, _Component.call(this, props)); + + _this.state = { + currentIndex: 0, + scrollLeft: 0, + scrollTop: 0 + }; + + _this.cachedRowHeight = []; + _this.lastScrollTop = 0; + return _this; + } + /** + *获取数据区高度 + * + * + **/ + + BigData.prototype.getContentHeight = function getContentHeight() { + if (!this.props.data) return 0; + return this.getSumHeight(0, this.props.data.length); + }; + + BigData.prototype.getSumHeight = function getSumHeight(start, end) { + var rowHeight = this.props.rowHeight; + + var height = 0; + for (var i = start; i < end; i++) { + height += this.cachedRowHeight[i] || rowHeight; + } + return height; + }; + + BigData.prototype.getData = function getData() {}; + + BigData.prototype.render = function render() { + return _react2["default"].createElement(Table, _extends({}, this.props, { data: this.getData })); + }; + + return BigData; + }(_react.Component); + BigData.defaultProps = defaultProps; + BigData.propTypes = propTypes; +} +module.exports = exports["default"]; \ No newline at end of file diff --git a/package.json b/package.json index b01aae1..9b8800e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bee-table", - "version": "1.6.15", + "version": "1.6.16", "description": "Table ui component for react", "keywords": [ "react", diff --git a/src/lib/bigData.js b/src/lib/bigData.js new file mode 100644 index 0000000..d2c6b88 --- /dev/null +++ b/src/lib/bigData.js @@ -0,0 +1,55 @@ +import React, { Component } from "react"; +import PropTypes from 'prop-types'; + +const propTypes = { + rowsInView: PropTypes.number.isRequired, +} +const defaultProps = { + data: undefined, + height: 40,//默认行高 + rowsInView:25 +} + +export default function bigData(Table) { + return class BigData extends Component { + constructor(props) { + super(props); + this.state = { + currentIndex: 0, + scrollLeft: 0, + scrollTop: 0 + }; + + this.cachedRowHeight = []; + this.lastScrollTop = 0; + } + /** + *获取数据区高度 + * + * + **/ + + getContentHeight() { + if (!this.props.data) return 0; + return this.getSumHeight(0, this.props.data.length); + } + + getSumHeight(start, end) { + const { rowHeight } = this.props; + let height = 0; + for (let i = start; i < end; i++) { + height += this.cachedRowHeight[i] || rowHeight; + } + return height; + } + + getData(){ + + } + render(){ + return + } + }; + BigData.defaultProps = defaultProps; + BigData.propTypes = propTypes; +} From 39587f6b5e8f0cf9861f04d70cbd22a00b985f28 Mon Sep 17 00:00:00 2001 From: wanghaoo Date: Mon, 17 Dec 2018 11:12:13 +0800 Subject: [PATCH 2/2] publish 1.6.16 --- CHANGELOG.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index df25837..95daa5e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ + +## [1.6.16](https://github.com/tinper-bee/bee-table/compare/v1.6.15...v1.6.16) (2018-12-17) + + + ## [1.6.15](https://github.com/tinper-bee/bee-table/compare/v1.6.14...v1.6.15) (2018-12-15) @@ -164,7 +169,7 @@ -## [1.5.1](https://github.com/tinper-bee/bee-table/compare/v1.5.0...v1.5.1) (2018-11-18) +## [1.5.1](https://github.com/tinper-bee/bee-table/compare/v1.5.0...v1.5.1) (2018-11-19)