From 4806634e3e0807648f0270d3b4b0897c8ef06a0f Mon Sep 17 00:00:00 2001 From: OrangeM21 Date: Tue, 26 May 2020 18:20:24 +0800 Subject: [PATCH] =?UTF-8?q?[update]=E5=AE=8C=E5=96=84=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E5=92=8C=E6=B7=BB=E5=8A=A0=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/favicon.ico | Bin 67646 -> 3283 bytes src/api/settings.js | 6 ++++++ src/layout/components/NavBar/Logo.vue | 15 +++++++++++++-- src/store/getters.js | 1 + src/store/modules/settings.js | 15 +++++++++++++-- 5 files changed, 33 insertions(+), 4 deletions(-) diff --git a/public/favicon.ico b/public/favicon.ico index 34b63ac63a87ee3ea8e7a0f3f5b5406c437e2112..266c07166d93bc2ce155ae72d729fbaee1e60bb0 100644 GIT binary patch literal 3283 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 X;@D+E7Ad=S_FbjlW&KY_+xPzm3MBT? diff --git a/src/api/settings.js b/src/api/settings.js index d2b74777d..af7bb74ab 100644 --- a/src/api/settings.js +++ b/src/api/settings.js @@ -52,3 +52,9 @@ export function getPublicSettings() { method: 'get' }) } +export function getLogo() { + return request({ + url: '/api/v1/xpack/interface/setting', + method: 'get' + }) +} diff --git a/src/layout/components/NavBar/Logo.vue b/src/layout/components/NavBar/Logo.vue index 0fda227cb..f383c3da4 100644 --- a/src/layout/components/NavBar/Logo.vue +++ b/src/layout/components/NavBar/Logo.vue @@ -6,7 +6,8 @@

{{ title }}

- + + @@ -14,6 +15,7 @@ diff --git a/src/store/getters.js b/src/store/getters.js index bf8d4b5bf..919ec58b3 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -9,6 +9,7 @@ const getters = { visitedViews: state => state.tagsView.visitedViews, cachedViews: state => state.tagsView.cachedViews, publicSettings: state => state.settings.publicSettings, + customSettings: state => state.settings.customSettings, getCurrentOrgRoles: state => state.users.profile.current_org_roles } export default getters diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js index 6ba828ec7..44111aa58 100644 --- a/src/store/modules/settings.js +++ b/src/store/modules/settings.js @@ -1,5 +1,5 @@ import defaultSettings from '@/settings' -import { getPublicSettings } from '@/api/settings' +import { getPublicSettings, getLogo } from '@/api/settings' const { showSettings, fixedHeader, sidebarLogo, tagsView } = defaultSettings @@ -8,7 +8,8 @@ const state = { fixedHeader: fixedHeader, sidebarLogo: sidebarLogo, tagsView: tagsView, - publicSettings: null + publicSettings: null, + customSettings: null } const mutations = { @@ -19,6 +20,9 @@ const mutations = { }, SET_PUBLIC_SETTINGS: (state, settings) => { state.publicSettings = settings + }, + SET_CUSTOM_SETTINGS: (state, settings) => { + state.customSettings = settings } } @@ -31,6 +35,13 @@ const actions = { return new Promise((resolve, reject) => { getPublicSettings().then(response => { commit('SET_PUBLIC_SETTINGS', response.data) + if (response.data.XPACK_ENABLED) { + if (response.data.XPACK_LICENSE_IS_VALID) { + getLogo().then((res) => { + commit('SET_CUSTOM_SETTINGS', res) + }) + } + } resolve(response) }).catch(error => { reject(error)