diff --git a/src/components/AssetRelationCard/index.vue b/src/components/AssetRelationCard/index.vue
index a1ffe02d7..d8e076224 100644
--- a/src/components/AssetRelationCard/index.vue
+++ b/src/components/AssetRelationCard/index.vue
@@ -8,7 +8,7 @@
- {{ $t('common.Add') }}
+ {{ $t('common.Add') }}
|
diff --git a/src/components/ListTable/formatters/DeleteActionFormatter.vue b/src/components/ListTable/formatters/DeleteActionFormatter.vue
index 953d62f3d..f1842c3da 100644
--- a/src/components/ListTable/formatters/DeleteActionFormatter.vue
+++ b/src/components/ListTable/formatters/DeleteActionFormatter.vue
@@ -1,5 +1,5 @@
-
+
@@ -11,8 +11,9 @@ export default {
name: 'DeleteActionFormatter',
extends: BaseFormatter,
computed: {
- canDelete() {
- return this.iCanDelete()
+ iDisabled() {
+ // 禁用
+ return (this.disabled() || this.$store.getters.currentOrgIsRoot)
}
},
methods: {
@@ -32,7 +33,7 @@ export default {
this.defaultOnDelete(col, row, cellValue, reload)
}
},
- iCanDelete() {
+ disabled() {
if (this.col.objects === 'all') {
return false
}
diff --git a/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue b/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue
index 09bfa1c68..705dadf27 100644
--- a/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue
+++ b/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue
@@ -77,6 +77,7 @@ export default {
name: 'Delete',
title: this.$t('common.Delete'),
type: 'danger',
+ can: !this.$store.getters.currentOrgIsRoot,
callback: (val) => {
this.$axios.delete(`/api/v1/assets/system-users-assets-relations/${val.row.id}/`).then(() => {
this.$message.success(this.$t('common.deleteSuccessMsg'))
@@ -190,6 +191,7 @@ export default {
assetRelationConfig: {
icon: 'fa-edit',
title: this.$t('xpack.ChangeAuthPlan.AddAsset'),
+ disabled: this.$store.getters.currentOrgIsRoot,
performAdd: (items, that) => {
const relationUrl = `/api/v1/assets/system-users-assets-relations/`
const data = [
diff --git a/src/views/perms/ApplicationPermission/ApplicationPermissionDetail/ApplicationsPermission.vue b/src/views/perms/ApplicationPermission/ApplicationPermissionDetail/ApplicationsPermission.vue
index 057c0c96a..3ee5102ff 100644
--- a/src/views/perms/ApplicationPermission/ApplicationPermissionDetail/ApplicationsPermission.vue
+++ b/src/views/perms/ApplicationPermission/ApplicationPermissionDetail/ApplicationsPermission.vue
@@ -63,6 +63,7 @@ export default {
remoteAppRelationConfig: {
icon: 'fa-edit',
title: this.$t('perms.addApplicationToThisPermission'),
+ disabled: this.$store.getters.currentOrgIsRoot,
objectsAjax: {
url: `/api/v1/applications/applications/?category=${this.object.category}&type=${this.object.type}`,
transformOption: (item) => {
diff --git a/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionAsset.vue b/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionAsset.vue
index fa234e716..879cd96c0 100644
--- a/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionAsset.vue
+++ b/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionAsset.vue
@@ -70,6 +70,7 @@ export default {
icon: 'fa-edit',
title: this.$t('perms.addAssetToThisPermission'),
hasObjectsId: this.object.assets,
+ disabled: this.$store.getters.currentOrgIsRoot,
canSelect: (row, index) => {
return this.object.assets.indexOf(row.id) === -1
},
diff --git a/src/views/perms/const.js b/src/views/perms/const.js
index 806a23e02..e3de5a421 100644
--- a/src/views/perms/const.js
+++ b/src/views/perms/const.js
@@ -7,7 +7,7 @@ export const CUSTOM = 'custom'
export const REMOTEAPP_CATEGORY = 'remote_app'
function hasLicence() {
- return store.getters.hasLicence
+ return store.getters.hasValidLicense
}
export const REMOTE_APP = [
diff --git a/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanAsset/index.vue b/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanAsset/index.vue
index 318821b96..432fbd8c6 100644
--- a/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanAsset/index.vue
+++ b/src/views/xpack/ChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanAsset/index.vue
@@ -73,6 +73,7 @@ export default {
assetRelationConfig: {
icon: 'fa-edit',
title: this.$t('xpack.ChangeAuthPlan.AddAsset'),
+ disabled: this.$store.getters.currentOrgIsRoot,
canSelect: (row, index) => {
return this.object.assets.indexOf(row.id) === -1
},
@@ -99,6 +100,7 @@ export default {
return { label: item.full_value, value: item.id }
}
},
+ disabled: this.$store.getters.currentOrgIsRoot,
hasObjectsId: this.object.nodes,
performAdd: (items, that) => {
const relationUrl = `/api/v1/xpack/change-auth-plan/plan/${this.object.id}/`