@hw-component/table 1.9.34 → 1.9.36

package/src/components/HTablePagination/index.tsx

@@ -7,14 +7,18 @@ import React, { useState } from "react";
 import type { AffixProps } from "antd/lib/affix";
 import GoTop from "../GoTop";
 import { useHTableConfigContext } from "@/components/TableConfig";
-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"];
 }
+const defaultShowTotal = (totalNum: number, [showCurrent, showCurrentEnd]) => {
+  return `第${showCurrent}-${showCurrentEnd}/总共${totalNum}条`;
+};
 export default ({
   onPageChange,
   paginationStyle,
@@ -22,6 +26,7 @@ export default ({
   goTop,
   actionRender,
   table,
+  showTotal = defaultShowTotal,
   ...props
 }: IPaginationProps) => {
   const {
@@ -40,6 +45,7 @@ export default ({
   const pageTotal = Number.parseInt(total || "0", 10);
   const className = useClassName("hw-table-pagination");
   const [style, setStyle] = useState({});
+  const cuShowTotal = showTotal === false ? undefined : showTotal;
   if (!data) {
     return <></>;
   }
@@ -57,9 +63,7 @@ export default ({
           showQuickJumper={true}
           pageSize={pageSize}
           current={pageCurrent}
-          showTotal={(totalNum, [showCurrent, showCurrentEnd]) => {
-            return `第${showCurrent}-${showCurrentEnd}/总共${totalNum}条`;
-          }}
+          showTotal={cuShowTotal}
           total={pageTotal}
           onChange={(pn, ps) => {
             tableOnPageChange({ size: ps, current: pn });
@@ -97,9 +101,7 @@ export default ({
           showQuickJumper={true}
           pageSize={pageSize}
           current={pageCurrent}
-          showTotal={(totalNum, [showCurrent, showCurrentEnd]) => {
-            return `第${showCurrent}-${showCurrentEnd}/总共${totalNum}条`;
-          }}
+          showTotal={cuShowTotal}
           total={pageTotal}
           onChange={(pn, ps) => {
             tableOnPageChange({ size: ps, current: pn });

package/src/components/Table.tsx

@@ -31,8 +31,8 @@ export default ({
   style,
   dataSource,
   reload,
-   loading:propsLoading,
-   error:propsError,
+  loading: propsLoading,
+  error: propsError,
   ...props
 }: HTableProps) => {
   const { run, loading, data, error, saveParams } = useReq({
@@ -72,8 +72,8 @@ export default ({
         selectedRowData,
         rowOnChange,
         data,
-        error:propsError||error,
-        loading:(propsLoading as boolean)||loading,
+        error: propsError || error,
+        loading: (propsLoading as boolean) || loading,
         allSelectChange,
         action,
         configData,

package/src/components/modal.ts

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

package/src/components/render/config.tsx

@@ -69,6 +69,10 @@ const linkRender = (config: ConfigItemModal, itemData: any) => {
   if (typeof href === "function") {
     hrefUrl = href(itemData);
   }
+  const relUrl=hrefUrl||tableVal;
+  if (!relUrl){
+    return  "-"
+  }
   return (
     <Link
       href={hrefUrl || tableVal}

package/src/pages/ModalTable/index.tsx

@@ -138,11 +138,6 @@ export default () => {
         onClick={() => {
           dialogTable.show({
             title: "3333",
-            dataSource: [
-              ...maker("第一页"),
-              ...maker("第二页"),
-              ...maker("第三页"),
-            ],
           });
         }}
       >
@@ -152,6 +147,15 @@ export default () => {
         dialogTable={dialogTable}
         width={1200}
         configData={configData}
+        request={(value) => {
+          console.log(value);
+          return {
+            records: maker("第一页"),
+            size: 10,
+            current: 1,
+            total: "100",
+          };
+        }}
         tableProps={{
           headerTitle: (
             <div

package/src/pages/Table/index.tsx

@@ -1,4 +1,9 @@
-import {HTable, useHTable, HTableConfig, HTableHeaderSubBtn} from "@/components";
+import {
+  HTable,
+  useHTable,
+  HTableConfig,
+  HTableHeaderSubBtn,
+} from "@/components";
 import { Button, Card, Tooltip, Typography, Tag, Row } from "antd";
 import { HFormConfigProvider } from "@hw-component/form";
 import { SettingOutlined } from "@ant-design/icons";
@@ -169,7 +174,7 @@ export default () => {
         <HTable
           configData={configData}
           searchSpan={{
-            span:24
+            span: 24,
           }}
           rowKey={(rowData, index) => {
             return index;
@@ -182,7 +187,7 @@ export default () => {
             },
           }}
           rowSelection={{
-            allPageCheck:false
+            allPageCheck: false,
           }}
           affixProps={{
             target: () => document.querySelector(".body"),