feat(web): 添加资源 ID 并优化相关功能
- 在 WareController 中添加 resourceId 字段 - 更新前端市场页面,将 targetId映射为 resourceId - 修改权限管理页面图标 - 移除不必要的 console.log 语句
This commit is contained in:
@@ -28,13 +28,10 @@ export function tabMarket() {
|
|||||||
payload.data = payload.data.map(i => {
|
payload.data = payload.data.map(i => {
|
||||||
return {
|
return {
|
||||||
...i,
|
...i,
|
||||||
targetId: i.id
|
targetId: i.resourceId,
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
console.log(payload, response, api, context)
|
return payload
|
||||||
return {
|
|
||||||
...payload
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
...crudCommonOptions(),
|
...crudCommonOptions(),
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ export function tabPermissions() {
|
|||||||
return {
|
return {
|
||||||
visibleOn: userOnly,
|
visibleOn: userOnly,
|
||||||
title: '权属管理',
|
title: '权属管理',
|
||||||
icon: 'fa fa-user-shield',
|
icon: 'fa fa-key',
|
||||||
reload: true,
|
reload: true,
|
||||||
body: {
|
body: {
|
||||||
type: 'tabs',
|
type: 'tabs',
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ public class WareController extends SimpleControllerSupport<Ware, WareController
|
|||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping(LIST + "_public")
|
@GetMapping(LIST + "_public")
|
||||||
public AmisResponse<ImmutableList<ListItem>> listPublic() throws Exception {
|
public AmisResponse<ImmutableList<ListItem>> listPublic() {
|
||||||
return AmisResponse.responseSuccess(wareService.listPublic().collect(this::toListItem));
|
return AmisResponse.responseSuccess(wareService.listPublic().collect(this::toListItem));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -79,6 +79,7 @@ public class WareController extends SimpleControllerSupport<Ware, WareController
|
|||||||
item.setDescription(entity.getDescription());
|
item.setDescription(entity.getDescription());
|
||||||
item.setIcon(StrUtil.format("{}/upload/download/{}", hostConfiguration.getPrefix(), entity.getIcon().getId()));
|
item.setIcon(StrUtil.format("{}/upload/download/{}", hostConfiguration.getPrefix(), entity.getIcon().getId()));
|
||||||
item.setState(entity.getState().name());
|
item.setState(entity.getState().name());
|
||||||
|
item.setResourceId(entity.getResource().getId());
|
||||||
item.setCreatedTime(entity.getCreatedTime());
|
item.setCreatedTime(entity.getCreatedTime());
|
||||||
item.setCreatedUsername(entity.getCreatedUser().getUsername());
|
item.setCreatedUsername(entity.getCreatedUser().getUsername());
|
||||||
return item;
|
return item;
|
||||||
@@ -119,6 +120,7 @@ public class WareController extends SimpleControllerSupport<Ware, WareController
|
|||||||
private String description;
|
private String description;
|
||||||
private String state;
|
private String state;
|
||||||
private String icon;
|
private String icon;
|
||||||
|
private Long resourceId;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
|
|||||||
Reference in New Issue
Block a user