@hw-component/table 0.0.7-beta-v16 → 0.0.7-beta-v20

package/es/HTableBody/index.d.ts

@@ -15,6 +15,7 @@ export interface HTableBodyProps extends Omit<ProTableProps<any, any>, "dataSour
     rowSelection?: HRowSelection | false;
     affixProps?: AffixProps | false;
     goTop?: boolean;
+    optionsRender?: (node: React.ReactNode) => React.ReactNode;
 }
-declare const _default: ({ configData, pagination, onPageChange, rowSelection, rowKey, emptyRender, errorRender, tableStyle, paginationStyle, headerTitle, options, actionRender, affixProps, goTop, size, ...props }: HTableBodyProps) => JSX.Element;
+declare const _default: ({ configData, pagination, onPageChange, rowSelection, rowKey, emptyRender, errorRender, tableStyle, paginationStyle, headerTitle, options, actionRender, affixProps, goTop, size, optionsRender, ...props }: HTableBodyProps) => JSX.Element;
 export default _default;

package/es/HTableBody/index.js

@@ -1,7 +1,4 @@
 // welcome to hoo hoo hoo
-import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
-import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
-import _keysInstanceProperty from '@babel/runtime-corejs3/core-js/instance/keys';
 import _Object$keys from '@babel/runtime-corejs3/core-js/object/keys';
 import _Object$getOwnPropertySymbols from '@babel/runtime-corejs3/core-js/object/get-own-property-symbols';
 import _filterInstanceProperty from '@babel/runtime-corejs3/core-js/instance/filter';
@@ -10,7 +7,10 @@ import _forEachInstanceProperty from '@babel/runtime-corejs3/core-js/instance/fo
 import _Object$getOwnPropertyDescriptors from '@babel/runtime-corejs3/core-js/object/get-own-property-descriptors';
 import _Object$defineProperties from '@babel/runtime-corejs3/core-js/object/define-properties';
 import _Object$defineProperty from '@babel/runtime-corejs3/core-js/object/define-property';
-import { jsxs, jsx } from 'react/jsx-runtime';
+import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
+import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
+import _keysInstanceProperty from '@babel/runtime-corejs3/core-js/instance/keys';
+import { jsx, jsxs } from 'react/jsx-runtime';
 import ProTable from '@ant-design/pro-table';
 import { useSize, useCols, useSynchronousKeys } from './hooks.js';
 import { useHTableContext } from '../context.js';
@@ -22,7 +22,7 @@ import { useClassName } from '../hooks/index.js';
 import AlertMsg from './AlertMsg.js';
 import Options from './Options/index.js';
 
-var _excluded = ["configData", "pagination", "onPageChange", "rowSelection", "rowKey", "emptyRender", "errorRender", "tableStyle", "paginationStyle", "headerTitle", "options", "actionRender", "affixProps", "goTop", "size"];
+var _excluded = ["configData", "pagination", "onPageChange", "rowSelection", "rowKey", "emptyRender", "errorRender", "tableStyle", "paginationStyle", "headerTitle", "options", "actionRender", "affixProps", "goTop", "size", "optionsRender"];
 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() {
@@ -55,6 +55,7 @@ var Body = (function (_ref) {
     _ref$goTop = _ref.goTop,
     goTop = _ref$goTop === void 0 ? true : _ref$goTop,
     size = _ref.size,
+    optionsRender = _ref.optionsRender,
     props = _objectWithoutProperties(_ref, _excluded);
   var _ref2 = rowSelection || {},
     selectedRowKeys = _ref2.selectedRowKeys;
@@ -93,6 +94,16 @@ var Body = (function (_ref) {
     records: records,
     rowKey: rowKey
   });
+  var optionsNode = options && jsx(Options, _objectSpread(_objectSpread({
+    reload: function reload() {
+      tableInstance.table.reloadWithParams();
+    }
+  }, options), {}, {
+    size: cuSize,
+    columns: cols,
+    setSizeChange: setCuSize,
+    onChange: changeCols
+  }));
   var _selectedRowData$keys = _keysInstanceProperty(selectedRowData),
     keys = _selectedRowData$keys === void 0 ? [] : _selectedRowData$keys,
     selectAll = selectedRowData.selectAll;
@@ -117,16 +128,7 @@ var Body = (function (_ref) {
         }),
         type: "info"
       })
-    }), options && jsx(Options, _objectSpread(_objectSpread({
-      reload: function reload() {
-        tableInstance.table.reloadWithParams();
-      }
-    }, options), {}, {
-      size: cuSize,
-      columns: cols,
-      setSizeChange: setCuSize,
-      onChange: changeCols
-    })), jsxs(ConfigProvider, {
+    }), optionsRender ? optionsRender(optionsNode) : optionsNode, jsxs(ConfigProvider, {
       renderEmpty: function renderEmpty() {
         if (error) {
           return tableErrorRender === null || tableErrorRender === void 0 ? void 0 : tableErrorRender(tableInstance, error);

package/es/Table.d.ts

@@ -1,3 +1,3 @@
 import type { HTableProps } from "./modal";
-declare const _default: ({ request, configData, searchSpan, table, hideHeader, headerStyle, tableStyle, action, spaceSize, className, paginationStyle, rowKey, ...props }: HTableProps) => JSX.Element;
+declare const _default: ({ request, configData, searchSpan, table, hideHeader, headerStyle, tableStyle, action, spaceSize, className, paginationStyle, rowKey, onFinish, ...props }: HTableProps) => JSX.Element;
 export default _default;

package/es/Table.js

@@ -21,7 +21,7 @@ import useReq from './hooks/useReq.js';
 import useDispatch from './hooks/useDispatch.js';
 import { useState } from 'react';
 
-var _excluded = ["request", "configData", "searchSpan", "table", "hideHeader", "headerStyle", "tableStyle", "action", "spaceSize", "className", "paginationStyle", "rowKey"];
+var _excluded = ["request", "configData", "searchSpan", "table", "hideHeader", "headerStyle", "tableStyle", "action", "spaceSize", "className", "paginationStyle", "rowKey", "onFinish"];
 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 Table = (function (_ref) {
@@ -41,6 +41,7 @@ var Table = (function (_ref) {
     var paginationStyle = _ref.paginationStyle,
     _ref$rowKey = _ref.rowKey,
     rowKey = _ref$rowKey === void 0 ? "id" : _ref$rowKey,
+    onFinish = _ref.onFinish,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useReq = useReq({
       request: request
@@ -106,7 +107,8 @@ var Table = (function (_ref) {
       },
       children: [!hideHeader && jsx(Header, {
         searchSpan: searchSpan,
-        headerStyle: headerStyle
+        headerStyle: headerStyle,
+        onFinish: onFinish
       }), jsx(Body, _objectSpread({
         tableStyle: hideHeader ? _objectSpread({
           paddingTop: 24

package/es/modal.d.ts

@@ -66,6 +66,8 @@ export interface HTableProps extends Omit<ProTableProps<any, any>, "request" | "
     rowSelection?: HRowSelection | false;
     affixProps?: AffixProps | false;
     goTop?: boolean;
+    optionsRender?: (node: React.ReactNode) => React.ReactNode;
+    onFinish?: (value: any) => Promise<any>;
 }
 export interface TableInstance {
     reload: (params?: ParamsModal) => Promise<any>;

package/lib/HTableBody/index.d.ts

@@ -15,6 +15,7 @@ export interface HTableBodyProps extends Omit<ProTableProps<any, any>, "dataSour
     rowSelection?: HRowSelection | false;
     affixProps?: AffixProps | false;
     goTop?: boolean;
+    optionsRender?: (node: React.ReactNode) => React.ReactNode;
 }
-declare const _default: ({ configData, pagination, onPageChange, rowSelection, rowKey, emptyRender, errorRender, tableStyle, paginationStyle, headerTitle, options, actionRender, affixProps, goTop, size, ...props }: HTableBodyProps) => JSX.Element;
+declare const _default: ({ configData, pagination, onPageChange, rowSelection, rowKey, emptyRender, errorRender, tableStyle, paginationStyle, headerTitle, options, actionRender, affixProps, goTop, size, optionsRender, ...props }: HTableBodyProps) => JSX.Element;
 export default _default;

package/lib/HTableBody/index.js

@@ -2,9 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
-var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
-var _keysInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/keys');
 var _Object$keys = require('@babel/runtime-corejs3/core-js/object/keys');
 var _Object$getOwnPropertySymbols = require('@babel/runtime-corejs3/core-js/object/get-own-property-symbols');
 var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/filter');
@@ -13,6 +10,9 @@ var _forEachInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/
 var _Object$getOwnPropertyDescriptors = require('@babel/runtime-corejs3/core-js/object/get-own-property-descriptors');
 var _Object$defineProperties = require('@babel/runtime-corejs3/core-js/object/define-properties');
 var _Object$defineProperty = require('@babel/runtime-corejs3/core-js/object/define-property');
+var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
+var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
+var _keysInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/keys');
 var jsxRuntime = require('react/jsx-runtime');
 var ProTable = require('@ant-design/pro-table');
 var hooks = require('./hooks.js');
@@ -21,11 +21,11 @@ var React = require('react');
 var antd = require('antd');
 var TableConfig = require('../TableConfig.js');
 var index$2 = require('../HTablePagination/index.js');
-var index = require('../hooks/index.js');
+var index$1 = require('../hooks/index.js');
 var AlertMsg = require('./AlertMsg.js');
-var index$1 = require('./Options/index.js');
+var index = require('./Options/index.js');
 
-var _excluded = ["configData", "pagination", "onPageChange", "rowSelection", "rowKey", "emptyRender", "errorRender", "tableStyle", "paginationStyle", "headerTitle", "options", "actionRender", "affixProps", "goTop", "size"];
+var _excluded = ["configData", "pagination", "onPageChange", "rowSelection", "rowKey", "emptyRender", "errorRender", "tableStyle", "paginationStyle", "headerTitle", "options", "actionRender", "affixProps", "goTop", "size", "optionsRender"];
 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() {
@@ -58,6 +58,7 @@ var Body = (function (_ref) {
     _ref$goTop = _ref.goTop,
     goTop = _ref$goTop === void 0 ? true : _ref$goTop,
     size = _ref.size,
+    optionsRender = _ref.optionsRender,
     props = _objectWithoutProperties(_ref, _excluded);
   var _ref2 = rowSelection || {},
     selectedRowKeys = _ref2.selectedRowKeys;
@@ -96,11 +97,21 @@ var Body = (function (_ref) {
     records: records,
     rowKey: rowKey
   });
+  var optionsNode = options && jsxRuntime.jsx(index.default, _objectSpread(_objectSpread({
+    reload: function reload() {
+      tableInstance.table.reloadWithParams();
+    }
+  }, options), {}, {
+    size: cuSize,
+    columns: cols,
+    setSizeChange: setCuSize,
+    onChange: changeCols
+  }));
   var _selectedRowData$keys = _keysInstanceProperty(selectedRowData),
     keys = _selectedRowData$keys === void 0 ? [] : _selectedRowData$keys,
     selectAll = selectedRowData.selectAll;
   var alwaysShowAlert = keys.length > 0 || selectAll;
-  var className = index.useClassName("hw-table-body");
+  var className = index$1.useClassName("hw-table-body");
   return jsxRuntime.jsxs("div", {
     style: tableStyle,
     className: "hw_table_body  ".concat(className),
@@ -120,16 +131,7 @@ var Body = (function (_ref) {
         }),
         type: "info"
       })
-    }), options && jsxRuntime.jsx(index$1.default, _objectSpread(_objectSpread({
-      reload: function reload() {
-        tableInstance.table.reloadWithParams();
-      }
-    }, options), {}, {
-      size: cuSize,
-      columns: cols,
-      setSizeChange: setCuSize,
-      onChange: changeCols
-    })), jsxRuntime.jsxs(antd.ConfigProvider, {
+    }), optionsRender ? optionsRender(optionsNode) : optionsNode, jsxRuntime.jsxs(antd.ConfigProvider, {
       renderEmpty: function renderEmpty() {
         if (error) {
           return tableErrorRender === null || tableErrorRender === void 0 ? void 0 : tableErrorRender(tableInstance, error);

package/lib/Table.d.ts

@@ -1,3 +1,3 @@
 import type { HTableProps } from "./modal";
-declare const _default: ({ request, configData, searchSpan, table, hideHeader, headerStyle, tableStyle, action, spaceSize, className, paginationStyle, rowKey, ...props }: HTableProps) => JSX.Element;
+declare const _default: ({ request, configData, searchSpan, table, hideHeader, headerStyle, tableStyle, action, spaceSize, className, paginationStyle, rowKey, onFinish, ...props }: HTableProps) => JSX.Element;
 export default _default;

package/lib/Table.js

@@ -24,7 +24,7 @@ var useReq = require('./hooks/useReq.js');
 var useDispatch = require('./hooks/useDispatch.js');
 var React = require('react');
 
-var _excluded = ["request", "configData", "searchSpan", "table", "hideHeader", "headerStyle", "tableStyle", "action", "spaceSize", "className", "paginationStyle", "rowKey"];
+var _excluded = ["request", "configData", "searchSpan", "table", "hideHeader", "headerStyle", "tableStyle", "action", "spaceSize", "className", "paginationStyle", "rowKey", "onFinish"];
 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 Table = (function (_ref) {
@@ -44,6 +44,7 @@ var Table = (function (_ref) {
     var paginationStyle = _ref.paginationStyle,
     _ref$rowKey = _ref.rowKey,
     rowKey = _ref$rowKey === void 0 ? "id" : _ref$rowKey,
+    onFinish = _ref.onFinish,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useReq = useReq.default({
       request: request
@@ -109,7 +110,8 @@ var Table = (function (_ref) {
       },
       children: [!hideHeader && jsxRuntime.jsx(index.default, {
         searchSpan: searchSpan,
-        headerStyle: headerStyle
+        headerStyle: headerStyle,
+        onFinish: onFinish
       }), jsxRuntime.jsx(index$1.default, _objectSpread({
         tableStyle: hideHeader ? _objectSpread({
           paddingTop: 24

package/lib/modal.d.ts

@@ -66,6 +66,8 @@ export interface HTableProps extends Omit<ProTableProps<any, any>, "request" | "
     rowSelection?: HRowSelection | false;
     affixProps?: AffixProps | false;
     goTop?: boolean;
+    optionsRender?: (node: React.ReactNode) => React.ReactNode;
+    onFinish?: (value: any) => Promise<any>;
 }
 export interface TableInstance {
     reload: (params?: ParamsModal) => Promise<any>;

package/package.json

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

package/src/components/HTableBody/index.tsx

@@ -29,6 +29,7 @@ export interface HTableBodyProps
   rowSelection?: HRowSelection | false;
   affixProps?: AffixProps | false;
   goTop?: boolean;
+  optionsRender?:(node:React.ReactNode)=>React.ReactNode;
 }
 const defaultRender = () => {
   return <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />;
@@ -54,6 +55,7 @@ export default ({
   affixProps,
   goTop = true,
   size,
+   optionsRender,
   ...props
 }: HTableBodyProps) => {
   // @ts-ignore
@@ -81,7 +83,18 @@ export default ({
     rowSelection
   });
   useSynchronousKeys({ selectedRowKeys, records, rowKey });
-
+  const optionsNode=options && (
+      <Options
+          reload={() => {
+            tableInstance.table.reloadWithParams();
+          }}
+          {...options}
+          size={cuSize}
+          columns={cols}
+          setSizeChange={setCuSize}
+          onChange={changeCols}
+      />
+  );
   const { keys = [], selectAll } = selectedRowData;
 
   const alwaysShowAlert = keys.length > 0 || selectAll;
@@ -104,18 +117,7 @@ export default ({
           />
         </div>
       )}
-      {options && (
-        <Options
-          reload={() => {
-            tableInstance.table.reloadWithParams();
-          }}
-          {...options}
-          size={cuSize}
-          columns={cols}
-          setSizeChange={setCuSize}
-          onChange={changeCols}
-        />
-      )}
+      {optionsRender?optionsRender(optionsNode):optionsNode}
       <ConfigProvider
         renderEmpty={() => {
           if (error) {

package/src/components/Table.tsx

@@ -21,6 +21,7 @@ export default ({
   className,
   paginationStyle,
   rowKey = "id",
+   onFinish,
   ...props
 }: HTableProps) => {
   const { run, loading, data, error, saveParams } = useReq({ request });
@@ -68,7 +69,7 @@ export default ({
     >
       <Space direction={"vertical"} size={0} style={{ width: "100%" }}>
         {!hideHeader && (
-          <Header searchSpan={searchSpan} headerStyle={headerStyle} />
+          <Header searchSpan={searchSpan} headerStyle={headerStyle} onFinish={onFinish}/>
         )}
         <Body
           tableStyle={

package/src/components/modal.ts

@@ -99,6 +99,8 @@ export interface HTableProps
   rowSelection?: HRowSelection | false;
   affixProps?: AffixProps | false;
   goTop?: boolean;
+  optionsRender?:(node:React.ReactNode)=>React.ReactNode;
+  onFinish?:(value:any)=>Promise<any>;
 }
 export interface TableInstance {
   reload: (params?: ParamsModal) => Promise<any>;

package/src/pages/Table/index.tsx

@@ -1,5 +1,5 @@
 import { HTable, useHTable } from "../../components";
-import { Button } from "antd";
+import {Button, Space} from "antd";
 import { HFormConfigProvider } from "@hw-component/form";
 
 const configData = [
@@ -54,6 +54,11 @@ export default () => {
           configData={configData}
           rowKey={"id"}
           table={hTable}
+          optionsRender={(node )=>{
+            return <Space>
+               ffff{node}
+            </Space>
+          }}
           rowSelection={{
             allPageCheck:false
           }}