From a328e324769a5c975e227a022a131707288b4a35 Mon Sep 17 00:00:00 2001 From: jonyshi Date: Mon, 26 Nov 2018 20:34:43 +0800 Subject: [PATCH] =?UTF-8?q?1px=E5=83=8F=E7=B4=A0=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E3=80=81=E6=8B=96=E6=8B=BD=E5=88=97=E5=AE=BD=E7=84=A6=E7=82=B9?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Table.scss | 28 ++++++++++++++++++++++------ src/TableHeader.js | 13 +++++++++---- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/src/Table.scss b/src/Table.scss index 4fa4011..67e86a7 100644 --- a/src/Table.scss +++ b/src/Table.scss @@ -290,9 +290,9 @@ $table-move-in-color: $bg-color-base; } th{ background: $table-head-background-color; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; + // overflow: hidden; + // white-space: nowrap; + // text-overflow: ellipsis; .bee-table-column-sorter { position: relative; margin-left: 4px; @@ -366,15 +366,25 @@ $table-move-in-color: $bg-color-base; &-drag-gap{ height: 100%; position: absolute; - right: 0px; + right: -10px; top: 0; // background:transparent; // width: 1px; - background:#ccc; - width: 2px; + // background:#ccc; + width: 20px; box-sizing: border-box; z-index: 1; + + .online{ + height: 100%; + width: 1px; + background:transparent; + margin: 0 auto; + } + .online-hover{ + background:#000000; + } } .th-drag-gap{ background:transparent; @@ -383,6 +393,12 @@ $table-move-in-color: $bg-color-base; // background: #ccc; cursor: col-resize; } + .th-drag-gap>div{ + background:transparent; + } + .th-drag-gap-hover>div{ + background: #000000 + } // &.th-can-not-drag{ // .th-drag-gap-hover{ // cursor: none; diff --git a/src/TableHeader.js b/src/TableHeader.js index ceb4559..f20a340 100644 --- a/src/TableHeader.js +++ b/src/TableHeader.js @@ -102,7 +102,9 @@ class TableHeader extends Component { //如果是固定列没有拖拽功能 if (this.border || data.fixed) return; const { clsPrefix } = this.props; - event.target.className = `${clsPrefix}-thead-th-drag-gap th-drag-gap-hover`; + if(event.target.id != 'th-online'){ + event.target.className = `${clsPrefix}-thead-th-drag-gap th-drag-gap-hover`; + } }; ableOnMouseMove = (event, data) => { @@ -130,7 +132,9 @@ class TableHeader extends Component { onMouseOut = (event, data) => { if (this.border) return; const { clsPrefix } = this.props; - event.target.className = `${clsPrefix}-thead-th-drag-gap th-drag-gap`; + if(event.target.id != 'th-online'){ + event.target.className = `${clsPrefix}-thead-th-drag-gap th-drag-gap`; + } }; onMouseDown = (event, data) => { let {dragAbleOrBord,dragAbleOrBordStart} = this.state; @@ -484,18 +488,19 @@ class TableHeader extends Component { thClassName += `${fixedStyle}`; if(!da.fixed){ thLineObj = { + //---------------- onMouseMove:(e)=>{ e.stopPropagation();this.onMouseMove(e, da)}, onMouseOut:(e)=>{this.onMouseOut(e, da)}, onMouseDown:(e)=>{ e.stopPropagation();this.onMouseDown(e, da)}, onMouseUp:(e)=>{this.onMouseUp(e, da)}, onMouseOver:(e)=>{this.onMouseOver(e, da)}, - className:`${clsPrefix}-thead-th-drag-gap `, + className:`${clsPrefix}-thead-th-drag-gap th-drag-gap`, }; } return ( {da.children} { - da.fixed ? "":
(this.gap = el)} {...thLineObj} /> + da.fixed ? "":
(this.gap = el)} {...thLineObj} >
} ) }else{