github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2025-09-24 12:40:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/jumpserver/lina

Browse Source
This commit is contained in:
Eric
2020-05-25 14:40:42 +08:00
parent d45f20968e c64843ebeb
commit 6d9f3fa03e
8 changed files with 41 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/ListTable/formatters/DeleteActionFormatter.vue
View File

@@ -20,7 +20,7 @@ export default {
const url = col.deleteUrl + cellValue const url = col.deleteUrl + cellValue
this.$axios.delete(url).then(res => { this.$axios.delete(url).then(res => {
this.$message.success(this.$t('common.deleteSuccessMsg')) this.$message.success(this.$t('common.deleteSuccessMsg'))
window.location.reload() setTimeout(() => location.reload(), 500)
}).catch(error => { }).catch(error => {
this.$message.error(this.$t('common.deleteErrorMsg' + ' ' + error)) this.$message.error(this.$t('common.deleteErrorMsg' + ' ' + error))
}) })

12
src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionAsset.vue
View File

@@ -112,7 +112,8 @@ export default {
this.$log.debug('Select value', that.select2.value) this.$log.debug('Select value', that.select2.value)
that.iHasObjects = [...that.iHasObjects, ...objects] that.iHasObjects = [...that.iHasObjects, ...objects]
that.$refs.select2.clearSelected() that.$refs.select2.clearSelected()
window.location.reload() this.$message.success(this.$t('common.updateSuccessMsg'))
setTimeout(() => location.reload(), 500)
}, },
performDelete: (item) => { performDelete: (item) => {
const itemId = item.value const itemId = item.value
@@ -128,7 +129,8 @@ export default {
this.$log.debug('disabled values remove index: ', i) this.$log.debug('disabled values remove index: ', i)
that.select2.disabledValues.splice(i, 1) that.select2.disabledValues.splice(i, 1)
} }
window.location.reload() this.$message.success(this.$t('common.deleteSuccessMsg'))
setTimeout(() => location.reload(), 500)
} }
}, },
systemUserReletionConfig: { systemUserReletionConfig: {
@@ -161,7 +163,8 @@ export default {
this.$log.debug('Select value', that.select2.value) this.$log.debug('Select value', that.select2.value)
that.iHasObjects = [...that.iHasObjects, ...objects] that.iHasObjects = [...that.iHasObjects, ...objects]
that.$refs.select2.clearSelected() that.$refs.select2.clearSelected()
window.location.reload() this.$message.success(this.$t('common.updateSuccessMsg'))
setTimeout(() => location.reload(), 500)
}, },
performDelete: (item) => { performDelete: (item) => {
const itemId = item.value const itemId = item.value
@@ -179,7 +182,8 @@ export default {
this.$log.debug('disabled values remove index: ', i) this.$log.debug('disabled values remove index: ', i)
that.select2.disabledValues.splice(i, 1) that.select2.disabledValues.splice(i, 1)
} }
window.location.reload() this.$message.success(this.$t('common.deleteSuccessMsg'))
setTimeout(() => location.reload(), 500)
} }
} }
} }

9
src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionUser.vue
View File

@@ -95,7 +95,8 @@ export default {
this.$log.debug('Select value', that.select2.value) this.$log.debug('Select value', that.select2.value)
that.iHasObjects = [...that.iHasObjects, ...objects] that.iHasObjects = [...that.iHasObjects, ...objects]
that.$refs.select2.clearSelected() that.$refs.select2.clearSelected()
window.location.reload() this.$message.success(this.$t('common.updateSuccessMsg'))
setTimeout(() => location.reload(), 500)
} }
}, },
groupReletionConfig: { groupReletionConfig: {
@@ -125,7 +126,8 @@ export default {
this.$log.debug('Select value', that.select2.value) this.$log.debug('Select value', that.select2.value)
that.iHasObjects = [...that.iHasObjects, ...objects] that.iHasObjects = [...that.iHasObjects, ...objects]
that.$refs.select2.clearSelected() that.$refs.select2.clearSelected()
window.location.reload() this.$message.success(this.$t('common.updateSuccessMsg'))
setTimeout(() => location.reload(), 500)
}, },
onDeleteSuccess: (obj, that) => { onDeleteSuccess: (obj, that) => {
const theRemoveIndex = that.iHasObjects.findIndex((v) => v.value === obj.value) const theRemoveIndex = that.iHasObjects.findIndex((v) => v.value === obj.value)
@@ -135,7 +137,8 @@ export default {
this.$log.debug('disabled values remove index: ', i) this.$log.debug('disabled values remove index: ', i)
that.select2.disabledValues.splice(i, 1) that.select2.disabledValues.splice(i, 1)
} }
window.location.reload() this.$message.success(this.$t('common.deleteSuccessMsg'))
setTimeout(() => location.reload(), 500)
} }
} }
} }

3
src/views/perms/AssetPermission/AssetPermissionDetail/AssetRelationCard/index.vue
View File

@@ -49,7 +49,8 @@ export default {
type: Function, type: Function,
default(that) { default(that) {
this.$log.debug('AssetSelect value', that.assets) this.$log.debug('AssetSelect value', that.assets)
window.location.reload() this.$message.success(this.$t('common.updateSuccessMsg'))
setTimeout(() => location.reload(), 500)
} }
} }
}, },

9
src/views/perms/DatabaseAppPermission/DatabaseAppPermissionDetail/DatabaseAppPermissionDatabaseApp.vue
View File

@@ -87,7 +87,8 @@ export default {
this.$log.debug('Select value', that.select2.value) this.$log.debug('Select value', that.select2.value)
that.iHasObjects = [...that.iHasObjects, ...objects] that.iHasObjects = [...that.iHasObjects, ...objects]
that.$refs.select2.clearSelected() that.$refs.select2.clearSelected()
window.location.reload() this.$message.success(this.$t('common.updateSuccessMsg'))
setTimeout(() => location.reload(), 500)
} }
}, },
systemUserReletionConfig: { systemUserReletionConfig: {
@@ -120,7 +121,8 @@ export default {
this.$log.debug('Select value', that.select2.value) this.$log.debug('Select value', that.select2.value)
that.iHasObjects = [...that.iHasObjects, ...objects] that.iHasObjects = [...that.iHasObjects, ...objects]
that.$refs.select2.clearSelected() that.$refs.select2.clearSelected()
window.location.reload() this.$message.success(this.$t('common.updateSuccessMsg'))
setTimeout(() => location.reload(), 500)
}, },
performDelete: (item) => { performDelete: (item) => {
const itemId = item.value const itemId = item.value
@@ -136,7 +138,8 @@ export default {
this.$log.debug('disabled values remove index: ', i) this.$log.debug('disabled values remove index: ', i)
that.select2.disabledValues.splice(i, 1) that.select2.disabledValues.splice(i, 1)
} }
window.location.reload() this.$message.success(this.$t('common.deleteSuccessMsg'))
setTimeout(() => location.reload(), 500)
} }
} }
} }

9
src/views/perms/DatabaseAppPermission/DatabaseAppPermissionDetail/DatabaseAppPermissionUser.vue
View File

@@ -96,7 +96,8 @@ export default {
this.$log.debug('Select value', that.select2.value) this.$log.debug('Select value', that.select2.value)
that.iHasObjects = [...that.iHasObjects, ...objects] that.iHasObjects = [...that.iHasObjects, ...objects]
that.$refs.select2.clearSelected() that.$refs.select2.clearSelected()
window.location.reload() this.$message.success(this.$t('common.updateSuccessMsg'))
setTimeout(() => location.reload(), 500)
} }
}, },
groupReletionConfig: { groupReletionConfig: {
@@ -121,7 +122,8 @@ export default {
this.$log.debug('Select value', that.select2.value) this.$log.debug('Select value', that.select2.value)
that.iHasObjects = [...that.iHasObjects, ...objects] that.iHasObjects = [...that.iHasObjects, ...objects]
that.$refs.select2.clearSelected() that.$refs.select2.clearSelected()
window.location.reload() this.$message.success(this.$t('common.updateSuccessMsg'))
setTimeout(() => location.reload(), 500)
}, },
performDelete: (item) => { performDelete: (item) => {
const objectId = this.object.id const objectId = this.object.id
@@ -136,7 +138,8 @@ export default {
this.$log.debug('disabled values remove index: ', i) this.$log.debug('disabled values remove index: ', i)
that.select2.disabledValues.splice(i, 1) that.select2.disabledValues.splice(i, 1)
} }
window.location.reload() this.$message.success(this.$t('common.deleteSuccessMsg'))
setTimeout(() => location.reload(), 500)
} }
} }
} }

9
src/views/perms/RemoteAppPermission/RemoteAppPermissionDetail/RemoteAppPermissionRemoteApp.vue
View File

@@ -73,7 +73,8 @@ export default {
this.$log.debug('Select value', that.select2.value) this.$log.debug('Select value', that.select2.value)
that.iHasObjects = [...that.iHasObjects, ...objects] that.iHasObjects = [...that.iHasObjects, ...objects]
that.$refs.select2.clearSelected() that.$refs.select2.clearSelected()
window.location.reload() this.$message.success(this.$t('common.updateSuccessMsg'))
setTimeout(() => location.reload(), 500)
} }
}, },
systemUserReletionConfig: { systemUserReletionConfig: {
@@ -103,7 +104,8 @@ export default {
this.$log.debug('Select value', that.select2.value) this.$log.debug('Select value', that.select2.value)
that.iHasObjects = [...that.iHasObjects, ...objects] that.iHasObjects = [...that.iHasObjects, ...objects]
that.$refs.select2.clearSelected() that.$refs.select2.clearSelected()
window.location.reload() this.$message.success(this.$t('common.updateSuccessMsg'))
setTimeout(() => location.reload(), 500)
}, },
performDelete: (item) => { performDelete: (item) => {
const objectId = this.object.id const objectId = this.object.id
@@ -121,7 +123,8 @@ export default {
this.$log.debug('disabled values remove index: ', i) this.$log.debug('disabled values remove index: ', i)
that.select2.disabledValues.splice(i, 1) that.select2.disabledValues.splice(i, 1)
} }
window.location.reload() this.$message.success(this.$t('common.deleteSuccessMsg'))
setTimeout(() => location.reload(), 500)
} }
} }
} }

9
src/views/perms/RemoteAppPermission/RemoteAppPermissionDetail/RemoteAppPermissionUser.vue
View File

@@ -80,7 +80,8 @@ export default {
this.$log.debug('Select value', that.select2.value) this.$log.debug('Select value', that.select2.value)
that.iHasObjects = [...that.iHasObjects, ...objects] that.iHasObjects = [...that.iHasObjects, ...objects]
that.$refs.select2.clearSelected() that.$refs.select2.clearSelected()
window.location.reload() this.$message.success(this.$t('common.updateSuccessMsg'))
setTimeout(() => location.reload(), 500)
} }
}, },
groupReletionConfig: { groupReletionConfig: {
@@ -102,7 +103,8 @@ export default {
this.$log.debug('Select value', that.select2.value) this.$log.debug('Select value', that.select2.value)
that.iHasObjects = [...that.iHasObjects, ...objects] that.iHasObjects = [...that.iHasObjects, ...objects]
that.$refs.select2.clearSelected() that.$refs.select2.clearSelected()
window.location.reload() this.$message.success(this.$t('common.updateSuccessMsg'))
setTimeout(() => location.reload(), 500)
}, },
performDelete: (item) => { performDelete: (item) => {
const objectId = this.object.id const objectId = this.object.id
@@ -120,7 +122,8 @@ export default {
this.$log.debug('disabled values remove index: ', i) this.$log.debug('disabled values remove index: ', i)
that.select2.disabledValues.splice(i, 1) that.select2.disabledValues.splice(i, 1)
} }
window.location.reload() this.$message.success(this.$t('common.deleteSuccessMsg'))
setTimeout(() => location.reload(), 500)
} }
} }
} }