File tree Expand file tree Collapse file tree 3 files changed +14
-6
lines changed
Expand file tree Collapse file tree 3 files changed +14
-6
lines changed Original file line number Diff line number Diff line change 44 <div class =" logo mt-4" >
55 <LogoFull />
66 </div >
7- <el-divider direction =" vertical" class =" ml-24 mr-24" />
8- <Workspace />
7+ <el-divider
8+ direction =" vertical"
9+ class =" ml-24 mr-24"
10+ v-if =" hasPermission(EditionConst.IS_EE, 'OR')"
11+ />
12+ <WorkspaceDropdown v-if =" hasPermission(EditionConst.IS_EE, 'OR')" />
913 <div class =" flex-between w-full" >
1014 <div ></div >
1115 <TopMenu ></TopMenu >
1822import TopMenu from ' ./top-menu/index.vue'
1923import Avatar from ' ./avatar/index.vue'
2024import TopAbout from ' ./top-about/index.vue'
21- import Workspace from ' ./workspace/index.vue'
22- import { useRouter } from ' vue-router'
25+ import { EditionConst } from ' @/utils/permission/data'
26+ import { hasPermission } from ' @/utils/permission/index'
27+ import WorkspaceDropdown from ' ./workspace-dropdown/index.vue'
2328
29+ import { useRouter } from ' vue-router'
30+ import useStore from ' @/stores'
2431const router = useRouter ()
32+ const { user } = useStore ()
2533 </script >
2634<style lang="scss" scoped>
2735.app-top-bar-container {
Original file line number Diff line number Diff line change @@ -45,7 +45,7 @@ async function getWorkspaceList() {
4545}
4646
4747onBeforeMount (async () => {
48- // await getWorkspaceList()
48+ await getWorkspaceList ()
4949 const id = localStorage .getItem (' workspace_id' ) ?? ' default'
5050 currentWorkspace .value = workspaceList .value .find (item => item .id === id )
5151})
Original file line number Diff line number Diff line change @@ -77,7 +77,7 @@ const useUserStore = defineStore('user', {
7777 this . edition = ok . data . edition
7878
7979 if ( this . isEE ( ) || this . isPE ( ) ) {
80- // await this.theme()
80+ await this . theme ( )
8181 } else {
8282 this . themeInfo = {
8383 ...defaultPlatformSetting ,
You can’t perform that action at this time.
0 commit comments