diff --git a/src/i18n/langs/cn.js b/src/i18n/langs/cn.js index 5be43ffb2..489ce7f3f 100644 --- a/src/i18n/langs/cn.js +++ b/src/i18n/langs/cn.js @@ -233,6 +233,7 @@ const cn = { 'gateway': '网关', 'date_created': '创建日期', 'port': '端口', + 'TestConnection': '测试连接', // 管理用户 'AdminUserList': '管理用户列表', 'AdminUserDetail': '管理用户详情', @@ -368,7 +369,8 @@ const cn = { 'date': '日期', 'addr': '地址', 'active': '激活中', - 'alive': '在线' + 'alive': '在线', + 'StorageConfiguration': '存储配置' }, jobcenter: { 'RunTimes': '执行次数', diff --git a/src/views/applications/DatabaseAppList.vue b/src/views/applications/DatabaseAppList.vue index 3aaea25d1..2e82d50d7 100644 --- a/src/views/applications/DatabaseAppList.vue +++ b/src/views/applications/DatabaseAppList.vue @@ -51,31 +51,7 @@ export default { prop: 'id', label: this.$tc('Action'), align: 'center', - formatter: ActionsFormatter, - actions: { - hasUpdate: (row, cellValue) => { - return true - }, - canUpdate: (row, cellValue) => { - console.log('On table update') - return true - }, - hasDelete: true, - canDelete: (row, cellValue) => { - return true - }, - onDelete: (row, cellValue) => { - this.$confirm('你好啊', '提示', { - type: 'warning', - confirmButtonClass: 'el-button--danger', - beforeClose: async(action, instance, done) => { - } - }).catch(() => { - /* 取消*/ - }) - }, - order: [] - } + formatter: ActionsFormatter } ], tableActions: { @@ -84,8 +60,7 @@ export default { } }, headerActions: { - hasDelete: false, - hasUpdate: false, + hasBulkDelete: false, createRoute: 'DatabaseAppCreate' } } diff --git a/src/views/applications/RemoteAppList.vue b/src/views/applications/RemoteAppList.vue index 0df534c3d..6bc7a6b6e 100644 --- a/src/views/applications/RemoteAppList.vue +++ b/src/views/applications/RemoteAppList.vue @@ -39,41 +39,12 @@ export default { prop: 'id', label: this.$tc('Action'), align: 'center', - formatter: ActionsFormatter, - actions: { - hasUpdate: (row, cellValue) => { - return true - }, - canUpdate: (row, cellValue) => { - console.log('On table update') - return true - }, - hasDelete: true, - canDelete: (row, cellValue) => { - return true - }, - onDelete: (row, cellValue) => { - this.$confirm('你好啊', '提示', { - type: 'warning', - confirmButtonClass: 'el-button--danger', - beforeClose: async(action, instance, done) => { - } - }).catch(() => { - /* 取消*/ - }) - }, - order: [] - } + formatter: ActionsFormatter } - ], - tableActions: { - hasEdit: true, - editRoute: '404' - } + ] }, headerActions: { - hasDelete: false, - hasUpdate: false, + hasBulkDelete: false, createRoute: 'RemoteAppCreate' } } diff --git a/src/views/assets/AdminUserList.vue b/src/views/assets/AdminUserList.vue index 1aa99dc9e..b900c657d 100644 --- a/src/views/assets/AdminUserList.vue +++ b/src/views/assets/AdminUserList.vue @@ -40,41 +40,12 @@ export default { prop: 'id', label: this.$tc('Action'), align: 'center', - formatter: ActionsFormatter, - actions: { - hasUpdate: (row, cellValue) => { - return true - }, - canUpdate: (row, cellValue) => { - console.log('On table update') - return true - }, - hasDelete: true, - canDelete: (row, cellValue) => { - return true - }, - onDelete: (row, cellValue) => { - this.$confirm('你好啊', '提示', { - type: 'warning', - confirmButtonClass: 'el-button--danger', - beforeClose: async(action, instance, done) => { - } - }).catch(() => { - /* 取消*/ - }) - }, - order: [] - } + formatter: ActionsFormatter } - ], - tableActions: { - hasEdit: true, - editRoute: '404' - } + ] }, headerActions: { - hasDelete: false, - hasUpdate: false, + hasBulkDelete: false, createRoute: 'AdminUserCreate' } } diff --git a/src/views/assets/CommandFilterList.vue b/src/views/assets/CommandFilterList.vue index e602898ac..7f6e7ef53 100644 --- a/src/views/assets/CommandFilterList.vue +++ b/src/views/assets/CommandFilterList.vue @@ -39,41 +39,12 @@ export default { prop: 'id', label: this.$tc('Action'), align: 'center', - formatter: ActionsFormatter, - actions: { - hasUpdate: (row, cellValue) => { - return true - }, - canUpdate: (row, cellValue) => { - console.log('On table update') - return true - }, - hasDelete: true, - canDelete: (row, cellValue) => { - return true - }, - onDelete: (row, cellValue) => { - this.$confirm('你好啊', '提示', { - type: 'warning', - confirmButtonClass: 'el-button--danger', - beforeClose: async(action, instance, done) => { - } - }).catch(() => { - /* 取消*/ - }) - }, - order: [] - } + formatter: ActionsFormatter } - ], - tableActions: { - hasEdit: true, - editRoute: '404' - } + ] }, headerActions: { - hasDelete: false, - hasUpdate: false, + hasBulkDelete: false, createRoute: 'CommandFilterCreate' } } diff --git a/src/views/assets/DomainList.vue b/src/views/assets/DomainList.vue index 421519913..b3ddf7fee 100644 --- a/src/views/assets/DomainList.vue +++ b/src/views/assets/DomainList.vue @@ -41,41 +41,12 @@ export default { prop: 'id', label: this.$tc('Action'), align: 'center', - formatter: ActionsFormatter, - actions: { - hasUpdate: (row, cellValue) => { - return true - }, - canUpdate: (row, cellValue) => { - console.log('On table update') - return true - }, - hasDelete: true, - canDelete: (row, cellValue) => { - return true - }, - onDelete: (row, cellValue) => { - this.$confirm('你好啊', '提示', { - type: 'warning', - confirmButtonClass: 'el-button--danger', - beforeClose: async(action, instance, done) => { - } - }).catch(() => { - /* 取消*/ - }) - }, - order: [] - } + formatter: ActionsFormatter } - ], - tableActions: { - hasEdit: true, - editRoute: '404' - } + ] }, headerActions: { - hasDelete: false, - hasUpdate: false, + hasBulkDelete: false, createRoute: 'DomainCreate' } } diff --git a/src/views/assets/GatewayList.vue b/src/views/assets/GatewayList.vue index e9bf72f06..1722f84b4 100644 --- a/src/views/assets/GatewayList.vue +++ b/src/views/assets/GatewayList.vue @@ -51,46 +51,22 @@ export default { align: 'center', formatter: ActionsFormatter, actions: { - hasUpdate: (row, cellValue) => { - return true - }, - canUpdate: (row, cellValue) => { - console.log('On table update') - return true - }, - hasDelete: true, - canDelete: (row, cellValue) => { - return true - }, - onDelete: (row, cellValue) => { - this.$confirm('你好啊', '提示', { - type: 'warning', - confirmButtonClass: 'el-button--danger', - beforeClose: async(action, instance, done) => { - } - }).catch(() => { - /* 取消*/ - }) - }, - order: [] + updateRoute: 'UserUpdate', + extraActions: [ + { + name: 'TestConnection', + title: this.$t('assets.TestConnection') + } + ] } } - ], - tableActions: { - hasEdit: true, - editRoute: '404' - } + ] }, headerActions: { - hasDelete: false, - hasUpdate: false, - createRoute: 'DomainCreate' + hasBulkDelete: false, + createRoute: 'GatewayCreate' } } - }, - created() { - console.log('111111') - console.log('/api/v1/assets/gateways/?domain=' + this.$route.params.id) } } diff --git a/src/views/assets/LabelList.vue b/src/views/assets/LabelList.vue index 722189f69..796c4cbe7 100644 --- a/src/views/assets/LabelList.vue +++ b/src/views/assets/LabelList.vue @@ -35,41 +35,12 @@ export default { prop: 'id', label: this.$tc('Action'), align: 'center', - formatter: ActionsFormatter, - actions: { - hasUpdate: (row, cellValue) => { - return true - }, - canUpdate: (row, cellValue) => { - console.log('On table update') - return true - }, - hasDelete: true, - canDelete: (row, cellValue) => { - return true - }, - onDelete: (row, cellValue) => { - this.$confirm('你好啊', '提示', { - type: 'warning', - confirmButtonClass: 'el-button--danger', - beforeClose: async(action, instance, done) => { - } - }).catch(() => { - /* 取消*/ - }) - }, - order: [] - } + formatter: ActionsFormatter } - ], - tableActions: { - hasEdit: true, - editRoute: '404' - } + ] }, headerActions: { - hasDelete: false, - hasUpdate: false, + hasBulkDelete: false, createRoute: 'LabelCreate' } } diff --git a/src/views/assets/PlatformList.vue b/src/views/assets/PlatformList.vue index 3b46f4c6d..4e8cdb33d 100644 --- a/src/views/assets/PlatformList.vue +++ b/src/views/assets/PlatformList.vue @@ -36,41 +36,12 @@ export default { prop: 'id', label: this.$tc('Action'), align: 'center', - formatter: ActionsFormatter, - actions: { - hasUpdate: (row, cellValue) => { - return true - }, - canUpdate: (row, cellValue) => { - console.log('On table update') - return true - }, - hasDelete: true, - canDelete: (row, cellValue) => { - return true - }, - onDelete: (row, cellValue) => { - this.$confirm('你好啊', '提示', { - type: 'warning', - confirmButtonClass: 'el-button--danger', - beforeClose: async(action, instance, done) => { - } - }).catch(() => { - /* 取消*/ - }) - }, - order: [] - } + formatter: ActionsFormatter } - ], - tableActions: { - hasEdit: true, - editRoute: '404' - } + ] }, headerActions: { - hasDelete: false, - hasUpdate: false, + hasBulkDelete: false, createRoute: 'PlatformCreate' } } diff --git a/src/views/assets/SystemUserList.vue b/src/views/assets/SystemUserList.vue index 2c2f0202f..ee87194a4 100644 --- a/src/views/assets/SystemUserList.vue +++ b/src/views/assets/SystemUserList.vue @@ -51,41 +51,12 @@ export default { prop: 'id', label: this.$tc('Action'), align: 'center', - formatter: ActionsFormatter, - actions: { - hasUpdate: (row, cellValue) => { - return true - }, - canUpdate: (row, cellValue) => { - console.log('On table update') - return true - }, - hasDelete: true, - canDelete: (row, cellValue) => { - return true - }, - onDelete: (row, cellValue) => { - this.$confirm('你好啊', '提示', { - type: 'warning', - confirmButtonClass: 'el-button--danger', - beforeClose: async(action, instance, done) => { - } - }).catch(() => { - /* 取消*/ - }) - }, - order: [] - } + formatter: ActionsFormatter } - ], - tableActions: { - hasEdit: true, - editRoute: '404' - } + ] }, headerActions: { - hasDelete: false, - hasUpdate: false, + hasBulkDelete: false, createRoute: 'SystemUserCreate' } } diff --git a/src/views/jobcenter/TaskList.vue b/src/views/jobcenter/TaskList.vue index b30b09bcc..b1df0f7ed 100644 --- a/src/views/jobcenter/TaskList.vue +++ b/src/views/jobcenter/TaskList.vue @@ -48,41 +48,16 @@ export default { label: this.$tc('Action'), align: 'center', formatter: ActionsFormatter, - actions: { - hasUpdate: (row, cellValue) => { - return false - }, - canUpdate: (row, cellValue) => { - console.log('On table update') - return false - }, - hasDelete: true, - canDelete: (row, cellValue) => { - return true - }, - onDelete: (row, cellValue) => { - this.$confirm('你好啊', '提示', { - type: 'warning', - confirmButtonClass: 'el-button--danger', - beforeClose: async(action, instance, done) => { - } - }).catch(() => { - /* 取消*/ - }) - }, - order: [] - } + actions: [ + ] } ], - // 写路由名字,table组件会自动传作为参数 - tableActions: { - editRoute: '404' - } + hasEdit: false, + hasDelete: false }, headerActions: { - hasDelete: false, - hasUpdate: false, - hasCreate: false + hasCreate: false, + hasBulkDelete: false, } } } diff --git a/src/views/perms/DatabaseAppPermissionList.vue b/src/views/perms/DatabaseAppPermissionList.vue index 8c7b3c33f..b63363b2c 100644 --- a/src/views/perms/DatabaseAppPermissionList.vue +++ b/src/views/perms/DatabaseAppPermissionList.vue @@ -49,41 +49,12 @@ export default { prop: 'id', label: this.$tc('Action'), align: 'center', - formatter: ActionsFormatter, - actions: { - hasUpdate: (row, cellValue) => { - return true - }, - canUpdate: (row, cellValue) => { - console.log('On table update') - return true - }, - hasDelete: true, - canDelete: (row, cellValue) => { - return true - }, - onDelete: (row, cellValue) => { - this.$confirm('你好啊', '提示', { - type: 'warning', - confirmButtonClass: 'el-button--danger', - beforeClose: async(action, instance, done) => { - } - }).catch(() => { - /* 取消*/ - }) - }, - order: [] - } + formatter: ActionsFormatter } - ], - tableActions: { - hasEdit: true, - editRoute: '404' - } + ] }, headerActions: { - hasDelete: false, - hasUpdate: false, + hasBulkDelete: false, createRoute: 'DatabaseAppPermissionCreate' } } diff --git a/src/views/perms/RemoteAppPermissionList.vue b/src/views/perms/RemoteAppPermissionList.vue index ebe68ece7..0e7f8a595 100644 --- a/src/views/perms/RemoteAppPermissionList.vue +++ b/src/views/perms/RemoteAppPermissionList.vue @@ -49,41 +49,12 @@ export default { prop: 'id', label: this.$tc('Action'), align: 'center', - formatter: ActionsFormatter, - actions: { - hasUpdate: (row, cellValue) => { - return true - }, - canUpdate: (row, cellValue) => { - console.log('On table update') - return true - }, - hasDelete: true, - canDelete: (row, cellValue) => { - return true - }, - onDelete: (row, cellValue) => { - this.$confirm('你好啊', '提示', { - type: 'warning', - confirmButtonClass: 'el-button--danger', - beforeClose: async(action, instance, done) => { - } - }).catch(() => { - /* 取消*/ - }) - }, - order: [] - } + formatter: ActionsFormatter } - ], - tableActions: { - hasEdit: true, - editRoute: '404' - } + ] }, headerActions: { - hasDelete: false, - hasUpdate: false, + hasBulkDelete: false, createRoute: 'RemoteAppPermissionCreate' } } diff --git a/src/views/sessions/CommandList.vue b/src/views/sessions/CommandList.vue index fe4069d69..c3544ff95 100644 --- a/src/views/sessions/CommandList.vue +++ b/src/views/sessions/CommandList.vue @@ -68,8 +68,7 @@ export default { }, headerActions: { hasCreate: false, - hasDelete: false, - hasUpdate: false + hasBulkDelete: false } } } diff --git a/src/views/sessions/SessionOfflineList.vue b/src/views/sessions/SessionOfflineList.vue index d7f49b21d..16bdc63bf 100644 --- a/src/views/sessions/SessionOfflineList.vue +++ b/src/views/sessions/SessionOfflineList.vue @@ -4,6 +4,7 @@ diff --git a/src/views/tickets/TicketsList.vue b/src/views/tickets/TicketsList.vue index 979e55ec4..3c5d14549 100644 --- a/src/views/tickets/TicketsList.vue +++ b/src/views/tickets/TicketsList.vue @@ -57,16 +57,11 @@ export default { label: this.$t('tickets.date'), sortable: 'custom' } - ], - // 写路由名字,table组件会自动传作为参数 - tableActions: { - editRoute: '404' - } + ] }, headerActions: { - hasDelete: false, - hasUpdate: false, - hasCreate: false + hasCreate: false, + hasBulkDelete: false, } } }