Commit a8553111 by zhaochengxiang

bug fix

parent aa6034ac
...@@ -1039,7 +1039,7 @@ const AssetAction = (props) => { ...@@ -1039,7 +1039,7 @@ const AssetAction = (props) => {
<span> <span>
{element.name} {element.name}
{ {
(currentAction==='add'||currentAction==='edit') && element.required && <span style={{ color: 'red' }}>*</span> (currentAction==='add'||currentAction==='edit') && (element.required==='是') && <span style={{ color: 'red' }}>*</span>
} }
</span> </span>
} }
...@@ -1052,7 +1052,7 @@ const AssetAction = (props) => { ...@@ -1052,7 +1052,7 @@ const AssetAction = (props) => {
<Form.Item <Form.Item
label='' label=''
name={element.name} name={element.name}
rules={[{ required: element.required }]} rules={[{ required: element.required === '是' }]}
style={{ marginBottom: 0 }} style={{ marginBottom: 0 }}
> >
{elementEditComponent(element)} {elementEditComponent(element)}
...@@ -1178,7 +1178,7 @@ const AssetAction = (props) => { ...@@ -1178,7 +1178,7 @@ const AssetAction = (props) => {
pagination={{ pagination={{
position: ['bottomLeft'], position: ['bottomLeft'],
size: 'small', size: 'small',
total: (tableData||[]).length, total: (metadataColumnList||[]).length,
showTotal: (total) => `${total}`, showTotal: (total) => `${total}`,
showSizeChanger: true, showSizeChanger: true,
current: pageNum, current: pageNum,
......
...@@ -112,7 +112,6 @@ const FC = (props) => { ...@@ -112,7 +112,6 @@ const FC = (props) => {
<Pagination <Pagination
className="text-center mt-3" className="text-center mt-3"
showSizeChanger showSizeChanger
showQuickJumper
onChange={(_pageNum, _pageSize) => { onChange={(_pageNum, _pageSize) => {
setPagination({ pageNum: _pageNum, pageSize: _pageSize || 20 }); setPagination({ pageNum: _pageNum, pageSize: _pageSize || 20 });
}} }}
...@@ -123,7 +122,6 @@ const FC = (props) => { ...@@ -123,7 +122,6 @@ const FC = (props) => {
pageSize={pageSize} pageSize={pageSize}
defaultCurrent={1} defaultCurrent={1}
total={(data||[]).length} total={(data||[]).length}
pageSizeOptions={[10,20,50,100]}
showTotal={total => ` ${total} `} showTotal={total => ` ${total} `}
/> />
</div> </div>
......
...@@ -948,7 +948,6 @@ const ModelTable = (props) => { ...@@ -948,7 +948,6 @@ const ModelTable = (props) => {
!modelId && (data||[]).length>0 && <Pagination !modelId && (data||[]).length>0 && <Pagination
className="text-center mt-3" className="text-center mt-3"
showSizeChanger showSizeChanger
showQuickJumper
onChange={(_pageNum, _pageSize) => { onChange={(_pageNum, _pageSize) => {
setPagination({ pageNum: _pageNum, pageSize: _pageSize || 20 }); setPagination({ pageNum: _pageNum, pageSize: _pageSize || 20 });
}} }}
...@@ -959,7 +958,6 @@ const ModelTable = (props) => { ...@@ -959,7 +958,6 @@ const ModelTable = (props) => {
pageSize={pageSize} pageSize={pageSize}
defaultCurrent={1} defaultCurrent={1}
total={(data||[]).length} total={(data||[]).length}
pageSizeOptions={[10,20,50]}
showTotal={total => ` ${total} `} showTotal={total => ` ${total} `}
/> />
} }
......
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