@hw-component/table 0.0.3-beta-v8 → 0.0.3-beta-v10

package/es/HTableBody/index.js

@@ -92,6 +92,9 @@ var Body = (function (_ref) {
         columns: cols,
         tableAlertRender: false,
         search: false,
+        options: {
+          reload: tableInstance.table.reloadWithParams
+        },
         tableStyle: {
           paddingBottom: 0
         },

package/es/Table.js

@@ -59,12 +59,19 @@ var Table = (function (_ref) {
     allSelectChange = _useRowObj.allSelectChange;
   var tableInstance = useCurrentTable({
     table: table,
-    reload: run,
+    reload: function reload(params) {
+      rowOnChange([], []);
+      return run(params);
+    },
     changeRowData: rowOnChange,
     dispatch: dispatch,
     reloadWithParams: function reloadWithParams() {
       var reloadParams = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      rowOnChange([], []);
       return run(_objectSpread(_objectSpread({}, saveParams.old), reloadParams));
+    },
+    getTableParams: function getTableParams() {
+      return saveParams.old;
     }
   });
   return jsx(HTableContext.Provider, {
@@ -78,7 +85,10 @@ var Table = (function (_ref) {
       allSelectChange: allSelectChange,
       action: action,
       configData: configData,
-      onFinish: run,
+      onFinish: function onFinish(value) {
+        rowOnChange([], []);
+        return run(value);
+      },
       onPageChange: tableInstance.table.reloadWithParams
     },
     children: jsxs(Space, {

package/es/TableCustomize.js

@@ -42,12 +42,19 @@ var Index = function Index(_ref) {
     allSelectChange = _useRowObj.allSelectChange;
   var tableInstance = useCurrentTable({
     table: table,
-    reload: run,
+    reload: function reload(params) {
+      rowOnChange([], []);
+      return run(params);
+    },
     changeRowData: rowOnChange,
     dispatch: dispatch,
     reloadWithParams: function reloadWithParams() {
       var reloadParams = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      rowOnChange([], []);
       return run(_objectSpread(_objectSpread({}, saveParams.old), reloadParams));
+    },
+    getTableParams: function getTableParams() {
+      return saveParams.old;
     }
   });
   return jsx(HTableContext.Provider, {
@@ -62,7 +69,10 @@ var Index = function Index(_ref) {
       action: action,
       configData: configData,
       params: saveParams.old,
-      onFinish: run,
+      onFinish: function onFinish(value) {
+        rowOnChange([], []);
+        return run(value);
+      },
       onPageChange: tableInstance.table.reloadWithParams
     },
     children: children

package/es/hooks/useCurrentTable.d.ts

@@ -6,6 +6,7 @@ interface currentTableParams {
     changeRowData: (keys: React.Key[], data: any) => void;
     dispatch: (key: string, params: any) => void;
     reloadWithParams: (params?: ParamsModal) => Promise<any>;
+    getTableParams: () => any;
 }
-declare const _default: ({ table, reload, changeRowData, dispatch, reloadWithParams, }: currentTableParams) => HTableInstance;
+declare const _default: ({ table, reload, changeRowData, dispatch, reloadWithParams, getTableParams, }: currentTableParams) => HTableInstance;
 export default _default;

package/es/hooks/useCurrentTable.js

@@ -7,7 +7,8 @@ var useCurrentTable = (function (_ref) {
     reload = _ref.reload,
     changeRowData = _ref.changeRowData,
     dispatch = _ref.dispatch,
-    reloadWithParams = _ref.reloadWithParams;
+    reloadWithParams = _ref.reloadWithParams,
+    getTableParams = _ref.getTableParams;
   var useCurrentTable = useHTable();
   return useMemo(function () {
     var resultTable = table || useCurrentTable;
@@ -15,6 +16,7 @@ var useCurrentTable = (function (_ref) {
     resultTable.table.setSelectedRowData = changeRowData;
     resultTable.table.dispatch = dispatch;
     resultTable.table.reloadWithParams = reloadWithParams;
+    resultTable.table.getParams = getTableParams;
     return resultTable;
   }, [table]);
 });

package/es/hooks/useHTable.d.ts

@@ -6,6 +6,7 @@ declare const _default: () => {
         setSelectedRowData: () => void;
         dispatch: () => void;
         reloadWithParams: (params?: ParamsModal) => Promise<ParamsModal | undefined>;
+        getParams: () => any;
     };
 };
 export default _default;

package/es/hooks/useHTable.js

@@ -14,6 +14,9 @@ var useHTable = (function () {
       dispatch: function dispatch() {},
       reloadWithParams: function reloadWithParams(params) {
         return _Promise.resolve(params);
+      },
+      getParams: function getParams() {
+        return {};
       }
     };
   }, []);

package/es/modal.d.ts

@@ -56,6 +56,7 @@ export interface TableInstance {
     setSelectedRowData: (keys: React.Key[], data: any) => void;
     dispatch: (key: string, params: any) => void;
     reloadWithParams: (params?: ParamsModal) => Promise<any>;
+    getParams: () => any;
 }
 export interface HTableInstance {
     form: HFormInstance;

package/lib/HTableBody/index.js

@@ -95,6 +95,9 @@ var Body = (function (_ref) {
         columns: cols,
         tableAlertRender: false,
         search: false,
+        options: {
+          reload: tableInstance.table.reloadWithParams
+        },
         tableStyle: {
           paddingBottom: 0
         },

package/lib/Table.js

@@ -62,12 +62,19 @@ var Table = (function (_ref) {
     allSelectChange = _useRowObj.allSelectChange;
   var tableInstance = useCurrentTable.default({
     table: table,
-    reload: run,
+    reload: function reload(params) {
+      rowOnChange([], []);
+      return run(params);
+    },
     changeRowData: rowOnChange,
     dispatch: dispatch,
     reloadWithParams: function reloadWithParams() {
       var reloadParams = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      rowOnChange([], []);
       return run(_objectSpread(_objectSpread({}, saveParams.old), reloadParams));
+    },
+    getTableParams: function getTableParams() {
+      return saveParams.old;
     }
   });
   return jsxRuntime.jsx(context.HTableContext.Provider, {
@@ -81,7 +88,10 @@ var Table = (function (_ref) {
       allSelectChange: allSelectChange,
       action: action,
       configData: configData,
-      onFinish: run,
+      onFinish: function onFinish(value) {
+        rowOnChange([], []);
+        return run(value);
+      },
       onPageChange: tableInstance.table.reloadWithParams
     },
     children: jsxRuntime.jsxs(antd.Space, {

package/lib/TableCustomize.js

@@ -45,12 +45,19 @@ var Index = function Index(_ref) {
     allSelectChange = _useRowObj.allSelectChange;
   var tableInstance = useCurrentTable.default({
     table: table,
-    reload: run,
+    reload: function reload(params) {
+      rowOnChange([], []);
+      return run(params);
+    },
     changeRowData: rowOnChange,
     dispatch: dispatch,
     reloadWithParams: function reloadWithParams() {
       var reloadParams = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      rowOnChange([], []);
       return run(_objectSpread(_objectSpread({}, saveParams.old), reloadParams));
+    },
+    getTableParams: function getTableParams() {
+      return saveParams.old;
     }
   });
   return jsxRuntime.jsx(context.HTableContext.Provider, {
@@ -65,7 +72,10 @@ var Index = function Index(_ref) {
       action: action,
       configData: configData,
       params: saveParams.old,
-      onFinish: run,
+      onFinish: function onFinish(value) {
+        rowOnChange([], []);
+        return run(value);
+      },
       onPageChange: tableInstance.table.reloadWithParams
     },
     children: children

package/lib/hooks/useCurrentTable.d.ts

@@ -6,6 +6,7 @@ interface currentTableParams {
     changeRowData: (keys: React.Key[], data: any) => void;
     dispatch: (key: string, params: any) => void;
     reloadWithParams: (params?: ParamsModal) => Promise<any>;
+    getTableParams: () => any;
 }
-declare const _default: ({ table, reload, changeRowData, dispatch, reloadWithParams, }: currentTableParams) => HTableInstance;
+declare const _default: ({ table, reload, changeRowData, dispatch, reloadWithParams, getTableParams, }: currentTableParams) => HTableInstance;
 export default _default;

package/lib/hooks/useCurrentTable.js

@@ -10,7 +10,8 @@ var useCurrentTable = (function (_ref) {
     reload = _ref.reload,
     changeRowData = _ref.changeRowData,
     dispatch = _ref.dispatch,
-    reloadWithParams = _ref.reloadWithParams;
+    reloadWithParams = _ref.reloadWithParams,
+    getTableParams = _ref.getTableParams;
   var useCurrentTable = useHTable.default();
   return React.useMemo(function () {
     var resultTable = table || useCurrentTable;
@@ -18,6 +19,7 @@ var useCurrentTable = (function (_ref) {
     resultTable.table.setSelectedRowData = changeRowData;
     resultTable.table.dispatch = dispatch;
     resultTable.table.reloadWithParams = reloadWithParams;
+    resultTable.table.getParams = getTableParams;
     return resultTable;
   }, [table]);
 });

package/lib/hooks/useHTable.d.ts

@@ -6,6 +6,7 @@ declare const _default: () => {
         setSelectedRowData: () => void;
         dispatch: () => void;
         reloadWithParams: (params?: ParamsModal) => Promise<ParamsModal | undefined>;
+        getParams: () => any;
     };
 };
 export default _default;

package/lib/hooks/useHTable.js

@@ -17,6 +17,9 @@ var useHTable = (function () {
       dispatch: function dispatch() {},
       reloadWithParams: function reloadWithParams(params) {
         return _Promise.resolve(params);
+      },
+      getParams: function getParams() {
+        return {};
       }
     };
   }, []);

package/lib/modal.d.ts

@@ -56,6 +56,7 @@ export interface TableInstance {
     setSelectedRowData: (keys: React.Key[], data: any) => void;
     dispatch: (key: string, params: any) => void;
     reloadWithParams: (params?: ParamsModal) => Promise<any>;
+    getParams: () => any;
 }
 export interface HTableInstance {
     form: HFormInstance;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/table",
-  "version": "0.0.3-beta-v8",
+  "version": "0.0.3-beta-v10",
   "description": "基于antd二次开发table组件",
   "keywords": [
     "table"
@@ -15,7 +15,7 @@
   "module": "es/index.js",
   "scripts": {
     "build": "rollup --config ./scripts/rollup.config.js",
-    "lint:fix": "eslint --fix --cache --ext .js,.jsx,.ts,.tsx --format=pretty ./src && npm run lint:style",
+    "lint:fix": "eslint --fix --cache --ext .js,.jsx,.ts,.tsx --format=pretty ./src ",
     "lint:js": "eslint --cache --ext .js,.jsx,.ts,.tsx --format=pretty ./src",
     "lint:style": "stylelint --fix \"src/**/*.less\" --syntax less",
     "prepare": "husky install",
@@ -23,9 +23,8 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "lint-staged": {
-    "**/*.less": "npm run lint:style",
     "**/*.{js,jsx,ts,tsx}": "npm run lint:fix",
-    "**/*.{js,jsx,tsx,ts,less,md,json}": [
+    "**/*.{js,jsx,tsx,ts,md,json}": [
       "prettier --write"
     ]
   },

package/src/components/HTableBody/index.tsx

@@ -76,6 +76,9 @@ export default ({
           columns={cols}
           tableAlertRender={false}
           search={false}
+          options={{
+            reload:tableInstance.table.reloadWithParams
+          }}
           tableStyle={{
             paddingBottom: 0,
           }}

package/src/components/Table.tsx

@@ -22,7 +22,7 @@ export default ({
   action = {},
   spaceSize = 15,
   className,
-                    paginationStyle,
+  paginationStyle,
   ...props
 }: HTableProps) => {
   const { run, loading, data, error, saveParams } = useReq({ request });
@@ -30,12 +30,19 @@ export default ({
   const { selectedRowData, rowOnChange, allSelectChange } = useRowObj();
   const tableInstance = useCurrentTable({
     table,
-    reload: run,
+    reload: (params) => {
+      rowOnChange([], []);
+      return run(params);
+    },
     changeRowData: rowOnChange,
     dispatch,
     reloadWithParams: (reloadParams = {}) => {
+      rowOnChange([], []);
       return run({ ...saveParams.old, ...reloadParams });
     },
+    getTableParams: () => {
+      return saveParams.old;
+    },
   });
   return (
     <HTableContext.Provider
@@ -49,7 +56,10 @@ export default ({
         allSelectChange,
         action,
         configData,
-        onFinish: run,
+        onFinish: (value) => {
+          rowOnChange([], []);
+          return run(value);
+        },
         onPageChange: tableInstance.table.reloadWithParams,
       }}
     >
@@ -62,7 +72,11 @@ export default ({
         {!hideHeader && (
           <Header searchSpan={searchSpan} headerStyle={headerStyle} />
         )}
-        <Body tableStyle={tableStyle} paginationStyle={paginationStyle} {...props} />
+        <Body
+          tableStyle={tableStyle}
+          paginationStyle={paginationStyle}
+          {...props}
+        />
         {footerRender !== false && (
           <Footer
             actionRender={actionRender}

package/src/components/TableCustomize.tsx

@@ -2,7 +2,7 @@ import useCurrentTable from "./hooks/useCurrentTable";
 import useRowObj from "./hooks/useRowObj";
 import { HTableContext } from "./context";
 import type { HTableProps } from "./modal";
-import type {IParamsModal} from "./hooks/useReq";
+import type { IParamsModal } from "./hooks/useReq";
 import useReq from "./hooks/useReq";
 import useDispatch from "./hooks/useDispatch";
 import React from "react";
@@ -14,17 +14,27 @@ const Index: React.FC<HTableProps> = ({
   children,
   ...props
 }) => {
-  const { run, loading, data, error, saveParams } = useReq(({ request,...props } as IParamsModal));
+  const { run, loading, data, error, saveParams } = useReq({
+    request,
+    ...props,
+  } as IParamsModal);
   const dispatch = useDispatch(action);
   const { selectedRowData, rowOnChange, allSelectChange } = useRowObj();
   const tableInstance = useCurrentTable({
     table,
-    reload: run,
+    reload: (params) => {
+      rowOnChange([], []);
+      return run(params);
+    },
     changeRowData: rowOnChange,
     dispatch,
     reloadWithParams: (reloadParams = {}) => {
+      rowOnChange([], []);
       return run({ ...saveParams.old, ...reloadParams });
     },
+    getTableParams:()=>{
+        return saveParams.old;
+    }
   });
   return (
     <HTableContext.Provider
@@ -39,7 +49,10 @@ const Index: React.FC<HTableProps> = ({
         action,
         configData,
         params: saveParams.old,
-        onFinish: run,
+        onFinish: (value) => {
+          rowOnChange([], []);
+          return run(value);
+        },
         onPageChange: tableInstance.table.reloadWithParams,
       }}
     >

package/src/components/hooks/useCurrentTable.ts

@@ -9,6 +9,7 @@ interface currentTableParams {
   changeRowData: (keys: React.Key[], data: any) => void;
   dispatch: (key: string, params: any) => void;
   reloadWithParams: (params?: ParamsModal) => Promise<any>;
+  getTableParams: () => any;
 }
 export default ({
   table,
@@ -16,6 +17,7 @@ export default ({
   changeRowData,
   dispatch,
   reloadWithParams,
+                  getTableParams,
 }: currentTableParams) => {
   const useCurrentTable = useHTable();
   return useMemo(() => {
@@ -24,6 +26,7 @@ export default ({
     resultTable.table.setSelectedRowData = changeRowData;
     resultTable.table.dispatch = dispatch;
     resultTable.table.reloadWithParams = reloadWithParams;
+    resultTable.table.getParams = getTableParams;
     return resultTable;
   }, [table]);
 };

package/src/components/hooks/useHTable.tsx

@@ -14,6 +14,9 @@ export default () => {
       reloadWithParams: (params?: ParamsModal) => {
         return Promise.resolve(params);
       },
+      getParams: () => {
+        return ({} as any);
+      },
     };
   }, []);
   return {

package/src/components/modal.ts

@@ -45,7 +45,8 @@ type FooterRenderFn = (
   selectedRowData: RowObj,
   data?: ResultModal
 ) => React.ReactNode;
-export interface HTableProps extends Omit<ProTableProps<any, any>, "request"|"dataSource"> {
+export interface HTableProps
+  extends Omit<ProTableProps<any, any>, "request" | "dataSource"> {
   request?: (params: ParamsModal) => Promise<ResultModal>;
   configData: ConfigDataModal;
   searchSpan?: ColProps;
@@ -68,13 +69,14 @@ export interface HTableProps extends Omit<ProTableProps<any, any>, "request"|"da
   reload?: (params: any) => Promise<any>;
   manual?: boolean;
   dataSource?: ResultModal;
-  paginationStyle?: React.CSSProperties
+  paginationStyle?: React.CSSProperties;
 }
 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;
 }
 export interface HTableInstance {
   form: HFormInstance;

package/src/pages/Table/index.tsx

@@ -1,5 +1,6 @@
 import { HTable, useHTable } from "../../components";
 import { Button } from "antd";
+import { HFormConfigProvider } from "@hw-component/form";
 
 const configData = [
   {
@@ -12,13 +13,20 @@ const configData = [
     title: "操作",
     name: "aaa",
     showSearch: true,
-    searchType: "rangePicker",
+    searchType: "test",
   },
 ];
+const Test = () => {
+  return <div>test</div>;
+};
 export default () => {
   const hTable = useHTable();
   return (
-    <>
+    <HFormConfigProvider
+      defaultComponent={{
+        test: Test,
+      }}
+    >
       <HTable
         configData={configData}
         rowKey={"id"}
@@ -47,6 +55,6 @@ export default () => {
           });
         }}
       />
-    </>
+    </HFormConfigProvider>
   );
 };