@hw-component/table 1.9.42 → 1.9.45

package/es/DialogTable/ModalTable.js

@@ -99,8 +99,7 @@ var ModalTable = (function (_ref) {
     title: title,
     width: width,
     bodyStyle: _objectSpread({
-      padding: 0,
-      paddingBottom: 12
+      padding: "0px 0px 12px"
     }, bodyStyle),
     afterClose: function afterClose() {
       currentTable.form.resetFields();

package/es/Table.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import type { HTableProps } from "./modal";
-declare const _default: ({ request, configData, searchSpan, table, hideHeader, headerStyle, tableStyle, action, spaceSize, className, paginationStyle, rowKey, onFinish, manual, formInitValues, hideLabel, labelWidth, onReset, style, dataSource, reload, loading: propsLoading, error: propsError, ...props }: HTableProps) => JSX.Element;
+declare const _default: ({ request, configData, searchSpan, table, hideHeader, headerStyle, tableStyle, action, spaceSize, className, paginationStyle, rowKey, onFinish, manual, formInitValues, hideLabel, labelWidth, onReset, style, dataSource, reload, loading: propsLoading, error: propsError, rowSelection, ...props }: HTableProps) => JSX.Element;
 export default _default;

package/es/Table.js

@@ -22,7 +22,7 @@ import useDispatch from './hooks/useDispatch.js';
 import { useState } from 'react';
 import { useClassName } from './hooks/index.js';
 
-var _excluded = ["request", "configData", "searchSpan", "table", "hideHeader", "headerStyle", "tableStyle", "action", "spaceSize", "className", "paginationStyle", "rowKey", "onFinish", "manual", "formInitValues", "hideLabel", "labelWidth", "onReset", "style", "dataSource", "reload", "loading", "error"];
+var _excluded = ["request", "configData", "searchSpan", "table", "hideHeader", "headerStyle", "tableStyle", "action", "spaceSize", "className", "paginationStyle", "rowKey", "onFinish", "manual", "formInitValues", "hideLabel", "labelWidth", "onReset", "style", "dataSource", "reload", "loading", "error", "rowSelection"];
 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 _context2, _context3; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context2 = ownKeys(Object(t), !0)).call(_context2, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context3 = ownKeys(Object(t))).call(_context3, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Table = (function (_ref) {
@@ -52,6 +52,7 @@ var Table = (function (_ref) {
     reload = _ref.reload,
     propsLoading = _ref.loading,
     propsError = _ref.error,
+    rowSelection = _ref.rowSelection,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useReq = useReq({
       request: request,
@@ -66,7 +67,7 @@ var Table = (function (_ref) {
     error = _useReq.error,
     saveParams = _useReq.saveParams;
   var dispatch = useDispatch(action);
-  var _useRowObj = useRowObj(),
+  var _useRowObj = useRowObj(rowSelection),
     selectedRowData = _useRowObj.selectedRowData,
     rowOnChange = _useRowObj.rowOnChange,
     allSelectChange = _useRowObj.allSelectChange,
@@ -134,7 +135,8 @@ var Table = (function (_ref) {
           paddingTop: 24
         }, tableStyle) : tableStyle,
         paginationStyle: paginationStyle,
-        rowKey: rowKey
+        rowKey: rowKey,
+        rowSelection: rowSelection
       }, props))]
     })
   });

package/es/hooks/useRowObj.d.ts

@@ -1,6 +1,7 @@
 import type React from "react";
 import type { RowObj } from "../modal";
-declare const _default: () => {
+import { HRowSelection } from "../modal";
+declare const _default: (rowSelection?: HRowSelection | false) => {
     rowOnChange: (keys: React.Key[], rowData: any[]) => void;
     selectedRowData: RowObj;
     allSelectChange: (checked?: boolean) => void;

package/es/hooks/useRowObj.js

@@ -2,7 +2,15 @@
 import _slicedToArray from '@babel/runtime-corejs3/helpers/slicedToArray';
 import { useState, useMemo } from 'react';
 
-var useRowObj = (function () {
+var useRowObj = (function (rowSelection) {
+  var change = function change(keys, rowData) {
+    if (rowSelection === false) {
+      return;
+    }
+    var _ref = rowSelection || {},
+      onChange = _ref.onChange;
+    onChange === null || onChange === void 0 || onChange(keys, rowData);
+  };
   var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
     selectedRowData = _useState2[0],
@@ -15,6 +23,7 @@ var useRowObj = (function () {
       keys: keys,
       rowData: rowData
     });
+    change(keys, rowData);
   };
   var allSelectChange = function allSelectChange(checked) {
     var newChecked = typeof checked === "undefined" ? !selectAll : checked;

package/lib/DialogTable/ModalTable.js

@@ -102,8 +102,7 @@ var ModalTable = (function (_ref) {
     title: title,
     width: width,
     bodyStyle: _objectSpread({
-      padding: 0,
-      paddingBottom: 12
+      padding: "0px 0px 12px"
     }, bodyStyle),
     afterClose: function afterClose() {
       currentTable.form.resetFields();

package/lib/Table.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import type { HTableProps } from "./modal";
-declare const _default: ({ request, configData, searchSpan, table, hideHeader, headerStyle, tableStyle, action, spaceSize, className, paginationStyle, rowKey, onFinish, manual, formInitValues, hideLabel, labelWidth, onReset, style, dataSource, reload, loading: propsLoading, error: propsError, ...props }: HTableProps) => JSX.Element;
+declare const _default: ({ request, configData, searchSpan, table, hideHeader, headerStyle, tableStyle, action, spaceSize, className, paginationStyle, rowKey, onFinish, manual, formInitValues, hideLabel, labelWidth, onReset, style, dataSource, reload, loading: propsLoading, error: propsError, rowSelection, ...props }: HTableProps) => JSX.Element;
 export default _default;

package/lib/Table.js

@@ -25,7 +25,7 @@ var useDispatch = require('./hooks/useDispatch.js');
 var React = require('react');
 var index = require('./hooks/index.js');
 
-var _excluded = ["request", "configData", "searchSpan", "table", "hideHeader", "headerStyle", "tableStyle", "action", "spaceSize", "className", "paginationStyle", "rowKey", "onFinish", "manual", "formInitValues", "hideLabel", "labelWidth", "onReset", "style", "dataSource", "reload", "loading", "error"];
+var _excluded = ["request", "configData", "searchSpan", "table", "hideHeader", "headerStyle", "tableStyle", "action", "spaceSize", "className", "paginationStyle", "rowKey", "onFinish", "manual", "formInitValues", "hideLabel", "labelWidth", "onReset", "style", "dataSource", "reload", "loading", "error", "rowSelection"];
 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 _context2, _context3; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context2 = ownKeys(Object(t), !0)).call(_context2, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context3 = ownKeys(Object(t))).call(_context3, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Table = (function (_ref) {
@@ -55,6 +55,7 @@ var Table = (function (_ref) {
     reload = _ref.reload,
     propsLoading = _ref.loading,
     propsError = _ref.error,
+    rowSelection = _ref.rowSelection,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useReq = useReq.default({
       request: request,
@@ -69,7 +70,7 @@ var Table = (function (_ref) {
     error = _useReq.error,
     saveParams = _useReq.saveParams;
   var dispatch = useDispatch.default(action);
-  var _useRowObj = useRowObj.default(),
+  var _useRowObj = useRowObj.default(rowSelection),
     selectedRowData = _useRowObj.selectedRowData,
     rowOnChange = _useRowObj.rowOnChange,
     allSelectChange = _useRowObj.allSelectChange,
@@ -137,7 +138,8 @@ var Table = (function (_ref) {
           paddingTop: 24
         }, tableStyle) : tableStyle,
         paginationStyle: paginationStyle,
-        rowKey: rowKey
+        rowKey: rowKey,
+        rowSelection: rowSelection
       }, props))]
     })
   });

package/lib/hooks/useRowObj.d.ts

@@ -1,6 +1,7 @@
 import type React from "react";
 import type { RowObj } from "../modal";
-declare const _default: () => {
+import { HRowSelection } from "../modal";
+declare const _default: (rowSelection?: HRowSelection | false) => {
     rowOnChange: (keys: React.Key[], rowData: any[]) => void;
     selectedRowData: RowObj;
     allSelectChange: (checked?: boolean) => void;

package/lib/hooks/useRowObj.js

@@ -5,7 +5,15 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _slicedToArray = require('@babel/runtime-corejs3/helpers/slicedToArray');
 var React = require('react');
 
-var useRowObj = (function () {
+var useRowObj = (function (rowSelection) {
+  var change = function change(keys, rowData) {
+    if (rowSelection === false) {
+      return;
+    }
+    var _ref = rowSelection || {},
+      onChange = _ref.onChange;
+    onChange === null || onChange === void 0 || onChange(keys, rowData);
+  };
   var _useState = React.useState({}),
     _useState2 = _slicedToArray(_useState, 2),
     selectedRowData = _useState2[0],
@@ -18,6 +26,7 @@ var useRowObj = (function () {
       keys: keys,
       rowData: rowData
     });
+    change(keys, rowData);
   };
   var allSelectChange = function allSelectChange(checked) {
     var newChecked = typeof checked === "undefined" ? !selectAll : checked;

package/package.json

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

package/src/components/DialogTable/ModalTable.tsx

@@ -76,7 +76,7 @@ export default ({
       destroyOnClose
       title={title}
       width={width}
-      bodyStyle={{ padding: 0, paddingBottom: 12, ...bodyStyle }}
+      bodyStyle={{ padding:"0px 0px 12px", ...bodyStyle }}
       afterClose={() => {
         currentTable.form.resetFields();
         afterClose?.();

package/src/components/Table.tsx

@@ -33,6 +33,7 @@ export default ({
   reload,
   loading: propsLoading,
   error: propsError,
+  rowSelection,
   ...props
 }: HTableProps) => {
   const { run, loading, data, error, saveParams } = useReq({
@@ -43,8 +44,7 @@ export default ({
     reload,
   });
   const dispatch = useDispatch(action);
-  const { selectedRowData, rowOnChange, allSelectChange, setSelectedRowData } =
-    useRowObj();
+  const { selectedRowData, rowOnChange, allSelectChange, setSelectedRowData } = useRowObj(rowSelection);
   const [open, setOpen] = useState<boolean | undefined>();
   const tableInstance = useCurrentTable({
     table,
@@ -106,6 +106,7 @@ export default ({
           }
           paginationStyle={paginationStyle}
           rowKey={rowKey}
+          rowSelection={rowSelection}
           {...props}
         />
       </div>

package/src/components/hooks/useRowObj.ts

@@ -1,8 +1,16 @@
 import type React from "react";
 import { useMemo, useState } from "react";
 import type { RowObj } from "../modal";
+import {HRowSelection} from "../modal";
 
-export default () => {
+export default (rowSelection?: HRowSelection | false) => {
+  const change=(keys: React.Key[], rowData: any[])=>{
+    if (rowSelection===false){
+      return;
+    }
+    const {onChange}=rowSelection||{};
+    onChange?.(keys,rowData);
+  }
   const [selectedRowData, setSelectedRowData] = useState<RowObj>({});
   const { selectAll = false } = selectedRowData;
   const selectedRowDataSource = useMemo(() => {}, []);
@@ -11,6 +19,7 @@ export default () => {
       keys,
       rowData,
     });
+    change(keys,rowData);
   };
   const allSelectChange = (checked?: boolean) => {
     const newChecked = typeof checked === "undefined" ? !selectAll : checked;

package/src/pages/ModalTable/index.tsx

@@ -167,6 +167,9 @@ export default () => {
             </div>
           ),
         }}
+        contentRender={()=>{
+          return <div style={{height:200,backgroundColor:"red"}}></div>
+        }}
       />
       <HTable configData={configData} headerTitle={<Test />} />
     </>

package/src/pages/Table/index.tsx

@@ -167,12 +167,12 @@ export default () => {
         >
           获取
         </div>
-        <ProTable
-          columns={configData}
-          scroll={{ x: 1000 }}
-          loading={loading}
-          dataSource={data}
-        />
+        {/*<ProTable*/}
+        {/*  columns={configData}*/}
+        {/*  scroll={{ x: 1000 }}*/}
+        {/*  loading={loading}*/}
+        {/*  dataSource={data}*/}
+        {/*/>*/}
         <HTable
           configData={configData}
           rowKey={(rowData, index) => {
@@ -199,7 +199,10 @@ export default () => {
             persistenceType: "localStorage",
           }}
           formInitValues={{
-            name2: 1,
+            mobileList: "mobileList",
+          }}
+          request={(params)=>{
+             console.log(params)
           }}
           tableExtraRender={() => {
             return <div>ffff</div>;