Skip to content

Commit

Permalink
Merge pull request #858 from WeBankPartners/821_enhance_table_comp
Browse files Browse the repository at this point in the history
#821 enhance table comp
  • Loading branch information
irvinezhao authored Apr 21, 2020
2 parents 78ab08e + f1f6bb9 commit 44c385f
Showing 1 changed file with 12 additions and 10 deletions.
22 changes: 12 additions & 10 deletions cmdb-ui/src/pages/components/cmdb-table/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -595,16 +595,18 @@ export default {
style="float: right; margin: 10px 0;"
/>
)}
<EditModal
isEdit={this.modalTitle === this.titles.edit}
title={this.modalTitle}
columns={columns.filter(col => !col.isAuto && col.isEditable)}
data={selectedRows}
on-closeEditModal={this.closeEditModal}
on-editModalOkHandler={this.editModalOkHandler}
modalVisible={modalVisible}
modalLoading={modalLoading}
></EditModal>
{modalVisible && (
<EditModal
isEdit={this.modalTitle === this.titles.edit}
title={this.modalTitle}
columns={columns.filter(col => !col.isAuto && col.isEditable)}
data={selectedRows}
on-closeEditModal={this.closeEditModal}
on-editModalOkHandler={this.editModalOkHandler}
modalVisible={modalVisible}
modalLoading={modalLoading}
></EditModal>
)}
</div>
)
}
Expand Down

0 comments on commit 44c385f

Please sign in to comment.