@hw-component/table 0.0.3-beta-v15 → 0.0.3-beta-v17

package/es/HTableBody/index.d.ts

@@ -10,5 +10,5 @@ interface HTableBodyProps extends Omit<ProTableProps<any, any>, "dataSource"> {
     tableStyle?: React.CSSProperties;
     paginationStyle?: React.CSSProperties;
 }
-declare const _default: ({ configData, pagination, onPageChange, rowSelection, rowKey, emptyRender, errorRender, tableStyle, paginationStyle, ...props }: HTableBodyProps) => JSX.Element;
+declare const _default: ({ configData, pagination, onPageChange, rowSelection, rowKey, emptyRender, errorRender, tableStyle, paginationStyle, headerTitle, ...props }: HTableBodyProps) => JSX.Element;
 export default _default;

package/es/HTableBody/index.js

@@ -14,12 +14,13 @@ import { jsx, jsxs } from 'react/jsx-runtime';
 import ProTable from '@ant-design/pro-table';
 import { useCols, useSynchronousKeys } from './hooks.js';
 import { useHTableContext } from '../context.js';
+import React from 'react';
 import { ConfigProvider, Empty } from 'antd';
 import { useHTableConfigContext } from '../TableConfig.js';
 import HTablePagination from '../HTablePagination/index.js';
 import { useClassName } from '../hooks/index.js';
 
-var _excluded = ["configData", "pagination", "onPageChange", "rowSelection", "rowKey", "emptyRender", "errorRender", "tableStyle", "paginationStyle"];
+var _excluded = ["configData", "pagination", "onPageChange", "rowSelection", "rowKey", "emptyRender", "errorRender", "tableStyle", "paginationStyle", "headerTitle"];
 function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 var defaultRender = function defaultRender() {
@@ -40,6 +41,7 @@ var Body = (function (_ref) {
     errorRender = _ref.errorRender,
     tableStyle = _ref.tableStyle,
     paginationStyle = _ref.paginationStyle,
+    headerTitle = _ref.headerTitle,
     props = _objectWithoutProperties(_ref, _excluded);
   var selectedRowKeys = rowSelection.selectedRowKeys,
     onChange = rowSelection.onChange;
@@ -50,7 +52,8 @@ var Body = (function (_ref) {
     selectedRowData = _useHTableContext.selectedRowData,
     rowOnChange = _useHTableContext.rowOnChange,
     error = _useHTableContext.error,
-    loading = _useHTableContext.loading;
+    loading = _useHTableContext.loading,
+    allSelectChange = _useHTableContext.allSelectChange;
   var _useHTableConfigConte = useHTableConfigContext({
       emptyRender: emptyRender,
       errorRender: errorRender
@@ -92,6 +95,11 @@ var Body = (function (_ref) {
         columns: cols,
         tableAlertRender: false,
         search: false,
+        headerTitle: headerTitle ? /*#__PURE__*/React.cloneElement(headerTitle, {
+          selectedRowData: selectedRowData,
+          allSelectChange: allSelectChange,
+          rowOnChange: rowOnChange
+        }) : null,
         options: {
           reload: function reload() {
             tableInstance.table.reloadWithParams();

package/es/Table.js

@@ -9,14 +9,13 @@ import _Object$defineProperties from '@babel/runtime-corejs3/core-js/object/defi
 import _Object$defineProperty from '@babel/runtime-corejs3/core-js/object/define-property';
 import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
 import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
-import { jsx, jsxs } from 'react/jsx-runtime';
+import { jsxs, jsx } from 'react/jsx-runtime';
 import Header from './HTableHeader/index.js';
 import Body from './HTableBody/index.js';
 import useCurrentTable from './hooks/useCurrentTable.js';
 import Footer from './HTableFooter/index.js';
 import useRowObj from './hooks/useRowObj.js';
 import { HTableContext } from './context.js';
-import { Space } from 'antd';
 import useReq from './hooks/useReq.js';
 import useDispatch from './hooks/useDispatch.js';
 
@@ -38,11 +37,10 @@ var Table = (function (_ref) {
     _ref$tableStyle = _ref.tableStyle,
     tableStyle = _ref$tableStyle === void 0 ? {} : _ref$tableStyle,
     _ref$action = _ref.action,
-    action = _ref$action === void 0 ? {} : _ref$action,
-    _ref$spaceSize = _ref.spaceSize,
-    spaceSize = _ref$spaceSize === void 0 ? 15 : _ref$spaceSize,
-    className = _ref.className,
-    paginationStyle = _ref.paginationStyle,
+    action = _ref$action === void 0 ? {} : _ref$action;
+    _ref.spaceSize;
+    _ref.className;
+    var paginationStyle = _ref.paginationStyle,
     footerBtnRender = _ref.footerBtnRender,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useReq = useReq({
@@ -75,7 +73,7 @@ var Table = (function (_ref) {
       return saveParams.old;
     }
   });
-  return jsx(HTableContext.Provider, {
+  return jsxs(HTableContext.Provider, {
     value: {
       tableInstance: tableInstance,
       selectedRowData: selectedRowData,
@@ -92,26 +90,18 @@ var Table = (function (_ref) {
       },
       onPageChange: tableInstance.table.reloadWithParams
     },
-    children: jsxs(Space, {
-      size: spaceSize,
-      direction: "vertical",
-      style: {
-        width: "100%"
-      },
-      className: className,
-      children: [!hideHeader && jsx(Header, {
-        searchSpan: searchSpan,
-        headerStyle: headerStyle
-      }), jsx(Body, _objectSpread({
-        tableStyle: tableStyle,
-        paginationStyle: paginationStyle
-      }, props)), footerRender !== false && jsx(Footer, {
-        actionRender: actionRender,
-        footerRender: footerRender,
-        footerStyle: footerStyle,
-        footerBtnRender: footerBtnRender
-      })]
-    })
+    children: [!hideHeader && jsx(Header, {
+      searchSpan: searchSpan,
+      headerStyle: headerStyle
+    }), jsx(Body, _objectSpread({
+      tableStyle: tableStyle,
+      paginationStyle: paginationStyle
+    }, props)), footerRender !== false && jsx(Footer, {
+      actionRender: actionRender,
+      footerRender: footerRender,
+      footerStyle: footerStyle,
+      footerBtnRender: footerBtnRender
+    })]
   });
 });
 

package/lib/HTableBody/index.d.ts

@@ -10,5 +10,5 @@ interface HTableBodyProps extends Omit<ProTableProps<any, any>, "dataSource"> {
     tableStyle?: React.CSSProperties;
     paginationStyle?: React.CSSProperties;
 }
-declare const _default: ({ configData, pagination, onPageChange, rowSelection, rowKey, emptyRender, errorRender, tableStyle, paginationStyle, ...props }: HTableBodyProps) => JSX.Element;
+declare const _default: ({ configData, pagination, onPageChange, rowSelection, rowKey, emptyRender, errorRender, tableStyle, paginationStyle, headerTitle, ...props }: HTableBodyProps) => JSX.Element;
 export default _default;

package/lib/HTableBody/index.js

@@ -17,12 +17,13 @@ var jsxRuntime = require('react/jsx-runtime');
 var ProTable = require('@ant-design/pro-table');
 var hooks = require('./hooks.js');
 var context = require('../context.js');
+var React = require('react');
 var antd = require('antd');
 var TableConfig = require('../TableConfig.js');
 var index$1 = require('../HTablePagination/index.js');
 var index = require('../hooks/index.js');
 
-var _excluded = ["configData", "pagination", "onPageChange", "rowSelection", "rowKey", "emptyRender", "errorRender", "tableStyle", "paginationStyle"];
+var _excluded = ["configData", "pagination", "onPageChange", "rowSelection", "rowKey", "emptyRender", "errorRender", "tableStyle", "paginationStyle", "headerTitle"];
 function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 var defaultRender = function defaultRender() {
@@ -43,6 +44,7 @@ var Body = (function (_ref) {
     errorRender = _ref.errorRender,
     tableStyle = _ref.tableStyle,
     paginationStyle = _ref.paginationStyle,
+    headerTitle = _ref.headerTitle,
     props = _objectWithoutProperties(_ref, _excluded);
   var selectedRowKeys = rowSelection.selectedRowKeys,
     onChange = rowSelection.onChange;
@@ -53,7 +55,8 @@ var Body = (function (_ref) {
     selectedRowData = _useHTableContext.selectedRowData,
     rowOnChange = _useHTableContext.rowOnChange,
     error = _useHTableContext.error,
-    loading = _useHTableContext.loading;
+    loading = _useHTableContext.loading,
+    allSelectChange = _useHTableContext.allSelectChange;
   var _useHTableConfigConte = TableConfig.useHTableConfigContext({
       emptyRender: emptyRender,
       errorRender: errorRender
@@ -95,6 +98,11 @@ var Body = (function (_ref) {
         columns: cols,
         tableAlertRender: false,
         search: false,
+        headerTitle: headerTitle ? /*#__PURE__*/React.cloneElement(headerTitle, {
+          selectedRowData: selectedRowData,
+          allSelectChange: allSelectChange,
+          rowOnChange: rowOnChange
+        }) : null,
         options: {
           reload: function reload() {
             tableInstance.table.reloadWithParams();

package/lib/Table.js

@@ -19,7 +19,6 @@ var useCurrentTable = require('./hooks/useCurrentTable.js');
 var index$2 = require('./HTableFooter/index.js');
 var useRowObj = require('./hooks/useRowObj.js');
 var context = require('./context.js');
-var antd = require('antd');
 var useReq = require('./hooks/useReq.js');
 var useDispatch = require('./hooks/useDispatch.js');
 
@@ -41,11 +40,10 @@ var Table = (function (_ref) {
     _ref$tableStyle = _ref.tableStyle,
     tableStyle = _ref$tableStyle === void 0 ? {} : _ref$tableStyle,
     _ref$action = _ref.action,
-    action = _ref$action === void 0 ? {} : _ref$action,
-    _ref$spaceSize = _ref.spaceSize,
-    spaceSize = _ref$spaceSize === void 0 ? 15 : _ref$spaceSize,
-    className = _ref.className,
-    paginationStyle = _ref.paginationStyle,
+    action = _ref$action === void 0 ? {} : _ref$action;
+    _ref.spaceSize;
+    _ref.className;
+    var paginationStyle = _ref.paginationStyle,
     footerBtnRender = _ref.footerBtnRender,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useReq = useReq.default({
@@ -78,7 +76,7 @@ var Table = (function (_ref) {
       return saveParams.old;
     }
   });
-  return jsxRuntime.jsx(context.HTableContext.Provider, {
+  return jsxRuntime.jsxs(context.HTableContext.Provider, {
     value: {
       tableInstance: tableInstance,
       selectedRowData: selectedRowData,
@@ -95,26 +93,18 @@ var Table = (function (_ref) {
       },
       onPageChange: tableInstance.table.reloadWithParams
     },
-    children: jsxRuntime.jsxs(antd.Space, {
-      size: spaceSize,
-      direction: "vertical",
-      style: {
-        width: "100%"
-      },
-      className: className,
-      children: [!hideHeader && jsxRuntime.jsx(index.default, {
-        searchSpan: searchSpan,
-        headerStyle: headerStyle
-      }), jsxRuntime.jsx(index$1.default, _objectSpread({
-        tableStyle: tableStyle,
-        paginationStyle: paginationStyle
-      }, props)), footerRender !== false && jsxRuntime.jsx(index$2.default, {
-        actionRender: actionRender,
-        footerRender: footerRender,
-        footerStyle: footerStyle,
-        footerBtnRender: footerBtnRender
-      })]
-    })
+    children: [!hideHeader && jsxRuntime.jsx(index.default, {
+      searchSpan: searchSpan,
+      headerStyle: headerStyle
+    }), jsxRuntime.jsx(index$1.default, _objectSpread({
+      tableStyle: tableStyle,
+      paginationStyle: paginationStyle
+    }, props)), footerRender !== false && jsxRuntime.jsx(index$2.default, {
+      actionRender: actionRender,
+      footerRender: footerRender,
+      footerStyle: footerStyle,
+      footerBtnRender: footerBtnRender
+    })]
   });
 });
 

package/package.json

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

package/src/components/HTableBody/index.tsx

@@ -3,12 +3,13 @@ import ProTable from "@ant-design/pro-table";
 import type { ConfigDataModal, ParamsModal } from "../modal";
 import { useCols, useSynchronousKeys } from "./hooks";
 import { useHTableContext } from "../context";
-import React from "react";
+import React, {DetailedReactHTMLElement} from "react";
 import { ConfigProvider, Empty } from "antd";
 import type { HTableInstance } from "../modal";
 import { useHTableConfigContext } from "../TableConfig";
 import HTablePagination from "../HTablePagination";
 import { useClassName } from "../hooks";
+import {ActionRenderFn} from "../modal";
 interface HTableBodyProps extends Omit<ProTableProps<any, any>, "dataSource"> {
   configData?: ConfigDataModal;
   onPageChange?: (params: ParamsModal) => void;
@@ -33,6 +34,7 @@ export default ({
   errorRender,
   tableStyle,
   paginationStyle,
+  headerTitle,
   ...props
 }: HTableBodyProps) => {
   // @ts-ignore
@@ -45,6 +47,7 @@ export default ({
     rowOnChange,
     error,
     loading,
+    allSelectChange
   } = useHTableContext();
   const {
     emptyRender: tableEmptyRender = defaultRender,
@@ -76,6 +79,7 @@ export default ({
           columns={cols}
           tableAlertRender={false}
           search={false}
+          headerTitle={headerTitle?React.cloneElement((headerTitle as DetailedReactHTMLElement<any,any>),{selectedRowData,allSelectChange,rowOnChange}):null}
           options={{
             reload:()=>{
               tableInstance.table.reloadWithParams();

package/src/components/Table.tsx

@@ -64,29 +64,22 @@ export default ({
         onPageChange: tableInstance.table.reloadWithParams,
       }}
     >
-      <Space
-        size={spaceSize}
-        direction={"vertical"}
-        style={{ width: "100%" }}
-        className={className}
-      >
         {!hideHeader && (
-          <Header searchSpan={searchSpan} headerStyle={headerStyle} />
+            <Header searchSpan={searchSpan} headerStyle={headerStyle} />
         )}
         <Body
-          tableStyle={tableStyle}
-          paginationStyle={paginationStyle}
-          {...props}
+            tableStyle={tableStyle}
+            paginationStyle={paginationStyle}
+            {...props}
         />
         {footerRender !== false && (
-          <Footer
-            actionRender={actionRender}
-            footerRender={footerRender}
-            footerStyle={footerStyle}
-            footerBtnRender={footerBtnRender}
-          />
+            <Footer
+                actionRender={actionRender}
+                footerRender={footerRender}
+                footerStyle={footerStyle}
+                footerBtnRender={footerBtnRender}
+            />
         )}
-      </Space>
     </HTableContext.Provider>
   );
 };

package/src/pages/Table/index.tsx

@@ -15,9 +15,18 @@ const configData = [
   {
     title: "操作",
     name: "aaa",
+    fixed:"right",
+    width:200,
     showSearch: true,
+    render:()=>{
+      return <div>fff</div>
+    }
   },
 ];
+const Test=({name,selectedRowData})=>{
+   console.log(selectedRowData);
+   return <div>{name}</div>
+}
 export default () => {
   const hTable = useHTable();
   return (
@@ -26,6 +35,8 @@ export default () => {
         configData={configData}
         rowKey={"id"}
         table={hTable}
+        scroll={{x:1000,y:100}}
+        headerTitle={<Test name="321321"/>}
         actionRender={(allCheck, selectedRowKeys, xjTable) => {
           console.log(allCheck, selectedRowKeys, xjTable);
           return <Button>点我</Button>;

package/src/pages/TableCustomize/index.tsx

@@ -19,6 +19,7 @@ const configData = [
     title: "操作",
     name: "aaa",
     showSearch: true,
+    fixed:"right",
     searchType: "rangePicker",
   },
 ];
@@ -53,7 +54,7 @@ export default () => {
     >
       <Space direction={"vertical"} style={{width:"100%"}}>
         <HTableHeader />
-        <HTableBody pagination={false} />
+        <HTableBody pagination={false} scroll={{x:1000,y:100}}/>
         <HTablePagination />
         <HTableFooter />
       </Space>