@hw-component/table 0.0.7-beta-v9 → 0.0.7-beta-v12

package/es/HTableBody/index.js

@@ -40,8 +40,7 @@ var Body = (function (_ref) {
     _ref$pagination = _ref.pagination,
     pagination = _ref$pagination === void 0 ? {} : _ref$pagination,
     onPageChange = _ref.onPageChange,
-    _ref$rowSelection = _ref.rowSelection,
-    rowSelection = _ref$rowSelection === void 0 ? {} : _ref$rowSelection,
+    rowSelection = _ref.rowSelection,
     _ref$rowKey = _ref.rowKey,
     rowKey = _ref$rowKey === void 0 ? "id" : _ref$rowKey,
     emptyRender = _ref.emptyRender,
@@ -57,7 +56,8 @@ var Body = (function (_ref) {
     goTop = _ref$goTop === void 0 ? true : _ref$goTop,
     size = _ref.size,
     props = _objectWithoutProperties(_ref, _excluded);
-  var selectedRowKeys = rowSelection.selectedRowKeys;
+  var _ref2 = rowSelection || {},
+    selectedRowKeys = _ref2.selectedRowKeys;
   var _useHTableContext = useHTableContext(),
     tableInstance = _useHTableContext.tableInstance,
     contextConfigData = _useHTableContext.configData,
@@ -79,11 +79,12 @@ var Body = (function (_ref) {
     cuSize = _useSize.cuSize,
     setCuSize = _useSize.setCuSize;
   var bodyConfigData = configData || contextConfigData;
-  var _ref2 = data || {},
-    records = _ref2.records;
+  var _ref3 = data || {},
+    records = _ref3.records;
   var _useCols = useCols({
       configData: bodyConfigData,
-      table: tableInstance
+      table: tableInstance,
+      rowSelection: rowSelection
     }),
     cols = _useCols.cols,
     changeCols = _useCols.changeCols;

package/es/ModalTable/hooks.js

@@ -55,7 +55,7 @@ var useCurrentTable = function useCurrentTable(_ref2) {
   return dialogTableInstance;
 };
 var useVisible = function useVisible(visible) {
-  var _useState3 = useState(visible),
+  var _useState3 = useState(false),
     _useState4 = _slicedToArray(_useState3, 2),
     modalVisible = _useState4[0],
     setModalVisible = _useState4[1];

package/es/ModalTable/index.js

@@ -44,14 +44,16 @@ var index = (function (_ref) {
         setModalTableParams(function (oldParams) {
           var configData = oldParams.configData,
             request = oldParams.request,
-            title = oldParams.title;
+            title = oldParams.title,
+            oldP = oldParams.params;
           var _showParams$title = showParams.title,
             showTitle = _showParams$title === void 0 ? title : _showParams$title,
             _showParams$configDat = showParams.configData,
             showConfigData = _showParams$configDat === void 0 ? configData : _showParams$configDat,
-            showReq = showParams.request,
+            _showParams$request = showParams.request,
+            showReq = _showParams$request === void 0 ? request : _showParams$request,
             _showParams$params = showParams.params,
-            params = _showParams$params === void 0 ? request : _showParams$params;
+            params = _showParams$params === void 0 ? oldP : _showParams$params;
           return {
             title: showTitle,
             request: showReq,

package/lib/HTableBody/index.js

@@ -43,8 +43,7 @@ var Body = (function (_ref) {
     _ref$pagination = _ref.pagination,
     pagination = _ref$pagination === void 0 ? {} : _ref$pagination,
     onPageChange = _ref.onPageChange,
-    _ref$rowSelection = _ref.rowSelection,
-    rowSelection = _ref$rowSelection === void 0 ? {} : _ref$rowSelection,
+    rowSelection = _ref.rowSelection,
     _ref$rowKey = _ref.rowKey,
     rowKey = _ref$rowKey === void 0 ? "id" : _ref$rowKey,
     emptyRender = _ref.emptyRender,
@@ -60,7 +59,8 @@ var Body = (function (_ref) {
     goTop = _ref$goTop === void 0 ? true : _ref$goTop,
     size = _ref.size,
     props = _objectWithoutProperties(_ref, _excluded);
-  var selectedRowKeys = rowSelection.selectedRowKeys;
+  var _ref2 = rowSelection || {},
+    selectedRowKeys = _ref2.selectedRowKeys;
   var _useHTableContext = context.useHTableContext(),
     tableInstance = _useHTableContext.tableInstance,
     contextConfigData = _useHTableContext.configData,
@@ -82,11 +82,12 @@ var Body = (function (_ref) {
     cuSize = _useSize.cuSize,
     setCuSize = _useSize.setCuSize;
   var bodyConfigData = configData || contextConfigData;
-  var _ref2 = data || {},
-    records = _ref2.records;
+  var _ref3 = data || {},
+    records = _ref3.records;
   var _useCols = hooks.useCols({
       configData: bodyConfigData,
-      table: tableInstance
+      table: tableInstance,
+      rowSelection: rowSelection
     }),
     cols = _useCols.cols,
     changeCols = _useCols.changeCols;

package/lib/ModalTable/hooks.js

@@ -56,7 +56,7 @@ var useCurrentTable = function useCurrentTable(_ref2) {
   return dialogTableInstance;
 };
 var useVisible = function useVisible(visible) {
-  var _useState3 = React.useState(visible),
+  var _useState3 = React.useState(false),
     _useState4 = _slicedToArray(_useState3, 2),
     modalVisible = _useState4[0],
     setModalVisible = _useState4[1];

package/lib/ModalTable/index.js

@@ -47,14 +47,16 @@ var index = (function (_ref) {
         setModalTableParams(function (oldParams) {
           var configData = oldParams.configData,
             request = oldParams.request,
-            title = oldParams.title;
+            title = oldParams.title,
+            oldP = oldParams.params;
           var _showParams$title = showParams.title,
             showTitle = _showParams$title === void 0 ? title : _showParams$title,
             _showParams$configDat = showParams.configData,
             showConfigData = _showParams$configDat === void 0 ? configData : _showParams$configDat,
-            showReq = showParams.request,
+            _showParams$request = showParams.request,
+            showReq = _showParams$request === void 0 ? request : _showParams$request,
             _showParams$params = showParams.params,
-            params = _showParams$params === void 0 ? request : _showParams$params;
+            params = _showParams$params === void 0 ? oldP : _showParams$params;
           return {
             title: showTitle,
             request: showReq,

package/package.json

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

package/src/components/HTableBody/Options/index.tsx

@@ -11,7 +11,7 @@ import { ColsSettingContent } from "./Content";
 import { Title } from "./Title";
 import type { IProps } from "./modal";
 import { useHTableContext } from "../../context";
-import {defaultKeys} from "@/components/HTableBody/Options/utils";
+import {defaultKeys} from "./utils";
 export default ({
   reload,
   size = "middle",

package/src/components/HTableBody/index.tsx

@@ -42,7 +42,7 @@ export default ({
   configData,
   pagination = {},
   onPageChange,
-  rowSelection = {},
+  rowSelection,
   rowKey = "id",
   emptyRender,
   errorRender,
@@ -57,7 +57,7 @@ export default ({
   ...props
 }: HTableBodyProps) => {
   // @ts-ignore
-  const { selectedRowKeys } = rowSelection;
+  const { selectedRowKeys } = rowSelection||{};
   const {
     tableInstance,
     configData: contextConfigData,
@@ -78,6 +78,7 @@ export default ({
   const { cols, changeCols } = useCols({
     configData: bodyConfigData,
     table: tableInstance,
+    rowSelection
   });
   useSynchronousKeys({ selectedRowKeys, records, rowKey });
 

package/src/components/ModalTable/hooks.ts

@@ -48,7 +48,7 @@ export const useCurrentTable = ({ show, hide, dialogTable }: ParamsModal) => {
 };
 
 export const useVisible = (visible: boolean) => {
-  const [modalVisible, setModalVisible] = useState(visible);
+  const [modalVisible, setModalVisible] = useState(false);
   useEffect(() => {
     setModalVisible(visible);
   }, [visible]);

package/src/components/ModalTable/index.tsx

@@ -1,6 +1,6 @@
 import { Modal } from "antd";
 import Table from "../Table";
-import type { ModalTableProps } from "../modal";
+import type {ModalTableProps, ParamsModal} from "../modal";
 import { useCurrentTable, useTableProps, useVisible } from "./hooks";
 export default ({
   configData: configDataProps,
@@ -23,12 +23,12 @@ export default ({
     show: (showParams) => {
       if (showParams) {
         setModalTableParams((oldParams) => {
-          const { configData, request, title } = oldParams;
+          const { configData, request, title,params:oldP } = oldParams;
           const {
             title: showTitle = title,
             configData: showConfigData = configData,
-            request: showReq,
-            params = request,
+            request: showReq=request,
+            params=oldP ,
           } = showParams;
           return {
             title: showTitle,
@@ -46,11 +46,9 @@ export default ({
     dialogTable,
   });
   const { configData, request, title, params } = modalTableParams;
-  const req = request
-    ? (reqParams) => {
-        return request({ ...params, ...reqParams });
-      }
-    : undefined;
+  const req=request?(reqParams)=>{
+    return request({ ...params, ...reqParams });
+  }:undefined;
   return (
     <Modal
       {...props}

package/src/components/Table.tsx

@@ -25,8 +25,7 @@ export default ({
 }: HTableProps) => {
   const { run, loading, data, error, saveParams } = useReq({ request });
   const dispatch = useDispatch(action);
-  const { selectedRowData, rowOnChange, allSelectChange, setSelectedRowData } =
-    useRowObj();
+  const { selectedRowData, rowOnChange, allSelectChange, setSelectedRowData } = useRowObj();
   const [open, setOpen] = useState<boolean | undefined>();
   const tableInstance = useCurrentTable({
     table,

package/src/pages/ModalTable/index.tsx

@@ -89,13 +89,13 @@ export default () => {
     <>
       <Button
         onClick={() => {
-          dialogTable.show({ title: "3333", request: req2 });
+          dialogTable.show({ title: "3333"});
         }}
       >
         点我333
       </Button>
-      <HModalTable dialogTable={dialogTable} configData={configData} />
-      <HTable configData={[]} headerTitle={<Test />} />
+      <HModalTable dialogTable={dialogTable} request={req2} configData={configData} />
+      <HTable configData={configData} headerTitle={<Test />} />
     </>
   );
 };

package/src/pages/Table/index.tsx

@@ -54,7 +54,9 @@ export default () => {
           configData={configData}
           rowKey={"id"}
           table={hTable}
-          rowSelection={{}}
+          rowSelection={{
+            allPageCheck:false
+          }}
           affixProps={{
             target: () => document.querySelector(".body"),
           }}