mirror of
https://github.com/jumpserver/lina.git
synced 2025-11-07 18:08:50 +00:00
Compare commits
3 Commits
pr@dev@ass
...
v2.13.2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7075758fd8 | ||
|
|
f8d2ae3b58 | ||
|
|
565507f2b8 |
@@ -102,6 +102,9 @@ export default {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
prop: 'protocols',
|
prop: 'protocols',
|
||||||
|
formatter: function(row) {
|
||||||
|
return <span> {row.protocols.toString()} </span>
|
||||||
|
},
|
||||||
label: this.$t('assets.Protocols')
|
label: this.$t('assets.Protocols')
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ export default {
|
|||||||
autoParam: ['id=key', 'name=n', 'level=lv'],
|
autoParam: ['id=key', 'name=n', 'level=lv'],
|
||||||
type: 'get',
|
type: 'get',
|
||||||
headers: {
|
headers: {
|
||||||
'X-JMS-ORG': this.$store.getters.currentOrg.id
|
'X-JMS-ORG': this.$store.getters.currentOrg ? this.$store.getters.currentOrg.id : ''
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
callback: {
|
callback: {
|
||||||
@@ -236,7 +236,7 @@ export default {
|
|||||||
name: data['value'],
|
name: data['value'],
|
||||||
pId: parentNode.id,
|
pId: parentNode.id,
|
||||||
meta: {
|
meta: {
|
||||||
'node': data
|
data: data
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
newNode.checked = this.zTree.getSelectedNodes()[0].checked
|
newNode.checked = this.zTree.getSelectedNodes()[0].checked
|
||||||
|
|||||||
@@ -4,7 +4,9 @@ const getters = {
|
|||||||
token: state => state.users.token,
|
token: state => state.users.token,
|
||||||
currentOrg: state => state.users.currentOrg,
|
currentOrg: state => state.users.currentOrg,
|
||||||
currentOrgIsDefault: state => state.users.currentOrg['is_default'],
|
currentOrgIsDefault: state => state.users.currentOrg['is_default'],
|
||||||
currentOrgIsRoot: state => state.users.currentOrg['is_root'],
|
currentOrgIsRoot: state => {
|
||||||
|
return state.users.currentOrg && state.users.currentOrg['is_root']
|
||||||
|
},
|
||||||
currentRole: state => state.users.currentRole,
|
currentRole: state => state.users.currentRole,
|
||||||
currentUser: state => state.users.profile,
|
currentUser: state => state.users.profile,
|
||||||
permission_routes: state => state.permission.routes,
|
permission_routes: state => state.permission.routes,
|
||||||
|
|||||||
Reference in New Issue
Block a user