From 07c81a193cef289ba05bfcba986c67102452619a Mon Sep 17 00:00:00 2001
From: xucz <xuchaozheng@outlook.com>
Date: Wed, 4 May 2022 15:34:11 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Board/index.tsx                       |  3 ++-
 src/layouts/components/Header.module.less            |  2 +-
 src/pages/Dashboard/Base/components/RankList.tsx     | 12 ++++++------
 .../Dashboard/Detail/components/PurchaseTrend.tsx    |  2 +-
 src/pages/List/Base/index.tsx                        |  9 +--------
 src/pages/List/Select/index.tsx                      |  2 --
 6 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/src/components/Board/index.tsx b/src/components/Board/index.tsx
index 3c38c98..9afbf5b 100644
--- a/src/components/Board/index.tsx
+++ b/src/components/Board/index.tsx
@@ -49,13 +49,14 @@ export const TrendIcon = ({ trend, trendNum }: { trend?: ETrend; trendNum?: stri
   </div>
 );
 
-const Board = ({ title, count, desc, trend, trendNum, Icon, dark }: IBoardProps) => (
+const Board = ({ title, count, desc, trend, trendNum, Icon, dark, border }: IBoardProps) => (
   <Card
     title={<div className={Style.boardTitle}>{title}</div>}
     header
     className={classnames({
       [Style.boardPanelDark]: dark,
     })}
+    bordered={border}
     footer={
       <div className={Style.boardItemBottom}>
         <div className={Style.boardItemDesc}>
diff --git a/src/layouts/components/Header.module.less b/src/layouts/components/Header.module.less
index 5e36a08..efb0b56 100644
--- a/src/layouts/components/Header.module.less
+++ b/src/layouts/components/Header.module.less
@@ -6,5 +6,5 @@
   z-index: 101;
   display: flex;
   justify-content: space-between;
-  //border-bottom: 1px solid var(--td-gray-color-10);
+  border-bottom: 1px solid var(--td-component-stroke);
 }
diff --git a/src/pages/Dashboard/Base/components/RankList.tsx b/src/pages/Dashboard/Base/components/RankList.tsx
index 9f4fe40..ee8a3fc 100644
--- a/src/pages/Dashboard/Base/components/RankList.tsx
+++ b/src/pages/Dashboard/Base/components/RankList.tsx
@@ -20,7 +20,7 @@ const SALE_COLUMNS: TdPrimaryTableProps['columns'] = [
     title: '排名',
     width: 80,
     fixed: 'left',
-    render: ({ rowIndex }) => (
+    cell: ({ rowIndex }) => (
       <span className={classnames(Style.rankIndex, { [Style.rankIndexTop]: rowIndex < 3 })}>{rowIndex + 1}</span>
     ),
   },
@@ -36,7 +36,7 @@ const SALE_COLUMNS: TdPrimaryTableProps['columns'] = [
     colKey: 'growUp',
     width: 100,
     title: '较上周',
-    render: ({ row }) => <TrendIcon trend={row.growUp < 0 ? ETrend.down : ETrend.up} trendNum={Math.abs(row.growUp)} />,
+    cell: ({ row }) => <TrendIcon trend={row.growUp < 0 ? ETrend.down : ETrend.up} trendNum={Math.abs(row.growUp)} />,
   },
   {
     align: 'center',
@@ -56,7 +56,7 @@ const SALE_COLUMNS: TdPrimaryTableProps['columns'] = [
     fixed: 'right',
     title: '操作',
     width: 80,
-    render: ({ row }) => (
+    cell: ({ row }) => (
       <Button variant='text' theme='primary' onClick={() => console.log(row)}>
         操作
       </Button>
@@ -71,7 +71,7 @@ const PURCHASE_COLUMNS: TdPrimaryTableProps['columns'] = [
     title: '排名',
     width: 80,
     fixed: 'left',
-    render: ({ rowIndex }) => (
+    cell: ({ rowIndex }) => (
       <span className={classnames(Style.rankIndex, { [Style.rankIndexTop]: rowIndex < 3 })}>{rowIndex + 1}</span>
     ),
   },
@@ -87,7 +87,7 @@ const PURCHASE_COLUMNS: TdPrimaryTableProps['columns'] = [
     colKey: 'growUp',
     width: 100,
     title: '较上周',
-    render: ({ row }) => <TrendIcon trend={row.growUp < 0 ? ETrend.down : ETrend.up} trendNum={Math.abs(row.growUp)} />,
+    cell: ({ row }) => <TrendIcon trend={row.growUp < 0 ? ETrend.down : ETrend.up} trendNum={Math.abs(row.growUp)} />,
   },
   {
     align: 'center',
@@ -107,7 +107,7 @@ const PURCHASE_COLUMNS: TdPrimaryTableProps['columns'] = [
     title: '操作',
     fixed: 'right',
     width: 80,
-    render: ({ row }) => (
+    cell: ({ row }) => (
       <Button variant='text' theme='primary' onClick={() => console.log(row)}>
         操作
       </Button>
diff --git a/src/pages/Dashboard/Detail/components/PurchaseTrend.tsx b/src/pages/Dashboard/Detail/components/PurchaseTrend.tsx
index fc40d42..519b089 100644
--- a/src/pages/Dashboard/Detail/components/PurchaseTrend.tsx
+++ b/src/pages/Dashboard/Detail/components/PurchaseTrend.tsx
@@ -27,7 +27,7 @@ const ProductTrend = ({ type, isSetup, description, name, icon }: IProductTrendP
 
     <p className={Style.productName}>{name}</p>
     <p className={Style.productDesc}>{description}</p>
-    <Row justify='space-between' align='middle' className='cardControlClass'>
+    <Row justify='space-between' align='middle'>
       <div className={Style.iconWrap}>
         <Button shape='circle' disabled={!isSetup}>
           {type}
diff --git a/src/pages/List/Base/index.tsx b/src/pages/List/Base/index.tsx
index 817b08f..e72f9ac 100644
--- a/src/pages/List/Base/index.tsx
+++ b/src/pages/List/Base/index.tsx
@@ -115,8 +115,7 @@ export default memo(() => {
           },
           {
             align: 'left',
-            width: 300,
-            minWidth: 300,
+            width: 50,
             ellipsis: true,
             colKey: 'name',
             title: '合同名称',
@@ -124,7 +123,6 @@ export default memo(() => {
           {
             align: 'left',
             width: 200,
-            minWidth: 200,
             ellipsis: true,
             colKey: 'status',
             title: '合同状态',
@@ -135,7 +133,6 @@ export default memo(() => {
           {
             align: 'left',
             width: 200,
-            minWidth: 200,
             ellipsis: true,
             colKey: 'no',
             title: '合同编号',
@@ -143,7 +140,6 @@ export default memo(() => {
           {
             align: 'left',
             width: 200,
-            minWidth: 200,
             ellipsis: true,
             colKey: 'contractType',
             title: '合同类型',
@@ -154,7 +150,6 @@ export default memo(() => {
           {
             align: 'left',
             width: 200,
-            minWidth: 200,
             ellipsis: true,
             colKey: 'paymentType',
             title: '合同收付类型',
@@ -165,7 +160,6 @@ export default memo(() => {
           {
             align: 'left',
             width: 200,
-            minWidth: 200,
             ellipsis: true,
             colKey: 'amount',
             title: '合同金额（元）',
@@ -174,7 +168,6 @@ export default memo(() => {
             align: 'left',
             fixed: 'right',
             width: 200,
-            minWidth: 200,
             colKey: 'op',
             title: '操作',
             cell() {
diff --git a/src/pages/List/Select/index.tsx b/src/pages/List/Select/index.tsx
index 99c8bde..710aaf7 100644
--- a/src/pages/List/Select/index.tsx
+++ b/src/pages/List/Select/index.tsx
@@ -61,7 +61,6 @@ export const SelectTable = () => {
           {
             title: '合同名称',
             fixed: 'left',
-            minWidth: '300',
             align: 'left',
             ellipsis: true,
             colKey: 'name',
@@ -108,7 +107,6 @@ export const SelectTable = () => {
             align: 'left',
             fixed: 'right',
             width: 200,
-            minWidth: 200,
             colKey: 'op',
             title: '操作',
             cell(record) {