Compare commits

...

2 Commits

Author SHA1 Message Date
Orange
0a8230b7da fix: 修复删除节点下资产授权报错的问题 2020-10-23 16:57:01 +08:00
jym503558564
d5ed85f973 perf(licenseTip):修复license过期提醒,开源版本出现split提示问题 2020-10-21 12:59:59 +08:00
2 changed files with 7 additions and 2 deletions

View File

@@ -24,7 +24,7 @@ export default {
'currentUser' 'currentUser'
]), ]),
isExpire() { isExpire() {
if (this.currentUser.role !== 'Admin') { if (!this.publicSettings.XPACK_ENABLED || this.currentUser.role !== 'Admin') {
return false return false
} }
const intervalDays = this.getIntervalDays(this.licenseData.date_expired) const intervalDays = this.getIntervalDays(this.licenseData.date_expired)

View File

@@ -85,7 +85,12 @@ export default {
}, },
actions: { actions: {
formatterArgs: { formatterArgs: {
updateRoute: 'AssetPermissionUpdate' updateRoute: 'AssetPermissionUpdate',
performDelete: ({ row, col }) => {
const id = row.id
const url = `/api/v1/perms/asset-permissions/${id}/`
return this.$axios.delete(url)
}
} }
} }
} }