diff --git a/src/components/DataForm/components/el-form-renderer/components/render-form-item.vue b/src/components/DataForm/components/el-form-renderer/components/render-form-item.vue index 006281440..1c4376c7d 100755 --- a/src/components/DataForm/components/el-form-renderer/components/render-form-item.vue +++ b/src/components/DataForm/components/el-form-renderer/components/render-form-item.vue @@ -42,7 +42,9 @@ v-else-if="data.type === 'checkbox-group'" :key="opt.label" v-bind="opt" - /> + > + {{ opt.value }} + +
+ {{ format(row.users) }}
+ {{ format(row.user_groups) }}
+ {{ format(row.assets) }}
+ :{{ format(row.nodes) }}
+ {{ format(row.system_users) }}
+ {{ format(row.actions) }} +
+ + + + + diff --git a/src/components/ListTable/formatters/index.js b/src/components/ListTable/formatters/index.js index 986d906b1..50bc0e617 100644 --- a/src/components/ListTable/formatters/index.js +++ b/src/components/ListTable/formatters/index.js @@ -4,6 +4,9 @@ import BooleanFormatter from './ChoicesFormatter' import ActionsFormatter from './ActionsFormatter' import ExpandPreFormatter from './ExpandPreFormatter' import LengthFormatter from './LengthFormatter' +import RouterFormatter from './RouterFormatter' +import OutputExpandFormatter from './OutputExpandFormatter' +import ExpandAssetPermissionFormatter from './ExpandAssetPermissionFormatter' export default { DetailFormatter, @@ -11,7 +14,10 @@ export default { BooleanFormatter, ActionsFormatter, ExpandPreFormatter, - LengthFormatter + LengthFormatter, + RouterFormatter, + OutputExpandFormatter, + ExpandAssetPermissionFormatter } export { @@ -20,5 +26,8 @@ export { BooleanFormatter, ActionsFormatter, ExpandPreFormatter, - LengthFormatter + LengthFormatter, + RouterFormatter, + OutputExpandFormatter, + ExpandAssetPermissionFormatter } diff --git a/src/i18n/langs/cn.js b/src/i18n/langs/cn.js index d69f95f84..c944ac4d1 100644 --- a/src/i18n/langs/cn.js +++ b/src/i18n/langs/cn.js @@ -322,41 +322,22 @@ const cn = { 'app_path': '应用路径' }, perms: { - 'asset_permission': '资产授权', - 'asset_permission_list': '资产授权列表', - 'asset_permission_detail': '资产授权详情', - 'create_asset_permission': '创建资产授权规则', - 'update_asset_permission': '更新资产授权规则', 'Asset permissions': '资产授权', - 'name': '名称', - 'user': '用户', - 'userGroup': '用户组', - 'asset': '资产', - 'node': '节点', - 'systemUser': '系统用户', - 'validity': '有效', - 'action': '动作', - 'update': '更新', - 'delete': '删除', - 'search': '搜索', - 'user_count': '用户数量', - 'user_group_count': '用户组数量', - 'asset_count': '资产数量', - 'node_count': '节点数量', - 'system_user_count': '系统用户数量', - 'date_start': '开始日期', - 'date_expired': '失效日期', - 'date_created': '创建日期', - 'created_by': '创建者', - 'comment': '备注', - 'quick_update': '快速更新', - 'active': '激活中', - 'users_and_user_groups': '用户或用户组', - 'assets_and_node': '资产或节点', + 'RefreshPermissionCache': '刷新授权缓存', + 'ReFreshSuccess': '刷新成功', + 'ReFreshFail': '刷新失败', + 'All': '全部', + 'Connect': '连接', + 'UpDownload': '上传下载', + 'UploadFile': '上传文件', + 'DownloadFile': '下载文件', 'Basic': '基本', 'User': '用户', 'Asset': '资产', 'Actions': '动作', + 'UserGroups': '用户组', + 'Node': '节点', + 'SystemUser': '系统用户', // 'RemoteApp': '远程应用', // diff --git a/src/views/perms/AssetPermissionCreateUpdate.vue b/src/views/perms/AssetPermissionCreateUpdate.vue index ef50ed92b..d96d96037 100644 --- a/src/views/perms/AssetPermissionCreateUpdate.vue +++ b/src/views/perms/AssetPermissionCreateUpdate.vue @@ -11,6 +11,8 @@ export default { data() { return { form: { + is_active: true, + actions: ['all', 'connect', 'updownload', 'upload_file', 'download_file'], date_expired: '2099-12-31 00:00:00 +0800' }, fields: [ @@ -53,7 +55,15 @@ export default { } }, actions: { - label: this.$t('perms.Actions') + label: this.$t('perms.Actions'), + type: 'checkbox-group', + options: [ + { label: 'all', value: this.$t('perms.All') }, + { label: 'connect', value: this.$t('perms.Connect') }, + { label: 'updownload', value: this.$t('perms.UpDownload') }, + { label: 'upload_file', value: this.$t('perms.UploadFile') }, + { label: 'download_file', value: this.$t('perms.DownloadFile') } + ] }, is_active: { type: 'checkbox' diff --git a/src/views/perms/AssetPermissionList.vue b/src/views/perms/AssetPermissionList.vue index 9a95c2c1e..ab677c511 100644 --- a/src/views/perms/AssetPermissionList.vue +++ b/src/views/perms/AssetPermissionList.vue @@ -4,7 +4,7 @@