Merge branch 'dev' of github.com:jumpserver/lina into dev

src/layout/components/NavBar/Logo.vue

@@ -34,18 +34,11 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'customSettings',
       'publicSettings'
     ]),
     // eslint-disable-next-line vue/return-in-computed-property
     logoSrc() {
-      if (this.publicSettings.XPACK_LICENSE_IS_VALID) {
-        if (this.customSettings && this.customSettings.logo_index && this.customSettings.logo_index !== '/static/img/logo_text.png') {
-          console.log(this.customSettings.logo_index)
-          return this.customSettings.logo_index
-        }
-      }
-      return this.logoText
+      return this.publicSettings.LOGO_URLS.logo_index
     }
   },
   created() {

src/store/getters.js

@@ -10,7 +10,6 @@ const getters = {
   visitedViews: state => state.tagsView.visitedViews,
   cachedViews: state => state.tagsView.cachedViews,
   publicSettings: state => state.settings.publicSettings,
-  customSettings: state => state.settings.customSettings,
   currentOrgRoles: state => state.users.roles,
   currentOrgPerms: state => state.users.perms,
   MFAVerifyAt: state => state.users.MFAVerifyAt

src/store/modules/settings.js

@@ -1,5 +1,5 @@
 import defaultSettings from '@/settings'
-import { getPublicSettings, getLogo } from '@/api/settings'
+import { getPublicSettings } from '@/api/settings'
 
 const { showSettings, fixedHeader, sidebarLogo, tagsView } = defaultSettings
 
@@ -8,8 +8,7 @@ const state = {
   fixedHeader: fixedHeader,
   sidebarLogo: sidebarLogo,
   tagsView: tagsView,
-  publicSettings: null,
-  customSettings: null
+  publicSettings: null
 }
 
 const mutations = {
@@ -20,9 +19,6 @@ const mutations = {
   },
   SET_PUBLIC_SETTINGS: (state, settings) => {
     state.publicSettings = settings
-  },
-  SET_CUSTOM_SETTINGS: (state, settings) => {
-    state.customSettings = settings
   }
 }
 
@@ -35,13 +31,6 @@ 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)

src/views/ops/TaskDetail/TaskHistory.vue

@@ -4,6 +4,7 @@
 
 <script type="text/jsx">
 import ListTable from '@/components/ListTable'
+import { DetailFormatter } from '@/components/ListTable/formatters'
 
 export default {
   name: 'TaskHistory',
@@ -67,7 +68,11 @@ export default {
             }
           },
           adhoc_short_id: {
-            label: this.$t('ops.version')
+            label: this.$t('ops.version'),
+            formatter: DetailFormatter,
+            formatterArgs: {
+              route: 'HistoryExecutionDetail'
+            }
           },
           actions: {
             prop: 'id',