shaogen1995 2 jaren geleden
bovenliggende
commit
8e76bbb693

+ 11 - 3
src/pages/ObjectSon/Object3/AddObject3/index.tsx

@@ -133,10 +133,18 @@ function AddObject3() {
   // 点击添加或者编辑出来页面
   const [addPage, setAddPage] = useState(false);
 
+  // 选中的表格数据
+  const [tableSelectList, setTableSelectList] = useState([]);
+
+  // 表格的勾选状态
+  const [selectedRowKeys, setSelectedRowKeys] = useState<React.Key[]>([]);
+
   // 表格的多选
   const rowSelection = {
+    selectedRowKeys,
     onChange: (selectedRowKeys: any, selectedRows: any) => {
       setTableSelectList(selectedRows);
+      setSelectedRowKeys(selectedRowKeys);
     },
   };
 
@@ -145,9 +153,6 @@ function AddObject3() {
     setAddPage(true);
   }, []);
 
-  // 选中的表格数据
-  const [tableSelectList, setTableSelectList] = useState([]);
-
   // 点击删除
   const delTableListFu = useCallback(() => {
     console.log("多个删除", tableSelectList);
@@ -155,6 +160,9 @@ function AddObject3() {
     dispatch({ type: "object3/getGoodsTableList", payload: data });
     setTableSelectList(data);
 
+    // 清除表格的勾选状态
+    setSelectedRowKeys([]);
+
     // 同时删除藏品位置信息
     tableSelectList.forEach((v: any) => {
       delete storesLocArr.current[v.id];

+ 11 - 3
src/pages/ObjectSon/Object4/AddObject4/index.tsx

@@ -133,10 +133,18 @@ function AddObject4() {
   // 点击添加或者编辑出来页面
   const [addPage, setAddPage] = useState(false);
 
+  // 选中的表格数据
+  const [tableSelectList, setTableSelectList] = useState([]);
+
+  // 表格的勾选状态
+  const [selectedRowKeys, setSelectedRowKeys] = useState<React.Key[]>([]);
+
   // 表格的多选
   const rowSelection = {
+    selectedRowKeys,
     onChange: (selectedRowKeys: any, selectedRows: any) => {
       setTableSelectList(selectedRows);
+      setSelectedRowKeys(selectedRowKeys);
     },
   };
 
@@ -145,9 +153,6 @@ function AddObject4() {
     setAddPage(true);
   }, []);
 
-  // 选中的表格数据
-  const [tableSelectList, setTableSelectList] = useState([]);
-
   // 点击删除
   const delTableListFu = useCallback(() => {
     console.log("多个删除", tableSelectList);
@@ -155,6 +160,9 @@ function AddObject4() {
     dispatch({ type: "object4/getGoodsTableList", payload: data });
     setTableSelectList(data);
 
+    // 清除表格的勾选状态
+    setSelectedRowKeys([]);
+
     // 同时删除出库位置信息
     tableSelectList.forEach((v: any) => {
       delete inputInfoRef.current[v.id];

+ 13 - 6
src/pages/ObjectSon/Object6/AddObject6/index.tsx

@@ -1,7 +1,7 @@
 import BreadTit from "@/components/BreadTit";
 import { object6AddAPI, object6infoOutAPI } from "@/store/action/object6";
 import history, { urlParameter } from "@/utils/history";
-import { Button,  Input, message, Popconfirm, Table } from "antd";
+import { Button, Input, message, Popconfirm, Table } from "antd";
 import TextArea from "antd/es/input/TextArea";
 import React, {
   useCallback,
@@ -79,7 +79,6 @@ function AddObject6() {
     if (results.length === 0)
       return message.warning("至少需要添加一条藏品信息!");
 
-
     const obj = {
       description: addInfoTop.description,
       id: addInfoTop.id,
@@ -96,10 +95,18 @@ function AddObject6() {
   // 点击添加或者编辑出来页面
   const [addPage, setAddPage] = useState(false);
 
+  // 选中的表格数据
+  const [tableSelectList, setTableSelectList] = useState([]);
+
+  // 表格的勾选状态
+  const [selectedRowKeys, setSelectedRowKeys] = useState<React.Key[]>([]);
+
   // 表格的多选
   const rowSelection = {
+    selectedRowKeys,
     onChange: (selectedRowKeys: any, selectedRows: any) => {
       setTableSelectList(selectedRows);
+      setSelectedRowKeys(selectedRowKeys);
     },
   };
 
@@ -108,15 +115,15 @@ function AddObject6() {
     setAddPage(true);
   }, []);
 
-  // 选中的表格数据
-  const [tableSelectList, setTableSelectList] = useState([]);
-
   // 点击删除
   const delTableListFu = useCallback(() => {
     console.log("多个删除", tableSelectList);
     const data = _.differenceBy(results, tableSelectList, "id");
     dispatch({ type: "object6/getGoodsTableList", payload: data });
     setTableSelectList(data);
+
+    // 清除表格的勾选状态
+    setSelectedRowKeys([]);
   }, [dispatch, results, tableSelectList]);
 
   // 控制弹窗的显示隐藏
@@ -160,7 +167,7 @@ function AddObject6() {
       },
       {
         title: "年代",
-        dataIndex:'dictAge'
+        dataIndex: "dictAge",
       },
       {
         title: "操作",