publish 1.2.9

This commit is contained in:
jonyshi 2018-07-16 17:14:15 +08:00
parent 30e8f11424
commit c2f32693ff
12 changed files with 83 additions and 93 deletions

View File

@ -337,7 +337,9 @@
border: none; } border: none; }
.u-table-filter-column-pop-cont { .u-table-filter-column-pop-cont {
margin: 10px; margin: 10px;
margin-top: 0px; } margin-top: 0px;
height: 300px;
overflow-y: scroll; }
.u-table-filter-column-clear-setting { .u-table-filter-column-clear-setting {
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
cursor: pointer; } cursor: pointer; }

View File

@ -89,9 +89,9 @@ function filterColumn(Table, Popover) {
columns.forEach(function (da) { columns.forEach(function (da) {
if (da.disable) { if (da.disable) {
_columns.push(da); _columns.push(da);
} if (da.width) {
if (da.width) { widthState++;
widthState++; }
} }
}); });
if (_columns.length == widthState) { if (_columns.length == widthState) {

View File

@ -115,7 +115,10 @@ function sort(Table, Icon) {
className: prefixCls + "-column-sorter-up " + (isAscend ? "on" : "off"), className: prefixCls + "-column-sorter-up " + (isAscend ? "on" : "off"),
title: "\u2191", title: "\u2191",
onClick: function onClick() { onClick: function onClick() {
return _this2.toggleSortOrder("ascend", column); _this2.toggleSortOrder("ascend", column);
if (column.sorterClick) {
column.sorterClick(column);
}
} }
}, },
_react2["default"].createElement(Icon, { type: "uf-triangle-up" }) _react2["default"].createElement(Icon, { type: "uf-triangle-up" })
@ -126,7 +129,10 @@ function sort(Table, Icon) {
className: prefixCls + "-column-sorter-down " + (isDescend ? "on" : "off"), className: prefixCls + "-column-sorter-down " + (isDescend ? "on" : "off"),
title: "\u2193", title: "\u2193",
onClick: function onClick() { onClick: function onClick() {
return _this2.toggleSortOrder("descend", column); _this2.toggleSortOrder("descend", column);
if (column.sorterClick) {
column.sorterClick(column);
}
} }
}, },
_react2["default"].createElement(Icon, { type: "uf-triangle-down" }) _react2["default"].createElement(Icon, { type: "uf-triangle-down" })

File diff suppressed because one or more lines are too long

4
dist/demo.css vendored
View File

@ -8038,7 +8038,9 @@ ul {
border: none; } border: none; }
.u-table-filter-column-pop-cont { .u-table-filter-column-pop-cont {
margin: 10px; margin: 10px;
margin-top: 0px; } margin-top: 0px;
height: 300px;
overflow-y: scroll; }
.u-table-filter-column-clear-setting { .u-table-filter-column-clear-setting {
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
cursor: pointer; } cursor: pointer; }

2
dist/demo.css.map vendored

File diff suppressed because one or more lines are too long

122
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.2.8", "version": "1.2.9",
"description": "Table ui component for react", "description": "Table ui component for react",
"keywords": [ "keywords": [
"react", "react",

View File

@ -308,6 +308,8 @@ $table-move-in-color: $bg-color-base;
&-pop-cont{ &-pop-cont{
margin: 10px; margin: 10px;
margin-top: 0px; margin-top: 0px;
height: 300px;
overflow-y: scroll;
} }
&-clear-setting{ &-clear-setting{
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;

View File

@ -115,9 +115,9 @@ export default function filterColumn(Table,Popover) {
columns.forEach((da)=>{ columns.forEach((da)=>{
if(da.disable){ if(da.disable){
_columns.push(da); _columns.push(da);
} if(da.width){
if(da.width){ widthState++;
widthState++; }
} }
}); });
if(_columns.length == widthState){ if(_columns.length == widthState){

View File

@ -75,7 +75,12 @@ export default function sort(Table, Icon) {
isAscend ? "on" : "off" isAscend ? "on" : "off"
}`} }`}
title="↑" title="↑"
onClick={() => this.toggleSortOrder("ascend", column)} onClick={() =>{
this.toggleSortOrder("ascend", column);
if(column.sorterClick){
column.sorterClick(column);
}
} }
> >
<Icon type="uf-triangle-up" /> <Icon type="uf-triangle-up" />
</span> </span>
@ -84,7 +89,12 @@ export default function sort(Table, Icon) {
isDescend ? "on" : "off" isDescend ? "on" : "off"
}`} }`}
title="↓" title="↓"
onClick={() => this.toggleSortOrder("descend", column)} onClick={() => {
this.toggleSortOrder("descend", column);
if(column.sorterClick){
column.sorterClick(column);
}
}}
> >
<Icon type="uf-triangle-down" /> <Icon type="uf-triangle-down" />
</span> </span>