@hw-component/table 1.9.91 → 1.9.93

package/src/components/HTableBody/hooks/useColData.tsx

@@ -78,14 +78,16 @@ export const useCols = ({
   useEffect(() => {
     setCols(changeConfigData(configData));
   }, [configData, table, rowSelection]);
-
+  const resetCols = () => {
+    setCols(changeConfigData(configData));
+  };
   return {
     cols,
-    setCols
+    setCols,
+    resetCols,
   };
 };
 
-
 interface useColumnsStateTypeModal {
   columnsState?: ColumnsStateType;
   columns: ConfigDataModal;
@@ -96,8 +98,11 @@ export const useColumnsStateType = ({
   columns,
 }: useColumnsStateTypeModal) => {
   const { tableInstance } = useHTableContext();
-  const { persistenceType, persistenceKey, value, defaultValue, onChange } = columnsState || {};
-  const [selfValue, setSelfValue] = useState<Record<string, ColumnsState> | undefined>(defaultValue);
+  const { persistenceType, persistenceKey, value, defaultValue, onChange } =
+    columnsState || {};
+  const [selfValue, setSelfValue] = useState<
+    Record<string, ColumnsState> | undefined
+  >(defaultValue);
 
   const initTableColsVal = useMemo(() => {
     return selfValue || {};
@@ -120,7 +125,7 @@ export const useColumnsStateType = ({
     onChange?.(newObj);
   };
 
-  const reset = () => {
+  const resetCheckCol = () => {
     setSelfValue(initTableColsVal);
   };
   return {
@@ -128,6 +133,6 @@ export const useColumnsStateType = ({
     persistenceKey,
     value: selfValue,
     onChange: change,
-    reset,
+    resetCheckCol,
   };
 }; //设置选项

package/src/components/HTableBody/index.tsx

@@ -66,18 +66,19 @@ export default (bodyProps: HTableBodyProps) => {
   const { records } = data || {};
   const tableInstance = table || contextTableInstance;
 
-  const { cols ,setCols} = useCols({
+  const { cols, setCols, resetCols } = useCols({
     configData: bodyConfigData,
     table: tableInstance,
     rowSelection,
     bordered,
   });
-  const { value, onChange, reset, ...selfColStatus } = useColumnsStateType({
-    columnsState,
-    columns: cols,
-  });
-
+  const { value, onChange, resetCheckCol, ...selfColStatus } =
+    useColumnsStateType({
+      columnsState,
+      columns: cols,
+    });
   useSynchronousKeys({ selectedRowKeys, records, rowKey });
+
   const optionsNode = options && (
     <Options
       reload={() => {
@@ -89,7 +90,10 @@ export default (bodyProps: HTableBodyProps) => {
       setSizeChange={setCuSize}
       colStatusValue={value || {}}
       onChange={onChange}
-      reset={reset}
+      reset={() => {
+        resetCheckCol();
+        resetCols();
+      }}
       onDrop={setCols}
     />
   );

package/src/components/Table.tsx

@@ -3,7 +3,6 @@ import Body from "./HTableBody";
 import useCurrentTable from "./hooks/useCurrentTable";
 import useRowObj from "./hooks/useRowObj";
 import { HTableContext } from "./context";
-import { Space } from "antd";
 import type { HTableProps } from "./modal";
 import useReq from "./hooks/useReq";
 import useDispatch from "./hooks/useDispatch";
@@ -85,7 +84,7 @@ export default ({
         configData,
         onFinish: (value) => {
           rowSelectionReload();
-          return run({ ...saveParams.old, ...value, current: 1 });
+          return run({ ...value, current: 1 });
         },
         onPageChange: tableInstance.table.reloadWithParams,
         setSelectedRowData,

package/src/components/index.less

@@ -85,6 +85,10 @@
 .@{ant-prefix}-hw-table-body-option-setting-content-title{
   display: flex;
 }
+.@{ant-prefix}-hw-table-op-tree-content{
+  padding: 6px 6px 6px 0px;
+  width: 100%;
+}
 .@{ant-prefix}-hw-table-body-option-tree{
   .@{ant-prefix}-tree-treenode{
      width: 100%;

package/src/pages/Table/index.tsx

@@ -5,7 +5,16 @@ import {
   HTableHeaderSubBtn,
   HTableHeader,
 } from "@/components";
-import { Button, Card, Tooltip, Typography, Tag, Row, Space } from "antd";
+import {
+  Button,
+  Card,
+  Tooltip,
+  Typography,
+  Tag,
+  Row,
+  Space,
+  Table,
+} from "antd";
 import { HFormConfigProvider, HRangePicker } from "@hw-component/form";
 import { SettingOutlined } from "@ant-design/icons";
 import ProTable from "@ant-design/pro-table";
@@ -42,6 +51,31 @@ const Testd = (props) => {
   );
 };
 export const configData = [
+  {
+    title: '订单编号',
+    dataIndex: 'childOrderNo',
+    showSearch: true,
+    valueType: 'copy',
+    width: 120,
+    searchType: 'selectInput',
+    name: 'selectInput',
+    itemProps: {
+      placeholder: '请输入',
+      selectProps: {
+        options:[
+          {
+            label: '订单编号',
+            value: 'orderNo',
+          },
+          {
+            label: '用户id',
+            value: 'userId',
+          },
+        ],
+        style: { width: 88 },
+      },
+    },
+  },
   {
     title: "短信接收手机号",
     dataIndex: "mobileList",
@@ -66,9 +100,33 @@ export const configData = [
     valueType: "image",
     valueTypeProps: {
       fallback:
-          "data:image/png;base64,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",
+        "data:image/png;base64,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",
     },
   },
+  {
+    title: "操作",
+    dataIndex: "op",
+    width: 120,
+    fixed: "right",
+  },
+  {
+    title: "操作1",
+    dataIndex: "op1",
+    width: 120,
+    fixed: "right",
+  },
+  {
+    title: "操作2",
+    dataIndex: "op2",
+    width: 120,
+    fixed: "left",
+  },
+  {
+    title: "操作3",
+    dataIndex: "op3",
+    width: 120,
+    fixed: "left",
+  },
 ];
 const maker = (name) => {
   const data = [];
@@ -155,9 +213,14 @@ export default () => {
               persistenceType: "localStorage",
             }}
             formInitValues={{
-              deviceType: "1",
+              select: 'orderNo',
             }}
+
             dataSource={[{}, {}, {}]}
+            request={(params)=>{
+               console.log(params)
+              return Promise.resolve({});
+            }}
             headerTitle={
               <Space size={8}>
                 <Button
@@ -171,9 +234,7 @@ export default () => {
                   操作
                 </Button>
                 <div>
-                  <div
-                    style={{ width, height: 50, backgroundColor: "red" }}
-                   />
+                  <div style={{ width, height: 50, backgroundColor: "red" }} />
                 </div>
               </Space>
             }

package/src/components/HTableBody/Options/hooks.ts

@@ -1,24 +0,0 @@
-import { useMemo } from "react";
-import type { IProps } from "@/components/HTableBody/Options/modal";
-
-export const useCheckKeys = ({
-  columns,
-  colStatusValue,
-}: Pick<IProps, "colStatusValue" | "columns">) => {
-  return useMemo(() => {
-    const keys: string[] = [];
-    columns.forEach((value) => {
-      const { dataIndex, hideInTable } = value;
-      if (hideInTable || !dataIndex) {
-        return;
-      }
-      const dataIndexStr = dataIndex.toString();
-      const { show = true } = colStatusValue[dataIndexStr] || {};
-      if (!show) {
-        return;
-      }
-      keys.push(dataIndexStr);
-    });
-    return keys;
-  }, [colStatusValue, columns]);
-};