From c6e520db0febe6c7d31cce6f7e629898d693ce64 Mon Sep 17 00:00:00 2001 From: izbz wh <731215820@qq.com> Date: Tue, 29 Sep 2020 09:45:11 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=88=97=E6=8B=B7?= =?UTF-8?q?=E8=B4=9D=E9=92=A9=E5=AD=90=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/TableHeader.js | 4 + build/TableRow.js | 10 +- build/lib/bigData.js | 1 + dist/demo.js | 5011 ++++++++++++++++++++++-------------------- dist/demo.js.map | 2 +- docs/api.md | 2 + src/Table.js | 6 +- src/Table.scss | 3 + src/TableHeader.js | 10 +- src/TableRow.js | 7 +- 10 files changed, 2612 insertions(+), 2444 deletions(-) diff --git a/build/TableHeader.js b/build/TableHeader.js index 681c7cc..68697ac 100644 --- a/build/TableHeader.js +++ b/build/TableHeader.js @@ -830,6 +830,8 @@ var _initialiseProps = function _initialiseProps() { } var event = _utils.Event.getEvent(e), target = _utils.Event.getTarget(event); + event.preventDefault(); + event.stopPropagation(); _this8.currentDome.setAttribute('draggable', false); //添加交换列效果 // let data = this.getCurrentEventData(this._dragCurrent); // if(!data){ @@ -858,6 +860,8 @@ var _initialiseProps = function _initialiseProps() { var event = _utils.Event.getEvent(e), target = _utils.Event.getTarget(event); _this8._dragCurrent.setAttribute("style", ""); + event.preventDefault(); + event.stopPropagation(); // this._dragCurrent.style = ""; document.getElementById(_this8._table_none_cont_id).innerHTML = ""; diff --git a/build/TableRow.js b/build/TableRow.js index 07caeeb..7b98897 100644 --- a/build/TableRow.js +++ b/build/TableRow.js @@ -139,7 +139,8 @@ var TableRow = function (_Component) { var event = _utils.Event.getEvent(e), _target = _utils.Event.getTarget(event), target = _target.parentNode; - + event.preventDefault(); + event.stopPropagation(); var currentKey = event.dataTransfer.getData("text"); var targetKey = target.getAttribute("data-row-key"); @@ -449,9 +450,10 @@ var TableRow = function (_Component) { if (this.props.treeType) { this.setRowParentIndex(); } - if (syncRowHeight) { - this.setRowHeight(); - } + // if(syncRowHeight){ + // this.setRowHeight() + // } + this.setRowHeight(); }; TableRow.prototype.componentWillUnmount = function componentWillUnmount() { diff --git a/build/lib/bigData.js b/build/lib/bigData.js index 3c74fd2..7beefa2 100644 --- a/build/lib/bigData.js +++ b/build/lib/bigData.js @@ -96,6 +96,7 @@ function bigData(Table) { _this.treeType = isTreeType; //fix: 滚动加载场景中,数据动态改变下占位计算错误的问题(26 Jun) if (newData.toString() !== props.data.toString()) { + _this.cachedRowHeight = []; //缓存每行的高度 _this.cachedRowParentIndex = []; _this.computeCachedRowParentIndex(newData); diff --git a/dist/demo.js b/dist/demo.js index 292c2c8..7a28e36 100644 --- a/dist/demo.js +++ b/dist/demo.js @@ -66,7 +66,7 @@ var _beeClipboard2 = _interopRequireDefault(_beeClipboard); - var _src = __webpack_require__(292); + var _src = __webpack_require__(285); var _src2 = _interopRequireDefault(_src); @@ -80,7 +80,7 @@ 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 Demo0101 = __webpack_require__(624);var Demo0102 = __webpack_require__(625);var Demo0103 = __webpack_require__(626);var Demo0104 = __webpack_require__(627);var Demo0105 = __webpack_require__(628);var Demo0106 = __webpack_require__(631);var Demo0107 = __webpack_require__(632);var Demo0201 = __webpack_require__(633);var Demo0202 = __webpack_require__(634);var Demo0301 = __webpack_require__(635);var Demo0302 = __webpack_require__(636);var Demo0401 = __webpack_require__(639);var Demo0402 = __webpack_require__(640);var Demo0404 = __webpack_require__(643);var Demo0405 = __webpack_require__(647);var Demo0406 = __webpack_require__(649);var Demo0501 = __webpack_require__(650);var Demo0502 = __webpack_require__(652);var Demo0503 = __webpack_require__(653);var Demo0505 = __webpack_require__(654);var Demo0601 = __webpack_require__(655);var Demo0602 = __webpack_require__(656);var Demo0603 = __webpack_require__(657);var Demo0701 = __webpack_require__(658);var Demo0702 = __webpack_require__(659);var Demo0802 = __webpack_require__(660);var Demo0901 = __webpack_require__(665);var Demo0902 = __webpack_require__(666);var Demo0903 = __webpack_require__(667);var Demo1001 = __webpack_require__(668);var Demo1002 = __webpack_require__(669);var Demo1101 = __webpack_require__(670);var Demo1102 = __webpack_require__(671);var Demo1103 = __webpack_require__(672);var Demo1105 = __webpack_require__(673);var Demo1106 = __webpack_require__(674);var Demo1107 = __webpack_require__(675);var Demo1108 = __webpack_require__(676);var Demo1201 = __webpack_require__(677);var Demo1301 = __webpack_require__(680);var Demo1302 = __webpack_require__(681);var Demo1401 = __webpack_require__(687);var Demo1402 = __webpack_require__(689);var Demo1403 = __webpack_require__(690);var Demo1404 = __webpack_require__(691);var Demo1601 = __webpack_require__(692);var DemoArray = [{ "example": _react2['default'].createElement(Demo0101, null), "title": " 基本表格", "code": "/**\n*\n* @title 基本表格\n* @parent 基础 Basic\n* @description 当单元格内容过多时,会自动显示省略号,鼠标hover有提示。showRowNum 设置是否显示序号列。\n* demo0101\n*/\n\nimport React, { Component } from \"react\";\nimport { Table } from 'tinper-bee';\n\n\nconst columns = [\n { title: \"员工编号\", dataIndex: \"a\", key: \"a\", width: 150 },\n { title: \"员工姓名\", dataIndex: \"b\", key: \"b\", width:100},\n { title: \"性别\", dataIndex: \"c\", key: \"c\", width: 100},\n { title: \"部门\", dataIndex: \"d\", key: \"d\", width: 100 },\n { title: \"职级\", dataIndex: \"e\", key: \"e\", width: 100 }\n];\n\nconst data = [\n { a: \"ASVAL_20190328\", b: \"小张\", c: \"男\", d: \"财务二科\", e: \"M1\", key: \"1\" },\n { a: \"ASVAL_20190320\", b: \"小明\", c: \"男\", d: \"财务一科\", e: \"T1\", key: \"2\" },\n { a: \"ASVAL_20190312\", b: \"小红\", c: \"女\", d: \"财务一科\", e: \"T2\", key: \"3\" }\n];\n\nclass Demo0101 extends Component {\n render() {\n return (\n
{ title }
\n{ desc }
\n 查看源码 \n\n { code }
\n
\n {!!scss_code ?\n { scss_code }
\n
: null }\n