From 0223e54156b7513c3b655c1c3e4d0e1668e76dca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Fri, 25 Nov 2022 10:04:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=9B=E5=BE=AE=E8=96=AA=E8=B5=84=E6=A0=B8?=
 =?UTF-8?q?=E7=AE=97iframe=E8=A1=A8=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/BlankLayout/index.tsx           |  2 +-
 src/pages/atdTable/components/antdTable.tsx | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/layouts/BlankLayout/index.tsx b/src/layouts/BlankLayout/index.tsx
index a09768c..eba3216 100644
--- a/src/layouts/BlankLayout/index.tsx
+++ b/src/layouts/BlankLayout/index.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import { useEffect } from "react";
 import { ConfigProvider } from "antd";
-import styles from "./index.less";
+import styles from "../index.less";
 
 export default ({ children, style = {} }: any) => {
   useEffect(() => {
diff --git a/src/pages/atdTable/components/antdTable.tsx b/src/pages/atdTable/components/antdTable.tsx
index b76e156..46ee980 100644
--- a/src/pages/atdTable/components/antdTable.tsx
+++ b/src/pages/atdTable/components/antdTable.tsx
@@ -144,6 +144,7 @@ const AntdTable: FC<ITableProps> = (props) => {
       result.dataIndex = item.column;
       result.oldWidth = result.width;
       result.width = "150px";
+      result.ellipsis = true;
       if (result.children) {
         result.width = (result.children.length * 150) + "px";
         result.children.map((child: any) => {
@@ -195,6 +196,7 @@ const AntdTable: FC<ITableProps> = (props) => {
           </span>;
           child.dataIndex = child.column;
           child.width = "150px";
+          child.ellipsis = true;
           child.render = (text: string) => {
             return <span className={styles.contentSpan}>
               <span>{text}</span>
@@ -238,7 +240,9 @@ const AntdTable: FC<ITableProps> = (props) => {
     setDataSource([]);
     const data: any = exceptStr(event.data);
     if (!_.isEmpty(data)) {
-      getPCDataList({ ...data, ...pageParams });
+      const { selectedRowKeys, ...extraData } = data;
+      getPCDataList({ ...extraData, ...pageParams });
+      if (selectedRowKeys) setSelected(selectedRowKeys);
     }
   };
 
@@ -275,7 +279,8 @@ const AntdTable: FC<ITableProps> = (props) => {
     dataSource={dataSource}
     size="small"
     bordered
-    rowSelection={tab === "PC" && usertab === "SA" ? rowSelection : undefined}
+    // rowSelection={tab === "PC" && usertab === "SA" ? rowSelection : undefined}
+    rowSelection={rowSelection}
     pagination={{
       ...paginationFun(pageParams, sizeChange, onChange),
       size: "default"
@@ -298,7 +303,7 @@ const AntdTable: FC<ITableProps> = (props) => {
         <Table.Summary fixed>
           <Table.Summary.Row>
             {
-              _.map(totalColumns, (item, index) => {
+              _.map([{},...totalColumns], (item, index) => {
                 if (index === 0) {
                   return <Table.Summary.Cell index={0}><Text type="danger">总计</Text></Table.Summary.Cell>;
                 }