feat(表格拖拽交换列、表头过滤、issues的示例): 表格拖拽交换列、表头过滤、issues的示例

表格拖拽交换列、表头过滤、issues的示例

BREAKING CHANGE: 表格拖拽交换列、表头过滤、issues的示例
This commit is contained in:
jonyshi 2018-05-11 11:37:55 +08:00
parent 96250f8832
commit 903d1a8763
12 changed files with 128 additions and 297 deletions

View File

@ -44,7 +44,6 @@ var ResizableTh = function (_Component) {
_this.onMouseDown = function (event, data) { _this.onMouseDown = function (event, data) {
_this.mouse = true; _this.mouse = true;
console.log(event.screenX);
_this.dragBorderObj.startScreenX = event.screenX; _this.dragBorderObj.startScreenX = event.screenX;
}; };
@ -63,7 +62,6 @@ var ResizableTh = function (_Component) {
}); });
if (!currObj) return; if (!currObj) return;
currObj.width = currObj.width ? currObj.width + endx : endx; currObj.width = currObj.width ? currObj.width + endx : endx;
console.log("currObj.width--", currObj.width);
_this.setState({ _this.setState({
columns: columns columns: columns
}); });
@ -75,7 +73,6 @@ var ResizableTh = function (_Component) {
_this.onMouseUp = function (event, data) { _this.onMouseUp = function (event, data) {
var endx = event.screenX - _this.dragBorderObj.startScreenX; var endx = event.screenX - _this.dragBorderObj.startScreenX;
console.log("onmouseup-", endx);
_this.mouse = false; _this.mouse = false;
}; };

View File

@ -168,8 +168,7 @@
position: absolute; position: absolute;
top: 0px; top: 0px;
left: 0px; left: 0px;
height: 10px; height: 10px; }
border: 1px solid; }
.u-table table { .u-table table {
width: 100%; width: 100%;
border-collapse: collapse; border-collapse: collapse;

View File

@ -139,7 +139,6 @@ var Table = function (_Component) {
_this.renderDragHideTable = function () { _this.renderDragHideTable = function () {
var columns = _this.props.columns; var columns = _this.props.columns;
debugger;
var sum = 0; var sum = 0;
return _react2["default"].createElement( return _react2["default"].createElement(
'div', 'div',
@ -348,6 +347,9 @@ var Table = function (_Component) {
drgHover: column.drgHover, drgHover: column.drgHover,
width: column.width width: column.width
}; };
if (column.onHeadCellClick) {
cell.onClick = column.onHeadCellClick;
}
if (column.children) { if (column.children) {
_this2.getHeaderRows(column.children, currentRow + 1, rows); _this2.getHeaderRows(column.children, currentRow + 1, rows);
} }

View File

@ -74,10 +74,8 @@ var TableHeader = function (_Component) {
if (_this.border) return; if (_this.border) return;
var clsPrefix = _this.props.clsPrefix; var clsPrefix = _this.props.clsPrefix;
console.log("00-----");
if (_this.border) { if (_this.border) {
var x = event.pageX - _this.drag.initPageLeftX + _this.drag.initLeft; var x = event.pageX - _this.drag.initPageLeftX + _this.drag.initLeft;
console.log("00-----", x);
} else { } else {
event.target.className = clsPrefix + '-thead-th-drag-gap th-drag-gap-hover'; event.target.className = clsPrefix + '-thead-th-drag-gap th-drag-gap-hover';
} }
@ -153,8 +151,9 @@ var TableHeader = function (_Component) {
{ key: index, style: rowStyle }, { key: index, style: rowStyle },
row.map(function (da, i) { row.map(function (da, i) {
var thHover = da.drgHover ? ' ' + clsPrefix + '-thead th-drag-hover' : ""; var thHover = da.drgHover ? ' ' + clsPrefix + '-thead th-drag-hover' : "";
delete da.drgHover;
if (draggable) { if (draggable) {
return _react2["default"].createElement('th', { return _react2["default"].createElement('th', _extends({}, da, {
onDragStart: function onDragStart(event) { onDragStart: function onDragStart(event) {
_this2.onDragStart(event, da); _this2.onDragStart(event, da);
}, },
@ -169,14 +168,22 @@ var TableHeader = function (_Component) {
}, },
draggable: draggable, draggable: draggable,
className: da.className + ' ' + clsPrefix + '-thead th-drag ' + thHover, className: da.className + ' ' + clsPrefix + '-thead th-drag ' + thHover,
key: i }); key: da.key }));
} else if (dragborder) { } else if (dragborder) {
console.log(da);
return _react2["default"].createElement( return _react2["default"].createElement(
'th', 'th',
_extends({}, da, { {
// onDragStart={(event)=>{this.onDragGapStart(event,da)}}
// onDragOver={(event)=>{this.onDragGapOver(event,da)}}
// onDrop={(event)=>{this.onDropGap(event,da)}}
// onDragEnter={(event)=>{this.onDragGapEnter(event,da)}}
// onMouseDown={(event)=>{onMouseDown(event,da)}}
// onMouseUp={(event)=>{onMouseUp(event,da)}}
// {...da}
className: da.className + ' ' + clsPrefix + '-thead-th ', className: da.className + ' ' + clsPrefix + '-thead-th ',
key: i }), key: i },
da.children, da.children,
_react2["default"].createElement('div', { ref: function ref(el) { _react2["default"].createElement('div', { ref: function ref(el) {
return _this2.gap = el; return _this2.gap = el;
@ -196,7 +203,10 @@ var TableHeader = function (_Component) {
className: clsPrefix + '-thead-th-drag-gap ' }) className: clsPrefix + '-thead-th-drag-gap ' })
); );
} else { } else {
return _react2["default"].createElement('th', _extends({}, da, { key: i })); var th = da.onClick ? _react2["default"].createElement('th', _extends({}, da, { key: i, onClick: function onClick(event) {
da.onClick(da, event);
} })) : _react2["default"].createElement('th', _extends({}, da, { key: i }));
return th;
} }
}) })
); );

View File

@ -178,7 +178,6 @@ function dragColumn(Table) {
this.onMouseDown = function (event, data) { this.onMouseDown = function (event, data) {
_this2.mouse = true; _this2.mouse = true;
console.log(event.screenX);
_this2.dragBorderObj.startScreenX = event.screenX; _this2.dragBorderObj.startScreenX = event.screenX;
}; };
@ -197,7 +196,6 @@ function dragColumn(Table) {
}); });
if (!currObj) return; if (!currObj) return;
currObj.width = currObj.width ? currObj.width + endx : endx; currObj.width = currObj.width ? currObj.width + endx : endx;
console.log("currObj.width--", currObj.width);
_this2.setState({ _this2.setState({
columns: columns columns: columns
}); });
@ -209,7 +207,6 @@ function dragColumn(Table) {
this.onMouseUp = function (event, data) { this.onMouseUp = function (event, data) {
var endx = event.screenX - _this2.dragBorderObj.startScreenX; var endx = event.screenX - _this2.dragBorderObj.startScreenX;
console.log("onmouseup-", endx);
_this2.mouse = false; _this2.mouse = false;
}; };
}, _temp; }, _temp;

View File

@ -175,7 +175,6 @@ function dragColumn(Table) {
this.onMouseDown = function (event, data) { this.onMouseDown = function (event, data) {
_this2.mouse = true; _this2.mouse = true;
console.log(event.screenX);
_this2.dragBorderObj.startScreenX = event.screenX; _this2.dragBorderObj.startScreenX = event.screenX;
}; };
@ -194,7 +193,6 @@ function dragColumn(Table) {
}); });
if (!currObj) return; if (!currObj) return;
currObj.width = currObj.width ? currObj.width + endx : endx; currObj.width = currObj.width ? currObj.width + endx : endx;
console.log("currObj.width--", currObj.width);
_this2.setState({ _this2.setState({
columns: columns columns: columns
}); });
@ -206,7 +204,6 @@ function dragColumn(Table) {
this.onMouseUp = function (event, data) { this.onMouseUp = function (event, data) {
var endx = event.screenX - _this2.dragBorderObj.startScreenX; var endx = event.screenX - _this2.dragBorderObj.startScreenX;
console.log("onmouseup-", endx);
_this2.mouse = false; _this2.mouse = false;
}; };
}, _temp; }, _temp;

View File

@ -71,7 +71,6 @@ var InputRender = function (_Component) {
var value = e; var value = e;
_this.setState({ value: value }); _this.setState({ value: value });
}, _this.check = function () { }, _this.check = function () {
console.log('1');
if (typeof _this.flag === "undefined" || _this.flag) { if (typeof _this.flag === "undefined" || _this.flag) {
_this.props.check(_this.flag, _this.obj); _this.props.check(_this.flag, _this.obj);
_this.setState({ editable: false }); _this.setState({ editable: false });
@ -88,9 +87,7 @@ var InputRender = function (_Component) {
}, _this.handleKeydown = function (event) { }, _this.handleKeydown = function (event) {
if (event.keyCode == 13) { if (event.keyCode == 13) {
_this.check(); _this.check();
} else if (event.keyCode == 9) { } else if (event.keyCode == 9) {}
debugger;
}
}, _this.formatCurrency = function (money) { }, _this.formatCurrency = function (money) {
if (money && money != null && !!Number(money)) { if (money && money != null && !!Number(money)) {
money = String(money); money = String(money);

View File

@ -1,67 +0,0 @@
/**
*
* @title 动态调整列的宽度
* @description 点击列的表头进行左右拖拽
*/
import React, { Component } from 'react';
import Table from '../../src';
import dragColumn from '../../src/lib/dragColumn';
import Icon from "bee-icon";
const columns23 = [
{
title: "名字",
dataIndex: "a",
key: "a",
width: 100
},
{
title: "性别",
dataIndex: "b",
key: "b",
width: 200
},
{
title: "年龄",
dataIndex: "c",
key: "c",
width: 200,
sumCol: true,
sorter: (a, b) => a.c - b.c
},
{
title: "武功级别",
dataIndex: "d",
key: "d",
width: 200,
}
];
const data23 = [
{ a: "杨过", b: "男", c: 30,d:'内行', key: "2" },
{ a: "令狐冲", b: "男", c: 41,d:'大侠', key: "1" },
{ a: "郭靖", b: "男", c: 25,d:'大侠', key: "3" }
];
const DragColumnTable = dragColumn(Table);
const defaultProps23 = {
prefixCls: "bee-table"
};
class Demo23 extends Component {
constructor(props) {
super(props);
}
render() {
return <DragColumnTable columns={columns23} data={data23} bordered
dragborder={true}
/>;
}
}
Demo23.defaultProps = defaultProps23;
export default Demo23;

File diff suppressed because one or more lines are too long

131
dist/demo.js vendored

File diff suppressed because one or more lines are too long

2
dist/demo.js.map vendored

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,6 @@
{ {
"name": "bee-table", "name": "bee-table",
"version": "1.1.3", "version": "1.1.4",
"description": "Table ui component for react", "description": "Table ui component for react",
"keywords": [ "keywords": [
"react", "react",