From 21801124c1c7ca5cfa4415a4aefe9f1c13987bd6 Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Mon, 6 Jan 2025 11:39:46 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BA=BA=E5=91=98=E5=8D=A1=E7=89=87=E9=94=9A?=
 =?UTF-8?q?=E7=82=B9=E5=A2=9E=E5=8A=A0=E6=BB=9A=E5=8A=A82.=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E8=AE=BE=E7=BD=AE=E5=A2=9E=E5=8A=A0=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/columnSetting/defineShowItems.js          | 5 +++++
 pc4mobx/organization/style/card.less                     | 9 +++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/pc4mobx/organization/components/columnSetting/defineShowItems.js b/pc4mobx/organization/components/columnSetting/defineShowItems.js
index 66838ef..48f9adf 100644
--- a/pc4mobx/organization/components/columnSetting/defineShowItems.js
+++ b/pc4mobx/organization/components/columnSetting/defineShowItems.js
@@ -38,11 +38,16 @@ export default class DefineShowItems extends Component {
         draggable
         deleteConfirm
         title=""
+        pageSize={10}
+        pageSizeOptions={[10, 20, 50]}
         columns={toJS(columns)}
         datas={toJS(datas)}
         copyFilterProps={["id"]}
         selectedData={!loading && toJS(selectedData)}
         onChange={e => columnSetting.setTableEditDatas(e)}
+        tableProps={{
+          scroll: { y: 400 }
+        }}
         onRowSelect={(sRowKeys, rows, dataIndex, selectedDatas) => this.onRowSelect(sRowKeys, rows, dataIndex, selectedDatas)}
       />
     );
diff --git a/pc4mobx/organization/style/card.less b/pc4mobx/organization/style/card.less
index f98d1a4..9497d8f 100644
--- a/pc4mobx/organization/style/card.less
+++ b/pc4mobx/organization/style/card.less
@@ -188,12 +188,17 @@
       width: 10%;
       background-color: #ffffff;
       margin-left: 20px;
+      position: fixed;
+      height: 100%;
+      top: 0;
+      right: 0;
+      overflow: scroll;
       .right{
         height: 100%;
         padding-left: 20px;
         .ant-timeline{
-          position: fixed;
-          top: 20px;
+          // position: fixed;
+          margin-top: 20px;
           .title {
             cursor: pointer;
           }