diff --git a/packages/common/src/assets/appIcon/ai-extension.svg b/packages/common/src/assets/appIcon/ai-extension.svg new file mode 100644 index 00000000..9945ab9c --- /dev/null +++ b/packages/common/src/assets/appIcon/ai-extension.svg @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/common/src/assets/appIcon/genui-sdk-white.svg b/packages/common/src/assets/appIcon/genui-sdk-white.svg new file mode 100644 index 00000000..6a65a6eb --- /dev/null +++ b/packages/common/src/assets/appIcon/genui-sdk-white.svg @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/common/src/assets/appIcon/genui-sdk.svg b/packages/common/src/assets/appIcon/genui-sdk.svg index 43383347..4609b60a 100644 --- a/packages/common/src/assets/appIcon/genui-sdk.svg +++ b/packages/common/src/assets/appIcon/genui-sdk.svg @@ -1,28 +1,28 @@ - + - + - + - + - - - - + + + + - + - + diff --git a/packages/common/src/assets/appIcon/next-sdk.svg b/packages/common/src/assets/appIcon/next-sdk.svg index 4141f73e..42efd7f5 100644 --- a/packages/common/src/assets/appIcon/next-sdk.svg +++ b/packages/common/src/assets/appIcon/next-sdk.svg @@ -1,27 +1,30 @@ - + - - - + + + + - - - + + + + + + + - - - + + - - - - - + + + + - - + + - \ No newline at end of file + diff --git a/packages/common/src/assets/appIcon/tiny-chart.svg b/packages/common/src/assets/appIcon/tiny-chart.svg index 895b4baf..0c2d421c 100644 --- a/packages/common/src/assets/appIcon/tiny-chart.svg +++ b/packages/common/src/assets/appIcon/tiny-chart.svg @@ -1,27 +1,35 @@ - - - Created with Pixso. - + - - - - + + + + - - - - + + + + - - - + + + + + + + - - - - - + + + + + + + + + + + + diff --git a/packages/common/src/assets/appIcon/tiny-cli.svg b/packages/common/src/assets/appIcon/tiny-cli.svg index aa96bbea..5ddd1c21 100644 --- a/packages/common/src/assets/appIcon/tiny-cli.svg +++ b/packages/common/src/assets/appIcon/tiny-cli.svg @@ -1,21 +1,20 @@ - - - Created with Pixso. - + - - - - + + + + - - - + + + - - - - + + + + + + diff --git a/packages/common/src/assets/appIcon/tiny-editor.svg b/packages/common/src/assets/appIcon/tiny-editor.svg index 09cab5de..ea2d490b 100644 --- a/packages/common/src/assets/appIcon/tiny-editor.svg +++ b/packages/common/src/assets/appIcon/tiny-editor.svg @@ -1,21 +1,21 @@ - + - + - + - - + + - + - + diff --git a/packages/common/src/assets/appIcon/tiny-engine.svg b/packages/common/src/assets/appIcon/tiny-engine.svg index 720d35d4..afe63774 100644 --- a/packages/common/src/assets/appIcon/tiny-engine.svg +++ b/packages/common/src/assets/appIcon/tiny-engine.svg @@ -1,22 +1,21 @@ - - - Created with Pixso. - + - - - - + + + + - - - + + + - - - - - + + + + + + + diff --git a/packages/common/src/assets/appIcon/tiny-ng.svg b/packages/common/src/assets/appIcon/tiny-ng.svg index 2df9d526..73488b12 100644 --- a/packages/common/src/assets/appIcon/tiny-ng.svg +++ b/packages/common/src/assets/appIcon/tiny-ng.svg @@ -1,28 +1,27 @@ - - - Created with Pixso. - + - - - + + + - - - + + + - - - - + + + + - - - + + + + + + + + + - - - - diff --git a/packages/common/src/assets/appIcon/tiny-pro-ng.svg b/packages/common/src/assets/appIcon/tiny-pro-ng.svg new file mode 100644 index 00000000..e230bc6b --- /dev/null +++ b/packages/common/src/assets/appIcon/tiny-pro-ng.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/common/src/assets/appIcon/tiny-pro.svg b/packages/common/src/assets/appIcon/tiny-pro.svg index 40a671a7..ddd18974 100644 --- a/packages/common/src/assets/appIcon/tiny-pro.svg +++ b/packages/common/src/assets/appIcon/tiny-pro.svg @@ -1,21 +1,31 @@ - - - Created with Pixso. - + - - - - + + + + - - - + + + + + + + + - - - - + + + + + + + + + + + + diff --git a/packages/common/src/assets/appIcon/tiny-robot-white.svg b/packages/common/src/assets/appIcon/tiny-robot-white.svg new file mode 100644 index 00000000..db877b1b --- /dev/null +++ b/packages/common/src/assets/appIcon/tiny-robot-white.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/packages/common/src/assets/appIcon/tiny-robot.svg b/packages/common/src/assets/appIcon/tiny-robot.svg index 339d60b6..2349dd42 100644 --- a/packages/common/src/assets/appIcon/tiny-robot.svg +++ b/packages/common/src/assets/appIcon/tiny-robot.svg @@ -1,9 +1,16 @@ - - - - - - - + + + + + + + + + + + + + + diff --git a/packages/common/src/assets/appIcon/tiny-theme.svg b/packages/common/src/assets/appIcon/tiny-theme.svg index f2d9cc6a..95ef854d 100644 --- a/packages/common/src/assets/appIcon/tiny-theme.svg +++ b/packages/common/src/assets/appIcon/tiny-theme.svg @@ -19,4 +19,4 @@ - + \ No newline at end of file diff --git a/packages/common/src/assets/appIcon/tiny-vue-mobile.svg b/packages/common/src/assets/appIcon/tiny-vue-mobile.svg index c557929e..b5020071 100644 --- a/packages/common/src/assets/appIcon/tiny-vue-mobile.svg +++ b/packages/common/src/assets/appIcon/tiny-vue-mobile.svg @@ -25,4 +25,4 @@ - + \ No newline at end of file diff --git a/packages/common/src/assets/appIcon/tiny-vue-plus.svg b/packages/common/src/assets/appIcon/tiny-vue-plus.svg index 5b6a9f99..0a8caffb 100644 --- a/packages/common/src/assets/appIcon/tiny-vue-plus.svg +++ b/packages/common/src/assets/appIcon/tiny-vue-plus.svg @@ -35,4 +35,4 @@ - + \ No newline at end of file diff --git a/packages/common/src/assets/appIcon/tiny-vue.svg b/packages/common/src/assets/appIcon/tiny-vue.svg index 5dd2dba0..59ee6a59 100644 --- a/packages/common/src/assets/appIcon/tiny-vue.svg +++ b/packages/common/src/assets/appIcon/tiny-vue.svg @@ -1,21 +1,23 @@ - - - Created with Pixso. - + - - - + + + + - - - - + + + - - - + + + + + + + + + - diff --git a/packages/common/src/assets/appIcon/web-agent.svg b/packages/common/src/assets/appIcon/web-agent.svg new file mode 100644 index 00000000..0475976a --- /dev/null +++ b/packages/common/src/assets/appIcon/web-agent.svg @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/common/src/components/footer.vue b/packages/common/src/components/footer.vue index cf0d175b..b600216f 100644 --- a/packages/common/src/components/footer.vue +++ b/packages/common/src/components/footer.vue @@ -67,9 +67,9 @@ function toggleLink(link: any) { @@ -346,16 +249,8 @@ function toggleLink(link: any) { color: #b3b3b3; background-color: #1a1a1a; - .footer-content { - border-bottom-color: #979797; - - .footer-text-list { - border-bottom-color: #979797; - } - } - .footer-title { color: #e6e6e6; } } - + \ No newline at end of file diff --git a/packages/common/src/components/header.vue b/packages/common/src/components/header.vue index db0cb9d4..b433a6af 100644 --- a/packages/common/src/components/header.vue +++ b/packages/common/src/components/header.vue @@ -22,6 +22,7 @@ import UserIcon3 from '../assets/userIcon/userIcon_3.png' // theme svg import SunSvg from '../assets/theme-icon/sun.svg' import MoonSvg from '../assets/theme-icon/moon.svg' +import gitcodeLogo from '../assets/appIcon/gitcode-logo.svg' import { useDark, useToggle } from "@vueuse/core" import useClickOutside from './useClickOutside' @@ -65,14 +66,12 @@ interface UserInfo { userId: string; userIcon: string } const state = reactive({ headerInfo: (props.options?.customMenus || headerInfo.filter(item => item.type !== 'other' - )).map(item => ({ ...item, active: false })), // 添加 active 字段 + )).map(item => ({ ...item, active: false })), otherAppInfo: headerInfo.filter(item => item.type === 'other' - ).map(item => ({ ...item, active: false })), // 添加 active 字段 + ).map(item => ({ ...item, active: false })), allInfo: props.options?.customMenus || headerInfo, - // isLogin: true, - // userInfo: { userId: 'shenjunjian', userIcon: UserIcon1 } as unknown as UserInfo isLogin: false, userInfo: null as unknown as UserInfo, mobileMenuActive: false, @@ -85,7 +84,6 @@ function enterTopMenu(item: any) { if (_lastHoverItem) { _lastHoverItem.active = false } - item.active = true _lastHoverItem = item } @@ -104,11 +102,11 @@ function checkUnderlineMenu() { }) }, 200); } -window.__checkUnderlineMenu=checkUnderlineMenu // 全局隐藏变量 +window.__checkUnderlineMenu=checkUnderlineMenu onMounted(() => checkUnderlineMenu()) -// 登录与登出。 +// 登录与登出 const userInfoUrl = `${serverHost}designtheme/api/user/userInfo`, loginUrl = `${serverHost}designtheme/api/user/login?thirdLoginType=third-platform`, logoutUrl = `${serverHost}designtheme/api/user/logout`; @@ -146,21 +144,16 @@ const userIconMap = { 'userIcon_1.png': UserIcon1, 'userIcon_2.png': UserIcon2, async function getUserInfo() { const res: any = await _queryUrl(userInfoUrl, 'json') if (res?.response?.data) { - // 已登录返回 data:{userId, userIcon} 未登录,返回data:{} state.userInfo = res.response.data state.isLogin = !!state.userInfo.userId - - // 外部登录,返回 data:{userIcon} 的值为: ['userIcon_1.png', 'userIcon_2.png', 'userIcon_3.png'] if (userIconMap[state.userInfo.userIcon]) { state.userInfo.userIcon = userIconMap[state.userInfo.userIcon] as string } } } -// onMounted(() => getUserInfo()) - // 移动端 -function clickMobileMenu(level1) { +function clickMobileMenu(level1: any) { if (level1 !== _lastHoverItem) { if (_lastHoverItem) { _lastHoverItem.m_active = false @@ -170,8 +163,6 @@ function clickMobileMenu(level1) { } else { level1.m_active = !level1.m_active } - - // checkUnderlineMenu() } useClickOutside(['.nav-mobile'], () => { @@ -181,20 +172,15 @@ useClickOutside(['.nav-mobile'], () => { // 收缩菜单 let menuEl: HTMLElement if (props?.options?.menuCollapse?.useCollapse) { - // 由于用户应用和common-header不是同一个应用,无法得知用户的menu什么时候加载出来 - // 用户也不可能页面显示的第1时间,就能点左上角的图标展开菜单,所以把这个时间留大一些。 setTimeout(() => { let menuId = props?.options?.menuCollapse?.menuId - if (!menuId) return - if (menuId.startsWith("#")) { menuId = menuId.slice(1) } - menuEl = document.getElementById(menuId) + menuEl = document.getElementById(menuId) as HTMLElement if (!menuEl) return - // resize时,给menu添加或移除 .common-user-menu-fixed 类名 const checkClass = () => { const winWidth = window.innerWidth; menuEl.classList.toggle('common-user-menu-fixed', winWidth <= 814) @@ -202,7 +188,6 @@ if (props?.options?.menuCollapse?.useCollapse) { window.addEventListener('resize', checkClass) checkClass() - // 监听document点击,如果不在MenuCollapse,且不在menuEl内部时,要关闭菜单 useClickOutside(['.is-menu-collapse', '#' + menuId], () => { state.menuCollapseActive = false menuEl.classList.toggle('active', state.menuCollapseActive) @@ -287,83 +272,70 @@ const toggleTheme = (event: MouseEvent) => {
- + - - - -