@zat-design/sisyphus-react 3.13.22-beta.2 → 3.13.22

package/es/ProTable/hooks/useAntdTable.js

@@ -152,13 +152,64 @@ function useAntdTable(service, options, useRequestOptions) {
       selectedRowKeys: []
     });
   };
+  var resetParams = () => {
+    setState({
+      searchValues: {},
+      allSelected: false,
+      selectedRecords: [],
+      selectedRowKeys: [],
+      extraFilter: {
+        filters: undefined,
+        sorter: undefined
+      }
+    });
+  };
+
+  // 重置查询条件: 页码还原、勾选清空
+  var onReset = refresh => {
+    form === null || form === void 0 || form.resetFields();
+    var newPage = {
+      pageNum: 1,
+      pageSize: page.pageSize
+    };
+    resetParams();
+    if (isResetQuery || refresh) {
+      onPageChange(newPage);
+      run(getTransformParams({
+        page: newPage
+      }));
+    }
+  };
 
   /**
    * 手动触发时，手动调用run
    */
   useEffect(() => {
     if (!(useRequestOptions !== null && useRequestOptions !== void 0 && useRequestOptions.manual)) {
-      run(getTransformParams());
+      onReset(true);
+    }
+  }, [useRequestOptions === null || useRequestOptions === void 0 ? void 0 : useRequestOptions.manual, curExtraParams, curService]);
+
+  /**
+   * 手动触发时，手动调用run
+   */
+  useEffect(() => {
+    if (!(useRequestOptions !== null && useRequestOptions !== void 0 && useRequestOptions.manual)) {
+      // 当 extraParams 变化时,重置分页和选中状态
+      onPageChange(initPage);
+      setState({
+        searchValues: {},
+        allSelected: false,
+        selectedRecords: [],
+        selectedRowKeys: [],
+        extraFilter: {
+          filters: undefined,
+          sorter: undefined
+        }
+      });
+      run(getTransformParams({
+        page: initPage
+      }));
     }
   }, [useRequestOptions === null || useRequestOptions === void 0 ? void 0 : useRequestOptions.manual, curExtraParams, curService]);
   useDeepCompareEffect(() => {
@@ -268,34 +319,6 @@ function useAntdTable(service, options, useRequestOptions) {
       page: newPage
     }, extraFilter), _values)));
   };
-  var resetParams = page => {
-    setState({
-      searchValues: {},
-      allSelected: false,
-      selectedRecords: [],
-      selectedRowKeys: [],
-      extraFilter: {
-        filters: undefined,
-        sorter: undefined
-      }
-    });
-  };
-
-  // 重置查询条件: 页码还原、勾选清空
-  var onReset = () => {
-    form === null || form === void 0 || form.resetFields();
-    var newPage = {
-      pageNum: 1,
-      pageSize: page.pageSize
-    };
-    resetParams(newPage);
-    if (isResetQuery) {
-      onPageChange(newPage);
-      run(getTransformParams({
-        page: newPage
-      }));
-    }
-  };
   var refreshPage = res => {
     var transformResult = transformResponse ? transformResponse(res) : res || {};
     var _ref3 = isListResult(transformResult) ? transformResult : (transformResult === null || transformResult === void 0 ? void 0 : transformResult.data) || {},

package/lib/ProTable/hooks/useAntdTable.js

@@ -160,13 +160,64 @@ function useAntdTable(service, options, useRequestOptions) {
       selectedRowKeys: []
     });
   };
+  var resetParams = () => {
+    setState({
+      searchValues: {},
+      allSelected: false,
+      selectedRecords: [],
+      selectedRowKeys: [],
+      extraFilter: {
+        filters: undefined,
+        sorter: undefined
+      }
+    });
+  };
+
+  // 重置查询条件: 页码还原、勾选清空
+  var onReset = refresh => {
+    form === null || form === void 0 || form.resetFields();
+    var newPage = {
+      pageNum: 1,
+      pageSize: page.pageSize
+    };
+    resetParams();
+    if (isResetQuery || refresh) {
+      onPageChange(newPage);
+      run(getTransformParams({
+        page: newPage
+      }));
+    }
+  };
 
   /**
    * 手动触发时，手动调用run
    */
   (0, _react.useEffect)(() => {
     if (!(useRequestOptions !== null && useRequestOptions !== void 0 && useRequestOptions.manual)) {
-      run(getTransformParams());
+      onReset(true);
+    }
+  }, [useRequestOptions === null || useRequestOptions === void 0 ? void 0 : useRequestOptions.manual, curExtraParams, curService]);
+
+  /**
+   * 手动触发时，手动调用run
+   */
+  (0, _react.useEffect)(() => {
+    if (!(useRequestOptions !== null && useRequestOptions !== void 0 && useRequestOptions.manual)) {
+      // 当 extraParams 变化时,重置分页和选中状态
+      onPageChange(initPage);
+      setState({
+        searchValues: {},
+        allSelected: false,
+        selectedRecords: [],
+        selectedRowKeys: [],
+        extraFilter: {
+          filters: undefined,
+          sorter: undefined
+        }
+      });
+      run(getTransformParams({
+        page: initPage
+      }));
     }
   }, [useRequestOptions === null || useRequestOptions === void 0 ? void 0 : useRequestOptions.manual, curExtraParams, curService]);
   (0, _ahooks.useDeepCompareEffect)(() => {
@@ -276,34 +327,6 @@ function useAntdTable(service, options, useRequestOptions) {
       page: newPage
     }, extraFilter), _values)));
   };
-  var resetParams = page => {
-    setState({
-      searchValues: {},
-      allSelected: false,
-      selectedRecords: [],
-      selectedRowKeys: [],
-      extraFilter: {
-        filters: undefined,
-        sorter: undefined
-      }
-    });
-  };
-
-  // 重置查询条件: 页码还原、勾选清空
-  var onReset = () => {
-    form === null || form === void 0 || form.resetFields();
-    var newPage = {
-      pageNum: 1,
-      pageSize: page.pageSize
-    };
-    resetParams(newPage);
-    if (isResetQuery) {
-      onPageChange(newPage);
-      run(getTransformParams({
-        page: newPage
-      }));
-    }
-  };
   var refreshPage = res => {
     var transformResult = transformResponse ? transformResponse(res) : res || {};
     var _ref3 = (0, _utils.isListResult)(transformResult) ? transformResult : (transformResult === null || transformResult === void 0 ? void 0 : transformResult.data) || {},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.13.22-beta.2",
+  "version": "3.13.22",
   "license": "MIT",
   "engines": {
     "node": ">=18.19.0"