From a48d100b2d51b6c92edb3581994aa2e4d90a86b9 Mon Sep 17 00:00:00 2001
From: whyour <imwhyour@gmail.com>
Date: Fri, 30 Aug 2024 00:30:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A1=A8=E6=A0=BC=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/dependence/index.tsx | 104 ++++++++++++++++++---------------
 src/pages/setting/index.tsx    |  10 ++--
 src/pages/setting/loginLog.tsx |  12 +++-
 3 files changed, 70 insertions(+), 56 deletions(-)

diff --git a/src/pages/dependence/index.tsx b/src/pages/dependence/index.tsx
index 8f014ecb..aaf77698 100644
--- a/src/pages/dependence/index.tsx
+++ b/src/pages/dependence/index.tsx
@@ -240,7 +240,7 @@ const Dependence = () => {
   const [isLogModalVisible, setIsLogModalVisible] = useState(false);
   const [type, setType] = useState('nodejs');
   const tableRef = useRef<HTMLDivElement>(null);
-  const tableScrollHeight = useTableScrollHeight(tableRef, 59);
+  const tableScrollHeight = useTableScrollHeight(tableRef, 162);
 
   const getDependencies = (status?: number[]) => {
     setLoading(true);
@@ -528,6 +528,56 @@ const Dependence = () => {
     setType(activeKey);
   };
 
+  const children = (
+    <div ref={tableRef}>
+      {selectedRowIds.length > 0 && (
+        <div style={{ marginBottom: 16 }}>
+          <Button
+            type="primary"
+            style={{ marginBottom: 5, marginLeft: 8 }}
+            onClick={() => handlereInstallDependencies()}
+          >
+            {intl.get('批量安装')}
+          </Button>
+          <Button
+            type="primary"
+            style={{ marginBottom: 5, marginLeft: 8 }}
+            onClick={() => delDependencies(false)}
+          >
+            {intl.get('批量删除')}
+          </Button>
+          <Button
+            type="primary"
+            style={{ marginBottom: 5, marginLeft: 8 }}
+            onClick={() => delDependencies(true)}
+          >
+            {intl.get('批量强制删除')}
+          </Button>
+          <span style={{ marginLeft: 8 }}>
+            {intl.get('已选择')}
+            <a>{selectedRowIds?.length}</a>
+            {intl.get('项')}
+          </span>
+        </div>
+      )}
+      <DndProvider backend={HTML5Backend}>
+        <Table
+          columns={columns}
+          rowSelection={rowSelection}
+          pagination={false}
+          dataSource={value}
+          rowKey="id"
+          size="middle"
+          scroll={{ x: 768, y: tableScrollHeight }}
+          loading={loading}
+          onChange={(pagination, filters) => {
+            getDependencies(filters?.status as number[]);
+          }}
+        />
+      </DndProvider>
+    </div>
+  );
+
   return (
     <PageContainer
       className="ql-container-wrapper dependence-wrapper ql-container-wrapper-has-tab"
@@ -552,69 +602,27 @@ const Dependence = () => {
         defaultActiveKey="nodejs"
         size="small"
         tabPosition="top"
+        style={{ height: '100%' }}
+        destroyInactiveTabPane
         onChange={onTabChange}
         items={[
           {
             key: 'nodejs',
             label: 'NodeJs',
+            children,
           },
           {
             key: 'python3',
             label: 'Python3',
+            children,
           },
           {
             key: 'linux',
             label: 'Linux',
+            children,
           },
         ]}
       />
-      <div ref={tableRef}>
-        {selectedRowIds.length > 0 && (
-          <div style={{ marginBottom: 16 }}>
-            <Button
-              type="primary"
-              style={{ marginBottom: 5, marginLeft: 8 }}
-              onClick={() => handlereInstallDependencies()}
-            >
-              {intl.get('批量安装')}
-            </Button>
-            <Button
-              type="primary"
-              style={{ marginBottom: 5, marginLeft: 8 }}
-              onClick={() => delDependencies(false)}
-            >
-              {intl.get('批量删除')}
-            </Button>
-            <Button
-              type="primary"
-              style={{ marginBottom: 5, marginLeft: 8 }}
-              onClick={() => delDependencies(true)}
-            >
-              {intl.get('批量强制删除')}
-            </Button>
-            <span style={{ marginLeft: 8 }}>
-              {intl.get('已选择')}
-              <a>{selectedRowIds?.length}</a>
-              {intl.get('项')}
-            </span>
-          </div>
-        )}
-        <DndProvider backend={HTML5Backend}>
-          <Table
-            columns={columns}
-            rowSelection={rowSelection}
-            pagination={false}
-            dataSource={value}
-            rowKey="id"
-            size="middle"
-            scroll={{ x: 768, y: tableScrollHeight }}
-            loading={loading}
-            onChange={(pagination, filters) => {
-              getDependencies(filters?.status as number[]);
-            }}
-          />
-        </DndProvider>
-      </div>
       <DependenceModal
         visible={isModalVisible}
         handleCancel={handleCancel}
diff --git a/src/pages/setting/index.tsx b/src/pages/setting/index.tsx
index bfa1f634..b291cb03 100644
--- a/src/pages/setting/index.tsx
+++ b/src/pages/setting/index.tsx
@@ -129,9 +129,9 @@ const Setting = () => {
   const [height, setHeight] = useState<number>(0);
 
   useResizeObserver(containergRef, (entry) => {
-    const _height = entry.target.parentElement?.parentElement?.offsetHeight;
-    if (_height && height !== _height - 110) {
-      setHeight(_height - 110);
+    const _height = (entry.target as HTMLElement)?.offsetHeight;
+    if (_height && height !== _height - 101) {
+      setHeight(_height - 101);
     }
   });
 
@@ -329,7 +329,7 @@ const Setting = () => {
                   dataSource={dataSource}
                   rowKey="id"
                   size="middle"
-                  scroll={{ x: 1000 }}
+                  scroll={{ x: 1000, y: height }}
                   loading={loading}
                 />
               ),
@@ -347,7 +347,7 @@ const Setting = () => {
             {
               key: 'login',
               label: intl.get('登录日志'),
-              children: <LoginLog data={loginLogData} />,
+              children: <LoginLog height={height} data={loginLogData} />,
             },
             {
               key: 'dependence',
diff --git a/src/pages/setting/loginLog.tsx b/src/pages/setting/loginLog.tsx
index a3348b65..5cfecc95 100644
--- a/src/pages/setting/loginLog.tsx
+++ b/src/pages/setting/loginLog.tsx
@@ -67,7 +67,14 @@ const columns = [
   },
 ];
 
-const LoginLog = ({ data }: any) => {
+const LoginLog = ({
+  data,
+  height,
+}: {
+  data: Array<object>;
+  height: number;
+}) => {
+  console.log(height);
   return (
     <>
       <Table
@@ -76,8 +83,7 @@ const LoginLog = ({ data }: any) => {
         dataSource={data}
         rowKey="id"
         size="middle"
-        scroll={{ x: 1000 }}
-        sticky
+        scroll={{ x: 1000, y: height }}
       />
     </>
   );