修改f001-f006

src/App.vue

@@ -16,6 +16,7 @@ import useLayoutStore from './layout/useLayoutStore'
 import WelcomePage from './layout/grid/WelcomePage'
 import TomatoPage from './layout/grid/TomatoPage'
 import useRouterStore from './useRouterStore'
+import BackupRecovery from './user/BackupRecovery'
 const Grid = asyncLoader(() => import('./layout/grid'))
 const Fox = asyncLoader(() => import('./fox'))
 const settings = useSettingsStore()
@@ -29,7 +30,13 @@ const layout = useLayoutStore()
 <template>
   <div class="fixed left-0 top-0 w-full h-screen style-root" @contextmenu.prevent>
     <Header />
-    <Background />
+    <Background
+      @dblclick="
+        () => {
+          layout.state.simple = !layout.state.simple
+        }
+      "
+    />
     <GLobalModal />
     <SettingsOverlay />
     <SettingsButton />
@@ -50,14 +57,21 @@ const layout = useLayoutStore()
         (layout.state.simple && settings.state.simpleModeShowString.includes('showDock'))
       "
     />
-    <div class="fixed z-40 right-[14%] top-8" v-if="!layout.state.simple ||
+    <div
-        (layout.state.simple && settings.state.simpleModeShowString.includes('showPet'))">
+      class="fixed z-40 right-[14%] top-8"
+      v-if="
+        !layout.state.simple ||
+        (layout.state.simple && settings.state.simpleModeShowString.includes('showPet'))
+      "
+    >
       <Fox />
     </div>
     <DirModal />
     <GlobalMenu />
     <WelcomePage></WelcomePage>
     <TomatoPage></TomatoPage>
+
+    <BackupRecovery v-if="router.path === 'global-backup'"></BackupRecovery>
   </div>
 </template>
 

src/GlobalModal.tsx

@@ -93,7 +93,8 @@ export default defineComponent(() => {
                   <AdderPage />
                 ) : router.path === 'global-background' ? (
                   <BackgroundSwtich />
-                ) : router.path.startsWith('widget-') ? (
+                ) :
+                  router.path.startsWith('widget-') ? (
                     (() => {
                       const name = router.path.split('-')[1]
                       const selected = widgetList.find((el) => el.name === name)

src/config.ts

@@ -20,7 +20,7 @@ export const apiBase = import.meta.env.PROD
 
 // 后端 cdn 加速地址
 export const cdnBase = import.meta.env.PROD ? apiBase : apiBase
-
+// eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiI2NzJkYjg5OGUxMjY5NDc1ODYwMmYwMTgifQ.8fpdr_HPgxyU0yr-8f6nGdbHYjsFRlBa2lvjc0Zhe-A
 // 图片后缀名
 export const imgArr = [
   'bmp',

src/layout/GlobalMenu.tsx

@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia'
-import { computed, defineComponent, onUnmounted, reactive } from 'vue'
+import { computed, defineComponent, onUnmounted, reactive, ref } from 'vue'
-import type { Block } from './layout.types'
+import type { Block, LayoutPages } from './layout.types'
 import clsx from 'clsx'
 import useLayoutStore from './useLayoutStore'
 import widgetList from '@/widgets'
@@ -11,11 +11,17 @@ import useSettingsStore from '@/settings/useSettingsStore'
 const defaultDisplay = {
   x: 0,
   y: 0,
-  type: 'global' as Block | 'global' | 'dock'
+  type: 'global' as Block | 'global' | 'dock' | 'page'
 }
 
 export const useMenuStore = defineStore('menu', () => {
   const display = reactive(defaultDisplay)
+  const selectPage = ref<{
+    id: string,
+    label: string,
+    name: string,
+  }>()
+  const showEditPage = ref(false)
   const mPos = {
     x: 0,
     y: 0
@@ -43,7 +49,9 @@ export const useMenuStore = defineStore('menu', () => {
     display,
     open,
     dismiss,
-    show
+    show,
+    selectPage,
+    showEditPage
   }
 })
 
@@ -184,6 +192,32 @@ export default defineComponent(() => {
               </>
             )
           }
+          if (menu.display.type === 'page') {
+            return (
+              <>
+                <Item
+                  onClick={() => {
+                    menu.showEditPage = true
+                    menu.dismiss()
+                  }}
+                >
+                  编辑
+                </Item>
+                <Item
+                  alert
+                  onClick={() => {
+                    // 删除链接
+                    const idx = layout.currentPage.list.findIndex((el) => el.id === block.id)
+                    if (idx < 0) return
+                    layout.currentPage.list.splice(idx, 1)
+                    menu.dismiss()
+                  }}
+                >
+                  删除
+                </Item>
+              </>
+            )
+          }
           const block = menu.display.type
           if (!block.link) {
             // 小组件

src/layout/grid/WelcomePage.tsx

@@ -2,9 +2,9 @@ import { computed, defineComponent, onMounted, ref, Transition } from 'vue'
 import WelcomeImg from '~/icons/welcome/welcomeTitle.png'
 import DivBgImg from '~/icons/welcome/back.png'
 import startUseImg from '~/icons/welcome/startUse.png'
-import useBackgroundStore from '../background/useBackgroundStore'
 import useLayoutStore from '../useLayoutStore'
 import request from '@/utils/request'
+import useStatisticStore from '@/utils/useStatisticStore'
 export const DefaultPageSetting = [
   {
     name: '游戏',
@@ -12,7 +12,7 @@ export const DefaultPageSetting = [
       'https://newfatfox.oss-cn-beijing.aliyuncs.com/000/user_upload/1/resource/831a4d4c-61ff-4bae-ad31-9c0f4fa2db1c.webp',
     contentUrl:
       'https://newfatfox.oss-cn-beijing.aliyuncs.com/000/user_upload/1/resource/b2f3ed2f-f550-499b-8ea1-dfd192cfd388.webp',
-    desct: '聚合多类游戏工具，以及 资讯、排行榜'
+    desct: '聚合多类游戏工具，以及 资讯、排行榜等'
   },
   {
     name: '工作台',
@@ -28,7 +28,7 @@ export const DefaultPageSetting = [
       'https://newfatfox.oss-cn-beijing.aliyuncs.com/000/user_upload/1/resource/73164094-cb0d-4366-8d1a-afc84ac119cc.webp',
     contentUrl:
       'https://newfatfox.oss-cn-beijing.aliyuncs.com/000/user_upload/1/resource/bcbbffc6-c8a4-4c8e-8ba5-36fa1fbad4f9.webp',
-    desct: '综合办公、学习、游戏等 属性，功能较为均'
+    desct: '综合办公、学习、游戏等 属性，功能较为均勺'
   }
 ]
 export default defineComponent(() => {
@@ -44,6 +44,11 @@ export default defineComponent(() => {
     if (!visited) {
       // 如果没有记录，说明是第一次访问
       isFirst.value = true
+      useStatisticStore().send({
+        widget: 'WELCOME',
+        action: 'OPEN',
+        space: 'TAB',
+      })
     }
   })
   return () =>
@@ -88,10 +93,10 @@ export default defineComponent(() => {
                       }
                       onClick={() => {
                         selectMode.value = idx
+
                       }}
                       style={{
-                        transform: `translate(${idx === selectMode.value ? 80 : idx === (selectMode.value + 1) % 2 ? 219 : -52}px) scale(${
+                        transform: `translate(${idx === selectMode.value ? 80 : (((selectMode.value === 2 && idx === 0) || (selectMode.value + 1 === idx)) ? 219 : -52)}px) scale(${idx === selectMode.value ? 1 : 0.85
-                          idx === selectMode.value ? 1 : 0.85
                           })`,
                         backgroundImage: `url('${DivBgImg}')`,
                         backgroundSize: '100% 100%',
@@ -130,6 +135,13 @@ export default defineComponent(() => {
                   if (!res) return
                   layout.state.dir = res.dir
                   layout.state.content = res.content
+
+                })
+                layout.state.current = selectMode.value as 0 | 1 | 2
+                useStatisticStore().send({
+                  widget: selectMode.value === 0 ? "WELCOME_GAME" : selectMode.value === 1 ? "WELCOME_WORK" : "WELCOME_RELAX",
+                  action: 'CLICK',
+                  space: 'TAB',
                 })
               }}
               style={{

src/layout/grid/index.tsx

@@ -21,6 +21,8 @@ export default defineComponent(() => {
 
   return () => (
     <div
+
+
       class="absolute left-0 top-0 w-full h-screen overflow-y-auto no-scrollbar pt-[240px] px-[calc((100%_-_var(--main-width))_/_2)]"
       onScroll={(e) => {
         const h = (e.target as any).scrollTop
@@ -57,6 +59,7 @@ export default defineComponent(() => {
       }}
     >
       <div
+
         class="w-full grid justify-center grid-flow-row-dense pb-[200px]"
         style="grid-template-columns:repeat(auto-fill, var(--block-size));grid-auto-rows:var(--block-size)"
         ref={container}

src/layout/header/search/SearchConfig.tsx

@@ -4,6 +4,7 @@ import useSearchStore from './useSearchStore'
 import { OhVueIcon, addIcons } from 'oh-vue-icons'
 import { FaPlus } from 'oh-vue-icons/icons'
 import useRouterStore from '@/useRouterStore'
+import useStatisticStore from '@/utils/useStatisticStore'
 
 addIcons(FaPlus)
 
@@ -34,6 +35,13 @@ export default defineComponent({
                 onClick={() => {
                   searchConfig.current = { ...item }
                   search.showSearchConfig = false
+
+                  useStatisticStore().send({
+                    widget: 'search',
+                    action: 'search',
+                    key: `key=${item.name}`
+                  })
+
                 }}
               >
                 <div

src/layout/header/search/SearchHistory.tsx

@@ -1,9 +1,10 @@
 import { defineComponent } from 'vue'
 import { OhVueIcon, addIcons } from 'oh-vue-icons'
-import { MdHistory, MdRemove, RiCloseCircleLine } from 'oh-vue-icons/icons'
+import { MdHistory, RiCloseCircleLine } from 'oh-vue-icons/icons'
 import useSearchConfigStore from './useSearchConfigStore'
 import jump from '@/utils/jump'
 import useSettingsStore from '@/settings/useSettingsStore'
+import useStatisticStore from '@/utils/useStatisticStore'
 addIcons(MdHistory, RiCloseCircleLine)
 export default defineComponent(() => {
   const searchConfig = useSearchConfigStore()
@@ -17,6 +18,12 @@ export default defineComponent(() => {
             class="flex justify-between hover:pl-[20px] duration-300 items-center text-black/80 cursor-pointer hover:bg-white/40 py-1 px-2 rounded transition-all"
             onMousedown={() => {
               jump(searchConfig.current.url + item)
+
+              useStatisticStore().send({
+                widget: 'search',
+                action: 'search',
+                key: `key=${item}&engine=${searchConfig.current.name}&type=直接搜索`
+              })
             }}
           >
             <div class="flex items-center w-0 flex-grow">

src/layout/header/search/useSearchConfigStore.ts

@@ -41,50 +41,7 @@ const defaultCustomSearchList: SearchInfo[] = [
 
 
 ]
-// const defaultCustomSearchList: SearchInfo[] = [
+
-//   {
-//     name: '知乎',
-//     url: 'https://www.zhihu.com/search?type=content&q=',
-//     icon: 'searchIcons/zhihu.svg',
-//     show: true
-//   },
-//   {
-//     name: 'GitHub',
-//     url: 'https://github.com/search?q=',
-//     icon: 'searchIcons/GitHub.svg',
-//     show: true
-//   },
-//   {
-//     name: 'F搜',
-//     url: 'https://fsoufsou.com/search?q=',
-//     icon: 'searchIcons/F.svg',
-//     show: true
-//   },
-//   {
-//     name: '豆瓣',
-//     url: 'https://www.douban.com/search?q=',
-//     icon: 'searchIcons/douban.svg',
-//     show: true
-//   },
-//   {
-//     name: 'Yandex',
-//     url: 'https://yandex.com/search/?text=',
-//     icon: 'searchIcons/yandex.svg',
-//     show: true
-//   },
-//   {
-//     name: '开发者',
-//     url: 'https://kaifa.baidu.com/searchPage?wd=',
-//     icon: 'searchIcons/kaifa.svg',
-//     show: true
-//   },
-//   {
-//     name: 'B站',
-//     url: 'https://search.bilibili.com/all?keyword=',
-//     icon: 'searchIcons/bilibili.svg',
-//     show: true
-//   }
-// ]
 export default defineStore(
   'searchConfig',
   () => {

src/layout/header/search/useSearchStore.ts

@@ -5,6 +5,7 @@ import jump from '@/utils/jump'
 import debounce from 'lodash/debounce'
 import { aIUrl, translateUrl } from '@/config'
 import request from '@/utils/request'
+import useStatisticStore from '@/utils/useStatisticStore'
 export type SearchAdType = {
   name: string
   icon: string
@@ -81,6 +82,12 @@ export default defineStore('search', () => {
         searchConfig.addHistory(str)
         searchStr.value = ''
         jump(searchConfig.current.url + str)
+  
+        useStatisticStore().send({
+          widget: 'search',
+          action: 'search',
+          key: `key=${str}&engine=${searchConfig.current.name}&type=直接搜索`
+        })
         return
       }
       if (current.value <= 1) {

src/layout/layout.types.ts

@@ -26,7 +26,7 @@ export interface Block {
   extra?: any
 }
 
-export type LayoutPages = { list: Block[]; label: string; name: string }[]
+export type LayoutPages = { list: Block[]; label: string; name: string; id: string }[]
 
 export interface Layout {
   content: [
@@ -52,3 +52,4 @@ export interface Layout {
   dockLabels: string
   simple: boolean
 }
+

src/layout/sider/ModeSwitch.tsx

@@ -16,9 +16,12 @@ export default defineComponent(() => {
     () => layout.state.current,
     (val) => {
       selected.value = val
+      hover.value = false
+
     },
     { immediate: true }
   )
+
   return () => (
     <div
       class="w-[56px] h-[56px] relative cursor-pointer"

src/layout/sider/index.tsx

@@ -9,7 +9,8 @@ import useUserStore from '@/user/useUserStore'
 import AvatarCircle from '@/user/AvatarCircle'
 import clsx from 'clsx'
 import useSettingsStore from '@/settings/useSettingsStore'
-
+import { useMenuStore } from '../GlobalMenu'
+import { v4 as uuid } from 'uuid'
 initIcons()
 addIcons(PxHeadset, PxAddBox, PxCheck)
 const Item = defineComponent({
@@ -29,6 +30,10 @@ const Item = defineComponent({
     active: {
       type: Boolean,
       default: false
+    },
+    id: {
+      type: String,
+      default: ''
     }
   },
   emits: ['click'],
@@ -36,6 +41,16 @@ const Item = defineComponent({
     const hover = ref(false)
     return () => (
       <div
+        onContextmenu={(e) => {
+          useMenuStore().open('page')
+          useMenuStore().selectPage = {
+            id: props.id,
+            label: props.label,
+            name: props.name,
+          }
+          e.stopPropagation()
+          e.preventDefault()
+        }}
         class={
           'relative z-10 w-full h-[56px] flex flex-col justify-center items-center text-[13px] cursor-pointer transition-all font-bold ' +
           (props.active ? 'text-white' : hover.value ? 'text-white' : 'text-white/80')
@@ -57,7 +72,7 @@ const Item = defineComponent({
   }
 })
 export default defineComponent(() => {
-  const showEdit = ref(false)
+  const menu = useMenuStore()
   const selected = ref(icons[0])
   const router = useRouterStore()
   const layout = useLayoutStore()
@@ -72,6 +87,21 @@ export default defineComponent(() => {
     },
     { immediate: true }
   )
+  watch(
+    () => menu.selectPage,
+    (val) => {
+      if (val) {
+        selected.value = {
+          name: val.name,
+          label: val.label
+        }
+        label.value = val.label
+      } else {
+        selected.value = icons[0]
+        label.value = ''
+      }
+    }
+  )
   return () => (
     <Transition>
       {layout.ready && (
@@ -112,6 +142,7 @@ export default defineComponent(() => {
                       key={idx}
                       name={el.name}
                       label={el.label}
+                      id={el.id}
                       idx={idx}
                       active={layout.state.currentPage === idx}
                       onClick={() => {
@@ -137,7 +168,7 @@ export default defineComponent(() => {
                 name="px-add-box"
                 label="添加"
                 onClick={() => {
-                  showEdit.value = true
+                  menu.showEditPage = true
                 }}
               />
               <Item
@@ -161,14 +192,14 @@ export default defineComponent(() => {
               </div>
             </div>
             {/* 添加页面 */}
-            {showEdit.value && (
+            {menu.showEditPage && (
               <div
                 class={clsx(
                   'absolute  bottom-0 w-56 rounded-lg p-4 bg-white/40 backdrop-blur shadow-lg',
                   settings.state.siderDirection === 'left' ? 'left-[70px]' : 'right-[70px]'
                 )}
                 v-outside-click={() => {
-                  showEdit.value = false
+                  menu.showEditPage = false
                 }}
               >
                 <input
@@ -196,15 +227,25 @@ export default defineComponent(() => {
                 <div
                   class="w-full mt-2 py-1 rounded-lg bg-white text-center text-sm shadow hover:shadow-lg transition-all cursor-pointer"
                   onClick={() => {
+                    if (menu.selectPage) {
+                      menu.selectPage.name = selected.value.name
+                      menu.selectPage.label = label.value
+        
+                    } else {
                       layout.currentMode.pages.push({
                         list: [],
                         label: label.value,
-                      name: selected.value.name
+                        name: selected.value.name,
+                        id: uuid()
                       })
+                    }
+
+                    menu.showEditPage = false
+
                   }}
                 >
                   <OhVueIcon name="px-check" />
-                  添加页面
+                  {menu.selectPage ? "修改页面" : "添加页面"}
                 </div>
               </div>
             )}

src/useRouterStore.ts

@@ -1,7 +1,7 @@
 import { defineStore } from 'pinia'
 import { computed, ref, watch } from 'vue'
 
-export type GlobalStr = 'search' | 'block' | 'adder' | 'login' | 'background'
+export type GlobalStr = 'search' | 'block' | 'adder' | 'login' | 'background' | 'backup'
 export type SettingStr =
   | 'user'
   | 'background'

src/user/BackupRecovery.tsx

@@ -0,0 +1,49 @@
+import { defineComponent, ref, Transition } from 'vue'
+import useRouterStore from '@/useRouterStore'
+import { Radio, RadioGroup } from 'ant-design-vue'
+import useUserStore from './useUserStore'
+
+
+export default defineComponent(() => {
+    const router = useRouterStore()
+    const userStore = useUserStore()
+    const select = ref(1)
+    return () => (
+        <div class="fixed left-0 top-0 z-50 w-full">
+            <Transition>
+                <div
+                    class="w-full h-screen bg-black/50"
+
+                ></div>
+            </Transition>
+            <Transition name="modal">
+                <div class="absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2 overflow-hidden transition-all w-[400px]  h-[240px] rounded-lg  bg-white/30 ">
+                    <div class="w-full h-full flex flex-col justify-between p-4 px-6   rounded-lg bg-white overflow-hidden relative">
+                        <div class={"text-center border-b-[#ddd] border-b-[1px] pb-2 "}>选择账号数据</div>
+
+                        <span class={"text-[#666] text-[14px]"}>检测到云端数据和本地数据不一致，请选择合并或者覆盖</span>
+                        <RadioGroup value={select.value} onChange={(e) => {
+                            select.value = e.target.value
+                        }} class={"flex flex-col text-[#333] gap-y-3"}>
+                            <Radio value={1} class={"text-[#333]"}>合并数据</Radio>
+                            <Radio value={2} class={"text-[#333]"}>覆盖数据</Radio>
+
+                        </RadioGroup>
+                        <div class={"flex justify-end "}
+                            onClick={() => {
+                                if (select.value === 1) {
+                                    userStore.comineData()
+                                } else {
+                                    userStore.coverageData()
+                                }
+                                router.replace('')
+                            }}
+                        >
+                            <button class={"px-10 py-1 hover:opacity-80 duration-150 bg-[#4a7aff] text-white rounded-lg"}>确定</button>
+                        </div>
+                    </div>
+                </div>
+            </Transition>
+        </div>
+    )
+})

src/user/UserPage.tsx

@@ -39,12 +39,13 @@ export default defineComponent(() => {
           </div>
           <div class="flex py-2">
             <div class={labelStyle}>性别:</div>
-            <Tag color={user.profile.gender === 1 ? 'blue' : 'red'}>
+            <Tag color={user.profile.gender === 1 ? 'blue' : user.profile.gender === 2 ? 'red' : 'gray'}>
-              {user.profile.gender === 1 ? '男' : '女'}
+              {user.profile.gender === 1 ? '男' : user.profile.gender === 2 ? '女' : '未知'}
             </Tag>
           </div>
         </div>
-      )}
+      )
+      }
 
       <div class="flex justify-around items-center my-10">
         {user.isLogin ? (

src/user/useUserStore.ts

@@ -1,5 +1,6 @@
 import type { Block, Layout } from '@/layout/layout.types'
 import useLayoutStore from '@/layout/useLayoutStore'
+import useRouterStore from '@/useRouterStore'
 import request from '@/utils/request'
 import { defineStore } from 'pinia'
 import { computed, reactive, ref, watch } from 'vue'
@@ -21,12 +22,43 @@ const defaultUserInfo: UserInfo = {
   openId: ''
 }
 
+
+function areArraysEqualById(arr1: Block[], arr2: Block[]): boolean {
+  if (arr1.length !== arr2.length) {
+    return false;
+  }
+
+  // 将 arr2 转换为一个以 id 为键的映射
+
+
+  // 检查 arr1 中的每个 item 是否在 arr2 中存在，并且值是否相同
+  for (let i = 0; i < arr1.length; i++) {
+    console.log(arr1[i].id);
+    console.log(arr2[i].id);
+
+    if (arr1[i].id !== arr2[i].id) {
+
+      return false
+    }
+  }
+
+  return true;
+}
+
+export default defineStore('user', () => {
+  const token = ref(localStorage.getItem('token') || '')
+  const remoteData = ref<Layout | null>(null)
+  const remoteAddList = ref<Block[]>([])
+
+  const profile = reactive({ ...defaultUserInfo })
+  const layout = useLayoutStore()
+
+  const isLogin = computed(() => !!token.value && !!profile.id)
   function getLinkList(data: Layout) {
     const list = [] as Block[]
     for (const mode of data.content) {
       for (const page of mode.pages) {
         for (const item of page.list) {
-        if (!item.link || item.link.startsWith('id:')) break
           list.push(item)
         }
       }
@@ -41,44 +73,79 @@ function getLinkList(data: Layout) {
     }
     return list
   }
-
+  watch(
-export default defineStore('user', () => {
+    token,
-  const token = ref(localStorage.getItem('token') || '')
+    async (val) => {
-  watch(token, (val) => {
       localStorage.setItem('token', val)
-  })
+
-  const profile = reactive({ ...defaultUserInfo })
+      if (!val) return
-  const layout = useLayoutStore()
+      const res = await request<UserInfo>('GET', '/api/profile')
+      Object.assign(profile, res)
+    },
+    { immediate: true }
+  )
+
   watch(
     token,
     async (val) => {
       if (!val) return
-      const res = await request<UserInfo>('GET', '/api/profile')
+      console.log(val);
-      Object.assign(profile, res)
+
       const data = await request<Layout>('GET', '/api/backup')
+      if (!data) {
+        useRouterStore().replace('')
+
+        return
+      }
       const remoteList = getLinkList(data)
       const localList = getLinkList(layout.state)
-      const addList: Block[] = []
+
+      remoteAddList.value = []
       for (const item of remoteList) {
-        if (!localList.some((el) => el.id !== item.id)) {
+        // if (!localList.some((el) => el.id !== item.id)) {
-          addList.push(item)
+        //   // addList.push(item)
+        //   remoteAddList.value.push(item)
+        // }
+        if (localList.findIndex(val => val.id === item.id) === -1) {
+
+          remoteAddList.value.push({ ...item })
         }
       }
-      if (addList.length > 0) {
+
+
+      if (remoteAddList.value.length > 0 || !areArraysEqualById(remoteList, localList)) {
         // TODO: 交给张阳
+        // remoteAddList.value = addList
+        remoteData.value = data
+
+        useRouterStore().go('global-backup')
       }
     },
-    { immediate: true }
   )
-  const isLogin = computed(() => !!token.value && !!profile.id)
   const logout = () => {
     token.value = ''
     Object.assign(profile, { ...defaultUserInfo })
   }
+  const comineData = () => {
+    if (!remoteAddList.value) return
+    console.log({ ...remoteAddList.value });
+    remoteAddList.value.map(item => {
+      layout.state.content[layout.state.current].pages[layout.state.currentPage].list.push(item)
+    })
+  }
+  const coverageData = () => {
+    if (!remoteData.value) return
+    Object.assign(layout.state.content, remoteData.value.content)
+    Object.assign(layout.state.dock, remoteData.value.dock)
+    Object.assign(layout.state.dir, remoteData.value.dir)
+
+  }
   return {
     token,
     profile,
     isLogin,
-    logout
+    logout,
+    coverageData,
+    comineData
   }
 })

src/utils/tool.ts

@@ -1,3 +1,5 @@
+import useLayoutStore from "@/layout/useLayoutStore";
+import request from "./request";
 /**
  * 生成随机数
  * @param min 最小值
@@ -37,3 +39,21 @@ export function formatSeconds(seconds: number): string {
   // 返回格式化后的字符串，确保分钟和秒数都是两位数
   return `${String(minutes).padStart(2, '0')}:${String(remainingSeconds).padStart(2, '0')}`;
 }
+export function sendEvent(list: {
+  widget: string;
+  space?: string;
+  action: string;
+  key: string;
+}[]) {
+  const store = useLayoutStore()
+  request('POST', '/api/app/statistics', {
+    data: list.map((item) => ({
+      widget: item.widget,
+      space: item.space || store.state.current === 0 ? 'TAB_GAME' : store.state.current === 1 ? 'TAB_WORK' : 'TAB_EAZY',
+      action: item.action,
+      key: item.key
+    }))
+
+  })
+
+}

src/utils/useStatisticStore.ts

@@ -0,0 +1,47 @@
+import { debounce } from "lodash";
+import { defineStore } from "pinia"
+import { ref, watch, type Ref } from "vue"
+import request from "./request";
+import { message } from "ant-design-vue";
+import useLayoutStore from "@/layout/useLayoutStore";
+export type StatisticType = {
+    widget: string;
+    space?: string;
+    action: string;
+    key?: string;
+}
+export default defineStore('statistic', () => {
+    const list = ref([] as StatisticType[])
+    const store = useLayoutStore()
+    const send = (item: StatisticType) => {
+        list.value.push(item)
+    }
+    const debouncedHandler = debounce((newValue: StatisticType[]) => {
+        console.log('数值改变并已防抖处理:', newValue)
+        if (newValue.length === 0) return
+        request("POST", `/api/app/statistics`, {
+            data: newValue.map((item) => ({
+                widget: item.widget,
+                space: item.space || store.state.current === 0 ? 'TAB_GAME' : store.state.current === 1 ? 'TAB_WORK' : 'TAB_EAZY',
+                action: item.action,
+                key: item.key
+            })),
+            returnType: 'text'
+        }).then(() => {
+
+            list.value = []
+            message.success('发送统计成功')
+        })
+    }, 2500) // 
+    watch(list, (newValue) => {
+        console.log(list);
+
+        debouncedHandler(newValue)
+    }, {
+        deep: true
+    })
+    return {
+        list,
+        send
+    }
+})