@hw-component/table 1.9.34 → 1.9.36

package/es/HTableBody/index.d.ts

@@ -1,12 +1,13 @@
 import type { ProTableProps } from "@ant-design/pro-table";
 import type { ActionRenderFn, ConfigDataModal, ParamsModal, HTableInstance, HRowSelection } from "../modal";
 import React from "react";
+import { IPaginationProps } from "../HTablePagination";
 import type { AffixProps } from "antd/lib/affix";
 import type { OptionConfig } from "@ant-design/pro-table/lib/components/ToolBar";
 export interface OptionModal extends OptionConfig {
     settingRender?: () => React.ReactNode;
 }
-export interface HTableBodyProps extends Omit<ProTableProps<any, any>, "dataSource" | "rowSelection" | "options"> {
+export interface HTableBodyProps extends Omit<ProTableProps<any, any>, "dataSource" | "rowSelection" | "options" | "pagination"> {
     configData?: ConfigDataModal;
     onPageChange?: (params: ParamsModal) => void;
     emptyRender?: (tableInstance: HTableInstance) => React.ReactNode;
@@ -22,6 +23,7 @@ export interface HTableBodyProps extends Omit<ProTableProps<any, any>, "dataSour
     localSorter?: boolean;
     options?: OptionModal | false;
     table?: HTableInstance;
+    pagination?: IPaginationProps | false;
 }
 declare const _default: (bodyProps: HTableBodyProps) => JSX.Element;
 export default _default;

package/es/HTablePagination/index.d.ts

@@ -2,13 +2,14 @@ import type { PaginationProps } from "antd";
 import type { ParamsModal, HTableInstance } from "../modal";
 import React from "react";
 import type { AffixProps } from "antd/lib/affix";
-export interface IPaginationProps extends PaginationProps {
+export interface IPaginationProps extends Omit<PaginationProps, "showTotal"> {
     onPageChange?: (params: ParamsModal) => void;
     paginationStyle?: React.CSSProperties;
     affixProps?: AffixProps | false;
     goTop?: boolean;
     actionRender?: (tableInstance: HTableInstance) => React.ReactNode;
     table?: HTableInstance;
+    showTotal?: false | PaginationProps["showTotal"];
 }
-declare const _default: ({ onPageChange, paginationStyle, affixProps, goTop, actionRender, table, ...props }: IPaginationProps) => JSX.Element;
+declare const _default: ({ onPageChange, paginationStyle, affixProps, goTop, actionRender, table, showTotal, ...props }: IPaginationProps) => JSX.Element;
 export default _default;

package/es/HTablePagination/index.js

@@ -1,4 +1,9 @@
 // welcome to hoo hoo hoo
+import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
+import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
+import _slicedToArray from '@babel/runtime-corejs3/helpers/slicedToArray';
+import _concatInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/concat';
+import _Number$parseInt from '@babel/runtime-corejs3/core-js-stable/number/parse-int';
 import _Object$keys from '@babel/runtime-corejs3/core-js-stable/object/keys';
 import _Object$getOwnPropertySymbols from '@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols';
 import _filterInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/filter';
@@ -7,11 +12,6 @@ import _forEachInstanceProperty from '@babel/runtime-corejs3/core-js-stable/inst
 import _Object$getOwnPropertyDescriptors from '@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors';
 import _Object$defineProperties from '@babel/runtime-corejs3/core-js-stable/object/define-properties';
 import _Object$defineProperty from '@babel/runtime-corejs3/core-js-stable/object/define-property';
-import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
-import _slicedToArray from '@babel/runtime-corejs3/helpers/slicedToArray';
-import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
-import _Number$parseInt from '@babel/runtime-corejs3/core-js-stable/number/parse-int';
-import _concatInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/concat';
 import { jsx, Fragment, jsxs } from 'react/jsx-runtime';
 import { Row, Pagination, Affix } from 'antd';
 import { useHTableContext } from '../context.js';
@@ -20,18 +20,27 @@ import { useState } from 'react';
 import GoTop from '../GoTop/index.js';
 import { useHTableConfigContext } from '../TableConfig.js';
 
-var _excluded = ["onPageChange", "paginationStyle", "affixProps", "goTop", "actionRender", "table"],
+var _excluded = ["onPageChange", "paginationStyle", "affixProps", "goTop", "actionRender", "table", "showTotal"],
   _excluded2 = ["offsetBottom"];
 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 _context5, _context6; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context5 = ownKeys(Object(t), !0)).call(_context5, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context6 = ownKeys(Object(t))).call(_context6, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
-var HTablePagination = (function (_ref) {
-  var onPageChange = _ref.onPageChange,
-    paginationStyle = _ref.paginationStyle,
-    affixProps = _ref.affixProps,
-    goTop = _ref.goTop,
-    actionRender = _ref.actionRender,
-    table = _ref.table,
-    props = _objectWithoutProperties(_ref, _excluded);
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context3, _context4; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context3 = ownKeys(Object(t), !0)).call(_context3, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context4 = ownKeys(Object(t))).call(_context4, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
+var defaultShowTotal = function defaultShowTotal(totalNum, _ref) {
+  var _context, _context2;
+  var _ref2 = _slicedToArray(_ref, 2),
+    showCurrent = _ref2[0],
+    showCurrentEnd = _ref2[1];
+  return _concatInstanceProperty(_context = _concatInstanceProperty(_context2 = "\u7B2C".concat(showCurrent, "-")).call(_context2, showCurrentEnd, "/\u603B\u5171")).call(_context, totalNum, "\u6761");
+};
+var HTablePagination = (function (_ref3) {
+  var onPageChange = _ref3.onPageChange,
+    paginationStyle = _ref3.paginationStyle,
+    affixProps = _ref3.affixProps,
+    goTop = _ref3.goTop,
+    actionRender = _ref3.actionRender,
+    table = _ref3.table,
+    _ref3$showTotal = _ref3.showTotal,
+    showTotal = _ref3$showTotal === void 0 ? defaultShowTotal : _ref3$showTotal,
+    props = _objectWithoutProperties(_ref3, _excluded);
   var _useHTableContext = useHTableContext(),
     contextOnPageChange = _useHTableContext.onPageChange,
     data = _useHTableContext.data,
@@ -42,10 +51,10 @@ var HTablePagination = (function (_ref) {
     defaultPaginationStyle = _useHTableConfigConte.paginationStyle;
   var tableInstance = table || contextTableInstance;
   var tableOnPageChange = onPageChange || contextOnPageChange;
-  var _ref2 = data || {},
-    size = _ref2.size,
-    current = _ref2.current,
-    total = _ref2.total;
+  var _ref4 = data || {},
+    size = _ref4.size,
+    current = _ref4.current,
+    total = _ref4.total;
   var pageCurrent = _Number$parseInt(current || "1", 10);
   var pageSize = _Number$parseInt(size || "10", 10);
   var pageTotal = _Number$parseInt(total || "0", 10);
@@ -54,6 +63,7 @@ var HTablePagination = (function (_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     style = _useState2[0],
     setStyle = _useState2[1];
+  var cuShowTotal = showTotal === false ? undefined : showTotal;
   if (!data) {
     return jsx(Fragment, {});
   }
@@ -70,13 +80,7 @@ var HTablePagination = (function (_ref) {
         showQuickJumper: true,
         pageSize: pageSize,
         current: pageCurrent,
-        showTotal: function showTotal(totalNum, _ref3) {
-          var _context, _context2;
-          var _ref4 = _slicedToArray(_ref3, 2),
-            showCurrent = _ref4[0],
-            showCurrentEnd = _ref4[1];
-          return _concatInstanceProperty(_context = _concatInstanceProperty(_context2 = "\u7B2C".concat(showCurrent, "-")).call(_context2, showCurrentEnd, "/\u603B\u5171")).call(_context, totalNum, "\u6761");
-        },
+        showTotal: cuShowTotal,
         total: pageTotal,
         onChange: function onChange(pn, ps) {
           tableOnPageChange({
@@ -116,13 +120,7 @@ var HTablePagination = (function (_ref) {
         showQuickJumper: true,
         pageSize: pageSize,
         current: pageCurrent,
-        showTotal: function showTotal(totalNum, _ref6) {
-          var _context3, _context4;
-          var _ref7 = _slicedToArray(_ref6, 2),
-            showCurrent = _ref7[0],
-            showCurrentEnd = _ref7[1];
-          return _concatInstanceProperty(_context3 = _concatInstanceProperty(_context4 = "\u7B2C".concat(showCurrent, "-")).call(_context4, showCurrentEnd, "/\u603B\u5171")).call(_context3, totalNum, "\u6761");
-        },
+        showTotal: cuShowTotal,
         total: pageTotal,
         onChange: function onChange(pn, ps) {
           tableOnPageChange({

package/es/modal.d.ts

@@ -8,6 +8,7 @@ import type { TableProps } from "antd/lib/table";
 import type { AffixProps } from "antd/lib/affix";
 import type { OptionModal } from "./HTableBody";
 import type { DrawerProps } from "antd";
+import type { IPaginationProps } from "@/components/HTablePagination";
 export interface RowObj {
     keys?: React.Key[];
     rowData?: any[];
@@ -47,7 +48,7 @@ export interface RowSelectionOuter {
 export type HRowSelection = RowSelectionOuter & (TableProps<any>["rowSelection"] & {
     alwaysShowAlert?: boolean;
 });
-export interface HTableProps extends Omit<ProTableProps<any, any>, "request" | "dataSource" | "rowSelection"> {
+export interface HTableProps extends Omit<ProTableProps<any, any>, "request" | "dataSource" | "rowSelection" | "pagination"> {
     request?: (params: ParamsModal) => Promise<ResultModal>;
     configData: ConfigDataModal;
     searchSpan?: ColProps;
@@ -79,6 +80,7 @@ export interface HTableProps extends Omit<ProTableProps<any, any>, "request" | "
     labelWidth?: number;
     hideLabel?: boolean;
     options?: OptionModal | false;
+    pagination?: IPaginationProps;
 }
 interface ColCheckResultKeys {
     keys?: string[];

package/es/render/Text.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const _default: () => JSX.Element;
 export default _default;

package/es/render/config.d.ts

@@ -5,7 +5,7 @@ declare const _default: {
     date: (config: ConfigItemModal, itemData: any) => string;
     tags: (config: ConfigItemModal, itemData: any, index: number, tableInstance: HTableInstance) => "-" | JSX.Element;
     copy: (config: ConfigItemModal, itemData: any) => "-" | JSX.Element;
-    link: (config: ConfigItemModal, itemData: any) => JSX.Element;
+    link: (config: ConfigItemModal, itemData: any) => "-" | JSX.Element;
     text: (config: ConfigItemModal, itemData: any) => JSX.Element;
     image: (config: ConfigItemModal, itemData: any) => JSX.Element;
     avatar: (config: ConfigItemModal, itemData: any) => JSX.Element;

package/es/render/config.js

@@ -86,6 +86,10 @@ var linkRender = function linkRender(config, itemData) {
   if (typeof href === "function") {
     hrefUrl = href(itemData);
   }
+  var relUrl = hrefUrl || tableVal;
+  if (!relUrl) {
+    return "-";
+  }
   return jsx(Link, {
     href: hrefUrl || tableVal,
     target: target,

package/lib/HTableBody/index.d.ts

@@ -1,12 +1,13 @@
 import type { ProTableProps } from "@ant-design/pro-table";
 import type { ActionRenderFn, ConfigDataModal, ParamsModal, HTableInstance, HRowSelection } from "../modal";
 import React from "react";
+import { IPaginationProps } from "../HTablePagination";
 import type { AffixProps } from "antd/lib/affix";
 import type { OptionConfig } from "@ant-design/pro-table/lib/components/ToolBar";
 export interface OptionModal extends OptionConfig {
     settingRender?: () => React.ReactNode;
 }
-export interface HTableBodyProps extends Omit<ProTableProps<any, any>, "dataSource" | "rowSelection" | "options"> {
+export interface HTableBodyProps extends Omit<ProTableProps<any, any>, "dataSource" | "rowSelection" | "options" | "pagination"> {
     configData?: ConfigDataModal;
     onPageChange?: (params: ParamsModal) => void;
     emptyRender?: (tableInstance: HTableInstance) => React.ReactNode;
@@ -22,6 +23,7 @@ export interface HTableBodyProps extends Omit<ProTableProps<any, any>, "dataSour
     localSorter?: boolean;
     options?: OptionModal | false;
     table?: HTableInstance;
+    pagination?: IPaginationProps | false;
 }
 declare const _default: (bodyProps: HTableBodyProps) => JSX.Element;
 export default _default;

package/lib/HTablePagination/index.d.ts

@@ -2,13 +2,14 @@ import type { PaginationProps } from "antd";
 import type { ParamsModal, HTableInstance } from "../modal";
 import React from "react";
 import type { AffixProps } from "antd/lib/affix";
-export interface IPaginationProps extends PaginationProps {
+export interface IPaginationProps extends Omit<PaginationProps, "showTotal"> {
     onPageChange?: (params: ParamsModal) => void;
     paginationStyle?: React.CSSProperties;
     affixProps?: AffixProps | false;
     goTop?: boolean;
     actionRender?: (tableInstance: HTableInstance) => React.ReactNode;
     table?: HTableInstance;
+    showTotal?: false | PaginationProps["showTotal"];
 }
-declare const _default: ({ onPageChange, paginationStyle, affixProps, goTop, actionRender, table, ...props }: IPaginationProps) => JSX.Element;
+declare const _default: ({ onPageChange, paginationStyle, affixProps, goTop, actionRender, table, showTotal, ...props }: IPaginationProps) => JSX.Element;
 export default _default;

package/lib/HTablePagination/index.js

@@ -2,6 +2,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
+var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
+var _slicedToArray = require('@babel/runtime-corejs3/helpers/slicedToArray');
+var _concatInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/concat');
+var _Number$parseInt = require('@babel/runtime-corejs3/core-js-stable/number/parse-int');
 var _Object$keys = require('@babel/runtime-corejs3/core-js-stable/object/keys');
 var _Object$getOwnPropertySymbols = require('@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols');
 var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/filter');
@@ -10,11 +15,6 @@ var _forEachInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/in
 var _Object$getOwnPropertyDescriptors = require('@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors');
 var _Object$defineProperties = require('@babel/runtime-corejs3/core-js-stable/object/define-properties');
 var _Object$defineProperty = require('@babel/runtime-corejs3/core-js-stable/object/define-property');
-var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
-var _slicedToArray = require('@babel/runtime-corejs3/helpers/slicedToArray');
-var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
-var _Number$parseInt = require('@babel/runtime-corejs3/core-js-stable/number/parse-int');
-var _concatInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/concat');
 var jsxRuntime = require('react/jsx-runtime');
 var antd = require('antd');
 var context = require('../context.js');
@@ -23,18 +23,27 @@ var React = require('react');
 var index$1 = require('../GoTop/index.js');
 var TableConfig = require('../TableConfig.js');
 
-var _excluded = ["onPageChange", "paginationStyle", "affixProps", "goTop", "actionRender", "table"],
+var _excluded = ["onPageChange", "paginationStyle", "affixProps", "goTop", "actionRender", "table", "showTotal"],
   _excluded2 = ["offsetBottom"];
 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 _context5, _context6; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context5 = ownKeys(Object(t), !0)).call(_context5, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context6 = ownKeys(Object(t))).call(_context6, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
-var HTablePagination = (function (_ref) {
-  var onPageChange = _ref.onPageChange,
-    paginationStyle = _ref.paginationStyle,
-    affixProps = _ref.affixProps,
-    goTop = _ref.goTop,
-    actionRender = _ref.actionRender,
-    table = _ref.table,
-    props = _objectWithoutProperties(_ref, _excluded);
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context3, _context4; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context3 = ownKeys(Object(t), !0)).call(_context3, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context4 = ownKeys(Object(t))).call(_context4, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
+var defaultShowTotal = function defaultShowTotal(totalNum, _ref) {
+  var _context, _context2;
+  var _ref2 = _slicedToArray(_ref, 2),
+    showCurrent = _ref2[0],
+    showCurrentEnd = _ref2[1];
+  return _concatInstanceProperty(_context = _concatInstanceProperty(_context2 = "\u7B2C".concat(showCurrent, "-")).call(_context2, showCurrentEnd, "/\u603B\u5171")).call(_context, totalNum, "\u6761");
+};
+var HTablePagination = (function (_ref3) {
+  var onPageChange = _ref3.onPageChange,
+    paginationStyle = _ref3.paginationStyle,
+    affixProps = _ref3.affixProps,
+    goTop = _ref3.goTop,
+    actionRender = _ref3.actionRender,
+    table = _ref3.table,
+    _ref3$showTotal = _ref3.showTotal,
+    showTotal = _ref3$showTotal === void 0 ? defaultShowTotal : _ref3$showTotal,
+    props = _objectWithoutProperties(_ref3, _excluded);
   var _useHTableContext = context.useHTableContext(),
     contextOnPageChange = _useHTableContext.onPageChange,
     data = _useHTableContext.data,
@@ -45,10 +54,10 @@ var HTablePagination = (function (_ref) {
     defaultPaginationStyle = _useHTableConfigConte.paginationStyle;
   var tableInstance = table || contextTableInstance;
   var tableOnPageChange = onPageChange || contextOnPageChange;
-  var _ref2 = data || {},
-    size = _ref2.size,
-    current = _ref2.current,
-    total = _ref2.total;
+  var _ref4 = data || {},
+    size = _ref4.size,
+    current = _ref4.current,
+    total = _ref4.total;
   var pageCurrent = _Number$parseInt(current || "1", 10);
   var pageSize = _Number$parseInt(size || "10", 10);
   var pageTotal = _Number$parseInt(total || "0", 10);
@@ -57,6 +66,7 @@ var HTablePagination = (function (_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     style = _useState2[0],
     setStyle = _useState2[1];
+  var cuShowTotal = showTotal === false ? undefined : showTotal;
   if (!data) {
     return jsxRuntime.jsx(jsxRuntime.Fragment, {});
   }
@@ -73,13 +83,7 @@ var HTablePagination = (function (_ref) {
         showQuickJumper: true,
         pageSize: pageSize,
         current: pageCurrent,
-        showTotal: function showTotal(totalNum, _ref3) {
-          var _context, _context2;
-          var _ref4 = _slicedToArray(_ref3, 2),
-            showCurrent = _ref4[0],
-            showCurrentEnd = _ref4[1];
-          return _concatInstanceProperty(_context = _concatInstanceProperty(_context2 = "\u7B2C".concat(showCurrent, "-")).call(_context2, showCurrentEnd, "/\u603B\u5171")).call(_context, totalNum, "\u6761");
-        },
+        showTotal: cuShowTotal,
         total: pageTotal,
         onChange: function onChange(pn, ps) {
           tableOnPageChange({
@@ -119,13 +123,7 @@ var HTablePagination = (function (_ref) {
         showQuickJumper: true,
         pageSize: pageSize,
         current: pageCurrent,
-        showTotal: function showTotal(totalNum, _ref6) {
-          var _context3, _context4;
-          var _ref7 = _slicedToArray(_ref6, 2),
-            showCurrent = _ref7[0],
-            showCurrentEnd = _ref7[1];
-          return _concatInstanceProperty(_context3 = _concatInstanceProperty(_context4 = "\u7B2C".concat(showCurrent, "-")).call(_context4, showCurrentEnd, "/\u603B\u5171")).call(_context3, totalNum, "\u6761");
-        },
+        showTotal: cuShowTotal,
         total: pageTotal,
         onChange: function onChange(pn, ps) {
           tableOnPageChange({

package/lib/modal.d.ts

@@ -8,6 +8,7 @@ import type { TableProps } from "antd/lib/table";
 import type { AffixProps } from "antd/lib/affix";
 import type { OptionModal } from "./HTableBody";
 import type { DrawerProps } from "antd";
+import type { IPaginationProps } from "@/components/HTablePagination";
 export interface RowObj {
     keys?: React.Key[];
     rowData?: any[];
@@ -47,7 +48,7 @@ export interface RowSelectionOuter {
 export type HRowSelection = RowSelectionOuter & (TableProps<any>["rowSelection"] & {
     alwaysShowAlert?: boolean;
 });
-export interface HTableProps extends Omit<ProTableProps<any, any>, "request" | "dataSource" | "rowSelection"> {
+export interface HTableProps extends Omit<ProTableProps<any, any>, "request" | "dataSource" | "rowSelection" | "pagination"> {
     request?: (params: ParamsModal) => Promise<ResultModal>;
     configData: ConfigDataModal;
     searchSpan?: ColProps;
@@ -79,6 +80,7 @@ export interface HTableProps extends Omit<ProTableProps<any, any>, "request" | "
     labelWidth?: number;
     hideLabel?: boolean;
     options?: OptionModal | false;
+    pagination?: IPaginationProps;
 }
 interface ColCheckResultKeys {
     keys?: string[];

package/lib/render/Text.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const _default: () => JSX.Element;
 export default _default;

package/lib/render/config.d.ts

@@ -5,7 +5,7 @@ declare const _default: {
     date: (config: ConfigItemModal, itemData: any) => string;
     tags: (config: ConfigItemModal, itemData: any, index: number, tableInstance: HTableInstance) => "-" | JSX.Element;
     copy: (config: ConfigItemModal, itemData: any) => "-" | JSX.Element;
-    link: (config: ConfigItemModal, itemData: any) => JSX.Element;
+    link: (config: ConfigItemModal, itemData: any) => "-" | JSX.Element;
     text: (config: ConfigItemModal, itemData: any) => JSX.Element;
     image: (config: ConfigItemModal, itemData: any) => JSX.Element;
     avatar: (config: ConfigItemModal, itemData: any) => JSX.Element;

package/lib/render/config.js

@@ -89,6 +89,10 @@ var linkRender = function linkRender(config, itemData) {
   if (typeof href === "function") {
     hrefUrl = href(itemData);
   }
+  var relUrl = hrefUrl || tableVal;
+  if (!relUrl) {
+    return "-";
+  }
   return jsxRuntime.jsx(Link, {
     href: hrefUrl || tableVal,
     target: target,

package/package.json

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

package/src/components/HTableBody/RowSelection.tsx

@@ -1,6 +1,6 @@
 import { useHTableContext } from "../context";
 import { Checkbox, Dropdown, Menu } from "antd";
-import {useEffect, useMemo} from "react";
+import { useEffect, useMemo } from "react";
 import type { HRowSelection } from "../modal";
 export const RowSelectionTitle = ({
   allPageCheck = true,
@@ -119,38 +119,32 @@ export const RowSelectionBox = ({
   const { selectedRowData, rowOnChange, rowKey = "id" } = useHTableContext();
   const { rowData = [], keys = [] } = selectedRowData;
   const key = typeof rowKey === "function" ? rowKey(data, index) : data[rowKey];
-  const add=()=>{
+  const add = () => {
     const newKeys = [...keys];
     const newRowData = [...rowData];
     newKeys.push(key);
     newRowData.push(data);
     rowOnChange(newKeys, newRowData);
     onChange?.(newKeys, newRowData);
-  }
-  const cancel=()=>{
+  };
+  const cancel = () => {
     const newKeys = [...keys];
-    const newRowData=[...rowData];
+    const newRowData = [...rowData];
     const keyIndex = newKeys.indexOf(key);
     newKeys.splice(keyIndex, 1);
-    newRowData.splice(keyIndex,1);
+    newRowData.splice(keyIndex, 1);
     rowOnChange(newKeys, newRowData);
     onChange?.(newKeys, newRowData);
-  }
+  };
   const check = (e) => {
     const checked = e.target.checked;
     if (checked) {
       add();
       return;
     }
-    cancel()
+    cancel();
   };
   const { disabled = false } = getCheckboxProps?.(data) || {};
-  const checked=keys.indexOf(key) !== -1;
-  return (
-    <Checkbox
-      checked={checked}
-      onChange={check}
-      disabled={disabled}
-    />
-  );
+  const checked = keys.indexOf(key) !== -1;
+  return <Checkbox checked={checked} onChange={check} disabled={disabled} />;
 };

package/src/components/HTableBody/hooks.tsx

@@ -90,19 +90,22 @@ export const useSynchronousKeys = ({
   rowKey,
 }: FilterKeysModal) => {
   const { rowOnChange } = useHTableContext();
-  const findId=(key)=>{
-     const msRecords=(records as any[]);
-     const rowIndex=msRecords.findIndex((item,index)=>{
-       const id = typeof rowKey === "function" ? rowKey(item, index) : item[(rowKey as string)];
-       return id===key;
-     });
-     return msRecords[rowIndex];
-  }
+  const findId = (key) => {
+    const msRecords = records as any[];
+    const rowIndex = msRecords.findIndex((item, index) => {
+      const id =
+        typeof rowKey === "function"
+          ? rowKey(item, index)
+          : item[rowKey as string];
+      return id === key;
+    });
+    return msRecords[rowIndex];
+  };
   useEffect(() => {
     if (selectedRowKeys && records && rowKey) {
-      const resultData= selectedRowKeys.map((key)=>{
-           return findId(key);
-      })
+      const resultData = selectedRowKeys.map((key) => {
+        return findId(key);
+      });
       rowOnChange(selectedRowKeys, resultData);
     }
   }, [selectedRowKeys, records, rowKey]);

package/src/components/HTableBody/index.tsx

@@ -17,7 +17,7 @@ import { useHTableContext } from "../context";
 import React from "react";
 import { ConfigProvider, Empty, Alert, Space } from "antd";
 import { useHTableConfigContext } from "../TableConfig";
-import HTablePagination from "../HTablePagination";
+import HTablePagination, {IPaginationProps} from "../HTablePagination";
 import { useClassName } from "../hooks";
 import AlertMsg from "./AlertMsg";
 import type { AffixProps } from "antd/lib/affix";
@@ -31,7 +31,7 @@ export interface OptionModal extends OptionConfig {
 export interface HTableBodyProps
   extends Omit<
     ProTableProps<any, any>,
-    "dataSource" | "rowSelection" | "options"
+    "dataSource" | "rowSelection" | "options"|"pagination"
   > {
   configData?: ConfigDataModal;
   onPageChange?: (params: ParamsModal) => void;
@@ -51,6 +51,7 @@ export interface HTableBodyProps
   localSorter?: boolean;
   options?: OptionModal | false;
   table?: HTableInstance;
+  pagination?:IPaginationProps|false;
 }
 const defaultRender = () => {
   return <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />;

package/src/components/HTableHeader/defaultSubComponent.tsx

@@ -7,7 +7,7 @@ import type { RowProps } from "antd/lib/grid/row";
 import { useHeaderContext } from "./Context";
 interface IProps {
   form: HFormInstance;
-  render?:(node:React.ReactNode[])=>React.ReactNode;
+  render?: (node: React.ReactNode[]) => React.ReactNode;
 }
 const OpenComponent = () => {
   const { headerOpen, setHeaderOpen } = useHTableContext();
@@ -35,7 +35,7 @@ const OpenComponent = () => {
     </>
   );
 };
-export const DefaultSubComponent = ({ form ,render}: IProps) => {
+export const DefaultSubComponent = ({ form, render }: IProps) => {
   const { loading, headerOpen } = useHTableContext();
   const { onReset } = useHeaderContext();
   const hide = typeof headerOpen === "undefined";
@@ -53,17 +53,20 @@ export const DefaultSubComponent = ({ form ,render}: IProps) => {
       style: {},
     };
   }, [headerOpen, hide]);
-  const subBtn= <Button
+  const subBtn = (
+    <Button
       type={"primary"}
       style={{ borderRadius: 4 }}
       loading={loading}
       onClick={() => {
         form.submit();
       }}
-  >
-    查询
-  </Button>
-  const resetBtn= <Button
+    >
+      查询
+    </Button>
+  );
+  const resetBtn = (
+    <Button
       style={{ borderRadius: 4 }}
       onClick={() => {
         if (onReset) {
@@ -72,14 +75,13 @@ export const DefaultSubComponent = ({ form ,render}: IProps) => {
         }
         form.resetFieldsInitValue();
       }}
-  >
-    重置
-  </Button>
-  const showMoreBtn= hide ? null : <OpenComponent />;
-  if (render){
-    return <>
-      { render([subBtn,resetBtn,showMoreBtn])}
-    </>
+    >
+      重置
+    </Button>
+  );
+  const showMoreBtn = hide ? null : <OpenComponent />;
+  if (render) {
+    return <>{render([subBtn, resetBtn, showMoreBtn])}</>;
   }
   return (
     <Row