@hw-component/table 1.10.5 → 1.10.7

package/src/components/TableProvider.tsx

@@ -0,0 +1,55 @@
+import { HContextModal, HTableContext } from "./context";
+import type { HTableProps } from "./modal";
+import React from "react";
+type ProviderProps = HTableProps & Omit<HContextModal, "onPageChange">;
+
+const Index: React.FC<ProviderProps> = ({ children, ...props }) => {
+  const {
+    configData,
+    action = {},
+    rowKey = "id",
+    hideLabel,
+    labelWidth,
+    configItemRender,
+    tableInstance,
+    selectedRowData,
+    rowOnChange,
+    data,
+    error,
+    loading,
+    allSelectChange,
+    onFinish,
+    setSelectedRowData,
+    headerOpen,
+    setHeaderOpen,
+    rowSelection,
+  } = props;
+  return (
+    <HTableContext.Provider
+      value={{
+        selectedRowData,
+        rowOnChange,
+        data,
+        error,
+        loading,
+        allSelectChange,
+        action,
+        configData,
+        onFinish,
+        onPageChange: tableInstance.table.reloadWithParams,
+        setSelectedRowData,
+        rowKey,
+        headerOpen,
+        setHeaderOpen,
+        hideLabel,
+        labelWidth,
+        configItemRender,
+        tableInstance,
+        rowSelection,
+      }}
+    >
+      {children}
+    </HTableContext.Provider>
+  );
+};
+export default Index;

package/src/components/context.ts

@@ -2,7 +2,7 @@ import type { Dispatch, SetStateAction } from "react";
 import React, { useContext } from "react";
 import type { HTableProps, ResultModal, RowObj, HTableInstance } from "./modal";
 
-interface HContextModal extends Omit<HTableProps, "request"> {
+export interface HContextModal extends Omit<HTableProps, "request"> {
   tableInstance: HTableInstance;
   data?: ResultModal;
   selectedRowData: RowObj;

package/src/components/modal.ts

@@ -79,6 +79,7 @@ export interface RowSelectionOuter {
 export type HRowSelection = RowSelectionOuter &
   (TableProps<any>["rowSelection"] & {
     alwaysShowAlert?: boolean;
+    allCheckType?: "batch" | "single";
   });
 export interface HTableProps
   extends Omit<
@@ -87,6 +88,7 @@ export interface HTableProps
   > {
   request?: (params: ParamsModal) => Promise<ResultModal>;
   configData: ConfigDataModal;
+  configItemRender?: (data: ConfigItemModal) => ConfigItemModal;
   searchSpan?: ColProps;
   table?: HTableInstance;
   actionRender?: ActionRenderFn;

package/src/components/render/TagsComponent.tsx

@@ -4,7 +4,7 @@ import type { TooltipProps } from "antd/lib/tooltip";
 import type { HTableInstance } from "../modal";
 
 type CloseFn = (key: string, tableInstance?: HTableInstance) => void;
-type TooltipRender=(item:any)=>TooltipProps;
+type TooltipRender = (item: any) => TooltipProps;
 
 interface IProps {
   data: any[];
@@ -12,7 +12,7 @@ interface IProps {
   onClose?: CloseFn;
   color?: string;
   icon?: React.ReactNode;
-  tooltip?: boolean | TooltipProps|TooltipRender;
+  tooltip?: boolean | TooltipProps | TooltipRender;
   fieldNames?: { label?: string; value?: string };
   tableInstance?: HTableInstance;
   maxLen?: number | null;
@@ -22,9 +22,9 @@ interface IProps {
 }
 const getTooltipProps = (
   item: any,
-  tooltip?: boolean | TooltipProps|TooltipRender
+  tooltip?: boolean | TooltipProps | TooltipRender
 ): TooltipProps => {
-  const {title}=item;
+  const { title } = item;
   if (!tooltip) {
     return {
       title: null,
@@ -36,7 +36,7 @@ const getTooltipProps = (
     };
   }
   if (typeof tooltip === "function") {
-     return  tooltip(item);
+    return tooltip(item);
   }
   return {
     ...tooltip,
@@ -84,7 +84,7 @@ const TagsComponent = (props: IProps) => {
         };
         const indexKey = index.toString();
         if (typeof tagItem === "string") {
-          const tooltipProps = getTooltipProps({title:tagItem}, tooltip);
+          const tooltipProps = getTooltipProps({ title: tagItem }, tooltip);
           return (
             <Tooltip {...tooltipProps}>
               <Tag
@@ -101,7 +101,10 @@ const TagsComponent = (props: IProps) => {
           );
         }
         const { [label]: tagLabel, [value]: tagValue, ...itemProps } = tagItem;
-        const tooltipProps =  getTooltipProps({title:tagLabel,value:tagValue,...itemProps}, tooltip);
+        const tooltipProps = getTooltipProps(
+          { title: tagLabel, value: tagValue, ...itemProps },
+          tooltip
+        );
         const cuTagProps = {
           ...tagProps,
           ...itemProps,

package/src/pages/Table/index.tsx

@@ -157,11 +157,14 @@ export default () => {
   const [keys, setKeys] = useState([]);
   return (
     <HFormConfigProvider>
-      <TagsComponent data={["213123"]} tooltip={()=>{
-        return {
-          title:"3123"
-        }
-      }}/>
+      <TagsComponent
+        data={["213123"]}
+        tooltip={() => {
+          return {
+            title: "3123",
+          };
+        }}
+      />
       <div>
         <div
           onClick={() => {
@@ -173,8 +176,9 @@ export default () => {
         <HTableConfig defaultSelectedRowClassName={null}>
           <HTable
             configData={configData}
-            rowKey={(rowData, index) => {
-              return index;
+            configItemRender={(d1) => {
+              console.log(d1);
+              return d1;
             }}
             table={hTable}
             labelWidth={88}
@@ -185,6 +189,11 @@ export default () => {
             }}
             rowSelection={{
               preserveSelectedRowKeys: true,
+              allPageCheck: false,
+              onChange: (keys, data)=>{
+                  console.log(keys, data);
+              },
+              allCheckType: "batch",
             }}
             affixProps={{
               target: () => document.querySelector(".body"),
@@ -199,10 +208,21 @@ export default () => {
             formInitValues={{
               select: "orderNo",
             }}
-            dataSource={[{}, {}, {}]}
             request={(params) => {
-              console.log(params);
-              return Promise.resolve({});
+              const { current } = params;
+              const records = [];
+              for (let i = 0; i < 10; i += 1) {
+                records.push({
+                  id: `${current}-${i}`,
+                });
+              }
+              console.log(records);
+              return Promise.resolve({
+                current: "1",
+                size: "10",
+                total: "100",
+                records,
+              });
             }}
             headerTitle={
               <Space size={8}>
@@ -221,7 +241,6 @@ export default () => {
                 </div>
               </Space>
             }
-            pagination={false}
           />
         </HTableConfig>
       </div>