xieyonghong 3 лет назад
Родитель
Сommit
f7a89e543b
2 измененных файлов с 14 добавлено и 6 удалено
  1. 11 5
      src/components/ProTableCard/index.tsx
  2. 3 1
      src/pages/device/Product/typings.d.ts

+ 11 - 5
src/components/ProTableCard/index.tsx

@@ -41,13 +41,19 @@ const ProTableCard = <
    */
   const handleCard = (dataSource: readonly T[] | undefined): JSX.Element => {
     return (
-      <div className={'pro-table-card-items'}>
-        {dataSource ? (
-          dataSource.map((item) => (cardRender && isFunction(cardRender) ? cardRender(item) : null))
+      <>
+        {dataSource && dataSource.length ? (
+          <div className={'pro-table-card-items'}>
+            {dataSource.map((item) =>
+              cardRender && isFunction(cardRender) ? cardRender(item) : null,
+            )}
+          </div>
         ) : (
-          <Empty />
+          <div style={{ display: 'flex', justifyContent: 'center' }}>
+            <Empty />
+          </div>
         )}
-      </div>
+      </>
     );
   };
 

+ 3 - 1
src/pages/device/Product/typings.d.ts

@@ -14,7 +14,7 @@ export type ProductItem = {
   createTime: number;
   updateTime: number;
   creatorId: string;
-  deviceType: DeviceType;
+  deviceType: string | DeviceType;
   count?: number;
   messageProtocol: string;
   metadata: string;
@@ -23,6 +23,8 @@ export type ProductItem = {
   state: number;
   transportProtocol: string;
   describe?: string;
+  accessId?: string;
+  accessName?: string;
   photoUrl?: string;
 };