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

Merge pull request #136 from jumpserver/fix_update_bulkdeleteUrl

Browse Source 
fix: 修复批量删除链接的bug
This commit is contained in:
Orange 2020-07-04 18:44:21 +08:00 committed by GitHub
commit 1e98827e98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/ListTable/TableAction/LeftSide.vue
View File

@ -152,7 +152,7 @@ export default {
return v.id return v.id
}) })
const data = await createSourceIdCache(ids) const data = await createSourceIdCache(ids)
const url = `${this.tableUrl}?spm=` + data.spm const url = (this.tableUrl.indexOf('?') === -1) ? `${this.tableUrl}?spm=` + data.spm : `${this.tableUrl}&spm=` + data.spm
return this.$axios.delete(url) return this.$axios.delete(url)
}, },
handleBulkUpdate({ selectedRows }) { handleBulkUpdate({ selectedRows }) {

3
src/i18n/langs/cn.json
View File

@ -859,7 +859,8 @@
"ReleasedCount": "已释放", "ReleasedCount": "已释放",
"DateSync": "同步日期", "DateSync": "同步日期",
"Status": "状态", "Status": "状态",
"Log": "日志" "Log": "日志",
"DeleteReleasedAssets": "删除已释放资产"
}, },
"Corporation": "公司", "Corporation": "公司",
"Edition": "版本", "Edition": "版本",

3
src/i18n/langs/en.json
View File

@ -858,7 +858,8 @@
"ReleasedCount": "Released count", "ReleasedCount": "Released count",
"DateSync": "Date sync", "DateSync": "Date sync",
"Status": "Status", "Status": "Status",
"Log": "Log" "Log": "Log",
"DeleteReleasedAssets": "Delete released assets"
}, },
"Corporation": "Corporation", "Corporation": "Corporation",
"Edition": "Edition", "Edition": "Edition",

2
src/views/xpack

@ -1 +1 @@
Subproject commit d247da036f22261afa2bd89523e552cb6407327d Subproject commit 41069df320e2c718bf6f3159c1d3efb0b2b1f4ef