diff --git a/src/components/Table/TableFormatters/AmountFormatter.vue b/src/components/Table/TableFormatters/AmountFormatter.vue index b3766f196..73186398f 100644 --- a/src/components/Table/TableFormatters/AmountFormatter.vue +++ b/src/components/Table/TableFormatters/AmountFormatter.vue @@ -60,6 +60,9 @@ export default { title() { return this.formatterArgs.title || this.col.label.replace('amount', '').replace('数量', '') }, + cellValueToRemove() { + return this.formatterArgs.cellValueToRemove || [] + }, items() { if (this.formatterArgs.async && !this.asyncGetDone) { return [this.$t('common.tree.Loading') + '...'] @@ -74,7 +77,11 @@ export default { } }, async mounted() { - this.amount = this.formatterArgs.async ? this.cellValue : (this.cellValue || []).length + if (this.formatterArgs.async) { + this.amount = this.cellValue + } else { + this.amount = (this.cellValue?.filter(value => !this.cellValueToRemove.includes(value)) || []).length + } }, methods: { getKey(item) { @@ -109,13 +116,14 @@ export default { max-height: 60vh; overflow-y: auto; } + .detail-item { border-bottom: 1px solid #EBEEF5; padding: 5px 0; margin-bottom: 0; &:hover { - background-color: #F5F7FA; + background-color: #F5F7FA; } } diff --git a/src/views/perms/AssetPermission/AssetPermissionList.vue b/src/views/perms/AssetPermission/AssetPermissionList.vue index 036b8c90a..bc67ef0fa 100644 --- a/src/views/perms/AssetPermission/AssetPermissionList.vue +++ b/src/views/perms/AssetPermission/AssetPermissionList.vue @@ -149,6 +149,7 @@ export default { return AccountLabelMapper[item] || item } }, + cellValueToRemove: ['@SPEC'], routeQuery: { activeTab: 'AssetPermissionAccount' }