From 2d5822dfa6f8a70ab06c9c686513a0aef6680be3 Mon Sep 17 00:00:00 2001
From: Dunqing <dengqing0821@gmail.com>
Date: Thu, 23 Mar 2023 12:19:41 +0800
Subject: [PATCH] fix(FixedBlock): avoid kanban triggering programmatic
 scrolling (#1406)

* fix(FixedBlock): avoid kanban triggering programmatic scrolling

* fix: kanban
---
 packages/core/client/src/board/Board.tsx                 | 2 +-
 .../client/src/schema-component/antd/kanban/Kanban.tsx   | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/core/client/src/board/Board.tsx b/packages/core/client/src/board/Board.tsx
index cbc2baadb8..62ffe6f629 100644
--- a/packages/core/client/src/board/Board.tsx
+++ b/packages/core/client/src/board/Board.tsx
@@ -18,7 +18,7 @@ import { partialRight, when } from './utils';
 import withDroppable from './withDroppable';
 
 const Columns = forwardRef((props, ref: any) => (
-  <div ref={ref} style={{ whiteSpace: 'nowrap', height: '100%', overflowY: 'hidden' }} {...props} />
+  <div ref={ref} style={{ whiteSpace: 'nowrap', height: '100%', overflowY: 'clip' }} {...props} />
 ));
 
 const DroppableBoard = withDroppable(Columns);
diff --git a/packages/core/client/src/schema-component/antd/kanban/Kanban.tsx b/packages/core/client/src/schema-component/antd/kanban/Kanban.tsx
index 5b0c5ad8f2..a1d8f2210f 100644
--- a/packages/core/client/src/schema-component/antd/kanban/Kanban.tsx
+++ b/packages/core/client/src/schema-component/antd/kanban/Kanban.tsx
@@ -1,5 +1,6 @@
 import { ArrayField } from '@formily/core';
 import { observer, RecursionField, useField, useFieldSchema, useForm } from '@formily/react';
+import { css } from '@emotion/css'
 import { Spin, Tag } from 'antd';
 import React, { useContext, useMemo, useState } from 'react';
 import { SchemaComponentOptions } from '../..';
@@ -85,8 +86,14 @@ export const Kanban: any = observer((props: any) => {
     const updatedBoard = Board.moveCard({ columns: field.value }, fromColumn, toColumn);
     field.value = updatedBoard.columns;
   };
+
   return (
-    <Spin spinning={field.loading || false}>
+    <Spin wrapperClassName={css`
+      overflow: hidden;
+      > .ant-spin-container {
+        height: 100%;
+      }
+    `} spinning={field.loading || false}>
       <Board
         {...restProps}
         allowAddCard={!!schemas.cardAdder}