合并分支

This commit is contained in:
黎永顺 2023-02-16 09:12:47 +08:00
parent b12ebdcf32
commit 6af7012e51
1 changed files with 4 additions and 4 deletions

View File

@ -227,11 +227,11 @@ const TitleNormalComp = (props) => {
<span>{name}</span>
{
name !== "未分类" && showOperateBtn &&
<i className="icon-coms-edit" title="编辑" onClick={() => onEditCategory(name, id)}/>
<i className="icon-coms-edit" title="编辑" onClick={() => onEditCategory(name, uuid)}/>
}
{
name !== "未分类" && _.isEmpty(items) && showOperateBtn &&
<i className="icon-coms-Delete" title="删除" onClick={() => onDeleteCategory(id)}/>
<i className="icon-coms-Delete" title="删除" onClick={() => onDeleteCategory(uuid)}/>
}
{
sortedIndex !== 0 && showOperateBtn &&
@ -246,8 +246,8 @@ const TitleNormalComp = (props) => {
{
showOperateBtn && <React.Fragment>
<WeaButtonIcon buttonType="del" type="primary" disabled={_.isEmpty(selectedRowKeys)}
onClick={() => onDeleteCategoryItems(id, selectedRowKeys)}/>
<WeaButtonIcon buttonType="add" type="primary" onClick={() => onAddCategoryItems(id)}/>
onClick={() => onDeleteCategoryItems(uuid, selectedRowKeys)}/>
<WeaButtonIcon buttonType="add" type="primary" onClick={() => onAddCategoryItems(uuid)}/>
</React.Fragment>
}
</div>