Commit 9cc23767 by zhaochengxiang

样式调整

parent cbfbd076
...@@ -375,18 +375,16 @@ const ModelTable = (props) => { ...@@ -375,18 +375,16 @@ const ModelTable = (props) => {
const hiddenActions = authActions.slice(3, authActions.length); const hiddenActions = authActions.slice(3, authActions.length);
return ( return (
<Row gutter={20}> <Space size={5} split={<Divider type='vertical' style={{margin:0}} />}>
{ {
showActions.map((item, index) => { showActions.map((item, index) => {
return ( return (
<Col key={index} span={6}> <a key={index} onClick={() => {handleItemClick(item.key, record)}} >{item.title}</a>
<a onClick={() => {handleItemClick(item.key, record)}} >{item.title}</a>
</Col>
) )
}) })
} }
{ {
haveMore ? <Dropdown overlay={ haveMore && <Dropdown overlay={
<Menu onClick={({ key }) => { <Menu onClick={({ key }) => {
handleItemClick(key, record); handleItemClick(key, record);
}}> }}>
...@@ -405,12 +403,10 @@ const ModelTable = (props) => { ...@@ -405,12 +403,10 @@ const ModelTable = (props) => {
} }
placement="bottomLeft" placement="bottomLeft"
> >
<Col span={4}> <UnorderedListOutlined className='default' style={{ fontSize:16,cursor:'pointer' }} />
<UnorderedListOutlined className='default' style={{ fontSize:16,cursor:'pointer', marginLeft: 10 }} /> </Dropdown>
</Col>
</Dropdown> : <Col span={4} />
} }
</Row> </Space>
) )
} }
} }
...@@ -848,8 +844,9 @@ const ModelTable = (props) => { ...@@ -848,8 +844,9 @@ const ModelTable = (props) => {
}); });
let expandable = undefined; let expandable = undefined;
if (!modelId) {
let needExpand = false; let needExpand = false;
if (!modelId) {
(filterData||[]).forEach(record => { (filterData||[]).forEach(record => {
if (record?.alreadyCheckedOut) { if (record?.alreadyCheckedOut) {
needExpand = true; needExpand = true;
...@@ -938,7 +935,7 @@ const ModelTable = (props) => { ...@@ -938,7 +935,7 @@ const ModelTable = (props) => {
<Table <Table
rowSelection={view!=='grant'?rowSelection:undefined} rowSelection={view!=='grant'?rowSelection:undefined}
rowKey={'id'} rowKey={'id'}
extraColWidth={80} extraColWidth={(modelId||needExpand)?80:32}
columns={columns||[]} columns={columns||[]}
dataSource={modelId?(subData||[]):(filterData||[])} dataSource={modelId?(subData||[]):(filterData||[])}
pagination={false} pagination={false}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment