github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2025-08-16 22:07:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #70 from jumpserver/bugfix_autodatatable

Browse Source 
[Update] 修改ActionsFormatter问题
This commit is contained in:
BaiJiangJie 2020-05-29 17:24:32 +08:00 committed by GitHub
commit a90c43010d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/AutoDataTable/index.vue
View File

@ -53,7 +53,7 @@ export default {
align: 'center', align: 'center',
width: '150px', width: '150px',
formatter: ActionsFormatter, formatter: ActionsFormatter,
formatterArgs: {} actions: this.config.actions || {}
} }
break break
case 'is_valid': case 'is_valid':

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

@ -67,7 +67,7 @@ export default {
} }
}, },
data() { data() {
const colActions = Object.assign(this.formatterArgsDefault, this.col.formatterArgs) const colActions = Object.assign(this.formatterArgsDefault, this.col.actions.formatterArgs)
const defaultActions = [ const defaultActions = [
{ {
name: 'update', name: 'update',