@hw-component/table 1.9.39 → 1.9.41

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

package/src/components/HTableHeader/index.tsx

@@ -6,8 +6,7 @@ import type { IHeaderProps } from "./modal";
 import useHeaderDefaultProps from "./hooks/useHeaderDefaultProps";
 import { HeaderProvider } from "./Context";
 import { useHTableConfigContext } from "../TableConfig";
-import useHideMoreTitle from './hooks/useHideMoreTitle'
-
+import useHideMoreTitle from "./hooks/useHideMoreTitle";
 
 const defaultSearchSpan = {
   xxl: 4,
@@ -23,11 +22,24 @@ export default ({
   onReset,
   ...props
 }: IHeaderProps) => {
-  const {tableLabelWidth,tableInstance,subOnFinish,submitLoading,tableHideLabel,headerConfigData}=useHeaderDefaultProps(props);
-  const {form}=tableInstance;
-  const nConfigData = useHideMoreTitle({searchSpan, configData: headerConfigData, table: tableInstance});
+  const {
+    tableLabelWidth,
+    tableInstance,
+    subOnFinish,
+    submitLoading,
+    tableHideLabel,
+    headerConfigData,
+  } = useHeaderDefaultProps(props);
+  const { form } = tableInstance;
+  const nConfigData = useHideMoreTitle({
+    searchSpan,
+    configData: headerConfigData,
+    table: tableInstance,
+  });
   const className = useClassName("hw-table-header");
-  const { headerStyle: defaultHeaderStyle } = useHTableConfigContext({headerStyle});
+  const { headerStyle: defaultHeaderStyle } = useHTableConfigContext({
+    headerStyle,
+  });
   return (
     <Card
       style={defaultHeaderStyle}
@@ -43,7 +55,9 @@ export default ({
           dismissOnPressEnter={false}
           gutter={[20, 0]}
           initialValues={initValues}
-          hideLabel={typeof tableHideLabel === "undefined" ? true : tableHideLabel}
+          hideLabel={
+            typeof tableHideLabel === "undefined" ? true : tableHideLabel
+          }
           configData={nConfigData}
           form={form}
           colon

package/src/components/hooks/useCurrentTable.ts

@@ -36,7 +36,10 @@ export default ({
     resultTable.table.getSelectedRowData = () => {
       return selectedRowData;
     };
-    resultTable.table.getTableSourceData = () => {
+    resultTable.table.getTableSourceData = (full) => {
+      if (full){
+        return  dataSource;
+      }
       return dataSource?.records;
     };
     return resultTable as HTableInstance;

package/src/components/index.less

@@ -114,6 +114,8 @@
   display: flex;
   position: relative;
   margin-right: 12px;
+  overflow: auto;
+
 }
 
 .@{ant-prefix}-hw-table-render-copy{

package/src/components/modal.ts

@@ -125,7 +125,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/src/components/render/config.tsx

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

package/src/pages/DwTable/index.tsx

@@ -112,12 +112,14 @@ const Test = () => {
       <Button
         onClick={() => {
           dialogTable1.show({
-            request:()=>{
-              return Promise.resolve({})
+            request: () => {
+              return Promise.resolve({});
             },
-            configData:[{
-              title:"测试"
-            }]
+            configData: [
+              {
+                title: "测试",
+              },
+            ],
           });
         }}
       >

package/src/pages/Table/index.tsx

@@ -2,7 +2,8 @@ import {
   HTable,
   useHTable,
   HTableConfig,
-  HTableHeaderSubBtn, HTableHeader,
+  HTableHeaderSubBtn,
+  HTableHeader,
 } from "@/components";
 import { Button, Card, Tooltip, Typography, Tag, Row } from "antd";
 import { HFormConfigProvider } from "@hw-component/form";
@@ -158,7 +159,7 @@ export default () => {
   return (
     <HFormConfigProvider>
       <div>
-       <HTableHeader configData={[]}/>
+        <HTableHeader configData={[]} />
         <div
           onClick={() => {
             console.log(hTable.table.getTableSourceData());
@@ -204,14 +205,18 @@ export default () => {
             return <div>ffff</div>;
           }}
           headerTitle={
-            <Button
-              type={"primary"}
-              onClick={() => {
-                console.log(hTable.table.getColSettingKeys());
-              }}
-            >
-              操作
-            </Button>
+            <div>
+             <div style={{width:"2000px",backgroundColor:'red'}}>
+               <Button
+                   type={"primary"}
+                   onClick={() => {
+                     console.log(hTable.table.getColSettingKeys());
+                   }}
+               >
+                 操作
+               </Button>
+             </div>
+            </div>
           }
           reload={(params) => {
             const { size, current } = params;