Skip to content

Commit

Permalink
Merge branch 'master' of github.com:tinper-bee/bee-table
Browse files Browse the repository at this point in the history
  • Loading branch information
yangchch6 committed Mar 26, 2019
2 parents 9d6502b + 34735e0 commit 58153b9
Show file tree
Hide file tree
Showing 7 changed files with 2,558 additions and 2,633 deletions.
1 change: 1 addition & 0 deletions build/TableHeader.js
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,7 @@ var TableHeader = function (_Component) {
};

TableHeader.prototype.componentWillUnmount = function componentWillUnmount() {
if (!this.table) return;
if (this.props.draggable) {
this.removeDragAbleEvent();
}
Expand Down
6 changes: 4 additions & 2 deletions demo/atom-one-dark.css
Original file line number Diff line number Diff line change
Expand Up @@ -158,10 +158,10 @@ hue-6-2: #e6c07b
}
/* 抽屉组件样式覆盖 */
.component-drawerc{
position: fixed;
/* position: fixed; */
top: 0;
left: 0;
z-index: 100000;
z-index: 1!important;
width: 0;
height: 100%;
}
Expand All @@ -173,6 +173,7 @@ hue-6-2: #e6c07b
top: 0;
left: 0;
transition: transform 300ms ease-in-out, opacity 300ms ease-in-out;
z-index: 2;
}
.component-drawerc .drawer-close{
position: absolute;
Expand All @@ -196,6 +197,7 @@ hue-6-2: #e6c07b
top: 0;
right: 0;
height: 100%;
z-index: 3;
}
.component-drawerc .drawer-top{
top: 0;
Expand Down
2 changes: 1 addition & 1 deletion dist/demo.css.map

Large diffs are not rendered by default.

5,175 changes: 2,548 additions & 2,627 deletions dist/demo.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/demo.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bee-table",
"version": "2.0.7",
"version": "2.0.8",
"description": "Table ui component for react",
"keywords": [
"react",
Expand Down Expand Up @@ -88,4 +88,4 @@
"react-dom": "^16.6.3",
"tinper-bee": "latest"
}
}
}
1 change: 1 addition & 0 deletions src/TableHeader.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ class TableHeader extends Component {


componentWillUnmount(){
if(!this.table)return;
if (this.props.draggable){
this.removeDragAbleEvent();
}
Expand Down

0 comments on commit 58153b9

Please sign in to comment.