@hw-component/table 1.9.35 → 1.9.37

package/es/DialogTable/hooks.js

@@ -40,6 +40,15 @@ var useTableProps = function useTableProps(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     modalTableParams = _useState2[0],
     setModalTableParams = _useState2[1];
+  useEffect(function () {
+    if (configData) {
+      setModalTableParams(function (oldVal) {
+        return _objectSpread(_objectSpread({}, oldVal), {}, {
+          configData: configData
+        });
+      });
+    }
+  }, [configData]);
   return {
     modalTableParams: modalTableParams,
     setModalTableParams: setModalTableParams

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/modal.d.ts

@@ -8,7 +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 { IPaginationProps } from "@/components/HTablePagination";
+import type { IPaginationProps } from "@/components/HTablePagination";
 export interface RowObj {
     keys?: React.Key[];
     rowData?: any[];

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/DialogTable/hooks.js

@@ -41,6 +41,15 @@ var useTableProps = function useTableProps(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     modalTableParams = _useState2[0],
     setModalTableParams = _useState2[1];
+  React.useEffect(function () {
+    if (configData) {
+      setModalTableParams(function (oldVal) {
+        return _objectSpread(_objectSpread({}, oldVal), {}, {
+          configData: configData
+        });
+      });
+    }
+  }, [configData]);
   return {
     modalTableParams: modalTableParams,
     setModalTableParams: setModalTableParams

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/modal.d.ts

@@ -8,7 +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 { IPaginationProps } from "@/components/HTablePagination";
+import type { IPaginationProps } from "@/components/HTablePagination";
 export interface RowObj {
     keys?: React.Key[];
     rowData?: any[];

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.35",
+  "version": "1.9.37",
   "description": "基于antd二次开发table组件",
   "keywords": [
     "table"

package/src/components/DialogTable/hooks.ts

@@ -35,6 +35,16 @@ export const useTableProps = ({
     request,
     dataSource,
   });
+  useEffect(()=>{
+       if (configData){
+          setModalTableParams((oldVal)=>{
+              return {
+                ...oldVal,
+                configData
+              }
+          })
+       }
+  },[configData])
   return {
     modalTableParams,
     setModalTableParams,

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

package/src/components/HTablePagination/index.tsx

@@ -14,11 +14,11 @@ export interface IPaginationProps extends Omit<PaginationProps, "showTotal"> {
   goTop?: boolean;
   actionRender?: (tableInstance: HTableInstance) => React.ReactNode;
   table?: HTableInstance;
-  showTotal?:false|PaginationProps["showTotal"]
+  showTotal?: false | PaginationProps["showTotal"];
 }
-const defaultShowTotal=(totalNum:number, [showCurrent, showCurrentEnd])=>{
+const defaultShowTotal = (totalNum: number, [showCurrent, showCurrentEnd]) => {
   return `第${showCurrent}-${showCurrentEnd}/总共${totalNum}条`;
-}
+};
 export default ({
   onPageChange,
   paginationStyle,
@@ -26,7 +26,7 @@ export default ({
   goTop,
   actionRender,
   table,
-  showTotal=defaultShowTotal,
+  showTotal = defaultShowTotal,
   ...props
 }: IPaginationProps) => {
   const {
@@ -45,7 +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;
+  const cuShowTotal = showTotal === false ? undefined : showTotal;
   if (!data) {
     return <></>;
   }

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,7 +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 {IPaginationProps} from "@/components/HTablePagination";
+import type { IPaginationProps } from "@/components/HTablePagination";
 
 export interface RowObj {
   keys?: React.Key[];
@@ -77,7 +77,7 @@ export type HRowSelection = RowSelectionOuter &
 export interface HTableProps
   extends Omit<
     ProTableProps<any, any>,
-    "request" | "dataSource" | "rowSelection"|"pagination"
+    "request" | "dataSource" | "rowSelection" | "pagination"
   > {
   request?: (params: ParamsModal) => Promise<ResultModal>;
   configData: ConfigDataModal;
@@ -113,7 +113,7 @@ export interface HTableProps
   labelWidth?: number;
   hideLabel?: boolean;
   options?: OptionModal | false;
-  pagination?:IPaginationProps
+  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"),