diff --git a/packages/design-core/assets/log-out.svg b/packages/design-core/assets/log-out.svg
index 4c7a0e1b38..5aab2404e9 100644
--- a/packages/design-core/assets/log-out.svg
+++ b/packages/design-core/assets/log-out.svg
@@ -1,6 +1,4 @@
-<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16.000000" height="16.000000" fill="none" customFrame="#000000">
-	<g id="组合 14775">
-		<rect id="退出-exit" width="16.000000" height="16.000000" x="0.000000" y="0.000000" />
-		<path id="形状结合" d="M7.99371 1.5C9.26567 1.5 10.2715 2.63155 10.2715 4L10.2715 5.5C10.2715 5.77614 10.0476 6 9.77148 6C9.49535 6 9.27148 5.77614 9.27148 5.5L9.27148 4C9.27148 3.15931 8.68543 2.5 7.99371 2.5L3.54926 2.5C2.85754 2.5 2.27148 3.15931 2.27148 4L2.27148 12C2.27148 12.8407 2.85754 13.5 3.54926 13.5L7.99371 13.5C8.68543 13.5 9.27148 12.8407 9.27148 12L9.27148 10.5C9.27148 10.2239 9.49535 10 9.77148 10C10.0476 10 10.2715 10.2239 10.2715 10.5L10.2715 12C10.2715 13.3685 9.26567 14.5 7.99371 14.5L3.54926 14.5C2.2773 14.5 1.27148 13.3685 1.27148 12L1.27148 4C1.27148 2.63155 2.2773 1.5 3.54926 1.5L7.99371 1.5ZM11.9273 5.04076L14.5577 7.6712C14.7393 7.85279 14.7393 8.14721 14.5577 8.3288L11.9273 10.9592C11.7457 11.1408 11.4513 11.1408 11.2697 10.9592C11.0881 10.7776 11.0881 10.4832 11.2697 10.3016L13.1062 8.46467L5.77191 8.465C5.5151 8.465 5.30691 8.25681 5.30691 8C5.30691 7.74319 5.5151 7.535 5.77191 7.535L13.1055 7.53467L11.2697 5.69837C11.1083 5.53695 11.0903 5.28639 11.2159 5.10516C11.3975 4.92356 11.7457 4.85916 11.9273 5.04076Z" fill="rgb(25,25,25)" fill-rule="nonzero" />
-	</g>
+<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16.000000" height="16.000000" fill="none">
+	<rect id="退出-exit" width="16.000000" height="16.000000" x="0.000000" y="0.000000" />
+	<path id="形状结合" d="M7.99371 1.5C9.26567 1.5 10.2715 2.63155 10.2715 4L10.2715 5.5C10.2715 5.77614 10.0476 6 9.77148 6C9.49534 6 9.27148 5.77614 9.27148 5.5L9.27148 4C9.27148 3.15931 8.68543 2.5 7.99371 2.5L3.54926 2.5C2.85754 2.5 2.27148 3.15931 2.27148 4L2.27148 12C2.27148 12.8407 2.85754 13.5 3.54926 13.5L7.99371 13.5C8.68543 13.5 9.27148 12.8407 9.27148 12L9.27148 10.5C9.27148 10.2239 9.49534 10 9.77148 10C10.0476 10 10.2715 10.2239 10.2715 10.5L10.2715 12C10.2715 13.3685 9.26567 14.5 7.99371 14.5L3.54926 14.5C2.2773 14.5 1.27148 13.3685 1.27148 12L1.27148 4C1.27148 2.63155 2.2773 1.5 3.54926 1.5L7.99371 1.5ZM11.9273 5.04076L14.5577 7.6712C14.7393 7.85279 14.7393 8.14721 14.5577 8.3288L11.9273 10.9592C11.7457 11.1408 11.4513 11.1408 11.2697 10.9592C11.0881 10.7776 11.0881 10.4832 11.2697 10.3016L13.1062 8.46467L5.77191 8.465C5.5151 8.465 5.30691 8.25681 5.30691 8C5.30691 7.74319 5.5151 7.535 5.77191 7.535L13.1055 7.53467L11.2697 5.69837C11.1083 5.53695 11.0903 5.28639 11.2159 5.10516C11.3975 4.92356 11.7457 4.85916 11.9273 5.04076Z" fill="currentColor" fill-rule="nonzero" />
 </svg>
diff --git a/packages/design-core/assets/organize.svg b/packages/design-core/assets/organize.svg
new file mode 100644
index 0000000000..3d14a2cc82
--- /dev/null
+++ b/packages/design-core/assets/organize.svg
@@ -0,0 +1,5 @@
+<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="20.000000" height="20.000000" fill="none" customFrame="#000000">
+	<rect id="组织" width="20.000000" height="20.000000" x="0.000000" y="0.000000" fill="rgb(255,255,255)" fill-opacity="0" />
+	<rect id="矩形 1237" width="20.000000" height="20.000000" x="0.000000" y="0.000000" rx="5.000000" fill="rgb(24,144,255)" transform="matrix(0,1,-1,0,20,0)" />
+	<path id="合并" d="M8.25056 8.07086C8.24492 8.01393 8.24209 7.95686 8.24209 7.89966C8.24209 7.84245 8.24492 7.78538 8.25056 7.72845C8.2562 7.67152 8.26464 7.615 8.27588 7.55889C8.28711 7.50278 8.30109 7.44736 8.3178 7.39262C8.33452 7.33787 8.3539 7.28407 8.37593 7.23122C8.39797 7.17837 8.42256 7.12672 8.44971 7.07627C8.47685 7.02582 8.50642 6.97681 8.53841 6.92924C8.5704 6.88168 8.60467 6.83578 8.6412 6.79156C8.65705 6.77237 8.67331 6.75353 8.68995 6.73504C8.71165 6.71094 8.73403 6.68744 8.75707 6.66455C8.79779 6.6241 8.84041 6.58573 8.88492 6.54944C8.92943 6.51315 8.97563 6.47911 9.02351 6.44733C9.07139 6.41554 9.12072 6.38617 9.17151 6.3592C9.22229 6.33224 9.27429 6.30781 9.32749 6.28591C9.38069 6.26402 9.43484 6.24477 9.48995 6.22817C9.54505 6.21156 9.60084 6.19768 9.65732 6.18652C9.7138 6.17536 9.77069 6.16697 9.828 6.16137C9.88531 6.15576 9.94275 6.15295 10.0003 6.15295C10.0579 6.15295 10.1154 6.15576 10.1727 6.16137C10.23 6.16697 10.2869 6.17536 10.3434 6.18652C10.3998 6.19768 10.4556 6.21156 10.5107 6.22817C10.5407 6.2372 10.5704 6.24701 10.5998 6.25761C10.6245 6.26649 10.6489 6.27593 10.6732 6.28591C10.7026 6.29802 10.7316 6.31089 10.7603 6.32455C10.7835 6.33559 10.8065 6.34714 10.8292 6.3592C10.88 6.38617 10.9293 6.41554 10.9772 6.44733C11.025 6.47911 11.0712 6.51315 11.1158 6.54944C11.141 6.57003 11.1657 6.5913 11.1897 6.61323C11.208 6.62995 11.226 6.64706 11.2436 6.66455C11.2843 6.705 11.3229 6.74734 11.3595 6.79156C11.396 6.83578 11.4303 6.88168 11.4623 6.92924C11.4801 6.95581 11.4972 6.98283 11.5136 7.01029C11.5265 7.032 11.539 7.05399 11.551 7.07627C11.5781 7.12672 11.6027 7.17837 11.6247 7.23122C11.6468 7.28407 11.6662 7.33787 11.6829 7.39262C11.6996 7.44736 11.7136 7.50278 11.7248 7.55889C11.736 7.615 11.7445 7.67152 11.7501 7.72845C11.7558 7.78538 11.7586 7.84245 11.7586 7.89966C11.7586 7.92789 11.7579 7.95609 11.7565 7.98426C11.7551 8.01316 11.753 8.04203 11.7501 8.07086C11.7445 8.1278 11.736 8.18431 11.7248 8.24042C11.7136 8.29653 11.6996 8.35195 11.6829 8.4067C11.6662 8.46144 11.6468 8.51524 11.6247 8.56809C11.6027 8.62094 11.5781 8.6726 11.551 8.72305C11.5238 8.7735 11.4943 8.82251 11.4623 8.87007C11.4303 8.91764 11.396 8.96353 11.3595 9.00775C11.3229 9.05198 11.2843 9.09431 11.2436 9.13476C11.2029 9.17521 11.1603 9.21359 11.1158 9.24988C11.0712 9.28617 11.025 9.32021 10.9772 9.35199C10.9293 9.38377 10.88 9.41315 10.8292 9.44011C10.7784 9.46708 10.7264 9.49151 10.6732 9.5134C10.62 9.53529 10.5658 9.55454 10.5107 9.57115C10.4556 9.58775 10.3998 9.60164 10.3434 9.6128C10.2869 9.62396 10.23 9.63234 10.1727 9.63795C10.1154 9.64356 10.0579 9.64636 10.0003 9.64636C9.94275 9.64636 9.88531 9.64356 9.828 9.63795C9.77069 9.63234 9.7138 9.62396 9.65732 9.6128C9.60084 9.60164 9.54505 9.58775 9.48995 9.57115C9.43484 9.55454 9.38069 9.53529 9.32749 9.5134C9.27429 9.49151 9.22229 9.46708 9.17151 9.44011C9.12072 9.41314 9.07139 9.38377 9.02351 9.35199C8.97563 9.3202 8.92943 9.28617 8.88492 9.24988C8.84041 9.21359 8.79779 9.17521 8.75707 9.13476C8.71635 9.09431 8.67773 9.05198 8.6412 9.00775C8.60467 8.96353 8.5704 8.91764 8.53841 8.87007C8.50642 8.82251 8.47685 8.7735 8.44971 8.72305C8.42256 8.6726 8.39797 8.62094 8.37593 8.56809C8.3539 8.51524 8.33452 8.46144 8.3178 8.4067C8.30109 8.35195 8.28711 8.29653 8.27588 8.24042C8.26464 8.18431 8.2562 8.1278 8.25056 8.07086ZM7.2726 9.06964C7.28693 9.10306 7.30126 9.13648 7.31718 9.16991C6.92075 9.45004 6.56731 9.79542 6.27596 10.1854C5.68689 9.93548 5.27454 9.35135 5.27454 8.67173C5.27454 7.7645 6.01008 7.02757 6.91916 7.02757C7.00673 7.02757 7.0927 7.03394 7.17708 7.04826C7.08792 7.33157 7.04334 7.62602 7.04334 7.92684C7.04175 8.32316 7.11976 8.70674 7.2726 9.06964ZM14.7362 8.67056C14.7362 9.3631 14.2983 9.95694 13.678 10.1989C13.3899 9.81684 13.0415 9.47773 12.6378 9.19594C12.6573 9.15455 12.6768 9.11315 12.6947 9.07017C12.851 8.70718 12.9308 8.32191 12.9308 7.92708C12.9308 7.62618 12.8852 7.33006 12.794 7.04668C12.8787 7.03394 12.965 7.02757 13.0545 7.02757C13.9825 7.02598 14.7362 7.76151 14.7362 8.67056ZM13.5168 13.6069C13.5024 13.7104 13.4531 13.8027 13.383 13.8743C13.2971 13.9602 13.1793 14.0128 13.0503 14.0128L6.86184 14.0128C6.62462 14.0128 6.42721 13.8361 6.39537 13.6069C6.39856 13.5385 6.40491 13.47 6.41128 13.4016C6.5275 12.3336 7.11817 10.5323 7.96835 9.95936C8.15621 9.83362 8.40139 9.83521 8.58767 9.96254C8.723 10.0549 8.86788 10.1344 9.02072 10.1981C9.3248 10.327 9.648 10.3923 9.98074 10.3923C10.3135 10.3923 10.6367 10.327 10.9408 10.1981C11.0872 10.136 11.2258 10.0612 11.3563 9.97368C11.5426 9.84794 11.7878 9.84953 11.9724 9.97687C12.8067 10.5514 13.3862 12.3447 13.5009 13.4016C13.5072 13.47 13.5136 13.5385 13.5168 13.6069ZM5.7251 10.4162C5.81585 10.4782 5.91137 10.5339 6.01167 10.5801C5.69485 11.1133 5.49425 12.566 5.41146 13.1772L5.39236 13.2376L5.39236 13.3491C5.38599 13.4176 5.3812 13.4875 5.37642 13.5576L5.37484 13.583L5.37484 13.6802L5.38439 13.7518C5.39712 13.8409 5.41781 13.9284 5.44647 14.0144L4.24605 14.0144C4.04226 14.0144 3.8735 13.8631 3.84644 13.6674C3.84962 13.6085 3.85439 13.5496 3.86076 13.4923C3.96106 12.5771 4.46576 10.908 5.19493 10.4162C5.35414 10.3047 5.56589 10.3063 5.7251 10.4162ZM16.1542 13.6658C16.1412 13.7549 16.0989 13.8345 16.037 13.895C15.9621 13.9682 15.8596 14.0144 15.7456 14.0144L14.5132 14.0144C14.5425 13.9284 14.5637 13.8408 14.5767 13.7517L14.5914 13.6562L14.5865 13.559C14.5816 13.4715 14.5751 13.3823 14.5653 13.2948C14.4937 12.6436 14.2804 11.151 13.9483 10.5985C14.0574 10.5508 14.1632 10.4935 14.2625 10.4282C14.4253 10.3199 14.6402 10.3215 14.803 10.4314C15.534 10.9233 16.0419 12.5863 16.1428 13.4922C16.1477 13.5479 16.1526 13.6069 16.1542 13.6658Z" fill="rgb(246,250,253)" fill-rule="evenodd" />
+</svg>
diff --git a/packages/layout/src/DesignWorkspace.vue b/packages/layout/src/DesignWorkspace.vue
index 993f6b86b0..6a8c4e49a1 100644
--- a/packages/layout/src/DesignWorkspace.vue
+++ b/packages/layout/src/DesignWorkspace.vue
@@ -7,9 +7,50 @@
           class="icon-arrow-left"
           @click="$emit('backToDesigner', '')"
         ></tiny-icon-arrow-left>
-        <svg-icon name="template-logo"></svg-icon>
+        <svg-icon class="logo-icon" name="template-logo"></svg-icon>
         <span>TinyEngine</span>
       </div>
+      <div class="user-wrapper">
+        <tiny-popover :visible-arrow="false" width="150" trigger="click">
+          <template #reference>
+            <div class="tenant-wrapper">
+              <span>{{ tenantValue.label }}</span>
+              <svg-icon class="expand-icon" name="down-arrow"></svg-icon>
+            </div>
+          </template>
+          <div class="dropdown-menu__items">
+            <div class="tenant-title">选择组织</div>
+            <div v-if="tenantList.length">
+              <div
+                class="dropdown-menu__item"
+                :class="{ 'active-menu': item.id === tenantValue?.id }"
+                v-for="item in tenantList"
+                :key="item.id"
+                @click="changeTenant(item.id)"
+              >
+                <svg-icon class="tenant-icon" name="organize"></svg-icon>
+                <span>{{ item.label }}</span>
+              </div>
+            </div>
+            <div class="empty" v-else>暂无相关数据</div>
+          </div>
+        </tiny-popover>
+        <tiny-popover :visible-arrow="false" width="150" trigger="click">
+          <template #reference>
+            <div>
+              <svg-icon class="user-icon" name="default-user"></svg-icon>
+            </div>
+          </template>
+          <div class="user-name">
+            <svg-icon class="user-icon" name="default-user"></svg-icon>{{ userInfo.username }}
+          </div>
+          <div class="divider"></div>
+          <div class="user-out" @click="logOut">
+            <svg-icon class="out-icon" name="log-out"></svg-icon>
+            退出登录
+          </div>
+        </tiny-popover>
+      </div>
     </div>
     <div class="manager-index">
       <div class="manager-menu">
@@ -28,11 +69,14 @@
 </template>
 
 <script>
-import { ref } from 'vue'
+import { ref, computed, onMounted } from 'vue'
 import { iconArrowLeft } from '@opentiny/vue-icon'
+import { getMetaApi, META_SERVICE, getMergeMeta } from '@opentiny/tiny-engine-meta-register'
+import { Popover } from '@opentiny/vue'
 
 export default {
   components: {
+    TinyPopover: Popover,
     TinyIconArrowLeft: iconArrowLeft()
   },
   props: {
@@ -51,13 +95,60 @@ export default {
       props.workspaceRegistry.find((item) => item.id === props.currentPageId) || props.workspaceRegistry[0]
     )
 
+    const enableLogin = getMergeMeta('engine.config')?.enableLogin
+    const { getUserInfo, setNeedToLogin, getBaseInfo } = getMetaApi(META_SERVICE.GlobalService)
+
+    const userInfo = computed(() => getUserInfo())
+    const tenantList = computed(() => {
+      const info = getUserInfo()
+
+      return Array.isArray(info?.tenant)
+        ? info.tenant?.map((item) => {
+            return {
+              ...item,
+              label: item.nameEn
+            }
+          })
+        : []
+    })
+    const tenantValue = computed(() =>
+      enableLogin
+        ? tenantList.value.find((item) => item.id === getBaseInfo().tenantId) || tenantList.value[0]
+        : { ...getBaseInfo(), label: 'Public' }
+    )
+
+    const changeTenant = (id) => {
+      const baseUrl = `${window.location.origin}${window.location.pathname}?type=app&`
+      window.location.href = `${baseUrl}tenant=${id}`
+    }
+
+    const logOut = () => {
+      localStorage.removeItem('engineToken')
+      setNeedToLogin(true)
+    }
     const handleMenuClick = (menu) => {
       activeNode.value = menu
     }
 
+    onMounted(() => {
+      if (enableLogin) {
+        const tenantId = getBaseInfo().tenantId || tenantList.value[0].id
+        const url = new URL(window.location.href)
+        if (!url.searchParams.has('tenant')) {
+          url.searchParams.append('tenant', tenantId)
+          window.history.replaceState({}, '', url.toString())
+        }
+      }
+    })
+
     return {
       activeNode,
-      handleMenuClick
+      tenantValue,
+      userInfo,
+      tenantList,
+      handleMenuClick,
+      changeTenant,
+      logOut
     }
   }
 }
@@ -74,13 +165,13 @@ export default {
     justify-content: space-between;
     align-items: center;
     border-bottom: 1px solid var(--te-common-border-bg-divider);
-    padding: 0 24px;
+    padding: 0 32px;
     .icon-arrow-left {
       font-size: 28px;
       padding-right: 10px;
       cursor: pointer;
     }
-    .svg-icon {
+    .logo-icon {
       font-size: 28px;
       padding-right: 8px;
     }
@@ -89,6 +180,22 @@ export default {
       font-size: 14px;
       font-weight: 500;
     }
+    .user-wrapper {
+      display: flex;
+      align-items: center;
+      gap: 12px;
+      .tenant-wrapper {
+        display: flex;
+        align-items: center;
+        gap: 4px;
+        .expand-icon {
+          font-size: 16px;
+        }
+      }
+      .user-icon {
+        font-size: 32px;
+      }
+    }
   }
   .manager-index {
     display: flex;
@@ -130,4 +237,59 @@ export default {
     background: var(--te-common-bg-container);
   }
 }
+.user-name {
+  color: var(--te-layout-common-text-color-weaken);
+  .user-icon {
+    margin-right: 6px;
+    font-size: 20px;
+  }
+}
+.divider {
+  width: 100%;
+  height: 1px;
+  background: var(--te-layout-common-border-color);
+  margin: 8px 0;
+}
+.user-out {
+  display: flex;
+  align-items: center;
+  font-size: 12px;
+  padding: 4px 16px;
+  margin: 0 -16px;
+  cursor: pointer;
+  .out-icon {
+    margin-right: 6px;
+  }
+  &:hover {
+    background: var(--te-layout-workspace-dropdown-bg-color-hover);
+  }
+}
+.dropdown-menu__items {
+  .tenant-title {
+    font-size: 14px;
+    line-height: 16px;
+    margin-bottom: 14px;
+    color: var(--te-layout-common-text-color-secondary);
+  }
+  .dropdown-menu__item {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    padding: 4px 16px;
+    margin: 0 -16px;
+    line-height: 16px;
+    .tenant-icon {
+      font-size: 20px;
+    }
+    &:hover {
+      background: var(--te-layout-workspace-dropdown-bg-color-hover);
+    }
+  }
+  .empty {
+    color: var(--te-layout-common-text-color-weaken);
+  }
+  .active-menu {
+    background: var(--te-layout-workspace-dropdown-bg-color-active);
+  }
+}
 </style>
diff --git a/packages/layout/src/styles/vars.less b/packages/layout/src/styles/vars.less
index 580e75bf0b..4698ac98fb 100644
--- a/packages/layout/src/styles/vars.less
+++ b/packages/layout/src/styles/vars.less
@@ -6,6 +6,7 @@
   --te-layout-common-text-color-secondary-checked: var(--te-common-text-checked);
   --te-layout-common-text-color: var(--te-common-text-primary);
   --te-layout-common-text-color-secondary: var(--te-common-text-secondary);
+  --te-layout-common-text-color-weaken: var(--te-common-text-weaken);
   --te-layout-common-text-color-hover: var(--te-common-text-primary);
   --te-layout-common-text-color-active: var(--te-common-text-primary);
   --te-layout-common-icon-color-primary: var(--te-common-icon-primary);
@@ -13,4 +14,7 @@
   --te-layout-common-icon-bg-color-hover: var(--te-common-bg-disabled);
 
   --te-layout-panel-active-color: var(--te-common-bg-primary-checked);
+
+  --te-layout-workspace-dropdown-bg-color-hover: var(--te-common-bg-container);
+  --te-layout-workspace-dropdown-bg-color-active: var(--te-common-bg-container);
 }
diff --git a/packages/toolbars/user/src/Main.vue b/packages/toolbars/user/src/Main.vue
index 206b8b6bca..a1b98748ea 100644
--- a/packages/toolbars/user/src/Main.vue
+++ b/packages/toolbars/user/src/Main.vue
@@ -39,7 +39,7 @@
 <script lang="ts">
 import { reactive, computed } from 'vue'
 import type { Component } from 'vue'
-import { Popover, Select, Input} from '@opentiny/vue'
+import { Popover, Select, Input } from '@opentiny/vue'
 import { getMetaApi, META_SERVICE, useModal } from '@opentiny/tiny-engine-meta-register'
 
 export default {
@@ -59,7 +59,7 @@ export default {
     }
   },
   setup() {
-    const { getUserInfo, fetchUserInfo, setUserInfo, setTenantInfo, setNeedToLogin, getBaseInfo } = getMetaApi(
+    const { getUserInfo, fetchUserInfo, setUserInfo, setNeedToLogin, getBaseInfo } = getMetaApi(
       META_SERVICE.GlobalService
     )
     const state = reactive({
@@ -116,12 +116,8 @@ export default {
     }
 
     const changeTenant = (id) => {
-      setTenantInfo(id).then((tenantData) => {
-        setUserInfo(tenantData)
-        localStorage.setItem('engineToken', tenantData.token)
-        const baseUrl = `${window.location.origin}${window.location.pathname}?type=app&`
-        window.location.href = `${baseUrl}tenant=${id}`
-      })
+      const baseUrl = `${window.location.origin}${window.location.pathname}?type=app&`
+      window.location.href = `${baseUrl}tenant=${id}`
     }
 
     return {