github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2026-01-29 21:28:52 +00:00
Code Issues Projects Releases Wiki Activity

fix: 修复资产详情-账号列表-模版账号列表跳转问题

Browse Source
This commit is contained in:
Bai
2023-02-03 15:00:30 +08:00
committed by Jiangjie.Bai
parent 39fa5bb997
commit 7f8dd45c21
6 changed files with 96 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -787,6 +787,10 @@
"isValid": "Validity",
"fromTicket": "From ticket",
"isEffective": "Effective",
"NodeSearchStrategy": "Node search Strategy",
"OnlySearchCurrentNodePerm": "Search only for the perms of the current node perms",
"SearchAncestorNodePerm": "Search perms for both current node and ancestor nodes",
"AssetName": "Asset name",
"nodeCount": "Node count",
"refreshFail": "Refresh fail",
"refreshPermissionCache": "Refresh permission cache",

6
src/i18n/langs/ja.json
View File

@@ -790,7 +790,11 @@
"hostName": "ホスト名",
"isValid": "有効",
"fromTicket": "ワークオーダーから",
"isEffective": "機能する",
"isEffective": "効果的",
"NodeSearchStrategy": "ノード検索戦略",
"OnlySearchCurrentNodePerm": "現在のノードと祖先ノードの両方の権限を検索",
"SearchAncestorNodePerm": "現在のノードの認可のみを検索",
"AssetName": "アセット名",
"nodeCount": "ノード数",
"refreshFail": "更新に失敗しました",
"refreshPermissionCache": "認可キャッシュの更新",

6
src/i18n/langs/zh.json
View File

@@ -993,7 +993,11 @@
"hostName": "主机名",
"isValid": "有效",
"fromTicket": "来自工单",
"isEffective": "起作用的",
"isEffective": "已生效的",
"NodeSearchStrategy": "节点搜索策略",
"SearchAncestorNodePerm": "同时搜索当前节点和祖先节点的授权",
"OnlySearchCurrentNodePerm": "仅搜索当前节点的授权",
"AssetName": "资产名称",
"nodeCount": "节点数量",
"refreshFail": "刷新失败",
"refreshPermissionCache": "刷新授权缓存",

98
src/views/perms/AssetPermission/AssetPermissionList.vue
View File

@@ -18,6 +18,7 @@ import AssetTreeTable from '@/components/AssetTreeTable'
import PermBulkUpdateDialog from './components/PermBulkUpdateDialog'
import AmountFormatter from '@/components/TableFormatters/AmountFormatter'
import { mapGetters } from 'vuex'
import { AssetPermissionListPageSearchConfigOptions } from '../const'
export default {
components: {
@@ -157,66 +158,43 @@ export default {
createInNewPage: true,
searchConfig: {
url: '',
options: [
{ label: this.$t('common.Name'), value: 'name' },
{
label: this.$t('perms.isValid'), value: 'is_valid',
children: [
{
value: '1',
label: this.$t('common.Yes')
},
{
value: '0',
label: this.$t('common.No')
}
]
},
{
label: this.$t('perms.fromTicket'), value: 'from_ticket',
children: [
{
value: '1',
label: this.$t('common.Yes')
},
{
value: '0',
label: this.$t('common.No')
}
]
},
{
label: this.$t('perms.isEffective'), value: 'is_effective',
children: [
{
value: '1',
label: this.$t('common.Yes')
},
{
value: '0',
label: this.$t('common.No')
}
]
},
{ label: this.$t('common.Username'), value: 'username' },
{ label: this.$t('perms.UserGroups'), value: 'user_group' },
{ label: this.$t('perms.IP'), value: 'ip' },
{ label: this.$t('perms.hostName'), value: 'hostname' },
{ label: this.$t('perms.SystemUser'), value: 'system_user' },
{
label: this.$t('perms.Inherit'), value: 'all',
children: [
{
value: '1',
label: this.$t('perms.Include')
},
{
value: '0',
label: this.$t('perms.Exclude')
}
]
}
]
options: AssetPermissionListPageSearchConfigOptions
// options: [
// { label: this.$t('common.Name'), value: 'name' },
// { label: this.$t('common.Username'), value: 'username' },
// { label: this.$t('perms.UserGroups'), value: 'user_group' },
// { label: this.$t('perms.AssetName'), value: 'asset_name' },
// { label: this.$t('assets.AssetAddress'), value: 'ip' },
// { label: this.$t('perms.Account'), value: 'accounts' },
// {
// label: this.$t('perms.NodeSearchStrategy'), value: 'all',
// children: [
// { value: '0', label: this.$t('perms.OnlySearchCurrentNodePerm') },
// { value: '1', label: this.$t('perms.SearchAncestorNodePerm') }
// ]
// },
// {
// label: this.$t('perms.isValid'), value: 'is_valid',
// children: [
// { value: '1', label: this.$t('common.Yes') },
// { value: '0', label: this.$t('common.No') }
// ]
// },
// {
// label: this.$t('perms.isEffective'), value: 'is_effective',
// children: [
// { value: '1', label: this.$t('common.Yes') },
// { value: '0', label: this.$t('common.No') }
// ]
// },
// {
// label: this.$t('perms.fromTicket'), value: 'from_ticket',
// children: [
// { value: '1', label: this.$t('common.Yes') },
// { value: '0', label: this.$t('common.No') }
// ]
// }
// ]
},
hasBulkUpdate: true,
handleBulkUpdate: ({ selectedRows }) => {

43
src/views/perms/const.js
View File

@@ -1 +1,42 @@
export const remoteApplication = ['chrome', 'mysql_workbench', 'vmware_client', 'custom']
import i18n from '@/i18n/i18n'
export const UserAssetPermissionListPageSearchConfigOptions = [
{ label: i18n.t('common.Name'), value: 'name' },
{ label: i18n.t('common.Username'), value: 'username' },
{ label: i18n.t('perms.UserGroups'), value: 'user_group' },
{ label: i18n.t('perms.AssetName'), value: 'asset_name' },
{ label: i18n.t('assets.AssetAddress'), value: 'ip' },
{ label: i18n.t('perms.Account'), value: 'accounts' },
{
label: i18n.t('perms.isValid'), value: 'is_valid',
children: [
{ value: '1', label: i18n.t('common.Yes') },
{ value: '0', label: i18n.t('common.No') }
]
},
{
label: i18n.t('perms.isEffective'), value: 'is_effective',
children: [
{ value: '1', label: i18n.t('common.Yes') },
{ value: '0', label: i18n.t('common.No') }
]
},
{
label: i18n.t('perms.fromTicket'), value: 'from_ticket',
children: [
{ value: '1', label: i18n.t('common.Yes') },
{ value: '0', label: i18n.t('common.No') }
]
}
]
export const AssetPermissionListPageSearchConfigOptions = [
...UserAssetPermissionListPageSearchConfigOptions,
{
label: i18n.t('perms.NodeSearchStrategy'), value: 'all',
children: [
{ value: '0', label: i18n.t('perms.OnlySearchCurrentNodePerm') },
{ value: '1', label: i18n.t('perms.SearchAncestorNodePerm') }
]
}
]

37
src/views/users/User/UserDetail/UserAssetPermissionRules.vue
View File

@@ -5,6 +5,7 @@
<script>
import ListTable from '@/components/ListTable'
import AmountFormatter from '@/components/TableFormatters/AmountFormatter.vue'
import { UserAssetPermissionListPageSearchConfigOptions } from '@/views/perms/const'
export default {
name: 'UserAssetPermission',
@@ -134,41 +135,7 @@ export default {
hasImport: false,
searchConfig: {
url: '',
options: [
{ label: this.$t('common.Name'), value: 'name' },
{
label: this.$t('perms.isValid'), value: 'is_valid',
children: [
{
value: '1',
label: this.$t('common.Yes')
},
{
value: '0',
label: this.$t('common.No')
}
]
},
{ label: this.$t('common.Username'), value: 'username' },
{ label: this.$t('perms.UserGroups'), value: 'user_group' },
{ label: this.$t('perms.IP'), value: 'ip' },
{ label: this.$t('perms.hostName'), value: 'hostname' },
{ label: this.$t('perms.Node'), value: 'node' },
{ label: this.$t('perms.SystemUser'), value: 'system_user' },
{
label: this.$t('perms.Inherit'), value: 'all',
children: [
{
value: '1',
label: this.$t('perms.Include')
},
{
value: '0',
label: this.$t('perms.Exclude')
}
]
}
]
options: UserAssetPermissionListPageSearchConfigOptions
}
}
}