@hw-component/table 1.9.39 → 1.9.40

package/es/HTableBody/index.d.ts

@@ -1,7 +1,7 @@
 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 { 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 {

package/es/HTableHeader/hooks/config.d.ts

@@ -1,4 +1,4 @@
-import { HFormInstance, HItemProps } from "@hw-component/form/es/Form/modal";
+import type { HFormInstance, HItemProps } from "@hw-component/form/es/Form/modal";
 import React from "react";
 export declare const sizeObj: {
     xl: {

package/es/HTableHeader/hooks/useHeaderDefaultProps.d.ts

@@ -1,5 +1,5 @@
 import type { IHeaderProps } from "../modal";
-declare const _default: ({ configData, loading, onFinish, hideLabel, labelWidth, table }: IHeaderProps) => {
+declare const _default: ({ configData, loading, onFinish, hideLabel, labelWidth, table, }: IHeaderProps) => {
     tableInstance: import("../../modal").HTableInstance;
     tableLabelWidth: number | undefined;
     tableHideLabel: boolean | undefined;

package/es/HTableHeader/hooks/useHideMoreTitle.d.ts

@@ -1,4 +1,4 @@
-import { IHeaderProps } from "../modal";
-import { HItemProps } from "@hw-component/form/es/Form/modal";
-declare const _default: ({ searchSpan, configData, table, }: IHeaderProps) => HItemProps[];
+import type { IHeaderProps } from "../modal";
+import type { HItemProps } from "@hw-component/form/es/Form/modal";
+declare const _default: ({ searchSpan, configData, table }: IHeaderProps) => HItemProps[];
 export default _default;

package/es/hooks/useCurrentTable.js

@@ -22,7 +22,10 @@ var useCurrentTable = (function (_ref) {
     resultTable.table.getSelectedRowData = function () {
       return selectedRowData;
     };
-    resultTable.table.getTableSourceData = function () {
+    resultTable.table.getTableSourceData = function (full) {
+      if (full) {
+        return dataSource;
+      }
       return dataSource === null || dataSource === void 0 ? void 0 : dataSource.records;
     };
     return resultTable;

package/es/modal.d.ts

@@ -93,7 +93,7 @@ export interface TableInstance {
     reloadWithParams: (params?: ParamsModal) => Promise<any>;
     getParams: () => any;
     getSelectedRowData: () => RowObj;
-    getTableSourceData: () => any;
+    getTableSourceData: (full?: boolean) => any;
     getColSettingKeys: () => ColCheckResultKeys;
 }
 export interface HTableInstance {

package/es/render/Text.d.ts

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

package/lib/HTableBody/index.d.ts

@@ -1,7 +1,7 @@
 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 { 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 {

package/lib/HTableHeader/hooks/config.d.ts

@@ -1,4 +1,4 @@
-import { HFormInstance, HItemProps } from "@hw-component/form/es/Form/modal";
+import type { HFormInstance, HItemProps } from "@hw-component/form/es/Form/modal";
 import React from "react";
 export declare const sizeObj: {
     xl: {

package/lib/HTableHeader/hooks/useHeaderDefaultProps.d.ts

@@ -1,5 +1,5 @@
 import type { IHeaderProps } from "../modal";
-declare const _default: ({ configData, loading, onFinish, hideLabel, labelWidth, table }: IHeaderProps) => {
+declare const _default: ({ configData, loading, onFinish, hideLabel, labelWidth, table, }: IHeaderProps) => {
     tableInstance: import("../../modal").HTableInstance;
     tableLabelWidth: number | undefined;
     tableHideLabel: boolean | undefined;

package/lib/HTableHeader/hooks/useHideMoreTitle.d.ts

@@ -1,4 +1,4 @@
-import { IHeaderProps } from "../modal";
-import { HItemProps } from "@hw-component/form/es/Form/modal";
-declare const _default: ({ searchSpan, configData, table, }: IHeaderProps) => HItemProps[];
+import type { IHeaderProps } from "../modal";
+import type { HItemProps } from "@hw-component/form/es/Form/modal";
+declare const _default: ({ searchSpan, configData, table }: IHeaderProps) => HItemProps[];
 export default _default;

package/lib/hooks/useCurrentTable.js

@@ -25,7 +25,10 @@ var useCurrentTable = (function (_ref) {
     resultTable.table.getSelectedRowData = function () {
       return selectedRowData;
     };
-    resultTable.table.getTableSourceData = function () {
+    resultTable.table.getTableSourceData = function (full) {
+      if (full) {
+        return dataSource;
+      }
       return dataSource === null || dataSource === void 0 ? void 0 : dataSource.records;
     };
     return resultTable;

package/lib/modal.d.ts

@@ -93,7 +93,7 @@ export interface TableInstance {
     reloadWithParams: (params?: ParamsModal) => Promise<any>;
     getParams: () => any;
     getSelectedRowData: () => RowObj;
-    getTableSourceData: () => any;
+    getTableSourceData: (full?: boolean) => any;
     getColSettingKeys: () => ColCheckResultKeys;
 }
 export interface HTableInstance {

package/lib/render/Text.d.ts

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

package/package.json

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

package/src/components/DialogTable/hooks.ts

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

package/src/components/HTableBody/index.tsx

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

package/src/components/HTableHeader/hooks/config.tsx

@@ -1,42 +1,42 @@
-import {HFormInstance, HItemProps} from "@hw-component/form/es/Form/modal";
+import type { HFormInstance, HItemProps } from "@hw-component/form/es/Form/modal";
 import React from "react";
-import {DefaultSubComponent} from "../defaultSubComponent";
+import { DefaultSubComponent } from "../defaultSubComponent";
 
 export const sizeObj = {
-    xl: {
-        min: 1200,
-        max: 1600,
-    },
-    xxl: {
-        min: 1600,
-    },
-    lg: {
-        min: 992,
-        max: 1200,
-    },
-    md: {
-        min: 768,
-        max: 992,
-    },
-    sm: {
-        min: 576,
-        max: 768,
-    },
-    xs: {
-        max: 576,
-    },
+  xl: {
+    min: 1200,
+    max: 1600,
+  },
+  xxl: {
+    min: 1600,
+  },
+  lg: {
+    min: 992,
+    max: 1200,
+  },
+  md: {
+    min: 768,
+    max: 992,
+  },
+  sm: {
+    min: 576,
+    max: 768,
+  },
+  xs: {
+    max: 576,
+  },
 };
 
 export const defaultSubItem = {
-    type: "submit",
-    itemProps: {
-        position: "end",
-    },
-    style: {
-        padding: 0,
-        marginLeft: -20,
-    },
-    render: (item: HItemProps, node: React.ReactNode, form: HFormInstance) => {
-        return <DefaultSubComponent form={form} />;
-    },
+  type: "submit",
+  itemProps: {
+    position: "end",
+  },
+  style: {
+    padding: 0,
+    marginLeft: -20,
+  },
+  render: (item: HItemProps, node: React.ReactNode, form: HFormInstance) => {
+    return <DefaultSubComponent form={form} />;
+  },
 };

package/src/components/HTableHeader/hooks/useHeaderDefaultProps.ts

@@ -2,28 +2,36 @@ import type { IHeaderProps } from "../modal";
 import { useHTableContext } from "../../context";
 import useHTable from "../../hooks/useHTable";
 
-export default ({configData,loading,onFinish,hideLabel,labelWidth,table}:IHeaderProps)=>{
-    const {
-        tableInstance: contextTableInstance,
-        loading: contextLoading,
-        onFinish: contextOnFinish,
-        configData: contextConfigData,
-        hideLabel: contextHideLabel,
-        labelWidth: contextLabelWidth,
-    } = useHTableContext();
-    const defaultTable=useHTable();
-    const headerConfigData = configData || contextConfigData;
-    const submitLoading=contextLoading || loading;
-    const subOnFinish = onFinish || contextOnFinish;
-    const tableHideLabel = typeof hideLabel === "undefined" ? contextHideLabel : hideLabel;
-    const tableLabelWidth = labelWidth || contextLabelWidth;
-    const tableInstance = table || contextTableInstance;
-    return {
-        tableInstance:tableInstance||defaultTable,
-        tableLabelWidth,
-        tableHideLabel,
-        subOnFinish,
-        submitLoading,
-        headerConfigData
-    }
-}
+export default ({
+  configData,
+  loading,
+  onFinish,
+  hideLabel,
+  labelWidth,
+  table,
+}: IHeaderProps) => {
+  const {
+    tableInstance: contextTableInstance,
+    loading: contextLoading,
+    onFinish: contextOnFinish,
+    configData: contextConfigData,
+    hideLabel: contextHideLabel,
+    labelWidth: contextLabelWidth,
+  } = useHTableContext();
+  const defaultTable = useHTable();
+  const headerConfigData = configData || contextConfigData;
+  const submitLoading = contextLoading || loading;
+  const subOnFinish = onFinish || contextOnFinish;
+  const tableHideLabel =
+    typeof hideLabel === "undefined" ? contextHideLabel : hideLabel;
+  const tableLabelWidth = labelWidth || contextLabelWidth;
+  const tableInstance = table || contextTableInstance;
+  return {
+    tableInstance: tableInstance || defaultTable,
+    tableLabelWidth,
+    tableHideLabel,
+    subOnFinish,
+    submitLoading,
+    headerConfigData,
+  };
+};

package/src/components/HTableHeader/hooks/useHideMoreTitle.tsx

@@ -1,174 +1,168 @@
-import {FormConfigDataItemProviderModal, IHeaderProps} from "../modal";
-import {useEffect, useState} from "react";
-import {HItemProps} from "@hw-component/form/es/Form/modal";
-import {defaultSubItem, sizeObj} from "./config";
-import {useHTableContext} from "../../context";
-import {useClassName} from "../../hooks";
-import {HTableInstance} from "../../modal";
-import {ColProps} from "antd";
-import {renderData} from "../defaultFormRender";
+import type { FormConfigDataItemProviderModal, IHeaderProps } from "../modal";
+import { useEffect, useState } from "react";
+import type { HItemProps } from "@hw-component/form/es/Form/modal";
+import { defaultSubItem, sizeObj } from "./config";
+import { useHTableContext } from "../../context";
+import { useClassName } from "../../hooks";
+import type { HTableInstance } from "../../modal";
+import type { ColProps } from "antd";
+import { renderData } from "../defaultFormRender";
 
 const formConfigDataItemProvider = (
-    {
-        searchType,
-        title,
-        name,
-        dataIndex,
-        itemProps = {},
-        searchRender,
-        childrenDataIndex,
-        showSearch,
-        hideInTable,
-        align,
-        searchLabel,
-        titleStr,
-        ...props
-    }: FormConfigDataItemProviderModal,
-    table: HTableInstance
+  {
+    searchType,
+    title,
+    name,
+    dataIndex,
+    itemProps = {},
+    searchRender,
+    childrenDataIndex,
+    showSearch,
+    hideInTable,
+    align,
+    searchLabel,
+    titleStr,
+    ...props
+  }: FormConfigDataItemProviderModal,
+  table: HTableInstance
 ): HItemProps => {
-    const { allowClear = true } = itemProps as any;
+  const { allowClear = true } = itemProps as any;
 
-    return {
-        ...props,
-        itemProps: {
-            ...itemProps,
-            allowClear,
-        },
-        label: searchLabel || titleStr || title,
-        type: searchType,
-        name: name || (dataIndex as string),
-        render: (item, node, form) => {
-            if (searchRender) {
-                return searchRender(item, node, form, table);
-            }
-            const defaultRender = renderData[searchType || ""];
+  return {
+    ...props,
+    itemProps: {
+      ...itemProps,
+      allowClear,
+    },
+    label: searchLabel || titleStr || title,
+    type: searchType,
+    name: name || (dataIndex as string),
+    render: (item, node, form) => {
+      if (searchRender) {
+        return searchRender(item, node, form, table);
+      }
+      const defaultRender = renderData[searchType || ""];
 
-            return defaultRender ? defaultRender(item) : node;
-        },
-    };
+      return defaultRender ? defaultRender(item) : node;
+    },
+  };
 };
 
 const getCuSpanMaxNum = (searchSpan: ColProps = { span: 6 }) => {
-    const clientWidth = document.documentElement.clientWidth;
-    const keys = Object.keys(sizeObj);
-    const index = keys.findIndex((value) => {
-        const { min = 0, max = Number.MAX_VALUE } = sizeObj[value];
-        return clientWidth >= min && clientWidth < max;
-    });
-    const cuKey = keys[index];
-    const cuSpan = searchSpan[cuKey] || searchSpan.span;
-    return 24 / cuSpan;
+  const clientWidth = document.documentElement.clientWidth;
+  const keys = Object.keys(sizeObj);
+  const index = keys.findIndex((value) => {
+    const { min = 0, max = Number.MAX_VALUE } = sizeObj[value];
+    return clientWidth >= min && clientWidth < max;
+  });
+  const cuKey = keys[index];
+  const cuSpan = searchSpan[cuKey] || searchSpan.span;
+  return 24 / cuSpan;
 };
 
-
 const mkNewConfig = ({ configData = [], table }: IHeaderProps) => {
-    let subConfigData: HItemProps | undefined;
-    const realConfigData: HItemProps[] = [];
-    configData.forEach((value) => {
-        const { searchType, showSearch } = value;
-        if (!showSearch) {
-            return false;
-        }
-        if (searchType === "submit") {
-            subConfigData = formConfigDataItemProvider(
-                value,
-                table as HTableInstance
-            );
-            return false;
-        }
-        realConfigData.push(
-            formConfigDataItemProvider(value, table as HTableInstance)
-        );
-    });
-    return {
-        realConfigData,
-        subConfigData,
-    };
+  let subConfigData: HItemProps | undefined;
+  const realConfigData: HItemProps[] = [];
+  configData.forEach((value) => {
+    const { searchType, showSearch } = value;
+    if (!showSearch) {
+      return false;
+    }
+    if (searchType === "submit") {
+      subConfigData = formConfigDataItemProvider(
+        value,
+        table as HTableInstance
+      );
+      return false;
+    }
+    realConfigData.push(
+      formConfigDataItemProvider(value, table as HTableInstance)
+    );
+  });
+  return {
+    realConfigData,
+    subConfigData,
+  };
 };
 
 const filterHideFormItem = (
-    configData: HItemProps[],
-    className: string,
-    searchSpan?: ColProps
+  configData: HItemProps[],
+  className: string,
+  searchSpan?: ColProps
 ) => {
-    const maxNum = getCuSpanMaxNum(searchSpan);
-    const len = configData.length;
-    const startIndex = maxNum - 1;
-    if (len <= startIndex) {
-        return {
-            lessData: configData,
-            hideData: [],
-        };
-    }
-    const index = startIndex === 0 ? 1 : startIndex;
-    const lessData = configData.slice(0, index);
-    const bigData = configData.slice(index);
-    const hideData = bigData.map((value) => {
-        return {
-            ...value,
-            className,
-        };
-    });
+  const maxNum = getCuSpanMaxNum(searchSpan);
+  const len = configData.length;
+  const startIndex = maxNum - 1;
+  if (len <= startIndex) {
     return {
-        lessData,
-        hideData,
+      lessData: configData,
+      hideData: [],
     };
+  }
+  const index = startIndex === 0 ? 1 : startIndex;
+  const lessData = configData.slice(0, index);
+  const bigData = configData.slice(index);
+  const hideData = bigData.map((value) => {
+    return {
+      ...value,
+      className,
+    };
+  });
+  return {
+    lessData,
+    hideData,
+  };
 };
 
-const useDefaultOpen=()=>{
-    const [open,setOpen]=useState(false);
-    const { headerOpen=open, setHeaderOpen=setOpen } = useHTableContext();
-
-    return {
-        headerOpen,
-        setHeaderOpen
-    }
-}
-export default ({
-                                     searchSpan,
-                                     configData,
-                                     table,
-                                 }: IHeaderProps) => {
+const useDefaultOpen = () => {
+  const [open, setOpen] = useState(false);
+  const { headerOpen = open, setHeaderOpen = setOpen } = useHTableContext();
 
-    const [formConfigData, setFormConfigData] = useState<HItemProps[]>([]);
-    const [subData, setSubData] = useState<HItemProps>(defaultSubItem as any);
+  return {
+    headerOpen,
+    setHeaderOpen,
+  };
+};
+export default ({ searchSpan, configData, table }: IHeaderProps) => {
+  const [formConfigData, setFormConfigData] = useState<HItemProps[]>([]);
+  const [subData, setSubData] = useState<HItemProps>(defaultSubItem as any);
 
-    const { headerOpen, setHeaderOpen } = useDefaultOpen();
-    const className = useClassName("hw-table-header-item-hide");
-    const mkNewFn = () => {
-        const { realConfigData, subConfigData } = mkNewConfig({
-            searchSpan,
-            configData,
-            table,
-        });
-        const changeClassName = headerOpen ? "" : className;
-        const { lessData, hideData } = filterHideFormItem(
-            realConfigData,
-            changeClassName,
-            searchSpan
-        );
-        if (subConfigData) {
-            setSubData(subConfigData);
-        }
-        setHeaderOpen((oldVal) => {
-            if (hideData.length === 0) {
-                return undefined;
-            }
-            if (typeof oldVal === "undefined") {
-                return false;
-            }
-            return oldVal;
-        });
-        setFormConfigData([...lessData, ...hideData]);
+  const { headerOpen, setHeaderOpen } = useDefaultOpen();
+  const className = useClassName("hw-table-header-item-hide");
+  const mkNewFn = () => {
+    const { realConfigData, subConfigData } = mkNewConfig({
+      searchSpan,
+      configData,
+      table,
+    });
+    const changeClassName = headerOpen ? "" : className;
+    const { lessData, hideData } = filterHideFormItem(
+      realConfigData,
+      changeClassName,
+      searchSpan
+    );
+    if (subConfigData) {
+      setSubData(subConfigData);
+    }
+    setHeaderOpen((oldVal) => {
+      if (hideData.length === 0) {
+        return undefined;
+      }
+      if (typeof oldVal === "undefined") {
+        return false;
+      }
+      return oldVal;
+    });
+    setFormConfigData([...lessData, ...hideData]);
+  };
+  useEffect(() => {
+    mkNewFn();
+  }, [configData, searchSpan, headerOpen]);
+  useEffect(() => {
+    window.addEventListener("resize", mkNewFn);
+    return () => {
+      window.removeEventListener("resize", mkNewFn);
     };
-    useEffect(() => {
-        mkNewFn();
-    }, [configData, searchSpan, headerOpen]);
-    useEffect(() => {
-        window.addEventListener("resize", mkNewFn);
-        return () => {
-            window.removeEventListener("resize", mkNewFn);
-        };
-    }, [configData, searchSpan, headerOpen]);
-    return [...formConfigData, subData];
-};
+  }, [configData, searchSpan, headerOpen]);
+  return [...formConfigData, subData];
+};