@hw-component/table 1.9.39 → 1.9.41

package/es/HTableBody/HeaderTitle/index.js

@@ -15,6 +15,7 @@ var HeaderTitle = (function (_ref) {
     rowOnChange = _useHTableContext.rowOnChange,
     allSelectChange = _useHTableContext.allSelectChange;
   var headerBox = useClassName("hw-table-header-title-box");
+  var headerBoxContent = useClassName("hw-table-header-title-box-content");
   if (!headerTitle && !rNode) {
     return null;
   }
@@ -24,11 +25,14 @@ var HeaderTitle = (function (_ref) {
     style: contentStyle,
     children: [jsx("div", {
       className: headerBox,
-      children: headerTitle && /*#__PURE__*/React.cloneElement(headerTitle, {
-        selectedRowData: selectedRowData,
-        allSelectChange: allSelectChange,
-        rowOnChange: rowOnChange,
-        tableInstance: tableInstance
+      children: jsx("div", {
+        className: headerBoxContent,
+        children: headerTitle && /*#__PURE__*/React.cloneElement(headerTitle, {
+          selectedRowData: selectedRowData,
+          allSelectChange: allSelectChange,
+          rowOnChange: rowOnChange,
+          tableInstance: tableInstance
+        })
       })
     }), rNode && rNode]
   });

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/index.css

@@ -119,6 +119,7 @@
   display: flex;
   position: relative;
   margin-right: 12px;
+  overflow: auto;
 }
 .ant-hw-table-render-copy {
   margin-bottom: 0 !important;

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/HeaderTitle/index.js

@@ -18,6 +18,7 @@ var HeaderTitle = (function (_ref) {
     rowOnChange = _useHTableContext.rowOnChange,
     allSelectChange = _useHTableContext.allSelectChange;
   var headerBox = index.useClassName("hw-table-header-title-box");
+  var headerBoxContent = index.useClassName("hw-table-header-title-box-content");
   if (!headerTitle && !rNode) {
     return null;
   }
@@ -27,11 +28,14 @@ var HeaderTitle = (function (_ref) {
     style: contentStyle,
     children: [jsxRuntime.jsx("div", {
       className: headerBox,
-      children: headerTitle && /*#__PURE__*/React.cloneElement(headerTitle, {
-        selectedRowData: selectedRowData,
-        allSelectChange: allSelectChange,
-        rowOnChange: rowOnChange,
-        tableInstance: tableInstance
+      children: jsxRuntime.jsx("div", {
+        className: headerBoxContent,
+        children: headerTitle && /*#__PURE__*/React.cloneElement(headerTitle, {
+          selectedRowData: selectedRowData,
+          allSelectChange: allSelectChange,
+          rowOnChange: rowOnChange,
+          tableInstance: tableInstance
+        })
       })
     }), rNode && rNode]
   });

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/index.css

@@ -119,6 +119,7 @@
   display: flex;
   position: relative;
   margin-right: 12px;
+  overflow: auto;
 }
 .ant-hw-table-render-copy {
   margin-bottom: 0 !important;

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.41",
   "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/HeaderTitle/index.tsx

@@ -13,17 +13,21 @@ export default ({ headerTitle, contentStyle, rNode }: IProps) => {
   const { tableInstance, selectedRowData, rowOnChange, allSelectChange } =
     useHTableContext();
   const headerBox = useClassName("hw-table-header-title-box");
+  const headerBoxContent = useClassName("hw-table-header-title-box-content");
+
   if (!headerTitle && !rNode) {
     return null;
   }
   return (
     <Row justify={"space-between"} align={"middle"} style={contentStyle}>
       <div className={headerBox}>
-        {headerTitle &&
-          React.cloneElement(
-            headerTitle as DetailedReactHTMLElement<any, any>,
-            { selectedRowData, allSelectChange, rowOnChange, tableInstance }
-          )}
+        <div className={headerBoxContent}>
+          {headerTitle &&
+              React.cloneElement(
+                  headerTitle as DetailedReactHTMLElement<any, any>,
+                  { selectedRowData, allSelectChange, rowOnChange, tableInstance }
+              )}
+        </div>
       </div>
       {rNode && rNode}
     </Row>

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,
+  };
+};