publish 1.2.4
This commit is contained in:
parent
d9c01c2648
commit
da3be3d87b
|
@ -345,10 +345,11 @@
|
|||
position: relative; }
|
||||
.u-table-filter-column-filter-icon {
|
||||
position: absolute;
|
||||
top: 10px;
|
||||
top: 6px;
|
||||
right: 3px;
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
z-index: 2; }
|
||||
.u-table-filter-column-pop-cont-item {
|
||||
margin-top: 10px;
|
||||
|
|
|
@ -119,7 +119,7 @@ function filterColumn(Table, Popover) {
|
|||
show: showModal },
|
||||
_react2["default"].createElement(
|
||||
"div",
|
||||
{ className: prefixCls + "-pop-column-filter" },
|
||||
{ className: prefixCls + "-pop-column-filter-cont" },
|
||||
_react2["default"].createElement(_beeIcon2["default"], { type: "uf-navmenu", onClick: this.openCloumList })
|
||||
)
|
||||
)
|
||||
|
|
|
@ -59,6 +59,7 @@ function newMultiSelect(Table, Checkbox) {
|
|||
_this.setState({
|
||||
checkedAll: check
|
||||
});
|
||||
_this.props.getSelectedDataFunc(data);
|
||||
};
|
||||
|
||||
_this.handleClick = function () {};
|
||||
|
@ -79,6 +80,7 @@ function newMultiSelect(Table, Checkbox) {
|
|||
_this.setState(_extends({}, _this.state, {
|
||||
checkedAll: checkedAll
|
||||
}));
|
||||
_this.props.getSelectedDataFunc(record);
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
@ -96,6 +96,104 @@ const data25 = [
|
|||
{ a: "郭靖", b: "男", c: 25, c1: 30, c2: 30,d:'大侠',e: "操作", key: "3" }
|
||||
];
|
||||
|
||||
function getCloumns(){
|
||||
const column = [
|
||||
{
|
||||
title: "序号",
|
||||
dataIndex: "index",
|
||||
key: "index",
|
||||
width: 100,
|
||||
},
|
||||
{
|
||||
title: "订单编号",
|
||||
dataIndex: "orderCode",
|
||||
key: "orderCode",
|
||||
width: 250,
|
||||
},
|
||||
{
|
||||
title: "供应商名称",
|
||||
dataIndex: "supplierName",
|
||||
key: "supplierName",
|
||||
width: 300
|
||||
},
|
||||
{
|
||||
title: "类型",
|
||||
dataIndex: "type_name",
|
||||
key: "type_name",
|
||||
width: 100
|
||||
},
|
||||
{
|
||||
title: "采购组织",
|
||||
dataIndex: "purchasing",
|
||||
key: "purchasing",
|
||||
width: 100
|
||||
},
|
||||
{
|
||||
title: "采购组",
|
||||
dataIndex: "purchasingGroup",
|
||||
key: "purchasingGroup",
|
||||
width: 100
|
||||
},
|
||||
{
|
||||
title: "凭证日期",
|
||||
dataIndex: "voucherDate",
|
||||
key: "voucherDate",
|
||||
width: 100,
|
||||
|
||||
},
|
||||
{
|
||||
title: "审批状态",
|
||||
dataIndex: "approvalState_name",
|
||||
key: "approvalState_name",
|
||||
width: 100
|
||||
},
|
||||
{
|
||||
title: "确认状态",
|
||||
dataIndex: "confirmState_name",
|
||||
key: "confirmState_name",
|
||||
width: 100
|
||||
},
|
||||
{
|
||||
title: "关闭状态",
|
||||
dataIndex: "closeState_name",
|
||||
key: "closeState_name",
|
||||
width: 100
|
||||
},
|
||||
{
|
||||
title: "操作",
|
||||
dataIndex: "d",
|
||||
key: "d",
|
||||
width:100,
|
||||
fixed: "right",
|
||||
render(text, record, index) {
|
||||
return (
|
||||
<div className='operation-btn'>
|
||||
|
||||
</div>
|
||||
)
|
||||
}
|
||||
}
|
||||
];
|
||||
return column;
|
||||
}
|
||||
|
||||
const dataList = [
|
||||
{
|
||||
index: 1,
|
||||
orderCode:"2343",
|
||||
supplierName: "xxx",
|
||||
type_name: "123",
|
||||
purchasing:'内行',
|
||||
purchasingGroup:"323",
|
||||
voucherDate:"kkkk",
|
||||
approvalState_name:"vvvv",
|
||||
confirmState_name:"aaaa",
|
||||
closeState_name:"vnnnnn",
|
||||
d:"操作",
|
||||
key: "2"
|
||||
},
|
||||
]
|
||||
|
||||
// const FilterColumnTable = filterColumn(Table, Popover);
|
||||
// const MultiSelectTable = multiSelect(Table, Checkbox);
|
||||
// let ComplexTable = multiSelect(Table, Checkbox);
|
||||
|
@ -113,8 +211,15 @@ class Demo25 extends Component {
|
|||
super(props);
|
||||
}
|
||||
|
||||
getSelectedDataFunc=(data)=>{
|
||||
console.log("data",data);
|
||||
}
|
||||
|
||||
render() {
|
||||
return <div className="demo25"><DragColumnTable columns={columns25} data={data25}
|
||||
return <div className="demo25"><DragColumnTable
|
||||
columns={getCloumns()}
|
||||
data={dataList}
|
||||
getSelectedDataFunc={this.getSelectedDataFunc}
|
||||
bordered
|
||||
dragborder={true}
|
||||
scroll={{x:700}}
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -8046,10 +8046,11 @@ ul {
|
|||
position: relative; }
|
||||
.u-table-filter-column-filter-icon {
|
||||
position: absolute;
|
||||
top: 10px;
|
||||
top: 6px;
|
||||
right: 3px;
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
z-index: 2; }
|
||||
.u-table-filter-column-pop-cont-item {
|
||||
margin-top: 10px;
|
||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "bee-table",
|
||||
"version": "1.2.3",
|
||||
"version": "1.2.4",
|
||||
"description": "Table ui component for react",
|
||||
"keywords": [
|
||||
"react",
|
||||
|
|
|
@ -318,10 +318,11 @@ $table-move-in-color: $bg-color-base;
|
|||
}
|
||||
&-filter-icon{
|
||||
position: absolute;
|
||||
top: 10px;
|
||||
top: 6px;
|
||||
right: 3px;
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
z-index: 2;
|
||||
}
|
||||
&-pop-cont-item{
|
||||
|
|
|
@ -110,7 +110,7 @@ export default function filterColumn(Table,Popover) {
|
|||
placement="leftTop"
|
||||
content={content}
|
||||
show={showModal} >
|
||||
<div className={`${prefixCls}-pop-column-filter`}>
|
||||
<div className={`${prefixCls}-pop-column-filter-cont`}>
|
||||
<Icon type="uf-navmenu" onClick={this.openCloumList}/>
|
||||
</div>
|
||||
</Popover>
|
||||
|
|
|
@ -46,7 +46,8 @@ export default function newMultiSelect(Table, Checkbox) {
|
|||
});
|
||||
this.setState({
|
||||
checkedAll:check
|
||||
})
|
||||
});
|
||||
this.props.getSelectedDataFunc(data);
|
||||
}
|
||||
|
||||
handleClick=()=>{
|
||||
|
@ -68,6 +69,7 @@ export default function newMultiSelect(Table, Checkbox) {
|
|||
...this.state,
|
||||
checkedAll
|
||||
})
|
||||
this.props.getSelectedDataFunc(record);
|
||||
};
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue