From d4e707aa7d488807134f73e58d3957975b8ea1c8 Mon Sep 17 00:00:00 2001
From: wangjie <379925517@qq.com>
Date: Sat, 6 Aug 2022 16:08:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:(react-table)=E6=9B=BF=E6=8D=A2icon?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8=E4=BF=AE=E6=94=B9=E7=BB=84=E4=BB=B6=E5=91=BD?=
 =?UTF-8?q?=E5=90=8D=20(#900,#845)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/react-table/src/TableTr.tsx    | 14 ++++++++------
 packages/react-table/src/style/index.ts |  6 +++++-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/packages/react-table/src/TableTr.tsx b/packages/react-table/src/TableTr.tsx
index 47a074b590..657f66c114 100644
--- a/packages/react-table/src/TableTr.tsx
+++ b/packages/react-table/src/TableTr.tsx
@@ -1,8 +1,10 @@
 import React, { useMemo, useState, useEffect } from 'react';
-import Icon from '@uiw/react-icon';
-import Table, { LocationWidth, TableColumns, TableProps } from './';
-import { TableStyleCol, TableStyleColContent } from './style';
-import './style/index.less';
+// import Icon from '@uiw/react-icon';
+import { MinusSquareO } from '@uiw/icons/lib/MinusSquareO';
+import { PlusSquareO } from '@uiw/icons/lib/PlusSquareO';
+import { LocationWidth, TableColumns, TableProps } from './';
+import { TableStyleCol, TableStyleColContent, TableStyleDomIcon } from './style';
+// import './style/index.less';
 import { noop } from '@uiw/utils';
 import { locationFixed } from './util';
 
@@ -52,8 +54,8 @@ export default function TableTr<T extends { [key: string]: any }>(props: TableTr
     return (key: T[keyof T] | number, isOpacity: boolean) => {
       const flag = expandIndex.includes(key);
       return (
-        <Icon
-          type={flag ? 'minus-square-o' : 'plus-square-o'}
+        <TableStyleDomIcon
+          as={flag ? MinusSquareO : PlusSquareO}
           style={{
             marginRight: 10,
             opacity: isOpacity ? 1 : 0,
diff --git a/packages/react-table/src/style/index.ts b/packages/react-table/src/style/index.ts
index 37df1e8955..2008606b67 100644
--- a/packages/react-table/src/style/index.ts
+++ b/packages/react-table/src/style/index.ts
@@ -1,5 +1,6 @@
 import styled, { css } from 'styled-components';
 import { getThemeVariantValue, ThemeVariantValueOptions } from '@uiw/utils';
+import { IconStyleBase, IconStyleBaseProps } from '@uiw/react-icon';
 
 export interface TableStyleBaseProps
   extends React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>,
@@ -11,6 +12,8 @@ export interface TableStyleWrapBaseProps extends TableStyleBaseProps {
   };
 }
 
+export interface TableStyleDomIconProps extends IconStyleBaseProps {}
+
 export interface TableStyleColProps extends TableStyleBaseProps {
   params?: {
     align?: 'left' | 'center' | 'right';
@@ -113,8 +116,9 @@ export const TableStyleWrap = styled.div<TableStyleWrapBaseProps>`
 `;
 TableStyleWrap.defaultProps = { defaultTheme: TableBaseDefaultTheme };
 
+export const TableStyleDomIcon = styled(IconStyleBase)<TableStyleDomIconProps>``;
 export const TableStyleTheadWrap = styled.thead``;
-export const TableStyleTheadItem = styled.th``;
+export const TheadItem = styled.th``;
 
 // 单元格
 export const TableStyleCol = styled.td<TableStyleColProps>`