push im model

src/components/BTable.tsx

@@ -37,7 +37,6 @@ const BTable = (props: any) => {
       rowSelection={rowSelection}
       columns={props.columns}
       dataSource={dataSource}
-      
     />
   );
 };

src/components/dilog/index.tsx

@@ -34,7 +34,7 @@ const Dilog = (props: DilogModel) => {
       document.documentElement.removeEventListener("click", onClick);
       document.documentElement.removeEventListener("keydown", handleKeyword);
     };
-  }, [props.show]);
+  }, [props, props.show]);
   const handleClose = () => {
     showState(false);
     props.close();

src/components/form/select.tsx

@@ -4,19 +4,19 @@ import { useState } from "react";
 export const FormSelect = (v: FormDatas) => {
   const [list] = useState([
     {
-      value: 1,
+      value: "1",
       label: "卡片一",
     },
     {
-      value: 2,
+      value: "2",
       label: "卡片二",
     },
     {
-      value: 3,
+      value: "3",
       label: "卡片三",
     },
     {
-      value: 4,
+      value: "4",
       label: "卡片四",
     },
   ]);

src/hooks/mounted-status.ts

@@ -0,0 +1,12 @@
+import { useEffect, useRef } from "react"
+
+// 判断组件挂载状态
+export const useMountedStatus = () => {
+    const status = useRef(false)
+    useEffect(() => { 
+        status.current = true;
+        return ()=>{
+            status.current = false;
+        }
+    })
+}

src/model/userModel.ts

@@ -20,5 +20,4 @@ export interface UserDataType {
     startTime: any;
     endTime: any;
     status: any;
-    
 }

src/pages/card/card-list.tsx

@@ -117,6 +117,7 @@ const CardPageList = (props) => {
     ]
 
     const onFinish = (values: any) => {
+        values.cardType = `${values.cardType}`;
         if (!id) {
             cardStore.add(values);
         } else {

src/store/baseStore.ts

@@ -35,8 +35,8 @@ class BaseStore<B> implements BaseStoreInterface<B> {
         this.getlist()
     }
     // 分页
-    setPages(page: Pages) {
+    setPages(params: Pages) {
-        this.page = page
+        this.page = params
         this.getlist()
     }
     // 添加
@@ -54,15 +54,11 @@ class BaseStore<B> implements BaseStoreInterface<B> {
     // 获取列表
     async getlist() {
         let res = await baseHttp.get(this.urlConfig.LIST, {
-            pageNum: this.page?.PageNum | 1,
+            pageIndex: this.page?.PageNum ?? 1,
-            pageSize: this.page?.PageSize | 20,
+            pageSize: this.page?.PageSize ?? 20,
             isSelf: 0
         });
-        
+        console.log(this.page?.PageNum)
-        this.page = {
-            PageNum: res.data?.pageNum,
-            PageSize: res.data?.pageSize
-        }
         let data: Array<B> = []
         if (!res.data.records) {
             runInAction(() => {