diff --git a/demo/GridEditDemo.jsx b/demo/GridEditDemo.jsx index 30606f3..f406738 100644 --- a/demo/GridEditDemo.jsx +++ b/demo/GridEditDemo.jsx @@ -24,6 +24,20 @@ const { createCellField } = Table; const mockData = { data: [ + { + email: 'xw@abc.com', + nameId: 'xiaowang', + name: '小王', + cityId: 'bj', + city: '北京', + }, + { + email: 'xl@abc.com', + nameId: 'xiaoli', + name: '小李', + cityId: 'hz', + city: '杭州', + }, ], currentPage: 1, totalCount: 10, @@ -182,7 +196,7 @@ class Demo extends React.Component { width: 300, type: 'action', actionType: 'link', - collapseNum: 1, + collapseNum: 3, actions: [ { title: '编辑', diff --git a/demo/index.jsx b/demo/index.jsx index bb55a02..51de750 100644 --- a/demo/index.jsx +++ b/demo/index.jsx @@ -10,14 +10,14 @@ import ReactDOM from 'react-dom'; import React from 'react'; // import Demo from './GridDemo'; -// import Demo2 from './GridEditDemo'; +import Demo2 from './GridEditDemo'; // import Demo3 from './TreeGridDemo'; // import Demo4 from './GridViewModeDemo'; // import Demo5 from './TableGroup'; import Demo6 from './TableRowGroup'; // ReactDOM.render(, document.getElementById('UXCoreDemo')); -// ReactDOM.render(, document.getElementById('UXCoreDemo2')); +ReactDOM.render(, document.getElementById('UXCoreDemo2')); // ReactDOM.render(, document.getElementById('UXCoreDemo3')); // ReactDOM.render(, document.getElementById('UXCoreDemo4')); // ReactDOM.render(, document.getElementById('UXCoreDemo5')); diff --git a/src/Table.jsx b/src/Table.jsx index 907055a..a9f8c20 100644 --- a/src/Table.jsx +++ b/src/Table.jsx @@ -800,7 +800,8 @@ class Table extends React.Component { // filter the column whose dataKey is rowGroupKey columns = columns.filter(item => - item.dataKey !== 'jsxchecked' && item.dataKey !== 'jsxtreeIcon' && item.dataKey !== actualProps.rowGroupKey, + item.dataKey === undefined || + (item.dataKey !== 'jsxchecked' && item.dataKey !== 'jsxtreeIcon' && item.dataKey !== actualProps.rowGroupKey), ); if (!!actualProps.rowSelection && !hasCheckboxColumn) { diff --git a/src/style/ActionBar.less b/src/style/ActionBar.less index 5a0047d..aa6a4ac 100644 --- a/src/style/ActionBar.less +++ b/src/style/ActionBar.less @@ -39,7 +39,7 @@ max-width: 232px; max-height: 400px; overflow: auto; - padding: '16px 12px'; + padding: 16px 12px; } .kuma-tree { padding: 0;