refactor: card list resize container

src/components/resize-container/index.tsx

@@ -0,0 +1,35 @@
+import { Col, Row } from 'antd';
+import ResizeObserver from 'rc-resize-observer';
+import useResponsive from './use-responsive';
+
+interface ResizeObserverContainerProps {
+  dataList: any[];
+  renderItem: (data: any) => React.ReactNode;
+  defaultSpan?: number;
+  resizable?: boolean;
+}
+
+const ResizeContainer: React.FC<ResizeObserverContainerProps> = ({
+  defaultSpan = 8,
+  dataList,
+  renderItem,
+  resizable = true
+}) => {
+  const { span, handleResize } = useResponsive({ defaultSpan });
+
+  return (
+    <ResizeObserver onResize={handleResize} disabled={!resizable}>
+      <Row gutter={[16, 16]}>
+        {dataList.map((item: any, index) => {
+          return (
+            <Col span={span} key={item.id || index}>
+              {renderItem(item)}
+            </Col>
+          );
+        })}
+      </Row>
+    </ResizeObserver>
+  );
+};
+
+export default ResizeContainer;

src/components/resize-container/use-responsive.ts

@@ -0,0 +1,23 @@
+import breakpoints from '@/config/breakpoints';
+import { useMemoizedFn } from 'ahooks';
+import _ from 'lodash';
+import { useState } from 'react';
+
+const useResponsive = ({ defaultSpan = 8 }: { defaultSpan?: number }) => {
+  const [span, setSpan] = useState(defaultSpan);
+
+  const getSpanByWidth = (width: number) => {
+    if (width < breakpoints.md) return 24;
+    if (width < breakpoints.lg) return 12;
+    return 8;
+  };
+
+  const handleResize = useMemoizedFn(
+    _.throttle((size: { width: number; height: number }) => {
+      setSpan(getSpanByWidth(size.width));
+    }, 100)
+  );
+  return { span, handleResize };
+};
+
+export default useResponsive;

src/components/templates/card-list.tsx

@@ -1,10 +1,9 @@
-import breakpoints from '@/config/breakpoints';
+import ResizeContainer from '@/components/resize-container';
+import CardSkeleton from '@/components/templates/card-skelton';
 import InfiniteScroller from '@/pages/_components/infinite-scroller';
 import { useScrollerContext } from '@/pages/_components/infinite-scroller/use-scroller-context';
-import { Col, Row, Spin } from 'antd';
+import { Spin } from 'antd';
-import _ from 'lodash';
+import React from 'react';
-import ResizeObserver from 'rc-resize-observer';
-import React, { useCallback } from 'react';
 import styled from 'styled-components';
 
 const SpinWrapper = styled.div`
@@ -30,22 +29,12 @@ interface CatalogListProps {
   activeId: Global.WithFalse<number>;
   isFirst: boolean;
   renderItem: (data: any) => React.ReactNode;
-  Skeleton: React.ComponentType<{ span: number }>;
 }
 
-const InnerSkeleton = (Skeleton: React.ComponentType<{ span: number }>) => {
-  return (props: any) => {
-    return <Skeleton {...props} />;
-  };
-};
-
 const ListSkeleton: React.FC<{
-  span: number;
   loading: boolean;
   isFirst: boolean;
-  Skeleton: React.ComponentType<{ span: number }>;
+}> = ({ loading, isFirst }) => {
-}> = ({ span, loading, isFirst, Skeleton }) => {
-  const CatalogSkeleton = InnerSkeleton(Skeleton);
   return (
     <div>
       {loading && (
@@ -57,7 +46,7 @@ const ListSkeleton: React.FC<{
             }}
             wrapperClassName="skelton-wrapper"
           >
-            {isFirst && <CatalogSkeleton span={span}></CatalogSkeleton>}
+            {isFirst && <CardSkeleton></CardSkeleton>}
           </Spin>
         </SpinWrapper>
       )}
@@ -72,10 +61,8 @@ const CardList: React.FC<CatalogListProps> = (props) => {
     isFirst,
     defaultSpan = 8,
     resizable = true,
-    Skeleton,
     renderItem
   } = props;
-  const [span, setSpan] = React.useState(defaultSpan);
   const {
     total,
     current,
@@ -83,46 +70,21 @@ const CardList: React.FC<CatalogListProps> = (props) => {
     refresh
   } = useScrollerContext();
 
-  const getSpanByWidth = (width: number) => {
-    if (width < breakpoints.md) return 24;
-    if (width < breakpoints.lg) return 12;
-    return 8;
-  };
-
-  const handleResize = useCallback(
-    _.throttle((size: { width: number; height: number }) => {
-      setSpan(getSpanByWidth(size.width));
-    }, 100),
-    []
-  );
-
   return (
-    <div className="relative" style={{ width: '100%' }}>
+    <InfiniteScroller
-      <ResizeObserver onResize={handleResize} disabled={!resizable}>
+      total={total}
-        <InfiniteScroller
+      current={current}
-          total={total}
+      loading={contextLoading}
-          current={current}
+      refresh={refresh}
-          loading={contextLoading}
+    >
-          refresh={refresh}
+      <ResizeContainer
-        >
+        dataList={dataList}
-          <Row gutter={[16, 16]}>
+        renderItem={renderItem}
-            {dataList.map((item: any, index) => {
+        defaultSpan={defaultSpan}
-              return (
+        resizable={resizable}
-                <Col span={span} key={item.id}>
+      ></ResizeContainer>
-                  {renderItem?.(item)}
+      <ListSkeleton loading={loading} isFirst={isFirst} />
-                </Col>
+    </InfiniteScroller>
-              );
-            })}
-          </Row>
-          <ListSkeleton
-            span={span}
-            loading={loading}
-            isFirst={isFirst}
-            Skeleton={Skeleton}
-          />
-        </InfiniteScroller>
-      </ResizeObserver>
-    </div>
   );
 };
 

src/components/templates/card-skelton.tsx

@@ -1,38 +1,33 @@
-import { Col, Row, Skeleton } from 'antd';
+import { Skeleton } from 'antd';
 import React from 'react';
+import ResizeContainer from '../resize-container';
 
 interface CatalogSkeltonProps {
-  span: number;
   skeletonProps?: any;
   skeletonStyle?: React.CSSProperties;
 }
 
 const CardSkelton: React.FC<CatalogSkeltonProps> = (props) => {
   return (
-    <Row gutter={[16, 16]}>
+    <ResizeContainer
-      {Array(6)
+      dataList={Array(6).fill({ label: 'skeleton' })}
-        .fill(1)
+      renderItem={() => (
-        .map((_, index) => {
+        <Skeleton
-          return (
+          avatar={{
-            <Col span={props.span} key={index}>
+            size: 32
-              <Skeleton
+          }}
-                avatar={{
+          paragraph={{ rows: 2 }}
-                  size: 32
+          style={{
-                }}
+            border: '1px solid var(--ant-color-border)',
-                paragraph={{ rows: 2 }}
+            borderRadius: 'var(--border-radius-base)',
-                style={{
+            padding: '16px 16px',
-                  border: '1px solid var(--ant-color-border)',
+            ...props.skeletonStyle
-                  borderRadius: 'var(--border-radius-base)',
+          }}
-                  padding: '16px 16px',
+          {...(props.skeletonProps || {})}
-                  ...props.skeletonStyle
+        ></Skeleton>
-                }}
+      )}
-                {...(props.skeletonProps || {})}
+    ></ResizeContainer>
-              ></Skeleton>
-            </Col>
-          );
-        })}
-    </Row>
   );
 };
 
-export default React.memo(CardSkelton);
+export default CardSkelton;

src/pages/_components/infinite-scroller/index.tsx

@@ -16,7 +16,7 @@ const InfiniteScroller: React.FC<
   const { observerRef, throttledLoadMore } = useInfiniteScroll(restProps);
 
   return (
-    <div>
+    <div className="relative" style={{ width: '100%' }}>
       {children}
       <div
         ref={observerRef}

src/pages/backends/components/backend-list.tsx

@@ -1,11 +1,9 @@
+import ResizeContainer from '@/components/resize-container';
 import CardSkeleton from '@/components/templates/card-skelton';
-import breakpoints from '@/config/breakpoints';
 import InfiniteScroller from '@/pages/_components/infinite-scroller';
 import { useScrollerContext } from '@/pages/_components/infinite-scroller/use-scroller-context';
-import { Col, Row, Spin } from 'antd';
+import { Spin } from 'antd';
-import _ from 'lodash';
+import React from 'react';
-import ResizeObserver from 'rc-resize-observer';
-import React, { useCallback } from 'react';
 import styled from 'styled-components';
 import BackendCard from './backend-card';
 
@@ -49,10 +47,9 @@ interface BackendListProps {
 }
 
 const ListSkeleton: React.FC<{
-  span: number;
   loading: boolean;
   isFirst: boolean;
-}> = ({ span, loading, isFirst }) => {
+}> = ({ loading, isFirst }) => {
   return (
     <div>
       {loading && (
@@ -67,7 +64,6 @@ const ListSkeleton: React.FC<{
             {isFirst && (
               <SkeletonWrapper>
                 <CardSkeleton
-                  span={span}
                   skeletonProps={{
                     title: false
                   }}
@@ -95,7 +91,6 @@ const CardList: React.FC<BackendListProps> = (props) => {
     resizable = true,
     onSelect
   } = props;
-  const [span, setSpan] = React.useState(defaultSpan);
   const {
     total,
     current,
@@ -104,42 +99,22 @@ const CardList: React.FC<BackendListProps> = (props) => {
     throttleDelay
   } = useScrollerContext();
 
-  const getSpanByWidth = (width: number) => {
-    if (width < breakpoints.md) return 24;
-    if (width < breakpoints.lg) return 12;
-    return 8;
-  };
-
-  const handleResize = useCallback(
-    _.throttle((size: { width: number; height: number }) => {
-      setSpan(getSpanByWidth(size.width));
-    }, 100),
-    []
-  );
-
   return (
-    <div className="relative" style={{ width: '100%' }}>
+    <InfiniteScroller
-      <ResizeObserver onResize={handleResize} disabled={!resizable}>
+      total={total}
-        <InfiniteScroller
+      current={current}
-          total={total}
+      loading={contextLoading}
-          current={current}
+      refresh={refresh}
-          loading={contextLoading}
+      throttleDelay={throttleDelay}
-          refresh={refresh}
+    >
-          throttleDelay={throttleDelay}
+      <ResizeContainer
-        >
+        defaultSpan={defaultSpan}
-          <Row gutter={[16, 16]}>
+        resizable={resizable}
-            {dataList.map((item: any) => {
+        dataList={dataList}
-              return (
+        renderItem={(item) => <BackendCard data={item} onSelect={onSelect} />}
-                <Col span={span} key={item.id}>
+      ></ResizeContainer>
-                  <BackendCard data={item} onSelect={onSelect} />
+      <ListSkeleton loading={loading} isFirst={isFirst} />
-                </Col>
+    </InfiniteScroller>
-              );
-            })}
-          </Row>
-          <ListSkeleton span={span} loading={loading} isFirst={isFirst} />
-        </InfiniteScroller>
-      </ResizeObserver>
-    </div>
   );
 };
 

src/pages/llmodels/components/catalog-list.tsx

@@ -1,14 +1,10 @@
+import ResizeContainer from '@/components/resize-container';
 import CatalogSkelton from '@/components/templates/card-skelton';
-import breakpoints from '@/config/breakpoints';
 import InfiniteScroller from '@/pages/_components/infinite-scroller';
 import { useScrollerContext } from '@/pages/_components/infinite-scroller/use-scroller-context';
-import { useIntl } from '@umijs/max';
+import { Spin } from 'antd';
-import { Col, Row, Spin } from 'antd';
+import React from 'react';
-import _ from 'lodash';
-import ResizeObserver from 'rc-resize-observer';
-import React, { useCallback } from 'react';
 import styled from 'styled-components';
-import { CatalogItem as CatalogItemType } from '../config/types';
 import CatalogItem from './catalog-item';
 
 const SpinWrapper = styled.div`
@@ -32,10 +28,9 @@ interface CatalogListProps {
 }
 
 const ListSkeleton: React.FC<{
-  span: number;
   loading: boolean;
   isFirst: boolean;
-}> = ({ span, loading, isFirst }) => {
+}> = ({ loading, isFirst }) => {
   return (
     <div>
       {loading && (
@@ -47,7 +42,7 @@ const ListSkeleton: React.FC<{
             }}
             wrapperClassName="skelton-wrapper"
           >
-            {isFirst && <CatalogSkelton span={span}></CatalogSkelton>}
+            {isFirst && <CatalogSkelton></CatalogSkelton>}
           </Spin>
         </SpinWrapper>
       )}
@@ -56,7 +51,6 @@ const ListSkeleton: React.FC<{
 };
 
 const CatalogList: React.FC<CatalogListProps> = (props) => {
-  const intl = useIntl();
   const { dataList, loading, activeId, isFirst, onDeploy } = props;
   const {
     total,
@@ -65,48 +59,27 @@ const CatalogList: React.FC<CatalogListProps> = (props) => {
     refresh,
     throttleDelay
   } = useScrollerContext();
-  const [span, setSpan] = React.useState(8);
-
-  const getSpanByWidth = (width: number) => {
-    if (width < breakpoints.md) return 24;
-    if (width < breakpoints.lg) return 12;
-    return 8;
-  };
-
-  const handleResize = useCallback(
-    _.throttle((size: { width: number; height: number }) => {
-      setSpan(getSpanByWidth(size.width));
-    }, 100),
-    []
-  );
 
   return (
-    <div className="relative" style={{ width: '100%' }}>
+    <InfiniteScroller
-      <ResizeObserver onResize={handleResize}>
+      total={total}
-        <InfiniteScroller
+      current={current}
-          total={total}
+      loading={contextLoading}
-          current={current}
+      refresh={refresh}
-          loading={contextLoading}
+      throttleDelay={throttleDelay}
-          refresh={refresh}
+    >
-          throttleDelay={throttleDelay}
+      <ResizeContainer
-        >
+        dataList={dataList}
-          <Row gutter={[16, 16]}>
+        renderItem={(item) => (
-            {dataList.map((item: CatalogItemType, index) => {
+          <CatalogItem
-              return (
+            onClick={onDeploy}
-                <Col span={span} key={item.id}>
+            activeId={activeId}
-                  <CatalogItem
+            data={item}
-                    onClick={onDeploy}
+          ></CatalogItem>
-                    activeId={activeId}
+        )}
-                    data={item}
+      ></ResizeContainer>
-                  ></CatalogItem>
+      <ListSkeleton loading={loading} isFirst={isFirst} />
-                </Col>
+    </InfiniteScroller>
-              );
-            })}
-          </Row>
-          <ListSkeleton span={span} loading={loading} isFirst={isFirst} />
-        </InfiniteScroller>
-      </ResizeObserver>
-    </div>
   );
 };
 

src/pages/llmodels/user-models.tsx

@@ -2,7 +2,6 @@ import IconFont from '@/components/icon-font';
 import PageTools from '@/components/page-tools';
 import BaseSelect from '@/components/seal-form/base/select';
 import CardList from '@/components/templates/card-list';
-import CardSkeleton from '@/components/templates/card-skelton';
 import useTableFetch from '@/hooks/use-table-fetch';
 import { SyncOutlined } from '@ant-design/icons';
 import { useIntl, useNavigate } from '@umijs/max';
@@ -236,7 +235,6 @@ const UserModels: React.FC = () => {
           loading={dataSource.loading}
           activeId={false}
           isFirst={!dataSource.loadend}
-          Skeleton={CardSkeleton}
           renderItem={renderCard}
         ></CardList>
         <NoResult