shaogen1995 1 jaar geleden
bovenliggende
commit
a3686ecc29

+ 5 - 0
src/components/MyTable/index.module.scss

@@ -0,0 +1,5 @@
+.MyTable{
+  :global{
+    
+  }
+}

+ 36 - 0
src/components/MyTable/index.tsx

@@ -0,0 +1,36 @@
+import React from "react";
+import styles from "./index.module.scss";
+import { Table } from "antd";
+
+type Props = {
+  yHeight: number;
+  list: any;
+  total: number;
+  columnsTemp: any;
+  paging?: boolean; //开启分页,默认true
+};
+
+function MyTable({ yHeight, list, total, columnsTemp, paging = true }: Props) {
+  return (
+    <Table
+      className={styles.MyTable}
+      scroll={{ y: 625 }}
+      dataSource={tableInfo.list}
+      columns={columns}
+      rowKey="id"
+      pagination={{
+        showQuickJumper: true,
+        position: ["bottomCenter"],
+        showSizeChanger: true,
+        current: fromData.pageNum,
+        pageSize: fromData.pageSize,
+        total: tableInfo.total,
+        onChange: paginationChange(),
+      }}
+    />
+  );
+}
+
+const MemoMyTable = React.memo(MyTable);
+
+export default MemoMyTable;

+ 2 - 2
src/pages/A7user/UserAdd/index.tsx

@@ -19,7 +19,7 @@ function UserAdd({ id, closePage, upTableList, addTableList }: Props) {
   const getInfoInAPIFu = useCallback(async (id: number) => {
     const res = await getUserInfoByIdAPI(id);
     FormBoxRef.current?.setFieldsValue(res.data);
-    console.log("是编辑,在这里发请求拿数据", res);
+    // console.log("是编辑,在这里发请求拿数据", res);
   }, []);
 
   // 没有通过校验
@@ -95,7 +95,7 @@ function UserAdd({ id, closePage, upTableList, addTableList }: Props) {
           <Form.Item
             label="真实姓名"
             name="realName"
-            rules={[{ required: true, message: "请输入真实姓名!" }]}
+            // rules={[{ required: true, message: "请输入真实姓名!" }]}
             getValueFromEvent={(e) => e.target.value.replace(/\s+/g, "")}
           >
             <Input maxLength={8} showCount placeholder="请输入内容" />

+ 1 - 1
src/pages/A7user/index.tsx

@@ -124,7 +124,7 @@ function A7user() {
 
       {
         title: "真实姓名",
-        dataIndex: "realName",
+        render: (item: UserTableListType) =>item.realName||'(空)'
       },
       {
         title: "创建日期",

+ 3 - 1
src/pages/Layout/index.tsx

@@ -146,7 +146,9 @@ function Layout() {
         <div className="layoutRightTop">
           {/* 用户相关 */}
           <div className="user">
-            {getTokenInfo().user.realName || "匿名"}
+            {getTokenInfo().user.realName ||
+              getTokenInfo().user.userName ||
+              "匿名"}
             <div className="userInco userInco1">
               <CaretUpOutlined rev={undefined} />
             </div>