Improve getTags()

This commit is contained in:
Yang Luo 2023-04-09 14:47:08 +08:00
parent b7d78d1e27
commit 30ea3a1335
3 changed files with 20 additions and 10 deletions

View File

@ -139,7 +139,7 @@ class PermissionListPage extends BaseListPage {
sorter: true,
...this.getColumnSearchProps("users"),
render: (text, record, index) => {
return Setting.getTags(text);
return Setting.getTags(text, "users");
},
},
{
@ -150,7 +150,7 @@ class PermissionListPage extends BaseListPage {
sorter: true,
...this.getColumnSearchProps("roles"),
render: (text, record, index) => {
return Setting.getTags(text);
return Setting.getTags(text, "roles");
},
},
{

View File

@ -130,7 +130,7 @@ class RoleListPage extends BaseListPage {
sorter: true,
...this.getColumnSearchProps("users"),
render: (text, record, index) => {
return Setting.getTags(text);
return Setting.getTags(text, "users");
},
},
{
@ -141,7 +141,7 @@ class RoleListPage extends BaseListPage {
sorter: true,
...this.getColumnSearchProps("roles"),
render: (text, record, index) => {
return Setting.getTags(text);
return Setting.getTags(text, "roles");
},
},
{

View File

@ -1070,18 +1070,28 @@ export function getTagColor(s) {
return "processing";
}
export function getTags(tags) {
export function getTags(tags, urlPrefix = null) {
const res = [];
if (!tags) {
return res;
}
tags.forEach((tag, i) => {
res.push(
<Tag color={getTagColor(tag)}>
{tag}
</Tag>
);
if (urlPrefix === null) {
res.push(
<Tag color={getTagColor(tag)}>
{tag}
</Tag>
);
} else {
res.push(
<Link to={`/${urlPrefix}/${tag}`}>
<Tag color={getTagColor(tag)}>
{tag}
</Tag>
</Link>
);
}
});
return res;
}