diff --git a/build/Table.css b/build/Table.css index ecd2ebb..0fe9206 100644 --- a/build/Table.css +++ b/build/Table.css @@ -153,6 +153,13 @@ .u-loading.u-loading-line.u-loading-line-warning > div { background-color: #ff9800; } +.u-loading.u-loading-custom > div { + position: absolute; + left: 50%; + top: 50%; + -webkit-transform: translate(-50%, -50%); + transform: translate(-50%, -50%); } + @keyframes line-scale { 0% { -webkit-transform: scaley(1); diff --git a/build/TableHeader.js b/build/TableHeader.js index ca7ff06..c2b12e5 100644 --- a/build/TableHeader.js +++ b/build/TableHeader.js @@ -96,11 +96,13 @@ var TableHeader = function (_Component) { _this.drag.minWidth = currentObj.style.minWidth != "" ? parseInt(currentObj.style.minWidth) : defaultWidth; _this.drag.tableWidth = parseInt(_this.table.table.style.width ? _this.table.table.style.width : _this.table.table.scrollWidth); } else if (type != 'online' && _this.props.draggable) { - if (!_this.props.draggable || targetEvent.nodeName.toUpperCase() != "TH") return; - targetEvent.setAttribute('draggable', true); //添加交换列效果 + // if (!this.props.draggable || targetEvent.nodeName.toUpperCase() != "TH") return; + if (!_this.props.draggable) return; + var th = _this.getTargetToTh(targetEvent); + th.setAttribute('draggable', true); //添加交换列效果 _this.drag.option = 'dragAble'; - _this.currentDome = event.target; - var _currentIndex = parseInt(currentElement.getAttribute("data-line-index")); + _this.currentDome = th; + var _currentIndex = parseInt(th.getAttribute("data-line-index")); _this.drag.currIndex = _currentIndex; } else { // console.log("onTrMouseDown dragborder or draggable is all false !"); @@ -108,6 +110,15 @@ var TableHeader = function (_Component) { } }; + _this.getTargetToTh = function (targetEvent) { + var th = targetEvent; + if (targetEvent.nodeName.toUpperCase() != "TH") { + th = _this.getThDome(targetEvent); + } + console.log(" getTargetToTh: ", th); + return th; + }; + _this.onTrMouseMove = function (e) { if (!_this.props.dragborder && !_this.props.draggable) return; var _this$props2 = _this.props, @@ -221,8 +232,9 @@ var TableHeader = function (_Component) { return; } var event = _utils.Event.getEvent(e), - target = _utils.Event.getTarget(event); + // target = Event.getTarget(event); + target = _this.getTargetToTh(_utils.Event.getTarget(event)); var currentIndex = parseInt(target.getAttribute("data-line-index")); var currentKey = target.getAttribute('data-line-key'); @@ -571,6 +583,11 @@ var TableHeader = function (_Component) { */ + /** + * 判断当前的target 是否是 th,如果不是,直接递归查找。 + * @memberof TableHeader + */ + /** * 调整列宽的move事件 * @memberof TableHeader @@ -667,6 +684,26 @@ var TableHeader = function (_Component) { return null; } }; + + /** + * 根据当前鼠标点击的节点,进行递归遍历,最终找到th + * @param {*} element + * @returns