From 14000317b9354b4d3ace0c847c5b6f75dfe1cf26 Mon Sep 17 00:00:00 2001 From: Orange Date: Tue, 23 Mar 2021 17:01:15 +0800 Subject: [PATCH 01/22] =?UTF-8?q?fix:=20=E6=81=A2=E5=A4=8DRDP=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E7=94=A8=E6=88=B7user=5Fgroup=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/assets/SystemUser/SystemUserCreate/rdp.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/views/assets/SystemUser/SystemUserCreate/rdp.vue b/src/views/assets/SystemUser/SystemUserCreate/rdp.vue index c7c3945c3..b4dea5032 100644 --- a/src/views/assets/SystemUser/SystemUserCreate/rdp.vue +++ b/src/views/assets/SystemUser/SystemUserCreate/rdp.vue @@ -23,7 +23,7 @@ export default { }, fields: [ [this.$t('common.Basic'), ['name', 'login_mode', 'username', 'username_same_with_user', 'priority', 'protocol']], - [this.$t('assets.AutoPush'), ['auto_push']], + [this.$t('assets.AutoPush'), ['auto_push', 'system_groups']], [this.$t('common.Auth'), ['update_password', 'password', 'ad_domain']], [this.$t('common.Other'), ['comment']] ], @@ -133,6 +133,11 @@ export default { } return !form.update_password } + }, + system_groups: { + label: this.$t('assets.LinuxUserAffiliateGroup'), + hidden: (item) => ['ssh', 'rdp'].indexOf(item.protocol) === -1 || !item.auto_push || item.username_same_with_user, + helpText: this.$t('assets.GroupsHelpMessage') } }, url: '/api/v1/assets/system-users/', From ff90e56763c73c1f5cb7aefb8c1f906622a885c3 Mon Sep 17 00:00:00 2001 From: Orange Date: Tue, 23 Mar 2021 15:43:53 +0800 Subject: [PATCH 02/22] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E8=BF=9C=E7=A8=8B=E5=BA=94=E7=94=A8=E9=BB=98=E8=AE=A4?= =?UTF-8?q?Path=E4=B8=A2=E5=A4=B1=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/applications/RemoteApp/RemoteAppCreateUpdate.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/applications/RemoteApp/RemoteAppCreateUpdate.vue b/src/views/applications/RemoteApp/RemoteAppCreateUpdate.vue index a642efbdb..50bc7d8e5 100644 --- a/src/views/applications/RemoteApp/RemoteAppCreateUpdate.vue +++ b/src/views/applications/RemoteApp/RemoteAppCreateUpdate.vue @@ -19,7 +19,9 @@ export default { return { initial: { type: appTypeMeta.name, - path: pathInitial + attrs: { + path: pathInitial + } }, fields: [ [this.$t('common.Basic'), ['name', 'type']], From c155e5a59b7af55b141f7a1dba67a3432e413105 Mon Sep 17 00:00:00 2001 From: Orange Date: Tue, 23 Mar 2021 11:37:59 +0800 Subject: [PATCH 03/22] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E7=BB=84=E7=BB=87=E4=B8=8B=E7=A6=81=E6=AD=A2=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/users/User/UserCreateUpdate.vue | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/views/users/User/UserCreateUpdate.vue b/src/views/users/User/UserCreateUpdate.vue index cd9900408..de95228ff 100644 --- a/src/views/users/User/UserCreateUpdate.vue +++ b/src/views/users/User/UserCreateUpdate.vue @@ -10,6 +10,7 @@ import { GenericCreateUpdatePage } from '@/layout/components' import UserPassword from '@/components/UserPassword' import RoleCheckbox from '@/views/users/User/components/RoleCheckbox' import rules from '@/components/DataForm/rules' +import { mapGetters } from 'vuex' export default { components: { @@ -109,6 +110,14 @@ export default { } } }, + computed: { + ...mapGetters(['currentOrgIsRoot']) + }, + mounted() { + if (this.currentOrgIsRoot) { + this.fieldsMeta.groups.el.disabled = true + } + }, methods: { cleanFormValue(value) { const method = this.getMethod() From 52a4c1824fde0fbca17a875095c41b3adc795006 Mon Sep 17 00:00:00 2001 From: Orange Date: Tue, 23 Mar 2021 11:04:09 +0800 Subject: [PATCH 04/22] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=9B?= =?UTF-8?q?=E5=BB=BAK8S=E7=B3=BB=E7=BB=9F=E7=94=A8=E6=88=B7=E7=9A=84?= =?UTF-8?q?=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/assets/SystemUser/SystemUserList.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/assets/SystemUser/SystemUserList.vue b/src/views/assets/SystemUser/SystemUserList.vue index f7f7ae11a..476ce1e48 100644 --- a/src/views/assets/SystemUser/SystemUserList.vue +++ b/src/views/assets/SystemUser/SystemUserList.vue @@ -115,7 +115,6 @@ export default { name: 'K8S', title: 'K8S', type: 'primary', - has: this.$store.getters.hasValidLicense, group: this.$t('assets.OtherProtocol') } ] From 5831cb326c2797c18130bb00095cf34a8dfcf749 Mon Sep 17 00:00:00 2001 From: ibuler Date: Mon, 29 Mar 2021 15:21:49 +0800 Subject: [PATCH 05/22] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E7=9B=91=E6=8E=A7=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/sessions/TerminalList.vue | 14 ++--- .../SystemMonitor/component/MonitorCard.vue | 53 ++++++++----------- src/views/xpack/SystemMonitor/index.vue | 29 ++++++---- 3 files changed, 47 insertions(+), 49 deletions(-) diff --git a/src/views/sessions/TerminalList.vue b/src/views/sessions/TerminalList.vue index efe6a1580..fac763172 100644 --- a/src/views/sessions/TerminalList.vue +++ b/src/views/sessions/TerminalList.vue @@ -94,8 +94,8 @@ export default { url: '/api/v1/terminal/terminals/', columns: [ 'name', 'remote_addr', 'session_online', - 'state.session_active_count', 'state.system_cpu_load_1', - 'state.system_disk_used_percent', 'state.system_memory_used_percent', + 'stat.cpu_load', + 'stat.disk_used', 'stat.memory_used', 'status_display', 'is_active', 'is_alive', 'actions' ], @@ -103,19 +103,15 @@ export default { name: { sortable: 'custom' }, - 'state.session_active_count': { - label: this.$t('sessions.sessionActiveCount'), - width: '120px' - }, - 'state.system_cpu_load_1': { + 'stat.cpu_load': { label: this.$t('sessions.systemCpuLoad'), width: '120px' }, - 'state.system_disk_used_percent': { + 'stat.disk_used': { label: this.$t('sessions.systemDiskUsedPercent'), width: '120px' }, - 'state.system_memory_used_percent': { + 'stat.memory_used': { label: this.$t('sessions.systemMemoryUsedPercent'), width: '120px' }, diff --git a/src/views/xpack/SystemMonitor/component/MonitorCard.vue b/src/views/xpack/SystemMonitor/component/MonitorCard.vue index 7b3c42130..3cd23cc29 100644 --- a/src/views/xpack/SystemMonitor/component/MonitorCard.vue +++ b/src/views/xpack/SystemMonitor/component/MonitorCard.vue @@ -1,9 +1,7 @@ From 1b223f0486d3f28aff4d2b513426392e5411913c Mon Sep 17 00:00:00 2001 From: Orange Date: Fri, 26 Mar 2021 10:49:45 +0800 Subject: [PATCH 06/22] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=91=BD?= =?UTF-8?q?=E4=BB=A4=E5=AD=98=E5=82=A8=E6=9B=B4=E6=96=B0=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/sessions/CommandStorageCreateUpdate.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/views/sessions/CommandStorageCreateUpdate.vue b/src/views/sessions/CommandStorageCreateUpdate.vue index 5a410c571..5ae31e09b 100644 --- a/src/views/sessions/CommandStorageCreateUpdate.vue +++ b/src/views/sessions/CommandStorageCreateUpdate.vue @@ -4,6 +4,7 @@ :create-success-next-route="successUrl" :update-success-next-route="successUrl" :has-detail-in-msg="false" + :after-get-form-value="afterGetFormValue" :perform-submit="performSubmit" /> @@ -59,6 +60,10 @@ export default { }, methods: { + afterGetFormValue(validValues) { + validValues.meta.HOSTS = validValues.meta.HOSTS.toString() + return validValues + }, performSubmit(validValues) { const method = this.getMethod() validValues.meta.HOSTS = validValues.meta.HOSTS.split(',').map(item => (item.trim())) From 91e04a8d1824bf7fd01f7879310e6ff1470e36f0 Mon Sep 17 00:00:00 2001 From: Orange Date: Wed, 24 Mar 2021 18:32:54 +0800 Subject: [PATCH 07/22] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nginx.conf | 10 ++++++++++ package.json | 1 + vue.config.js | 13 ++++++++++++- 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/nginx.conf b/nginx.conf index 7e98037ce..f5164215f 100644 --- a/nginx.conf +++ b/nginx.conf @@ -1,6 +1,16 @@ server { listen 80; + gzip on; + gzip_min_length 1k; + gzip_buffers 4 16k; + #gzip_http_version 1.0; + gzip_comp_level 8; + gzip_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png; + gzip_vary off; + gzip_static on; + gzip_disable "MSIE [1-6]."; + location /ui/ { try_files $uri / /ui/index.html; alias /opt/lina/; diff --git a/package.json b/package.json index bd9f4695f..28956643b 100644 --- a/package.json +++ b/package.json @@ -73,6 +73,7 @@ "babel-eslint": "10.0.1", "babel-jest": "23.6.0", "chalk": "2.4.2", + "compression-webpack-plugin": "^6.1.1", "connect": "3.6.6", "element-theme-chalk": "^2.13.1", "eslint": "^5.15.3", diff --git a/vue.config.js b/vue.config.js index 24c4319e7..419491b5c 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,6 +1,9 @@ 'use strict' const path = require('path') const defaultSettings = require('./src/settings.js') +const CompressionWebpackPlugin = require('compression-webpack-plugin') +const productionGzipExtensions = /\.(js|css|json|txt|ico|svg)(\?.*)?$/i + function resolve(dir) { return path.join(__dirname, dir) @@ -82,7 +85,15 @@ module.exports = { alias: { '@': resolve('src') } - } + }, + plugins: [ + new CompressionWebpackPlugin({ + algorithm: 'gzip', + test: productionGzipExtensions, // 处理所有匹配此 {RegExp} 的资源 + threshold: 10240, // 只处理比这个值大的资源。按字节计算(楼主设置10K以上进行压缩) + minRatio: 0.8 // 只有压缩率比这个值小的资源才会被处理 + }) + ] }, chainWebpack(config) { // it can improve the speed of the first screen, it is recommended to turn on preload From 191900381a6b694abe573d9ad62a4dfe58281048 Mon Sep 17 00:00:00 2001 From: Orange Date: Tue, 6 Apr 2021 11:31:51 +0800 Subject: [PATCH 08/22] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B5=84?= =?UTF-8?q?=E4=BA=A7=E6=9B=B4=E5=A4=9A=E4=BF=A1=E6=81=AF=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/Asset/AssetMoreInformationEdit.vue | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/views/assets/Asset/AssetMoreInformationEdit.vue b/src/views/assets/Asset/AssetMoreInformationEdit.vue index de945a9d2..a70cc8ac4 100644 --- a/src/views/assets/Asset/AssetMoreInformationEdit.vue +++ b/src/views/assets/Asset/AssetMoreInformationEdit.vue @@ -1,5 +1,5 @@ From 30c1284a41edb60bcd853ebac36a3e7750b01e45 Mon Sep 17 00:00:00 2001 From: Orange Date: Thu, 1 Apr 2021 19:33:53 +0800 Subject: [PATCH 09/22] =?UTF-8?q?fix:=20=E5=AE=8C=E5=96=84=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E9=82=AE=E7=AE=B1=E5=9C=B0=E5=9D=80=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes https://github.com/jumpserver/trello/issues/933 --- src/components/DataForm/rules/index.js | 9 ++++++++- src/i18n/langs/cn.json | 1 + src/i18n/langs/en.json | 1 + src/views/settings/Email.vue | 20 ++++++++++++++++++++ src/views/users/User/UserCreateUpdate.vue | 6 ++++++ 5 files changed, 36 insertions(+), 1 deletion(-) diff --git a/src/components/DataForm/rules/index.js b/src/components/DataForm/rules/index.js index 83b98e649..57fc7a3fe 100644 --- a/src/components/DataForm/rules/index.js +++ b/src/components/DataForm/rules/index.js @@ -8,7 +8,14 @@ export const RequiredChange = { required: true, message: i18n.t('common.fieldRequiredError'), trigger: 'change' } +export const EmailCheck = { + type: 'email', + message: i18n.t('common.InputEmailAddress'), + trigger: ['blur', 'change'] +} + export default { Required, - RequiredChange + RequiredChange, + EmailCheck } diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json index d4b4dc8ce..1f9c93fbf 100644 --- a/src/i18n/langs/cn.json +++ b/src/i18n/langs/cn.json @@ -320,6 +320,7 @@ "fieldRequiredError": "这个字段是必填项", "getErrorMsg": "获取失败", "MFAErrorMsg": "MFA错误，请检查", + "InputEmailAddress": "请输入正确的邮箱地址", "imExport": { "ExportAll": "导出所有", "ExportOnlyFiltered": "仅导出搜索结果", diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json index 7a2d51f96..e05d0f644 100644 --- a/src/i18n/langs/en.json +++ b/src/i18n/langs/en.json @@ -277,6 +277,7 @@ "Reset": "Reset", "Search": "Search", "MFAErrorMsg": "MFA Error，please check", + "InputEmailAddress": "Please enter your email address", "Select": "Select", "SelectFile": "Select file", "Show": "Show", diff --git a/src/views/settings/Email.vue b/src/views/settings/Email.vue index 05d5b5fc1..dab192527 100644 --- a/src/views/settings/Email.vue +++ b/src/views/settings/Email.vue @@ -4,6 +4,7 @@ :fields="fields" :url="url" :get-method="getMethod" + :fields-meta="fieldsMeta" :more-buttons="moreButtons" :has-detail-in-msg="false" /> @@ -14,6 +15,7 @@ import GenericCreateUpdateForm from '@/layout/components/GenericCreateUpdateForm' import { testEmailSetting } from '@/api/settings' import { IBox } from '@/components' +import rules from '@/components/DataForm/rules' export default { name: 'Email', @@ -51,6 +53,24 @@ export default { ] ] ], + fieldsMeta: { + EMAIL_HOST_USER: { + rules: [ + rules.EmailCheck, + rules.Required + ] + }, + EMAIL_FROM: { + rules: [ + rules.EmailCheck + ] + }, + EMAIL_RECIPIENT: { + rules: [ + rules.EmailCheck + ] + } + }, url: '/api/v1/settings/setting/?category=email', moreButtons: [ { diff --git a/src/views/users/User/UserCreateUpdate.vue b/src/views/users/User/UserCreateUpdate.vue index de95228ff..e171d3411 100644 --- a/src/views/users/User/UserCreateUpdate.vue +++ b/src/views/users/User/UserCreateUpdate.vue @@ -42,6 +42,12 @@ export default { return this.$route.params.id } }, + email: { + rules: [ + rules.EmailCheck, + rules.Required + ] + }, update_password: { label: this.$t('users.UpdatePassword'), type: 'checkbox', From 73c17fccbe8071524b15d6440c02b15095419e11 Mon Sep 17 00:00:00 2001 From: Orange Date: Thu, 1 Apr 2021 17:08:25 +0800 Subject: [PATCH 10/22] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E7=BF=BB?= =?UTF-8?q?=E8=AF=91=E6=89=B9=E9=87=8F=E5=91=BD=E4=BB=A4=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E8=B5=84=E4=BA=A7=E6=97=B6=E6=8F=90=E7=A4=BA=E8=B5=84=E4=BA=A7?= =?UTF-8?q?=E4=B8=8D=E6=94=AF=E6=8C=81SSH=E5=8D=8F=E8=AE=AE=EF=BC=9B?= =?UTF-8?q?=E8=BF=9E=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/langs/cn.json | 2 +- src/i18n/langs/en.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json index 1f9c93fbf..28048c0f6 100644 --- a/src/i18n/langs/cn.json +++ b/src/i18n/langs/cn.json @@ -179,7 +179,7 @@ "TestAssetsConnective": "测试资产可连接性", "TestConnection": "测试连接", "Type": "类型", - "UnselectedAssets": "未选择资产", + "UnselectedAssets": "未选择资产或所选择的资产不支持SSH协议连接", "UnselectedNodes": "未选择节点", "UpdateAssetUserToken": "更新资产用户认证信息", "Username": "用户名", diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json index e05d0f644..0c25a4348 100644 --- a/src/i18n/langs/en.json +++ b/src/i18n/langs/en.json @@ -178,7 +178,7 @@ "TestAssetsConnective": "Test assets connective", "TestConnection": "Test connection", "Type": "Type", - "UnselectedAssets": "Unselected assets", + "UnselectedAssets": "No asset selected or the selected asset does not support SSH protocol connection", "UnselectedNodes": "Unselected nodes", "UpdateAssetUserToken": "Update asset user auth", "Username": "Username", From be176ad408bb6bfd4a84ce72280400514c78200f Mon Sep 17 00:00:00 2001 From: Orange Date: Thu, 1 Apr 2021 15:15:02 +0800 Subject: [PATCH 11/22] =?UTF-8?q?perf:=20=E7=94=A8=E6=88=B7=E6=9D=A5?= =?UTF-8?q?=E6=BA=90=E4=B8=8D=E6=98=AF=E6=9C=AC=E5=9C=B0=E6=97=B6=E7=A6=81?= =?UTF-8?q?=E7=94=A8=E6=9B=B4=E6=96=B0=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/users/User/UserCreateUpdate.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/users/User/UserCreateUpdate.vue b/src/views/users/User/UserCreateUpdate.vue index e171d3411..d65a1e2fd 100644 --- a/src/views/users/User/UserCreateUpdate.vue +++ b/src/views/users/User/UserCreateUpdate.vue @@ -38,8 +38,8 @@ export default { url: '/api/v1/users/users/', fieldsMeta: { password_strategy: { - hidden: () => { - return this.$route.params.id + hidden: (formValue) => { + return this.$route.params.id || formValue.source !== 'local' } }, email: { @@ -64,7 +64,7 @@ export default { if (formValue.password_strategy) { return false } - return !formValue.update_password + return !formValue.update_password || formValue.source !== 'local' }, el: { required: false @@ -77,12 +77,12 @@ export default { if (formValue.set_public_key) { return true } - return this.$route.meta.action !== 'update' + return this.$route.meta.action !== 'update' || formValue.source !== 'local' } }, public_key: { hidden: (formValue) => { - return !formValue.set_public_key + return !formValue.set_public_key || formValue.source !== 'local' } }, role: { From ee6a3c6d68791b0d9713621fc0fb85a9219b218c Mon Sep 17 00:00:00 2001 From: liubo Date: Tue, 30 Mar 2021 17:14:49 +0800 Subject: [PATCH 12/22] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0nutanix=E4=BA=91=E8=B4=A6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/xpack/Cloud/Account/AccountList.vue | 6 +++++- src/views/xpack/Cloud/const.js | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/views/xpack/Cloud/Account/AccountList.vue b/src/views/xpack/Cloud/Account/AccountList.vue index 54e89e01b..4e7426888 100644 --- a/src/views/xpack/Cloud/Account/AccountList.vue +++ b/src/views/xpack/Cloud/Account/AccountList.vue @@ -4,7 +4,7 @@ diff --git a/src/layout/index.vue b/src/layout/index.vue index 980d9784f..33fd356a3 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -1,14 +1,14 @@ @@ -98,4 +98,28 @@ export default { .mobile .fixed-header { width: 100%; } + @media print { + .disabled-when-print{ + display: none; + width: 100%; + } + .enabled-when-print{ + display: inherit !important; + } + .print-margin{ + margin-top: 10px; + } + .drawer-bg{ + display: none; + } + .main-container{ + margin-left: 0px !important; + } + //.fixed-header{ + // width: 100% !important; + //} + //.hideSidebar .fixed-header{ + // width: 100% !important; + //} + } diff --git a/src/views/dashboard/DatesLoginSummary/LoginActivePin.vue b/src/views/dashboard/DatesLoginSummary/LoginActivePin.vue index 03104d0de..688cf9f82 100644 --- a/src/views/dashboard/DatesLoginSummary/LoginActivePin.vue +++ b/src/views/dashboard/DatesLoginSummary/LoginActivePin.vue @@ -1,12 +1,28 @@ @@ -23,7 +24,7 @@ export default { data() { return { fields: [ - [this.$t('common.BasicInfo'), ['SITE_URL', 'USER_GUIDE_URL', 'FORGOT_PASSWORD_URL']] + [this.$t('common.BasicInfo'), ['SITE_URL', 'USER_GUIDE_URL', 'FORGOT_PASSWORD_URL', 'GLOBAL_ORG_DISPLAY_NAME']] ], successUrl: { name: 'Settings', params: { activeMenu: 'Basic' }}, url: '/api/v1/settings/setting/?category=basic' @@ -32,6 +33,9 @@ export default { methods: { getMethod() { return 'put' + }, + onPerformSuccess() { + setTimeout(() => window.location.reload(), 500) } } }