Merge branch 'master' into feature/业务线管理

# Conflicts:
#	src/pages/salaryFileTable/index.tsx
#	src/pages/welfareArchiveTable/index.tsx

src/pages/atdTable/components/index.less

@@ -285,6 +285,18 @@
       height: 14px;
     }
 
+    .ant-table-header {
+      .ant-checkbox-checked {
+        .ant-checkbox-inner:after {
+          width: 5px !important;
+        }
+      }
+
+      .ant-checkbox-inner:after {
+        width: 8px !important;
+      }
+    }
+
     .ant-checkbox-inner:after {
       width: 5px;
       height: 8px;

src/pages/calcTable/index.tsx

@@ -48,7 +48,7 @@ const index: FunctionComponent<Props> = (props) => {
     const data: any = exceptStr(event.data);
     if (!_.isEmpty(data)) {
       const {
-        columns, dataSource, pageInfo, selectedRowKeys, i18n: i18nRes = {},
+        columns, dataSource, pageInfo, selectedRowKeys: rowKeys, i18n: i18nRes = {},
         showTotalCell = false, sumRowlistUrl = "", payload = {}, calcDetail,
         fixed = true, tableScrollHeight, sumRow, optWidth
       } = data;
@@ -61,7 +61,7 @@ const index: FunctionComponent<Props> = (props) => {
       setSumRow(sumRow);
       setPageInfo(pageInfo);
       setDataSource(dataSource);
-      setSelectedRowKeys(selectedRowKeys);
+      setSelectedRowKeys([...selectedRowKeys, ...rowKeys]);
       setTableScrollHeight(tableScrollHeight);
       setColumns([...convertColumns(_.map(columns, o => ({ ...o, i18n: i18nRes }))), {
         title: i18nRes["操作"], dataIndex: "operate", fixed: "right", width: optWidth || 120,
@@ -142,14 +142,11 @@ const index: FunctionComponent<Props> = (props) => {
     columnWidth: 60, columnTitle: (isDetailTable && !showTotalCell) ? "序号" : "",
     renderCell: (value: boolean, record: any, index: number, originNode: React.ReactNode) => ((isDetailTable && !showTotalCell) ?
       <span>{index + 1}</span> : originNode),
-    selectedRowKeys: selectedRowKeys,
+    selectedRowKeys, preserveSelectedRowKeys: true,
-    onChange: (selectedRowKeys: React.Key[]) => {
+    onChange: (rowKeys: React.Key[]) => {
-      setSelectedRowKeys(selectedRowKeys);
+      setSelectedRowKeys(rowKeys);
       window.parent.postMessage(
-        {
+        { type: "turn", payload: { id: "CHECKBOX", params: { selectedRowKeys: rowKeys } } },
-          type: "turn",
-          payload: { id: "CHECKBOX", params: { selectedRowKeys } }
-        },
         "*"
       );
     }

src/pages/salaryFileTable/index.tsx

@@ -38,13 +38,13 @@ const Index: FunctionComponent<Props> = (props) => {
     const data: any = exceptStr(event.data);
     if (!_.isEmpty(data)) {
       const {
-        columns, dataSource, pageInfo, selectedRowKeys, i18n: i18nRes = {}, selectedKey, showDelSalaryFileBtn
+        columns, dataSource, pageInfo, selectedRowKeys: rowKeys, i18n: i18nRes = {}, selectedKey, showDelSalaryFileBtn
       } = data;
       setRunStatuses(selectedKey);
       setI18n(i18nRes);
       setPageInfo(pageInfo);
       setDataSource(dataSource);
-      setSelectedRowKeys(selectedRowKeys);
+      setSelectedRowKeys([...rowKeys, ...selectedRowKeys]);
       setColumns(columns);
       setShowDelSalaryFileBtn(showDelSalaryFileBtn);
     }
@@ -63,15 +63,12 @@ const Index: FunctionComponent<Props> = (props) => {
     });
   };
   const rowSelection = {
-    columnWidth: 60,
+    columnWidth: 60, selectedRowKeys,
-    selectedRowKeys: selectedRowKeys,
+    preserveSelectedRowKeys: true,
-    onChange: (selectedRowKeys: React.Key[]) => {
+    onChange: (rowKeys: React.Key[]) => {
-      setSelectedRowKeys(selectedRowKeys);
+      setSelectedRowKeys(rowKeys);
       window.parent.postMessage(
-        {
+        { type: "turn", payload: { id: "ROWSELECTION", params: { selectedRowKeys: rowKeys } } },
-          type: "turn",
-          payload: { id: "ROWSELECTION", params: { selectedRowKeys } }
-        },
         "*"
       );
     }

src/pages/unitTable/index.tsx

@@ -36,7 +36,7 @@ const UnitTable: FC = (props) => {
     if (!_.isEmpty(data)) {
       const {
         columns, dataSource, pageInfo, scrollHeight, i18n, showOperateBtn: permission, unitTableType = "welfareRecord",
-        selectedRowKeys, selectedKey, rowKey, showTotalCell = false, sumDataSource = {}
+        selectedRowKeys: rowKeys, selectedKey, rowKey, showTotalCell = false, sumDataSource = {}
       } = data;
       setI18n(i18n);
       setColumns(columns);
@@ -44,7 +44,10 @@ const UnitTable: FC = (props) => {
       setPageInfo(pageInfo);
       setUnitTableType(unitTableType);
       setSumRow(sumDataSource);
-      setExtraParams({ selectedKey, selectedRowKeys, scrollHeight, permission, rowKey, showTotalCell });
+      setExtraParams({
+        selectedKey, scrollHeight, permission, rowKey, showTotalCell,
+        selectedRowKeys: [extraParams.selectedRowKeys, ...rowKeys]
+      });
     }
   };
   const onChange = (current: number, pageSize: number) => {
@@ -61,8 +64,8 @@ const UnitTable: FC = (props) => {
     });
   };
   const rowSelection = {
-    columnWidth: 60,
+    columnWidth: 60, selectedRowKeys: extraParams.selectedRowKeys,
-    selectedRowKeys: extraParams.selectedRowKeys,
+    preserveSelectedRowKeys: true,
     onChange: (selectedRowKeys: React.Key[]) => {
       // @ts-ignore
       setExtraParams({ ...extraParams, selectedRowKeys: selectedRowKeys });

src/pages/welfareArchiveTable/index.tsx

@@ -37,12 +37,12 @@ const Index: FunctionComponent<Props> = (props) => {
   const receiveMessageFromIndex = (event: any) => {
     const data: any = exceptStr(event.data);
     if (!_.isEmpty(data)) {
-      const { columns, dataSource, pageInfo, selectedRowKeys, i18n: i18nRes = {}, runStatuses } = data;
+      const { columns, dataSource, pageInfo, selectedRowKeys: rowKeys, i18n: i18nRes = {}, runStatuses } = data;
       setRunStatuses(runStatuses);
       setI18n(i18nRes);
       setPageInfo(pageInfo);
       setDataSource(dataSource);
-      setSelectedRowKeys(selectedRowKeys);
+      setSelectedRowKeys([...rowKeys, ...selectedRowKeys]);
       setColumns(columns);
     }
   };
@@ -59,12 +59,14 @@ const Index: FunctionComponent<Props> = (props) => {
       return { ...pageInfo, current: size === pageSize ? current : 1, pageSize };
     });
   };
+
   const rowSelection = {
-    columnWidth: 60,
+    columnWidth: 60, selectedRowKeys,
-    selectedRowKeys: selectedRowKeys,
+    preserveSelectedRowKeys: true,
-    onChange: (selectedRowKeys: React.Key[]) => {
+    onChange: (rowKeys: React.Key[]) => {
-      setSelectedRowKeys(selectedRowKeys);
+      setSelectedRowKeys(rowKeys);
-      window.parent.postMessage({ type: "turn", payload: { id: "CHECKBOX", params: { selectedRowKeys } } },
+      window.parent.postMessage(
+        { type: "turn", payload: { id: "CHECKBOX", params: { selectedRowKeys: rowKeys } } },
         "*"
       );
     }