diff --git a/demo/GridDemo.jsx b/demo/GridDemo.jsx index 535b9bd..6786c7a 100644 --- a/demo/GridDemo.jsx +++ b/demo/GridDemo.jsx @@ -78,7 +78,6 @@ class Demo extends React.Component { title: '操作1', width: '200px', type: 'action', - rightFixed: true, actions: [{ title: '点击', callback: () => { diff --git a/demo/index.jsx b/demo/index.jsx index 80f5d2a..e440879 100644 --- a/demo/index.jsx +++ b/demo/index.jsx @@ -17,9 +17,9 @@ import Demo5 from './TableGroup'; import Demo6 from './TableRowGroup'; import '../style'; -// ReactDOM.render(, document.getElementById('UXCoreDemo')); +ReactDOM.render(, document.getElementById('UXCoreDemo')); // ReactDOM.render(, document.getElementById('UXCoreDemo2')); -ReactDOM.render(, document.getElementById('UXCoreDemo3')); +// ReactDOM.render(, document.getElementById('UXCoreDemo3')); // ReactDOM.render(, document.getElementById('UXCoreDemo4')); // ReactDOM.render(, document.getElementById('UXCoreDemo5')); // ReactDOM.render(, document.getElementById('UXCoreDemo6')); diff --git a/src/Header/HeaderCell.jsx b/src/Header/HeaderCell.jsx index 1789349..c561c75 100644 --- a/src/Header/HeaderCell.jsx +++ b/src/Header/HeaderCell.jsx @@ -322,10 +322,10 @@ class HeaderCell extends React.Component { { columnResizeable - & column.type !== 'treeIcon' + && column.type !== 'treeIcon' && column.type !== 'checkboxSelector' && column.type !== 'radioSelector' - && !column.fixed + // && !column.fixed && !column.rightFixed && !column.hidden && !last