forgetest5
/
bee-table7
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

拖拽bug fix 修复2

This commit is contained in:
jonyshi 2018-05-13 14:40:34 +08:00
parent 05f8b4483b
commit 645fe865f0
3 changed files with 6 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
dist/demo.js vendored
View File

@ -9742,8 +9742,6 @@
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); }
// import createColResizable from '../resiztable'
// import Table from './Table';
/**
* 参数: 列拖拽
* @param {*} Table
@ -9764,8 +9762,6 @@
var columns = props.columns;
_this.dragBorderObj = { startScreenX: 0, endScreenX: 0 };
_this.mouse = false;
_this.setColumOrderByIndex(columns);
return _this;
}
@ -9776,17 +9772,6 @@
}
};
// componentDidMount() {
// const domElemTableList = document.querySelectorAll('table');
// createColResizable(domElemTableList[0], {
// liveDrag: true
// });
// createColResizable(domElemTableList[1], {
// liveDrag: false,
// headerOnly: false
// });
// }
dragColumn.prototype.render = function render() {
var _props = this.props,
data = _props.data,
@ -9800,12 +9785,7 @@
onDragEnter: this.onDragEnter,
draggable: draggable,
dragborder: true,
onMouseDown: this.onMouseDown,
onMouseMove: this.onMouseMove,
onMouseUp: this.onMouseUp,
onThMouseMove: this.onThMouseMove
dragborder: true
}));
};
@ -9876,56 +9856,9 @@
});
};
this.onMouseDown = function (event, data) {
_this2.mouse = true;
_this2.dragBorderObj.startScreenX = event.screenX;
};
this.onMouseMove = function (event, data) {
if (!_this2.mouse) return;
var endx = event.screenX - _this2.dragBorderObj.startScreenX;
var _columns = _this2.state.columns;
var columns = [];
_extends(columns, _columns);
// let currentIndex = columns.findIndex((_da,i)=>_da.key == data.key);
// currentIndex = currentIndex==0?currentIndex:(currentIndex-1);
var currObj = columns.find(function (_da, i) {
return _da.key == data.key;
});
if (!currObj) return;
currObj.width = currObj.width ? currObj.width + endx : endx;
_this2.setState({
columns: columns
});
};
this.getTarget = function (evt) {
return evt.target || evt.srcElement;
};
this.onMouseUp = function (event, data) {
var endx = event.screenX - _this2.dragBorderObj.startScreenX;
_this2.mouse = false;
};
this.onThMouseMove = function (event, data, left) {
var _columns = _this2.state.columns;
var columns = [];
_extends(columns, _columns);
var currObj = columns.find(function (_da, i) {
return _da.key == data.key;
});
if (currObj.width) {
currObj.width = currObj.width + left;
}
console.log("currObj.width---", currObj.width + " _ " + left);
_this2.setState({
columns: columns
});
};
}, _temp;
}
module.exports = exports["default"];

2
dist/demo.js.map vendored
View File

File diff suppressed because one or more lines are too long

69
src/lib/dragColumn.js
View File

@ -4,8 +4,6 @@ import Checkbox from "bee-checkbox";
import ReactDOM from 'react-dom';
import Popover from 'bee-popover';
import {sortBy} from './util';
// import createColResizable from '../resiztable'
// import Table from './Table';
/**
* 参数: 列拖拽
* @param {*} Table
@ -17,9 +15,7 @@ export default function dragColumn(Table) {
constructor(props) {
super(props);
const {columns} = props;
this.dragBorderObj = {startScreenX:0,endScreenX:0};
this.mouse = false;
const {columns} = props;
this.setColumOrderByIndex(columns);
}
@ -28,18 +24,7 @@ export default function dragColumn(Table) {
this.setColumOrderByIndex();
}
}
// componentDidMount() {
// const domElemTableList = document.querySelectorAll('table');
// createColResizable(domElemTableList[0], {
// liveDrag: true
// });
// createColResizable(domElemTableList[1], {
// liveDrag: false,
// headerOnly: false
// });
// }
setColumOrderByIndex = (columns)=>{
let _column = [];
Object.assign(_column,columns);
@ -92,52 +77,11 @@ export default function dragColumn(Table) {
columns:_columns,
});
}
onMouseDown=(event,data)=>{
this.mouse = true;
this.dragBorderObj.startScreenX = event.screenX;
}
onMouseMove=(event,data)=>{
if(!this.mouse)return;
let endx = (event.screenX-this.dragBorderObj.startScreenX);
let {columns:_columns} = this.state;
let columns = [];
Object.assign(columns,_columns);
// let currentIndex = columns.findIndex((_da,i)=>_da.key == data.key);
// currentIndex = currentIndex==0?currentIndex:(currentIndex-1);
let currObj = columns.find((_da,i)=>_da.key == data.key);
if(!currObj)return;
currObj.width = currObj.width?(currObj.width+endx):endx;
this.setState({
columns
});
}
getTarget=(evt)=>{
return evt.target || evt.srcElement;
}
onMouseUp=(event,data)=>{
let endx = (event.screenX-this.dragBorderObj.startScreenX);
this.mouse = false;
}
onThMouseMove=(event,data,left)=>{
const {columns:_columns} = this.state;
let columns = [];
Object.assign(columns,_columns);
let currObj = columns.find((_da,i)=>_da.key == data.key);
if(currObj.width){
currObj.width = (currObj.width + left);
}
console.log("currObj.width---",currObj.width + " _ " + left);
this.setState({
columns
})
}
render() {
const {data,dragborder,draggable,className} = this.props;
const {columns} = this.state;
@ -147,12 +91,7 @@ export default function dragColumn(Table) {
draggable={draggable}
dragborder={true}
onMouseDown={this.onMouseDown}
onMouseMove={this.onMouseMove}
onMouseUp={this.onMouseUp}
onThMouseMove={this.onThMouseMove}
/>)
/>)
}
};
}