Merge pull request #280 from SuanmoSuanyangTechnology/fix/release_web_zy
fix(web): prompt history remove pageLoading
This commit is contained in:
@@ -26,6 +26,7 @@ interface PageScrollListProps<T, Q = Record<string, unknown>> {
|
|||||||
query?: Q;
|
query?: Q;
|
||||||
column?: number;
|
column?: number;
|
||||||
className?: string;
|
className?: string;
|
||||||
|
needLoading?: boolean;
|
||||||
}
|
}
|
||||||
const PageScrollList = forwardRef(<T, Q = Record<string, unknown>>({
|
const PageScrollList = forwardRef(<T, Q = Record<string, unknown>>({
|
||||||
renderItem,
|
renderItem,
|
||||||
@@ -33,6 +34,7 @@ const PageScrollList = forwardRef(<T, Q = Record<string, unknown>>({
|
|||||||
url,
|
url,
|
||||||
column = 4,
|
column = 4,
|
||||||
className = '',
|
className = '',
|
||||||
|
needLoading = true,
|
||||||
}: PageScrollListProps<T, Q>, ref: React.Ref<PageScrollListRef>) => {
|
}: PageScrollListProps<T, Q>, ref: React.Ref<PageScrollListRef>) => {
|
||||||
useImperativeHandle(ref, () => ({
|
useImperativeHandle(ref, () => ({
|
||||||
refresh,
|
refresh,
|
||||||
@@ -104,9 +106,10 @@ const PageScrollList = forwardRef(<T, Q = Record<string, unknown>>({
|
|||||||
dataLength={data.length}
|
dataLength={data.length}
|
||||||
next={loadMoreData}
|
next={loadMoreData}
|
||||||
hasMore={hasMore}
|
hasMore={hasMore}
|
||||||
loader={<PageLoading />}
|
loader={needLoading ? <PageLoading /> : undefined}
|
||||||
// endMessage={<Divider plain>It is all, nothing more 🤐</Divider>}
|
// endMessage={<Divider plain>It is all, nothing more 🤐</Divider>}
|
||||||
scrollableTarget="scrollableDiv"
|
scrollableTarget="scrollableDiv"
|
||||||
|
className='rb:h-full!'
|
||||||
>
|
>
|
||||||
{data.length > 0 ? (
|
{data.length > 0 ? (
|
||||||
<List
|
<List
|
||||||
|
|||||||
@@ -180,4 +180,7 @@ body {
|
|||||||
.x6-node foreignObject > body {
|
.x6-node foreignObject > body {
|
||||||
min-height: 100%;
|
min-height: 100%;
|
||||||
max-height: 100%;
|
max-height: 100%;
|
||||||
|
}
|
||||||
|
#scrollableDiv .infinite-scroll-component__outerdiv {
|
||||||
|
height: 100%;
|
||||||
}
|
}
|
||||||
@@ -50,6 +50,7 @@ const History: React.FC<{ query: HistoryQuery; edit: (item: HistoryItem) => void
|
|||||||
url={getPromptReleaseListUrl}
|
url={getPromptReleaseListUrl}
|
||||||
query={query}
|
query={query}
|
||||||
column={3}
|
column={3}
|
||||||
|
needLoading={false}
|
||||||
renderItem={(item) => {
|
renderItem={(item) => {
|
||||||
const historyItem = item as unknown as HistoryItem;
|
const historyItem = item as unknown as HistoryItem;
|
||||||
return (
|
return (
|
||||||
|
|||||||
Reference in New Issue
Block a user