@quansitech/antd-admin 1.2.6 → 1.2.7

package/dist/components/Table.js

@@ -33,11 +33,13 @@ import { TabsContext } from "./TabsContext";
 export default function (props) {
   var request = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params, sort, filter) {
+      var _formRef$current;
       var data, res, _props;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            data = _objectSpread(_objectSpread(_objectSpread({}, params), filter), {}, {
+            setLoading(true);
+            data = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.getFieldsValue()), params), filter), {}, {
               sort: sort
             }); // 兼容 key:value 的写法
             Object.keys(data).forEach(function (key) {
@@ -58,7 +60,7 @@ export default function (props) {
             setEditableValues([]);
             setSelectedRows([]);
             if (modalContext.inModal) {
-              _context.next = 9;
+              _context.next = 10;
               break;
             }
             // 如果不在 modal 中，则使用 routerNavigateTo
@@ -85,16 +87,16 @@ export default function (props) {
               }
             });
             return _context.abrupt("return");
-          case 9:
-            _context.prev = 9;
-            _context.next = 12;
+          case 10:
+            _context.prev = 10;
+            _context.next = 13;
             return http.get(searchUrl, {
               params: data,
               headers: {
                 'X-Table-Search': '1'
               }
             });
-          case 12:
+          case 13:
             res = _context.sent;
             _props = res.data;
             setToolActions(_props.actions);
@@ -107,15 +109,15 @@ export default function (props) {
               data: res.data.dataSource || [],
               success: true
             });
-          case 21:
-            _context.prev = 21;
+          case 22:
+            _context.prev = 22;
             setLoading(false);
-            return _context.finish(21);
-          case 24:
+            return _context.finish(22);
+          case 25:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[9,, 21, 24]]);
+      }, _callee, null, [[10,, 22, 25]]);
     }));
     return function request(_x, _x2, _x3) {
       return _ref.apply(this, arguments);
@@ -297,13 +299,20 @@ export default function (props) {
 
     // 搜索
     if (!searchUrl) {
-      setSearchUrl(window.location.href);
+      var s = window.location.href;
+      s = s.replace(/page=\d+&?/, '');
+      realColumns.filter(function (c) {
+        return c.search !== false;
+      }).map(function (c) {
+        s = s.replace(new RegExp("".concat(c.dataIndex, "=[^&]*&?")), '');
+      });
+      setSearchUrl(s);
     }
     setDataSource(postData(props.dataSource || []));
     if (!modalContext.inModal) {
       var query = qs.parse(window.location.search.replace(/^\?/, ''));
       if (query && Object.keys(query).length) {
-        var _formRef$current;
+        var _formRef$current2;
         Object.keys(query).forEach(function (key) {
           if (typeof query[key] === 'string') {
             /^\d+$/.test(query[key]) && (query[key] = parseInt(query[key]));
@@ -311,7 +320,7 @@ export default function (props) {
         });
         handleSearchRangeValue(query);
         handleSearchArrayKey(query);
-        (_formRef$current = formRef.current) === null || _formRef$current === void 0 || _formRef$current.setFieldsValue(query);
+        (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 || _formRef$current2.setFieldsValue(query);
         setLastQuery(query);
       }
     }
@@ -363,7 +372,7 @@ export default function (props) {
     form: {
       initialValues: props.defaultSearchValue,
       onValuesChange: function onValuesChange(changedValues, allValues) {
-        var _formRef$current2;
+        var _formRef$current3;
         var submit = realColumns.filter(function (c) {
           if (!c.searchOnChange) {
             return false;
@@ -374,7 +383,7 @@ export default function (props) {
           return;
         }
         // 是否立即搜索
-        (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 || _formRef$current2.submit();
+        (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 || _formRef$current3.submit();
       }
     },
     rowSelection: props.rowSelection && {

package/package.json

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