From 909adfead4fefbd4c7786486cc04163356b40123 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BD=A6=E5=8E=98=E5=AD=90?= <fadinglight9291117@126.com>
Date: Thu, 17 Nov 2022 17:13:09 +0800
Subject: [PATCH] =?UTF-8?q?to=F0=9F=9B=A0=EF=B8=8F:=20new=20api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/bills.ts            |  8 ++++----
 src/api/request.ts          |  2 +-
 src/pages/Home/Home.tsx     |  2 +-
 src/pages/Record/Record.tsx |  2 +-
 src/store/index.ts          | 26 +++++++++++++++++++-------
 vite.config.ts              |  2 +-
 6 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/src/api/bills.ts b/src/api/bills.ts
index f4fe86c..ac58057 100644
--- a/src/api/bills.ts
+++ b/src/api/bills.ts
@@ -2,16 +2,16 @@ import request from "./request";
 import {IBill} from "../model";
 
 export async function getBills(year: number, month: number) {
-    const data = await request.get(`/search/${year}/${month}`)
+    const data = await request.get(`/bill/${year}/${month}`)
     return data.data
 }
 
-export async function getClass() {
-    const data = await request.get(`/class`)
+export async function getLabels() {
+    const data = await request.get(`/label/`)
     return data.data
 }
 
 export async function createBill(bill: IBill) {
-    const data = await request.post(`/create`, bill)
+    const data = await request.post(`/bill/`, bill)
     return data.data
 }
\ No newline at end of file
diff --git a/src/api/request.ts b/src/api/request.ts
index bc6a9d0..01b6b75 100644
--- a/src/api/request.ts
+++ b/src/api/request.ts
@@ -1,7 +1,7 @@
 import axios from "axios";
 
 const request = axios.create({
-    baseURL: "/api",
+    baseURL: "/api/",
     timeout: 30000,
 })
 
diff --git a/src/pages/Home/Home.tsx b/src/pages/Home/Home.tsx
index ee3ff60..90db489 100644
--- a/src/pages/Home/Home.tsx
+++ b/src/pages/Home/Home.tsx
@@ -111,7 +111,7 @@ const Home = () => {
                 </Card>
                 {
                     clsesForShow.map(cls => {
-                        return (<Card>
+                        return (<Card key={cls.toString()}>
                             <Pie
                                 title={cls}
                                 data={transformer(billStore.groupByLabelOfClass(cls))}
diff --git a/src/pages/Record/Record.tsx b/src/pages/Record/Record.tsx
index c2b611a..8a8561c 100644
--- a/src/pages/Record/Record.tsx
+++ b/src/pages/Record/Record.tsx
@@ -130,7 +130,7 @@ function Record() {
         setUploadLoading(false)
     }
 
-    let classData: string[]
+    let classData: string[] = []
     switch (billType) {
         case BillType.consume:
             classData = Object.keys(cls2label.consume)
diff --git a/src/store/index.ts b/src/store/index.ts
index a2fcae3..2d0c7cc 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -1,6 +1,6 @@
 import { makeAutoObservable, runInAction } from "mobx";
 import { createContext } from "react";
-import { createBill, getBills, getClass } from "../api/bills";
+import { createBill, getBills, getLabels } from "../api/bills";
 import { BillType, IBill } from "../model";
 import * as R from "ramda"
 
@@ -10,11 +10,11 @@ import * as R from "ramda"
 export class Bill {
     private _bills: IBill[] = [];
     // _cls2label: IClass = {consume: new Map<string, string[]>(), income: []}
-    private _cls2label: { consume: Record<string, string[]>, income: [] } = { consume: {}, income: [] }
+    private _cls2label: { consume: [], income: [] } = { consume: [], income: [] }
 
     constructor() {
         makeAutoObservable(this)
-        this.fetchClass().then()
+        this.fetchLabels().then()
     }
 
     get bills() {
@@ -118,14 +118,26 @@ export class Bill {
     async fetch(year: number, month: number) {
         const data = await getBills(year, month)
         runInAction(() => {
-            this._bills = data
+            this._bills = data.map((data: any) => {
+                return {
+                    id: data.id,
+                    type: data.type.toLowerCase() === 'income' ? BillType.income : BillType.consume,
+                    date: data.date,
+                    money: data.money,
+                    cls: data.cls,
+                    label: data.label,
+                    options: data.options
+                }
+            })
         })
     }
 
-    async fetchClass() {
-        const cls2label = await getClass()
+    async fetchLabels() {
+        const cls2label = await getLabels()
         runInAction(() => {
-            this._cls2label = cls2label
+            if (cls2label.length > 0) {
+                this._cls2label == cls2label
+            }
         })
     }
 }
diff --git a/vite.config.ts b/vite.config.ts
index 42d2d5c..98fba33 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -7,7 +7,7 @@ export default defineConfig({
   server: {
     proxy: {
       "/api/": {
-        target: "http://www.fadinglight.cn:8088/",
+        target: "http://localhost:8080/api/v1/",
         changeOrigin: true,
         rewrite: (path) => path.replace(/^\/api/, ""),
       }