@quansitech/antd-admin 1.1.18 → 1.1.20

package/dist/components/Table.js

@@ -201,16 +201,20 @@ export default function (props) {
       searchUrl = window.location.href;
     }
     if (props.defaultSearchValue !== undefined) {
-      formRef.current.setFieldsValue(props.defaultSearchValue);
+      var _formRef$current;
+      (_formRef$current = formRef.current) === null || _formRef$current === void 0 || _formRef$current.setFieldsValue(props.defaultSearchValue);
     }
-    var query = qs.parse(window.location.search.replace(/^\?/, ''));
-    if (query && Object.keys(query).length) {
-      Object.keys(query).forEach(function (key) {
-        if (typeof query[key] === 'string') {
-          /^\d+$/.test(query[key]) && (query[key] = parseInt(query[key]));
-        }
-      });
-      formRef.current.setFieldsValue(query);
+    if (!modalContext.inModal) {
+      var query = qs.parse(window.location.search.replace(/^\?/, ''));
+      if (query && Object.keys(query).length) {
+        var _formRef$current2;
+        Object.keys(query).forEach(function (key) {
+          if (typeof query[key] === 'string') {
+            /^\d+$/.test(query[key]) && (query[key] = parseInt(query[key]));
+          }
+        });
+        (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 || _formRef$current2.setFieldsValue(query);
+      }
     }
   }, []);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TableContext.Provider, {
@@ -255,9 +259,9 @@ export default function (props) {
         }
         // 是否立即搜索
         if (c.searchOnChange) {
-          var _formRef$current;
+          var _formRef$current3;
           // @ts-ignore
-          (_formRef$current = formRef.current) === null || _formRef$current === void 0 || _formRef$current.submit();
+          (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 || _formRef$current3.submit();
         }
       }
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quansitech/antd-admin",
-  "version": "1.1.18",
+  "version": "1.1.20",
   "type": "module",
   "files": [
     "dist"