@hw-component/table 1.1.7 → 1.1.8

package/src/components/HTableBody/utils.ts

@@ -0,0 +1,91 @@
+import {ColumnsStateType} from "@ant-design/pro-table/es/typing";
+import {ConfigDataModal, ConfigItemModal} from "@/components/modal";
+import React from "react";
+import {getItemValue} from "./Options/utils";
+
+const strToJson=(str:string|null)=>{
+    if (!str){
+        return  {};
+    }
+    try {
+        const result=JSON.parse(str);
+        if (typeof result==="object"){
+            return  result;
+        }
+        return {};
+    }catch (e) {
+        return {}
+    }
+}
+
+export const mkChangeValue=(columnsState?:ColumnsStateType)=>{
+    const {persistenceType,persistenceKey,value,defaultValue,onChange}=columnsState||{};
+    if (value){
+        return value
+    }
+    if (!persistenceKey){
+        return {};
+    }
+    const cuPersistenceType=persistenceType||"localStorage";
+    const saveValStr=window[cuPersistenceType].getItem(persistenceKey);
+    return  strToJson(saveValStr);
+}//获取默认值
+
+
+const childDataIndexProvider = (
+    data: ConfigItemModal[] | string[],
+    title?: string | React.ReactNode
+) => {
+    const keys: string[] = [];
+    const cols: ConfigDataModal = [];
+    data.forEach((value) => {
+        if (typeof value === "string") {
+            keys.push(value);
+            cols.push(
+                getItemValue({
+                    title,
+                    dataIndex: value,
+                })
+            );
+            return;
+        }
+        keys.push(value.dataIndex);
+        cols.push(getItemValue(value));
+    });
+    return {
+        keys,
+        cols,
+    };
+};
+
+
+export const outColSetting=(columns:ConfigDataModal,columnsState:ColumnsStateType={})=>{
+    const keys: string[] = [];
+    const checkCols:ConfigDataModal=[];
+    columns.forEach((value) => {
+        const { dataIndex,titleStr,title, hideInTable, childrenDataIndex } =
+            value;
+        if (hideInTable || !dataIndex) {
+            return;
+        }
+        const {show=true}=columnsState[dataIndex.toString()]||{};
+        if (!show){
+            return;
+        }
+        if (childrenDataIndex) {
+          const { keys: childKeys, cols: childCols } = childDataIndexProvider(
+            childrenDataIndex,
+            titleStr || title
+          );
+            keys.push(...childKeys);
+          checkCols.push(...childCols);
+          return;
+        }
+        keys.push(dataIndex.toString());
+        checkCols.push(getItemValue(value));
+    });
+    return {
+        checkCols,
+        keys
+    };
+}

package/src/components/Table.tsx

@@ -55,6 +55,7 @@ export default ({
     },
     selectedRowData,
     dataSource: data,
+
   });
   return (
     <HTableContext.Provider

package/src/components/hooks/useHTable.tsx

@@ -17,12 +17,14 @@ export default (): HTableInstance => {
       getParams: () => {
         return {} as any;
       },
-      settingKeys: {},
       getSelectedRowData: () => {
         return {};
       },
       getTableSourceData:()=>{
         return [];
+      },
+      getColSettingKeys:()=>{
+        return {}
       }
     };
   }, []);

package/src/components/modal.ts

@@ -114,18 +114,19 @@ export interface HTableProps
   labelWidth?: number;
   hideLabel?: boolean;
 }
+interface ColCheckResultKeys {
+  keys?: string[];
+  checkCols?: ConfigDataModal;
+};
 export interface TableInstance {
   reload: (params?: ParamsModal) => Promise<any>;
   setSelectedRowData: (keys: React.Key[], data: any) => void;
   dispatch: (key: string, params: any) => void;
   reloadWithParams: (params?: ParamsModal) => Promise<any>;
   getParams: () => any;
-  settingKeys: {
-    keys?: string[];
-    checkCols?: ConfigDataModal;
-  };
   getSelectedRowData: () => RowObj;
   getTableSourceData: () => any;
+  getColSettingKeys:()=>ColCheckResultKeys;
 }
 export interface HTableInstance {
   form: HFormInstance;

package/src/pages/Table/index.tsx

@@ -100,11 +100,16 @@ export default () => {
           scroll={{
             x: 1000,
           }}
+          columnsState={{
+            persistenceKey:"test",
+            persistenceType:"localStorage"
+          }}
           formInitValues={{
             name2: 1,
           }}
-          headerTitle={<Button type={"primary"}>操作</Button>}
-          options={false}
+          headerTitle={<Button type={"primary"} onClick={()=>{
+             console.log(hTable.table.getColSettingKeys());
+          }}>操作</Button>}
           paginationActionRender={() => {
             return <div>你大爷</div>;
           }}

package/src/pages/TableCustomize/index.tsx

@@ -3,7 +3,7 @@ import {
   HTableHeader,
   HTableBody,
   HTableFooter,
-  HTablePagination,
+  HTablePagination, useHTable,
 } from "@/components";
 import { useRequest } from "ahooks";
 import { Space } from "antd";
@@ -28,6 +28,7 @@ const AddBtn = (props) => {
   return <div>fff</div>;
 };
 export default () => {
+  const hTable=useHTable();
   const { run, loading, error, data } = useRequest(
     (params) => {
       const { current = 1 } = params;
@@ -57,14 +58,22 @@ export default () => {
       configData={configData}
       loading={loading}
       error={error}
+      table={hTable}
       dataSource={data}
       reload={run}
-      manual={true}
     >
       <Space direction={"vertical"} style={{ width: "100%" }}>
         <HTableHeader />
         <HTableBody
-          headerTitle={<AddBtn />}
+            headerTitle={<div onClick={()=>{
+                console.log( hTable.table.getColSettingKeys())
+            }}>
+              点我获取
+            </div>}
+          columnsState={{
+            persistenceKey:"zd",
+            persistenceType:"localStorage"
+          }}
           affixProps={{
             target: () => document.querySelector(".body"),
           }}