@hw-component/table 0.0.3-beta-v18 → 0.0.4-beta-v2

package/es/HTableBody/index.js

@@ -108,7 +108,7 @@ var Body = (function (_ref) {
         tableStyle: {
           paddingBottom: 0
         },
-        rowSelection: _objectSpread(_objectSpread({}, rowSelection), {}, {
+        rowSelection: rowSelection === false ? rowSelection : _objectSpread(_objectSpread({}, rowSelection), {}, {
           selectedRowKeys: _keysInstanceProperty(selectedRowData),
           onChange: change
         }),

package/es/HTableFooter/index.js

@@ -29,7 +29,8 @@ var Footer = (function (_ref) {
     _useHTableContext$sel = _useHTableContext.selectedRowData,
     selectedRowData = _useHTableContext$sel === void 0 ? {} : _useHTableContext$sel,
     allSelectChange = _useHTableContext.allSelectChange,
-    tableInstance = _useHTableContext.tableInstance;
+    tableInstance = _useHTableContext.tableInstance,
+    setSelectedRowData = _useHTableContext.setSelectedRowData;
   var _ref2 = data || {},
     _ref2$total = _ref2.total,
     total = _ref2$total === void 0 ? "0" : _ref2$total;
@@ -45,9 +46,6 @@ var Footer = (function (_ref) {
       children: footerRender(tableInstance, selectedRowData, data)
     });
   }
-  var allCheck = function allCheck(checked) {
-    allSelectChange === null || allSelectChange === void 0 || allSelectChange(checked);
-  };
   var btnDom = jsxs(Space, {
     size: 20,
     children: [jsx(Button, {
@@ -81,7 +79,7 @@ var Footer = (function (_ref) {
     children: jsxs(Row, {
       justify: "space-between",
       align: "middle",
-      children: [footerBtnRender ? footerBtnRender(btnDom, total, selectedRowData, allCheck) : btnDom, actionRender === null || actionRender === void 0 ? void 0 : actionRender(selectedRowData, tableInstance)]
+      children: [footerBtnRender ? footerBtnRender(btnDom, total, selectedRowData, setSelectedRowData) : btnDom, actionRender === null || actionRender === void 0 ? void 0 : actionRender(selectedRowData, tableInstance)]
     })
   });
   if (!data) {

package/es/Table.js

@@ -57,7 +57,8 @@ var Table = (function (_ref) {
   var _useRowObj = useRowObj(),
     selectedRowData = _useRowObj.selectedRowData,
     rowOnChange = _useRowObj.rowOnChange,
-    allSelectChange = _useRowObj.allSelectChange;
+    allSelectChange = _useRowObj.allSelectChange,
+    setSelectedRowData = _useRowObj.setSelectedRowData;
   var tableInstance = useCurrentTable({
     table: table,
     reload: function reload(params) {
@@ -90,7 +91,8 @@ var Table = (function (_ref) {
         rowOnChange([], []);
         return run(value);
       },
-      onPageChange: tableInstance.table.reloadWithParams
+      onPageChange: tableInstance.table.reloadWithParams,
+      setSelectedRowData: setSelectedRowData
     },
     children: jsxs(Space, {
       direction: "vertical",

package/es/context.d.ts

@@ -12,6 +12,7 @@ interface HContextModal extends Omit<HTableProps, "request"> {
     params?: any;
     onFinish: (value: Record<string, any>) => Promise<any>;
     onPageChange: (value: Record<string, any>) => Promise<any>;
+    setSelectedRowData: (row: RowObj) => void;
 }
 export declare const HTableContext: React.Context<HContextModal | null>;
 export declare const useHTableContext: () => HContextModal;

package/es/hooks/useRowObj.d.ts

@@ -4,5 +4,6 @@ declare const _default: () => {
     rowOnChange: (keys: React.Key[], rowData: any[]) => void;
     selectedRowData: RowObj;
     allSelectChange: (checked?: boolean) => void;
+    setSelectedRowData: React.Dispatch<React.SetStateAction<RowObj>>;
 };
 export default _default;

package/es/hooks/useRowObj.js

@@ -24,7 +24,8 @@ var useRowObj = (function () {
   return {
     rowOnChange: rowOnChange,
     selectedRowData: selectedRowData,
-    allSelectChange: allSelectChange
+    allSelectChange: allSelectChange,
+    setSelectedRowData: setSelectedRowData
   };
 });
 

package/es/modal.d.ts

@@ -27,7 +27,7 @@ interface HColumns extends Omit<ProColumns, "render"> {
 export type ConfigItemModal = Omit<HItemProps, "render" | "type"> & HColumns;
 export type ConfigDataModal = ConfigItemModal[];
 export type ActionRenderFn = (selectedRowKeys: RowObj, tableInstance: HTableInstance) => React.ReactNode;
-export type FooterBtnRenderFn = (dom: React.ReactNode, total: string, selectedRowKeys: RowObj, setAllCheck: (checked: boolean) => void) => React.ReactNode;
+export type FooterBtnRenderFn = (dom: React.ReactNode, total: string, selectedRowKeys: RowObj, setAllCheck: (row: RowObj) => void) => React.ReactNode;
 export type actionFn = (...arg: any[]) => void;
 type FooterRenderFn = (tableInstance: HTableInstance, selectedRowData: RowObj, data?: ResultModal) => React.ReactNode;
 export interface HTableProps extends Omit<ProTableProps<any, any>, "request" | "dataSource"> {

package/lib/HTableBody/index.js

@@ -111,7 +111,7 @@ var Body = (function (_ref) {
         tableStyle: {
           paddingBottom: 0
         },
-        rowSelection: _objectSpread(_objectSpread({}, rowSelection), {}, {
+        rowSelection: rowSelection === false ? rowSelection : _objectSpread(_objectSpread({}, rowSelection), {}, {
           selectedRowKeys: _keysInstanceProperty(selectedRowData),
           onChange: change
         }),

package/lib/HTableFooter/index.js

@@ -32,7 +32,8 @@ var Footer = (function (_ref) {
     _useHTableContext$sel = _useHTableContext.selectedRowData,
     selectedRowData = _useHTableContext$sel === void 0 ? {} : _useHTableContext$sel,
     allSelectChange = _useHTableContext.allSelectChange,
-    tableInstance = _useHTableContext.tableInstance;
+    tableInstance = _useHTableContext.tableInstance,
+    setSelectedRowData = _useHTableContext.setSelectedRowData;
   var _ref2 = data || {},
     _ref2$total = _ref2.total,
     total = _ref2$total === void 0 ? "0" : _ref2$total;
@@ -48,9 +49,6 @@ var Footer = (function (_ref) {
       children: footerRender(tableInstance, selectedRowData, data)
     });
   }
-  var allCheck = function allCheck(checked) {
-    allSelectChange === null || allSelectChange === void 0 || allSelectChange(checked);
-  };
   var btnDom = jsxRuntime.jsxs(antd.Space, {
     size: 20,
     children: [jsxRuntime.jsx(antd.Button, {
@@ -84,7 +82,7 @@ var Footer = (function (_ref) {
     children: jsxRuntime.jsxs(antd.Row, {
       justify: "space-between",
       align: "middle",
-      children: [footerBtnRender ? footerBtnRender(btnDom, total, selectedRowData, allCheck) : btnDom, actionRender === null || actionRender === void 0 ? void 0 : actionRender(selectedRowData, tableInstance)]
+      children: [footerBtnRender ? footerBtnRender(btnDom, total, selectedRowData, setSelectedRowData) : btnDom, actionRender === null || actionRender === void 0 ? void 0 : actionRender(selectedRowData, tableInstance)]
     })
   });
   if (!data) {

package/lib/Table.js

@@ -60,7 +60,8 @@ var Table = (function (_ref) {
   var _useRowObj = useRowObj.default(),
     selectedRowData = _useRowObj.selectedRowData,
     rowOnChange = _useRowObj.rowOnChange,
-    allSelectChange = _useRowObj.allSelectChange;
+    allSelectChange = _useRowObj.allSelectChange,
+    setSelectedRowData = _useRowObj.setSelectedRowData;
   var tableInstance = useCurrentTable.default({
     table: table,
     reload: function reload(params) {
@@ -93,7 +94,8 @@ var Table = (function (_ref) {
         rowOnChange([], []);
         return run(value);
       },
-      onPageChange: tableInstance.table.reloadWithParams
+      onPageChange: tableInstance.table.reloadWithParams,
+      setSelectedRowData: setSelectedRowData
     },
     children: jsxRuntime.jsxs(antd.Space, {
       direction: "vertical",

package/lib/context.d.ts

@@ -12,6 +12,7 @@ interface HContextModal extends Omit<HTableProps, "request"> {
     params?: any;
     onFinish: (value: Record<string, any>) => Promise<any>;
     onPageChange: (value: Record<string, any>) => Promise<any>;
+    setSelectedRowData: (row: RowObj) => void;
 }
 export declare const HTableContext: React.Context<HContextModal | null>;
 export declare const useHTableContext: () => HContextModal;

package/lib/hooks/useRowObj.d.ts

@@ -4,5 +4,6 @@ declare const _default: () => {
     rowOnChange: (keys: React.Key[], rowData: any[]) => void;
     selectedRowData: RowObj;
     allSelectChange: (checked?: boolean) => void;
+    setSelectedRowData: React.Dispatch<React.SetStateAction<RowObj>>;
 };
 export default _default;

package/lib/hooks/useRowObj.js

@@ -27,7 +27,8 @@ var useRowObj = (function () {
   return {
     rowOnChange: rowOnChange,
     selectedRowData: selectedRowData,
-    allSelectChange: allSelectChange
+    allSelectChange: allSelectChange,
+    setSelectedRowData: setSelectedRowData
   };
 });
 

package/lib/modal.d.ts

@@ -27,7 +27,7 @@ interface HColumns extends Omit<ProColumns, "render"> {
 export type ConfigItemModal = Omit<HItemProps, "render" | "type"> & HColumns;
 export type ConfigDataModal = ConfigItemModal[];
 export type ActionRenderFn = (selectedRowKeys: RowObj, tableInstance: HTableInstance) => React.ReactNode;
-export type FooterBtnRenderFn = (dom: React.ReactNode, total: string, selectedRowKeys: RowObj, setAllCheck: (checked: boolean) => void) => React.ReactNode;
+export type FooterBtnRenderFn = (dom: React.ReactNode, total: string, selectedRowKeys: RowObj, setAllCheck: (row: RowObj) => void) => React.ReactNode;
 export type actionFn = (...arg: any[]) => void;
 type FooterRenderFn = (tableInstance: HTableInstance, selectedRowData: RowObj, data?: ResultModal) => React.ReactNode;
 export interface HTableProps extends Omit<ProTableProps<any, any>, "request" | "dataSource"> {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/table",
-  "version": "0.0.3-beta-v18",
+  "version": "0.0.4-beta-v2",
   "description": "基于antd二次开发table组件",
   "keywords": [
     "table"

package/src/components/HTableBody/index.tsx

@@ -88,7 +88,7 @@ export default ({
           tableStyle={{
             paddingBottom: 0,
           }}
-          rowSelection={{
+          rowSelection={rowSelection===false?rowSelection:{
             ...rowSelection,
             selectedRowKeys: selectedRowData.keys,
             onChange: change,

package/src/components/HTableFooter/index.tsx

@@ -23,6 +23,7 @@ export default ({ actionRender, footerRender, footerStyle ,footerBtnRender}: IFo
     selectedRowData = {},
     allSelectChange,
     tableInstance,
+    setSelectedRowData
   } = useHTableContext();
   const { total = "0" } = data || {};
   const totalNum = Number.parseInt(total, 10);
@@ -32,9 +33,6 @@ export default ({ actionRender, footerRender, footerStyle ,footerBtnRender}: IFo
   if (footerRender) {
     return <>{footerRender(tableInstance, selectedRowData, data)}</>;
   }
-  const allCheck=(checked: boolean)=>{
-    allSelectChange?.(checked);
-  }
   const btnDom=  <Space size={20}>
     <Button
         type={"primary"}
@@ -57,7 +55,7 @@ export default ({ actionRender, footerRender, footerStyle ,footerBtnRender}: IFo
       className="hw_table_footer"
     >
       <Row justify="space-between" align="middle">
-        {footerBtnRender?footerBtnRender(btnDom,total,selectedRowData,allCheck):btnDom}
+        {footerBtnRender?footerBtnRender(btnDom,total,selectedRowData,setSelectedRowData):btnDom}
         {actionRender?.(selectedRowData, tableInstance)}
       </Row>
     </Card>

package/src/components/Table.tsx

@@ -28,7 +28,7 @@ export default ({
 }: HTableProps) => {
   const { run, loading, data, error, saveParams } = useReq({ request });
   const dispatch = useDispatch(action);
-  const { selectedRowData, rowOnChange, allSelectChange } = useRowObj();
+  const { selectedRowData, rowOnChange, allSelectChange ,setSelectedRowData} = useRowObj();
   const tableInstance = useCurrentTable({
     table,
     reload: (params) => {
@@ -62,6 +62,7 @@ export default ({
           return run(value);
         },
         onPageChange: tableInstance.table.reloadWithParams,
+        setSelectedRowData
       }}
     >
         <Space direction={"vertical"} size={spaceSize} style={{width:'100%'}}>

package/src/components/context.ts

@@ -13,6 +13,7 @@ interface HContextModal extends Omit<HTableProps, "request"> {
   params?: any;
   onFinish: (value: Record<string, any>) => Promise<any>;
   onPageChange: (value: Record<string, any>) => Promise<any>;
+  setSelectedRowData:(row:RowObj)=>void;
 }
 
 export const HTableContext = React.createContext<HContextModal | null>(null);

package/src/components/hooks/useRowObj.ts

@@ -17,9 +17,11 @@ export default () => {
       selectAll: newChecked,
     });
   };
+
   return {
     rowOnChange,
     selectedRowData,
     allSelectChange,
+    setSelectedRowData
   };
 };

package/src/components/modal.ts

@@ -43,7 +43,7 @@ export type FooterBtnRenderFn = (
     dom: React.ReactNode,
     total: string,
     selectedRowKeys: RowObj,
-    setAllCheck: (checked: boolean) => void
+    setAllCheck: (row: RowObj) => void
 ) => React.ReactNode;
 export type actionFn = (...arg) => void;
 type FooterRenderFn = (

package/src/pages/Table/index.tsx

@@ -36,6 +36,7 @@ export default () => {
         rowKey={"id"}
         table={hTable}
         scroll={{x:1000,y:100}}
+        rowSelection={false}
         headerTitle={<Test name="321321"/>}
         actionRender={(allCheck, selectedRowKeys, xjTable) => {
           console.log(allCheck, selectedRowKeys, xjTable);