From f9edef3ff079017e1d825856e9068a7c3aeca8be Mon Sep 17 00:00:00 2001 From: OrangeM21 Date: Tue, 2 Jun 2020 14:22:25 +0800 Subject: [PATCH 1/7] =?UTF-8?q?[fix]=E4=BF=AE=E5=A4=8D=E7=89=88=E6=9C=AClo?= =?UTF-8?q?go=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/NavBar/Logo.vue | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/layout/components/NavBar/Logo.vue b/src/layout/components/NavBar/Logo.vue index f383c3da4..b4d0056db 100644 --- a/src/layout/components/NavBar/Logo.vue +++ b/src/layout/components/NavBar/Logo.vue @@ -6,8 +6,13 @@

{{ title }}

- - +
+ + +
+
+ +
@@ -34,11 +39,15 @@ export default { }, computed: { ...mapGetters([ - 'customSettings' - ]) + 'customSettings', + 'publicSettings' + ]), + logo_index() { + return this.customSettings.logo_index + } }, created() { - console.log(this.customSettings.logo_index) + } } From 619260b79dc1a3c5b5d5795707eb7a80920c41f6 Mon Sep 17 00:00:00 2001 From: OrangeM21 Date: Tue, 2 Jun 2020 15:01:34 +0800 Subject: [PATCH 2/7] =?UTF-8?q?[fix]=E4=B8=8A=E4=BC=A0=E5=AF=86=E9=92=A5?= =?UTF-8?q?=E5=BA=94=E8=AF=A5=E5=92=8C=E5=AF=86=E7=A0=81=E4=B8=80=E8=B5=B7?= =?UTF-8?q?=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/assets/SystemUser/SystemUserCreateUpdate.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/assets/SystemUser/SystemUserCreateUpdate.vue b/src/views/assets/SystemUser/SystemUserCreateUpdate.vue index 764adf6d3..56a782248 100644 --- a/src/views/assets/SystemUser/SystemUserCreateUpdate.vue +++ b/src/views/assets/SystemUser/SystemUserCreateUpdate.vue @@ -44,7 +44,7 @@ export default { private_key: { component: UploadKey, hidden: (form) => { - return form.login_mode !== 'auto' + return form => form.auto_generate_key === true || form.login_mode !== 'auto' } }, username_same_with_user: { From 46bfe8d966a1dfbc5715e0afbf1c5875d18889fa Mon Sep 17 00:00:00 2001 From: OrangeM21 Date: Tue, 2 Jun 2020 15:11:19 +0800 Subject: [PATCH 3/7] =?UTF-8?q?[fix]=E4=BF=AE=E5=A4=8D=E6=89=93=E5=BC=80?= =?UTF-8?q?=E6=96=B0=E7=AA=97=E5=8F=A3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/assets/AdminUser/AdminUserDetail/AssetsList.vue | 4 ++-- src/views/assets/Asset/AssetDetail/AssetList.vue | 2 +- src/views/assets/Asset/AssetDetail/Detail.vue | 4 ++-- src/views/assets/SystemUser/SystemUserDetail/AssetList.vue | 4 ++-- src/views/assets/SystemUser/SystemUserList.vue | 2 +- src/views/ops/TaskList.vue | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/views/assets/AdminUser/AdminUserDetail/AssetsList.vue b/src/views/assets/AdminUser/AdminUserDetail/AssetsList.vue index 971e39ad3..b0f16fe86 100644 --- a/src/views/assets/AdminUser/AdminUserDetail/AssetsList.vue +++ b/src/views/assets/AdminUser/AdminUserDetail/AssetsList.vue @@ -67,7 +67,7 @@ export default { this.$axios.get( `api/v1/assets/admin-users/${this.object.id}/connective/` ).then(res => { - window.open(`/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600') + window.open(`/core/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600') } ) }.bind(this) @@ -123,7 +123,7 @@ export default { `api/v1/assets/asset-users/tasks/?id=${val.cellValue}`, { action: 'test' } ).then(res => { - window.open(`/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600') + window.open(`/core/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600') }) } }, diff --git a/src/views/assets/Asset/AssetDetail/AssetList.vue b/src/views/assets/Asset/AssetDetail/AssetList.vue index dc4144fbc..e851cb7d0 100644 --- a/src/views/assets/Asset/AssetDetail/AssetList.vue +++ b/src/views/assets/Asset/AssetDetail/AssetList.vue @@ -42,7 +42,7 @@ export default { { action: 'test' } ).then(res => { console.log(`/ops/celery/task/${res.task}/log/`) - window.open(`/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600') + window.open(`/core/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600') } ) }.bind(this) diff --git a/src/views/assets/Asset/AssetDetail/Detail.vue b/src/views/assets/Asset/AssetDetail/Detail.vue index 25f3f1e27..f3d8daa39 100644 --- a/src/views/assets/Asset/AssetDetail/Detail.vue +++ b/src/views/assets/Asset/AssetDetail/Detail.vue @@ -64,7 +64,7 @@ export default { `/api/v1/assets/assets/${this.object.id}/tasks/`, { action: 'refresh' } ).then(res => { - window.open(`/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600') + window.open(`/core/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600') } ) }.bind(this) @@ -82,7 +82,7 @@ export default { `/api/v1/assets/assets/${this.object.id}/tasks/`, { action: 'test' } ).then(res => { - window.open(`/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600') + window.open(`/core/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600') } ) }.bind(this) diff --git a/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue b/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue index d09e842d9..0db4ddd2f 100644 --- a/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue +++ b/src/views/assets/SystemUser/SystemUserDetail/AssetList.vue @@ -110,7 +110,7 @@ export default { `api/v1/assets/system-users/${this.object.id}/tasks/`, { action: 'test' } ).then(res => { - window.open(`/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600') + window.open(`/core/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600') } ) }.bind(this) @@ -166,7 +166,7 @@ export default { `api/v1/assets/asset-users/tasks/?id=${val.cellValue}`, { action: 'test' } ).then(res => { - window.open(`/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600') + window.open(`/core/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600') }) } }, diff --git a/src/views/assets/SystemUser/SystemUserList.vue b/src/views/assets/SystemUser/SystemUserList.vue index 7bcaffea9..578027ad9 100644 --- a/src/views/assets/SystemUser/SystemUserList.vue +++ b/src/views/assets/SystemUser/SystemUserList.vue @@ -64,7 +64,7 @@ export default { ] }, headerActions: { - // hasBulkDelete: false, + hasBulkDelete: false, hasMoreActions: false, createRoute: 'SystemUserCreate' }, diff --git a/src/views/ops/TaskList.vue b/src/views/ops/TaskList.vue index a953c3168..40c9e11af 100644 --- a/src/views/ops/TaskList.vue +++ b/src/views/ops/TaskList.vue @@ -72,7 +72,7 @@ export default { this.$axios.get( `/api/v1/ops/tasks/${cellValue}/run/` ).then(res => { - window.open(`/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600') + window.open(`/core/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600') }) } } From e34ad816742e950b76de7ab3915ece880482034e Mon Sep 17 00:00:00 2001 From: OrangeM21 Date: Tue, 2 Jun 2020 15:17:53 +0800 Subject: [PATCH 4/7] =?UTF-8?q?[fix]=E4=BF=AE=E5=A4=8D=E6=89=93=E5=BC=80?= =?UTF-8?q?=E6=96=B0=E7=AA=97=E5=8F=A3=E9=97=AE=E9=A2=982?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/userviews/users/UserProfile/SSHUpdate.vue | 2 +- .../HistoryExecutionDetail/HistoryExecutionDetail.vue | 2 +- src/views/ops/TaskDetail/TaskDetail.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/userviews/users/UserProfile/SSHUpdate.vue b/src/userviews/users/UserProfile/SSHUpdate.vue index 7316e9120..33869466f 100644 --- a/src/userviews/users/UserProfile/SSHUpdate.vue +++ b/src/userviews/users/UserProfile/SSHUpdate.vue @@ -55,7 +55,7 @@ export default { { title: this.$t('users.ResetAndDownloadSSHKey'), callback: function() { - window.open(`/users/profile/pubkey/generate/`, '_blank') + window.open(`/core/users/profile/pubkey/generate/`, '_blank') } } ] diff --git a/src/views/ops/TaskDetail/HistoryExecutionDetail/HistoryExecutionDetail.vue b/src/views/ops/TaskDetail/HistoryExecutionDetail/HistoryExecutionDetail.vue index 8d4a71717..e799b01b2 100644 --- a/src/views/ops/TaskDetail/HistoryExecutionDetail/HistoryExecutionDetail.vue +++ b/src/views/ops/TaskDetail/HistoryExecutionDetail/HistoryExecutionDetail.vue @@ -43,7 +43,7 @@ export default { callbacks: { click: function() { const taskId = vm.object.id - window.open(`/ops/celery/task/${taskId}/log/`, '', 'width=900,height=600') + window.open(`/core/ops/celery/task/${taskId}/log/`, '', 'width=900,height=600') } } } diff --git a/src/views/ops/TaskDetail/TaskDetail.vue b/src/views/ops/TaskDetail/TaskDetail.vue index 97e88e7b4..7c0c7d38a 100644 --- a/src/views/ops/TaskDetail/TaskDetail.vue +++ b/src/views/ops/TaskDetail/TaskDetail.vue @@ -43,7 +43,7 @@ export default { callbacks: { click: function() { const taskId = vm.object.latest_execution.id - window.open(`/ops/celery/task/${taskId}/log/`, '', 'width=900,height=600') + window.open(`/core/ops/celery/task/${taskId}/log/`, '', 'width=900,height=600') } } } From 7e3d64f05c542ddfa935be2e4487dba1a1ca3de1 Mon Sep 17 00:00:00 2001 From: xinwen Date: Tue, 2 Jun 2020 15:37:03 +0800 Subject: [PATCH 5/7] =?UTF-8?q?[Update]=20=E6=97=A5=E5=BF=97=E5=AE=A1?= =?UTF-8?q?=E8=AE=A1=20=E6=B7=BB=E5=8A=A0=E6=97=B6=E9=97=B4=E8=BF=87?= =?UTF-8?q?=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/audits/CommandExecutionList.vue | 3 ++- src/views/audits/FTPLogList.vue | 3 ++- src/views/audits/LoginLogList.vue | 3 ++- src/views/audits/OperateLogList.vue | 3 ++- src/views/audits/PasswordChangeLogList.vue | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/views/audits/CommandExecutionList.vue b/src/views/audits/CommandExecutionList.vue index 6faada35f..f388641e7 100644 --- a/src/views/audits/CommandExecutionList.vue +++ b/src/views/audits/CommandExecutionList.vue @@ -35,7 +35,8 @@ export default { hasCreate: false, hasBulkDelete: false, hasImport: false, - hasRefresh: false + hasRefresh: false, + hasDatePicker: true } } } diff --git a/src/views/audits/FTPLogList.vue b/src/views/audits/FTPLogList.vue index d2232636f..ae654c1a3 100644 --- a/src/views/audits/FTPLogList.vue +++ b/src/views/audits/FTPLogList.vue @@ -38,7 +38,8 @@ export default { hasCreate: false, hasBulkDelete: false, hasImport: false, - hasRefresh: false + hasRefresh: false, + hasDatePicker: true } } } diff --git a/src/views/audits/LoginLogList.vue b/src/views/audits/LoginLogList.vue index 3bfe9b717..476c02e41 100644 --- a/src/views/audits/LoginLogList.vue +++ b/src/views/audits/LoginLogList.vue @@ -40,7 +40,8 @@ export default { headerActions: { hasLeftActions: false, hasImport: false, - hasRefresh: false + hasRefresh: false, + hasDatePicker: true } } } diff --git a/src/views/audits/OperateLogList.vue b/src/views/audits/OperateLogList.vue index 369c434a4..c805fe0cc 100644 --- a/src/views/audits/OperateLogList.vue +++ b/src/views/audits/OperateLogList.vue @@ -29,7 +29,8 @@ export default { headerActions: { hasLeftActions: false, hasImport: false, - hasRefresh: false + hasRefresh: false, + hasDatePicker: true } } } diff --git a/src/views/audits/PasswordChangeLogList.vue b/src/views/audits/PasswordChangeLogList.vue index 9f8f605c8..9059e8243 100644 --- a/src/views/audits/PasswordChangeLogList.vue +++ b/src/views/audits/PasswordChangeLogList.vue @@ -29,7 +29,8 @@ export default { hasCreate: false, hasBulkDelete: false, hasImport: false, - hasRefresh: false + hasRefresh: false, + hasDatePicker: true } } } From 548e436a12060dfc817689bb49fd240bac8ab602 Mon Sep 17 00:00:00 2001 From: OrangeM21 Date: Tue, 2 Jun 2020 15:46:35 +0800 Subject: [PATCH 6/7] =?UTF-8?q?[fix]=E4=BF=AE=E5=A4=8D=E8=8B=B1=E6=96=87?= =?UTF-8?q?=E8=B7=AF=E7=94=B1=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/langs/en.json | 67 +++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json index 8fb97a257..84f83459d 100644 --- a/src/i18n/langs/en.json +++ b/src/i18n/langs/en.json @@ -347,83 +347,82 @@ "": "" }, "route": { - "": "", "AdminUserCreate": "Admin user create", - "AdminUserDetail": "", + "AdminUserDetail": "Admin user detail", "AdminUserList": "Admin users", - "AdminUserUpdate": "", + "AdminUserUpdate": "Admin user update", "Applications": "Applications", - "AssetCreate": "", - "AssetDetail": "", + "AssetCreate": "Asset create", + "AssetDetail": "Asset detail", "AssetList": "Assets", "AssetPermission": "Asset permissions", "AssetPermissionCreate": "Asset permissions create", "AssetPermissionDetail": "Asset permissions detail", "AssetPermissionUpdate": "Asset permissions update", - "AssetUpdate": "", + "AssetUpdate": "Asset update", "Assets": "Assets", "Audits": "Audits", "BatchCommand": "Batch command", - "CeleryTaskLog": "", - "CommandExecutions": "", - "CommandFilterCreate": "\\u521b\\u5efa\\u547d\\u4ee4\\u8fc7\\u6ee4\\u5668", - "CommandFilterDetail": "", + "CeleryTaskLog": "Celery task log", + "CommandExecutions": "CommandExecutions ", + "CommandFilterCreate": "Command filter create", + "CommandFilterDetail": "Command filter detail", "CommandFilterList": "Command filters", - "CommandFilterRulesCreate": " \\u521b\\u5efa\\u547d\\u4ee4\\u8fc7\\u6ee4\\u5668\\u89c4\\u5219", - "CommandFilterRulesUpdate": "", - "CommandFilterUpdate": "\\u66f4\\u65b0\\u547d\\u4ee4\\u8fc7\\u6ee4\\u5668", + "CommandFilterRulesCreate": "Command filter rules create", + "CommandFilterRulesUpdate": "Command filter rules update", + "CommandFilterUpdate": "Command filter update", "CommandStorageUpdate": "Command storage update", "Commands": "Commands", "CreateCommandStorage": "Create command storage", "CreateReplayStorage": "Create replay storage", "Dashboard": "Dashboard", "DatabaseApp": "Database apps", - "DatabaseAppCreate": "", + "DatabaseAppCreate": "Database app create", "DatabaseAppDetail": "Database app detail", "DatabaseAppPermission": "Databases permissions", "DatabaseAppPermissionCreate": "Databases permissions create", "DatabaseAppPermissionDetail": "Databases permissions detail", "DatabaseAppPermissionUpdate": "Databases permissions update", - "DatabaseAppUpdate": "", - "DomainCreate": "", - "DomainDetail": "", + "DatabaseAppUpdate": "Database app update", + "DomainCreate": "Domain create", + "DomainDetail": "Domain detail", "DomainList": "Domains", - "DomainUpdate": "", + "DomainUpdate": "Domain update", "FileManager": "File manager", "FtpLog": "FTP logs", - "GatewayCreate": "", - "GatewayUpdate": "", + "GatewayCreate": "Gateway create", + "GatewayUpdate": "Gateway update", "JobCenter": "Job center", - "LabelCreate": "\\u521b\\u5efa\\u6807\\u7b7e", + "LabelCreate": "Label create", "LabelList": "Labels", - "LabelUpdate": "\\u66f4\\u65b0\\u6807\\u7b7e", + "LabelUpdate": "Label update", "LoginLog": "Login logs", - "MyApps": "", - "MyAssets": "", + "MyApps": "My apps", + "MyAssets": "My assets", "OperateLog": "Operation logs", "PasswordChangeLog": "Password update logs", "Perms": "Permissions", - "PlatformCreate": "\\u521b\\u5efa\\u7cfb\\u7edf\\u5e73\\u53f0", - "PlatformDetail": "", + "PlatformCreate": "Platform create", + "PlatformDetail": "Platform detail", "PlatformList": "Platforms", - "PlatformUpdate": "\\u66f4\\u65b0\\u7cfb\\u7edf\\u5e73\\u53f0", + "PlatformUpdate": "Platform update", "RemoteApp": "Remote apps", "RemoteAppDetail": "Remote app detail", "RemoteAppPermission": "Remote apps permissions", "RemoteAppPermissionCreate": "Remote apps permission create", "RemoteAppPermissionDetail": "Remote apps permissions detail", "RemoteAppPermissionUpdate": "Remote app permission update", - "RemoteAppUpdate": "", + "RemoteAppUpdate": "Remote app update", "ReplayStorageUpdate": "Replay storage update", "SessionDetail": "Sessions detail", "SessionOffline": "Sessions offline", "SessionOnline": "Sessions online", "Sessions": "Sessions", "Settings": "Settings", - "SystemUserCreate": "\\u521b\\u5efa\\u7cfb\\u7edf\\u7528\\u6237", - "SystemUserDetail": "\\u7cfb\\u7edf\\u7528\\u6237\\u8be6\\u60c5", + "SystemUserCreate": "System user create", + "SystemUserDetail": "System user detail", "SystemUserList": "System users", - "SystemUserUpdate": "\\u66f4\\u65b0\\u7cfb\\u7edf\\u7528\\u6237", + "SystemUserUpdate": "System user update", "TaskDetail": "Tasks detail", "TaskList": "Tasks", "Terminal": "Terminal", @@ -434,12 +433,12 @@ "UserGroupCreate": "User group create", "UserGroupDetail": "User group detail", "UserGroupList": "User groups", - "UserGroupUpdate": "", + "UserGroupUpdate": "User group update", "UserList": "Users", - "UserProfile": "", + "UserProfile": "User profile", "UserUpdate": "User update", "Users": "Users", - "WebFTP": "", + "WebFTP": "WebFTP", "WebTerminal": "Web terminal", "BatchCommandLog": "Batch command log" }, From ed51b9de1ba6a3a6a6fb7f92ca92f7ae145430c4 Mon Sep 17 00:00:00 2001 From: xinwen Date: Tue, 2 Jun 2020 15:56:25 +0800 Subject: [PATCH 7/7] =?UTF-8?q?[Update]=20=E6=97=A5=E5=BF=97=E5=AE=A1?= =?UTF-8?q?=E8=AE=A1=20=E5=8E=BB=E6=8E=89=20LeftAction?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/audits/CommandExecutionList.vue | 1 + src/views/audits/FTPLogList.vue | 1 + src/views/audits/PasswordChangeLogList.vue | 1 + 3 files changed, 3 insertions(+) diff --git a/src/views/audits/CommandExecutionList.vue b/src/views/audits/CommandExecutionList.vue index f388641e7..0d3a84564 100644 --- a/src/views/audits/CommandExecutionList.vue +++ b/src/views/audits/CommandExecutionList.vue @@ -31,6 +31,7 @@ export default { hasSelection: false }, headerActions: { + hasLeftActions: false, hasSelection: false, hasCreate: false, hasBulkDelete: false, diff --git a/src/views/audits/FTPLogList.vue b/src/views/audits/FTPLogList.vue index ae654c1a3..acfb8f5fc 100644 --- a/src/views/audits/FTPLogList.vue +++ b/src/views/audits/FTPLogList.vue @@ -34,6 +34,7 @@ export default { hasSelection: false }, headerActions: { + hasLeftActions: false, hasSelection: false, hasCreate: false, hasBulkDelete: false, diff --git a/src/views/audits/PasswordChangeLogList.vue b/src/views/audits/PasswordChangeLogList.vue index 9059e8243..5619c9598 100644 --- a/src/views/audits/PasswordChangeLogList.vue +++ b/src/views/audits/PasswordChangeLogList.vue @@ -25,6 +25,7 @@ export default { hasSelection: false }, headerActions: { + hasLeftActions: false, hasSelection: false, hasCreate: false, hasBulkDelete: false,