修复令牌bug

web/src/components/LogsTable.js

@@ -71,7 +71,7 @@ const LogsTable = () => {
                     isAdminUser ?
                     isAdminUser ?
                         record.type === 0 || record.type === 2 ?
                         record.type === 0 || record.type === 2 ?
                             <div>
                             <div>
-                                {<Tag color={stringToColor(text)} size='large'> {text} </Tag>}
+                                {<Tag color={colors[parseInt(text) % colors.length]} size='large'> {text} </Tag>}
                             </div>
                             </div>
                             :
                             :
                             <></>
                             <></>

web/src/components/TokensTable.js

@@ -187,21 +187,21 @@ const TokensTable = () => {
 
 
     const closeEdit = () => {
     const closeEdit = () => {
         setShowEdit(false);
         setShowEdit(false);
-        setEditingToken({
-            id: undefined,
-        });
+        // setEditingToken({
+        //     id: undefined,
+        // });
     }
     }
 
 
     const setTokensFormat = (tokens) => {
     const setTokensFormat = (tokens) => {
         setTokens(tokens);
         setTokens(tokens);
-        if (tokens.length === ITEMS_PER_PAGE) {
+        if (tokens.length >= ITEMS_PER_PAGE) {
             setTokenCount(tokens.length + ITEMS_PER_PAGE);
             setTokenCount(tokens.length + ITEMS_PER_PAGE);
         } else {
         } else {
             setTokenCount(tokens.length);
             setTokenCount(tokens.length);
         }
         }
     }
     }
 
 
-    // let pageData = tokens.slice((activePage - 1) * ITEMS_PER_PAGE, activePage * ITEMS_PER_PAGE);
+    let pageData = tokens.slice((activePage - 1) * ITEMS_PER_PAGE, activePage * ITEMS_PER_PAGE);
     const loadTokens = async (startIdx) => {
     const loadTokens = async (startIdx) => {
         setLoading(true);
         setLoading(true);
         const res = await API.get(`/api/token/?p=${startIdx}`);
         const res = await API.get(`/api/token/?p=${startIdx}`);
@@ -450,11 +450,12 @@ const TokensTable = () => {
                         onClick={searchTokens} style={{marginRight: 8}}>查询</Button>
                         onClick={searchTokens} style={{marginRight: 8}}>查询</Button>
             </Form>
             </Form>
 
 
-            <Table style={{marginTop: 20}} columns={columns} dataSource={tokens} pagination={{
+            <Table style={{marginTop: 20}} columns={columns} dataSource={pageData} pagination={{
                 currentPage: activePage,
                 currentPage: activePage,
                 pageSize: ITEMS_PER_PAGE,
                 pageSize: ITEMS_PER_PAGE,
                 total: tokenCount,
                 total: tokenCount,
-                pageSizeOpts: [10, 20, 50, 100],
+                showSizeChanger: true,
+                pageSizeOptions: [10, 20, 50, 100],
                 onPageChange: handlePageChange,
                 onPageChange: handlePageChange,
             }} loading={loading} rowSelection={rowSelection}>
             }} loading={loading} rowSelection={rowSelection}>
             </Table>
             </Table>

web/src/index.css

@@ -8,6 +8,15 @@ body {
     scrollbar-width: none;
     scrollbar-width: none;
     color: var(--semi-color-text-0) !important;
     color: var(--semi-color-text-0) !important;
     background-color: var( --semi-color-bg-0) !important;
     background-color: var( --semi-color-bg-0) !important;
+    height: 100%;
+}
+
+#root {
+    height: 100%;
+}
+
+.semi-layout {
+    height: 100%;
 }
 }
 
 
 .tableShow {
 .tableShow {
@@ -40,7 +49,7 @@ code {
     /*display: flex;*/
     /*display: flex;*/
     /*flex-direction: column;*/
     /*flex-direction: column;*/
     /*width: 100%;*/
     /*width: 100%;*/
-    height: 100vh;
+    height: 100%;
     overflow: hidden;
     overflow: hidden;
 }
 }
 
 

web/src/index.js

@@ -22,7 +22,6 @@ root.render(
             <UserProvider>
             <UserProvider>
                 <BrowserRouter>
                 <BrowserRouter>
                     <Layout>
                     <Layout>
-
                         <Sider>
                         <Sider>
                             <SiderBar/>
                             <SiderBar/>
                         </Sider>
                         </Sider>
@@ -37,11 +36,12 @@ root.render(
                             >
                             >
                                 <App/>
                                 <App/>
                             </Content>
                             </Content>
-                            <Footer></Footer>
+                            {/*<Layout.Footer>*/}
+                            {/*    <Footer></Footer>*/}
+                            {/*</Layout.Footer>*/}
                         </Layout>
                         </Layout>
+                        <ToastContainer/>
                     </Layout>
                     </Layout>
-                    <ToastContainer/>
-                    {/*<Footer />*/}
                 </BrowserRouter>
                 </BrowserRouter>
             </UserProvider>
             </UserProvider>
         </StatusProvider>
         </StatusProvider>

web/src/pages/Token/EditToken.js

@@ -112,6 +112,7 @@ const EditToken = (props) => {
     return (
     return (
         <>
         <>
             <SideSheet
             <SideSheet
+                placement={isEdit ? 'right' : 'left'}
                 title={<Title level={3}>{isEdit ? '更新令牌信息' : '创建新的令牌'}</Title>}
                 title={<Title level={3}>{isEdit ? '更新令牌信息' : '创建新的令牌'}</Title>}
                 headerStyle={{borderBottom: '1px solid var(--semi-color-border)'}}
                 headerStyle={{borderBottom: '1px solid var(--semi-color-border)'}}
                 bodyStyle={{borderBottom: '1px solid var(--semi-color-border)'}}
                 bodyStyle={{borderBottom: '1px solid var(--semi-color-border)'}}