show match history (90%)

Author: Java-S12138

src/background.js

@@ -17,6 +17,7 @@ import {
   queryMatchIpc,
   creatMatchAfterStartGame
 } from "../frankElectron";
+
 const Store = require("electron-store");Store.initRenderer()
 const path = require('path')
 

src/render/components/assist/assistWindow.vue

@@ -25,7 +25,7 @@ import {onMounted, ref} from "vue";
 import {ipcRenderer} from "electron";
 import {createHttp1Request} from "@/utils/league-connect";
 import {appConfig} from "@/utils/main/config";
-import {useStore} from "@/render/store";
+import {assistStore} from "@/render/store";
 import {storeToRefs} from "pinia/dist/pinia";
 import {querySummonerIdAndSummonerName,queryEnemySummonerIdAndSummonerName} from "@/utils/render/blacklistUtils";
 
@@ -50,7 +50,7 @@ onMounted(() => {
 const tabsInstRef = ref(['champRank', 'rune','blacklist'])
 let transValue = ref('champRank')
 const message = useMessage()
-const store = useStore()
+const store = assistStore()
 const {summonerInfo,showSummonerInfoModal,currentBlackList,endGameAfterInfo} = storeToRefs(store)
 const isSwitchBlacklist = appConfig.get('isSwitchBlacklist')
 

src/render/components/assist/blacklist.vue

@@ -130,7 +130,7 @@ import {onMounted, reactive, ref,watch} from "vue"
 import PickSummoner from "./pickSummoner.vue"
 import {appConfig} from "@/utils/main/config";
 import AddBlacklist from "./addBlacklist.vue"
-import {useStore} from "@/render/store";
+import {assistStore} from "@/render/store";
 import {storeToRefs} from "pinia/dist/pinia";
 
 const active = ref(false)
@@ -139,7 +139,7 @@ const blacklist = ref([])
 const detialsJson = reactive({name:'',date:'',content:'',tag:'',summonerId:''})
 const message = useMessage()
 let localBlacklist
-const store = useStore()
+const store = assistStore()
 const {currentBlackList} = storeToRefs(store)
 
 watch(currentBlackList.value,() => {

src/render/components/assist/pickSummoner.vue

@@ -79,14 +79,14 @@ import {CircleX} from '@vicons/tabler'
 import AddBlacklist from './addBlacklist.vue'
 import {ref} from "vue";
 import {ipcRenderer} from "electron";
-import {useStore} from "@/render/store";
+import {assistStore} from "@/render/store";
 import {storeToRefs} from "pinia/dist/pinia";
 
 
 const active = ref(false)
 const summonersList = ref([])
 const enemySummonersList = ref([])
-const store = useStore()
+const store = assistStore()
 const {endGameAfterInfo, showSummonerInfoModal} = storeToRefs(store)
 const blacklistName = ref('')
 const blacklistId = ref('')

src/render/components/home/dashboard.vue

@@ -21,7 +21,7 @@
       </n-popover>
       <n-popover :show-arrow="false" trigger="hover" :delay="1000">
         <template #trigger>
-          <n-button text circle color="black" @click="toSettingPage">
+          <n-button text circle color="black" @click="changePage">
             <n-icon size="24">
               <settings/>
             </n-icon>
@@ -38,7 +38,7 @@
             </n-icon>
           </n-button>
         </template>
-        是否退出Frank
+        是否退出Frank?
       </n-popconfirm>
     </n-space>
   </header>
@@ -47,17 +47,15 @@
 <script setup>
 import {NIcon, NSpace, NButton, NPopover,NPopconfirm} from 'naive-ui'
 import {ChevronsDownRight, Settings, CircleX} from '@vicons/tabler'
-import {useStore} from "@/render/store";
 import {ipcRenderer} from 'electron'
 import {ref} from "vue";
 import {appConfig} from "@/utils/main/config";
 
-
-const store = useStore()
+const emits = defineEmits(['changePage'])
 let isConnectSuccess = ref(appConfig.get('credentials.port'))
 
-const toSettingPage = () => {
-  store.pageIncrease()
+const changePage = () => {
+  emits('changePage')
 }
 
 const handldDrge = (pos) => {

src/render/components/home/fbottom.vue

@@ -57,7 +57,6 @@
         </n-space>
       </n-space>
     </n-card>
-
   </div>
 </template>
 

src/render/components/home/index.vue

@@ -1,25 +1,21 @@
 <template>
-  <dashboard></dashboard>
+  <dashboard @changePage="() => { pageCount =  pageCount === 1 ? 2 : 1}"/>
   <div>
-    <app-main v-if="pageCount==1" class="slide-in-left "></app-main>
-    <fbottom v-if="pageCount==1" class="slide-in-left "></fbottom>
-    <setting v-else-if="pageCount==2" class="slide-in-right "></setting>
+    <app-main v-if="pageCount===1" class="slide-in-left "/>
+    <fbottom v-if="pageCount===1" class="slide-in-left "/>
+    <setting v-else-if="pageCount===2" class="slide-in-right" @changePage="() => { pageCount = 1}"/>
   </div>
 </template>
 
 <script setup>
 import Dashboard from './dashboard.vue'
 import Setting from './setting.vue'
 import AppMain from './appMain.vue'
-import {useStore} from '../../store'
-import {storeToRefs} from 'pinia'
-import Fbottom from "@/render/components/home/fbottom";
-document.title = 'Frank'
-
-// 使用pinia 管理切换页面的参数
-const store = useStore()
-let {pageCount, echartsData} = storeToRefs(store)
+import Fbottom from "@/render/components/home/fbottom"
+import {ref} from "vue";
 
+document.title = 'Frank'
+const pageCount = ref(1)
 </script>
 
 <style scoped>

src/render/components/home/setting.vue

@@ -65,7 +65,7 @@
         <n-space>
           <n-tag :bordered="false" >赞助发电</n-tag>
           <n-button size="small" type="success" style="width: 214px;"
-                    secondary @click="showModal = true">赞助作者持续开发
+                    secondary @click="() => {showModal = true}">赞助作者持续开发
           </n-button>
         </n-space>
 
@@ -151,12 +151,11 @@ import {
 import {optionsChampion} from '@/utils/render/lolDataList'
 import {ref} from "vue";
 import {appConfig} from "@/utils/main/config"
-import {useStore} from "@/render/store";
 import {ipcRenderer} from "electron";
 
+const emits = defineEmits(['changePage'])
 let isExist = ref(false)
 let directory = ref('')
-const store = useStore()
 let isAutoPick = ref(appConfig.get('autoPickChampion.isAuto'))
 let pickChampion = ref(appConfig.get('autoPickChampion.championId'))
 const optionsChampionPick = optionsChampion
@@ -168,6 +167,11 @@ let isAccept = ref(appConfig.get('autoAccept'))
 const message = useMessage()
 const showModal = ref(false)
 
+
+const toHomePage = () => {
+  emits('changePage')
+}
+
 // 判断是否已经获取路径
 if (appConfig.get('gameDirectory') != '') {
   isExist.value = true
@@ -225,10 +229,6 @@ const handleUpdateAccept = () => {
   appConfig.set('autoAccept', isAccept.value)
 }
 
-// 回到首页
-const toHomePage = () => {
-  store.pageIncrease()
-}
 
 // 恢复默认设置
 const toReset = async () => {

src/render/components/matchHistory/barKDA.vue

@@ -192,6 +192,14 @@
 
         <div class="suspension">
           <n-space>
+            <n-button
+              text
+              @click="() => {pageCount=1}" color="black">
+              <n-icon size="25">
+                <PictureInPictureTop/>
+              </n-icon>
+            </n-button>
+
             <n-button
               text
               @click="handleMin" color="black">
@@ -235,14 +243,14 @@ import {
 } from 'naive-ui'
 import {onMounted, ref} from "vue"
 import {appConfig} from "@/utils/main/config"
-import {ChevronsDownLeft, CircleX, Ballon} from '@vicons/tabler'
+import {ChevronsDownLeft, CircleX, Ballon,PictureInPictureTop} from '@vicons/tabler'
 import {ipcRenderer} from "electron"
-import {useStore} from "@/render/store";
+import {matchStore} from "@/render/store";
 import {storeToRefs} from "pinia/dist/pinia";
 import {sendMessageToChat} from "@/utils/main/lcu";
 
-const store = useStore()
-const {echartsData, enemyEchartsData, currentTeam, currentEchartData,summonerInfo} = storeToRefs(store)
+const store = matchStore()
+const {echartsData, enemyEchartsData, currentTeam, currentEchartData,summonerInfo,pageCount} = storeToRefs(store)
 let refresh = ref(1)
 let topHorse = ref(appConfig.get("topHorse"))
 let midHorse = ref(appConfig.get("midHorse"))
@@ -254,7 +262,7 @@ let midHorseType = ref(horseType.value.mid)
 let botHorseType = ref(horseType.value.bot)
 let trashHorseType = ref(horseType.value.trash)
 const sendPopover = ref(false)
-const emits = defineEmits(['summonerId'])
+const emits = defineEmits(['summonerId','changePage'])
 
 const summonerName = ref([])
 
@@ -277,7 +285,6 @@ const closeWindow = () => {
 const handleMin = () => {
   ipcRenderer.send('match-history-window-min')
 }
-
 const sendToChat = () => {
   if (summonerName.value.length ===0){sendPopover.value = !sendPopover.value; return}
   let sendMessage = 'Powered By Frank \n'
@@ -347,8 +354,8 @@ function onClick() {
 
 .suspension {
   position: absolute;
-  top: 30px;
-  right: 25px;
+  top: 7px;
+  right: 3px;
 }
 
 .n-popconfirm__action {

src/render/components/matchHistory/gameDetails.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <n-card class="mainCard boxShadow">
+    <n-card class="mainCard boxShadow" content-style="padding-top:30px">
       <n-space vertical>
         <n-grid :cols="7">
           <n-gi>
@@ -56,7 +56,7 @@
           </n-gi>
         </n-grid>
       </n-space>
-      <n-space vertical  style="margin-top: 25px" :size="[2,21]" >
+      <n-space vertical  style="margin-top: 25px" :size="[2,25]" >
         <!--        队伍一-->
         <n-space justify="space-around" v-for="(singleData,index) in summonersDataList">
           <n-space vertical :size="[2,0]">
@@ -246,7 +246,7 @@ import {
 } from 'naive-ui'
 import {ThumbUp,World,ThumbDown,ChevronsDownLeft, ArrowBackUp, Ballon} from '@vicons/tabler'
 import {onMounted,ref} from "vue";
-import {useStore} from "@/render/store";
+import {matchStore} from "@/render/store";
 import {storeToRefs} from "pinia/dist/pinia";
 import {appConfig} from "@/utils/main/config";
 import {queryGameDetailsData} from "@/utils/main/queryDetailedGame";
@@ -258,10 +258,15 @@ export default {
     NCard, NAvatar, NSpace, NTag, NIcon, NButton, NColorPicker,NEllipsis,
     NPopover,NList, NListItem,NScrollbar,NGrid,NGi,NBadge,ThumbUp,World,ThumbDown,ChevronsDownLeft, ArrowBackUp, Ballon
   },
-  setup(props,{emit}){
+  props: {
+    lastPage: {
+      type: Number
+    }
+  },
+  setup(props){
     let gameDetalisList = []
-    const store = useStore()
-    const {currentQueryGameId,currentSummonerName} = storeToRefs(store)
+    const store = matchStore()
+    const {currentQueryGameId,currentSummonerName,pageCount} = storeToRefs(store)
     let titleList = ref([])
     let summonersDataList = ref([])
     let otherData = ref(null)
@@ -365,10 +370,14 @@ export default {
       })
     }
     const backPageSencond = () => {
-      emit('changePageSencond')
+      if (props.lastPage===1){
+        pageCount.value = 1
+      }else {
+        pageCount.value = 2
+      }
     }
     const handleMin = () => {
-      ipcRenderer.send('mainwin-min')
+      ipcRenderer.send('match-history-window-min')
     }
 
     // 图片不存在显示默认图片
@@ -413,8 +422,8 @@ export default {
 }
 .suspension {
   position: absolute;
-  bottom: 5px;
-  right: 60px;
+  top: 7px;
+  right: 3px;
 }
 .scale-in-hor-left {
   -webkit-animation: scale-in-hor-left 1.5s cubic-bezier(0.250, 0.460, 0.450, 0.940) both;