@hw-component/table 0.0.9-beta-v2 → 0.0.9-beta-v6

package/src/components/HTableHeader/hooks.tsx

@@ -6,6 +6,7 @@ import { useClassName } from "../hooks";
 import type { HFormInstance } from "@hw-component/form/es/Form/modal";
 import { DefaultSubComponent } from "../HTableHeader/defaultSubComponent";
 import { useHTableContext } from "../context";
+import {HTableInstance} from "@/components/modal";
 const sizeObj = {
   xl: {
     min: 1200,
@@ -68,7 +69,7 @@ const formConfigDataItemProvider = ({
   hideInTable,
   align,
   ...props
-}: FormConfigDataItemProviderModal): HItemProps => {
+}: FormConfigDataItemProviderModal,table:HTableInstance): HItemProps => {
   const { allowClear = true } = itemProps as any;
   return {
     ...props,
@@ -80,10 +81,15 @@ const formConfigDataItemProvider = ({
     colon,
     type: searchType,
     name: name || (dataIndex as string),
-    render: searchRender,
+    render:(item,node,form)=>{
+      if (searchRender){
+          return searchRender(item,node,form,table);
+      }
+      return  node;
+    },
   };
 };
-const mkNewConfig = ({ configData = [] }: IHeaderProps) => {
+const mkNewConfig = ({ configData = [] ,table}: IHeaderProps) => {
   let subConfigData: HItemProps | undefined;
   const realConfigData: HItemProps[] = [];
   configData.forEach((value) => {
@@ -92,10 +98,10 @@ const mkNewConfig = ({ configData = [] }: IHeaderProps) => {
       return false;
     }
     if (searchType === "submit") {
-      subConfigData = formConfigDataItemProvider(value);
+      subConfigData = formConfigDataItemProvider(value,(table as HTableInstance));
       return false;
     }
-    realConfigData.push(formConfigDataItemProvider(value));
+    realConfigData.push(formConfigDataItemProvider(value,(table as HTableInstance)));
   });
   return {
     realConfigData,
@@ -130,7 +136,7 @@ const filterHideFormItem = (
     hideData,
   };
 };
-export const useHideMoreTitle = ({ searchSpan, configData }: IHeaderProps) => {
+export const useHideMoreTitle = ({ searchSpan, configData ,table}: IHeaderProps) => {
   const [formConfigData, setFormConfigData] = useState<HItemProps[]>([]);
   const [subData, setSubData] = useState<HItemProps>(defaultSubItem as any);
   const { headerOpen, setHeaderOpen } = useHTableContext();
@@ -139,6 +145,7 @@ export const useHideMoreTitle = ({ searchSpan, configData }: IHeaderProps) => {
     const { realConfigData, subConfigData } = mkNewConfig({
       searchSpan,
       configData,
+      table
     });
     const changeClassName = headerOpen ? "" : className;
     const { lessData, hideData } = filterHideFormItem(

package/src/components/HTableHeader/index.tsx

@@ -31,6 +31,7 @@ export default ({
   const nConfigData = useHideMoreTitle({
     searchSpan,
     configData: headerConfigData,
+    table:tableInstance
   });
   const className = useClassName("hw-table-header");
   return (

package/src/components/HTableHeader/modal.ts

@@ -1,6 +1,7 @@
-import type { ConfigDataModal, ConfigItemModal } from "../modal";
+import type {ConfigDataModal, ConfigItemModal} from "../modal";
 import type { ColProps } from "antd";
 import type React from "react";
+import {HTableInstance} from "../modal";
 
 export interface IHeaderProps {
   configData?: ConfigDataModal;
@@ -8,6 +9,7 @@ export interface IHeaderProps {
   searchSpan?: ColProps;
   loading?: boolean;
   headerStyle?: React.CSSProperties;
+  table?:HTableInstance;
 }
 
 export interface FormConfigDataItemProviderModal extends ConfigItemModal {

package/src/components/Table.tsx

@@ -22,10 +22,10 @@ export default ({
   paginationStyle,
   rowKey = "id",
   onFinish,
-                    manual,
+  manual,
   ...props
 }: HTableProps) => {
-  const { run, loading, data, error, saveParams } = useReq({ request,manual });
+  const { run, loading, data, error, saveParams } = useReq({ request, manual });
   const dispatch = useDispatch(action);
   const { selectedRowData, rowOnChange, allSelectChange, setSelectedRowData } =
     useRowObj();

package/src/components/index.less

@@ -44,10 +44,6 @@
   }
 }
 
-.@{ant-prefix}-hw-table-body-option{
-  padding: 0px 24px 16px 24px;
-
-}
 .@{ant-prefix}-hw-table-body-option-icon{
  font-size: 16px;
 }
@@ -84,4 +80,10 @@
     color:#1890ff;
   }
 }
+.@{ant-prefix}-hw-table-header-title-box{
+  flex: 1;
+  display: flex;
+  position: relative;
+  margin-right: 12px;
+}
 

package/src/components/modal.ts

@@ -4,7 +4,7 @@ import type {
   HItemProps,
   HFormInstance,
 } from "@hw-component/form/es/Form/modal";
-import type { ColProps } from "antd";
+import type {ColProps, FormInstance} from "antd";
 import type React from "react";
 import type { ModalProps } from "antd";
 import type { TableProps } from "antd/lib/table";
@@ -34,7 +34,7 @@ interface HColumns extends Omit<ProColumns, "render" | "title"> {
   ) => React.ReactNode;
   showSearch?: boolean;
   searchType?: HItemProps["type"];
-  searchRender?: HItemProps["render"];
+  searchRender?:(item:HItemProps,node:React.ReactNode,form:FormInstance,tableInstance:HTableInstance)=>React.ReactNode;
   rowSelectionTitle?: boolean;
   title?: string | React.ReactNode;
 }

package/src/pages/ModalTable/index.tsx

@@ -98,7 +98,7 @@ export default () => {
         request={req2}
         configData={configData}
         tableProps={{
-          manual:true,
+          manual: true,
           headerTitle: (
             <div
               onClick={() => {

package/src/pages/Table/index.tsx

@@ -7,8 +7,8 @@ const configData = [
     title: "座位21321",
     showSearch: true,
     searchType: "select",
-    hideInTable: true,
     dataIndex: "name",
+    sorter: true,
     itemProps: {
       options: [{ label: "1", value: 1 }],
     },
@@ -64,32 +64,24 @@ export default () => {
           configData={configData}
           rowKey={"id"}
           table={hTable}
-          optionsRender={(node) => {
-            return <Space>ffff{node}</Space>;
+          action={{
+            test:(params)=>{
+                console.log(params,"lllll")
+            }
           }}
           rowSelection={{
-            alwaysShowAlert:true,
             allPageCheck: false,
           }}
           affixProps={{
             target: () => document.querySelector(".body"),
           }}
-          actionRender={() => {
-            return (
-              <Button
-                onClick={() => {
-                  console.log(hTable.table.settingKeys);
-                }}
-              >
-                你大爷
-              </Button>
-            );
-          }}
           scroll={{
             x: 1000,
           }}
           headerTitle={<Button type={"primary"}>操作</Button>}
+          options={false}
           request={(params) => {
+            console.log(params,".....");
             const { current = 1 } = params;
             const arrayData = [];
             for (let i = 0; i < 100; i = i + 1) {

package/src/pages/TableCustomize/index.tsx

@@ -72,7 +72,7 @@ export default () => {
             onChange: () => {
               console.log("rowSelection");
             },
-            alwaysShowAlert:true
+            alwaysShowAlert: true,
           }}
         />
       </Space>