@quansitech/antd-admin 1.1.30 → 1.1.31

package/dist/components/Column/Image.js

@@ -75,7 +75,7 @@ export default function (props) {
         aspect = parseInt(aspects[0]) / parseInt(aspects[1]);
       }
       return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ImgCrop, {
-        quality: ((_props$fieldProps$cro = props.fieldProps.crop) === null || _props$fieldProps$cro === void 0 ? void 0 : _props$fieldProps$cro.quality) || 0.8,
+        quality: ((_props$fieldProps$cro = props.fieldProps.crop) === null || _props$fieldProps$cro === void 0 ? void 0 : _props$fieldProps$cro.quality) || 0.92,
         rotationSlider: true,
         aspect: aspect
       }, dom));

package/dist/components/Table.js

@@ -31,27 +31,27 @@ import { diffTree, getValueByPath, routerNavigateTo } from "../lib/helpers";
 import qs from 'qs';
 import { TabsContext } from "./TabsContext";
 export default function (props) {
-  var searchUrl = props.searchUrl;
   var request = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params, sort, filter) {
-      var _formRef$current;
       var data, only, res;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            setLoading(true);
-            data = _objectSpread(_objectSpread(_objectSpread({}, filter), (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.getFieldsValue()), {}, {
+            data = _objectSpread(_objectSpread(_objectSpread({}, params), filter), {}, {
               sort: sort
             });
             if (props.pagination) {
               data[props.pagination.paramName || 'page'] = params.current;
+              delete data.current;
+              delete data.pageSize;
             }
             setEditableKeys([]);
             setEditableValues([]);
             if (modalContext.inModal) {
-              _context.next = 10;
+              _context.next = 9;
               break;
             }
+            // 如果不在 modal 中，则使用 routerNavigateTo
             only = ['dataSource', 'pagination', 'extraRenderValues'];
             if (tabsContext.inTabs) {
               only.push('tabs');
@@ -77,16 +77,16 @@ export default function (props) {
               }
             });
             return _context.abrupt("return");
-          case 10:
-            _context.prev = 10;
-            _context.next = 13;
+          case 9:
+            _context.prev = 9;
+            _context.next = 12;
             return http.get(searchUrl, {
               params: data,
               headers: {
                 'X-Table-Search': '1'
               }
             });
-          case 13:
+          case 12:
             res = _context.sent;
             if (res.data.pagination) {
               setPagination(_objectSpread(_objectSpread({}, res.data.pagination), {}, {
@@ -101,15 +101,15 @@ export default function (props) {
               data: res.data.dataSource || [],
               success: true
             });
-          case 18:
-            _context.prev = 18;
+          case 17:
+            _context.prev = 17;
             setLoading(false);
-            return _context.finish(18);
-          case 21:
+            return _context.finish(17);
+          case 20:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[10,, 18, 21]]);
+      }, _callee, null, [[9,, 17, 20]]);
     }));
     return function request(_x, _x2, _x3) {
       return _ref.apply(this, arguments);
@@ -150,47 +150,51 @@ export default function (props) {
       return row;
     });
   };
+  var _useState = useState(props.searchUrl),
+    _useState2 = _slicedToArray(_useState, 2),
+    searchUrl = _useState2[0],
+    setSearchUrl = _useState2[1];
   var formRef = useRef();
   var actionRef = useRef();
-  var _useState = useState({}),
-    _useState2 = _slicedToArray(_useState, 2),
-    lastQuery = _useState2[0],
-    setLastQuery = _useState2[1];
-  var _useState3 = useState(function () {
+  var _useState3 = useState({}),
+    _useState4 = _slicedToArray(_useState3, 2),
+    lastQuery = _useState4[0],
+    setLastQuery = _useState4[1];
+  var _useState5 = useState(function () {
       return [];
     }),
-    _useState4 = _slicedToArray(_useState3, 2),
-    editableKeys = _useState4[0],
-    setEditableKeys = _useState4[1];
-  var _useState5 = useState([]),
     _useState6 = _slicedToArray(_useState5, 2),
-    selectedRows = _useState6[0],
-    setSelectedRows = _useState6[1];
+    editableKeys = _useState6[0],
+    setEditableKeys = _useState6[1];
   var _useState7 = useState([]),
     _useState8 = _slicedToArray(_useState7, 2),
-    editableValues = _useState8[0],
-    setEditableValues = _useState8[1];
-  var _useState9 = useState(false),
+    selectedRows = _useState8[0],
+    setSelectedRows = _useState8[1];
+  var _useState9 = useState([]),
     _useState10 = _slicedToArray(_useState9, 2),
-    loading = _useState10[0],
-    setLoading = _useState10[1];
-  // @ts-ignore
-  var _useState11 = useState(props.pagination),
+    editableValues = _useState10[0],
+    setEditableValues = _useState10[1];
+  var _useState11 = useState(false),
     _useState12 = _slicedToArray(_useState11, 2),
-    pagination = _useState12[0],
-    setPagination = _useState12[1];
-  var _useState13 = useState(postData(props.dataSource)),
+    loading = _useState12[0],
+    setLoading = _useState12[1];
+  // @ts-ignore
+  var _useState13 = useState(props.pagination),
     _useState14 = _slicedToArray(_useState13, 2),
-    dataSource = _useState14[0],
-    setDataSource = _useState14[1];
-  var _useState15 = useState(true),
+    pagination = _useState14[0],
+    setPagination = _useState14[1];
+  var _useState15 = useState(postData(props.dataSource)),
     _useState16 = _slicedToArray(_useState15, 2),
-    sticky = _useState16[0],
-    setSticky = _useState16[1];
-  var _useState17 = useState(props.extraRenderValues),
+    dataSource = _useState16[0],
+    setDataSource = _useState16[1];
+  var _useState17 = useState(true),
     _useState18 = _slicedToArray(_useState17, 2),
-    extraRenderValues = _useState18[0],
-    setExtraRenderValues = _useState18[1];
+    sticky = _useState18[0],
+    setSticky = _useState18[1];
+  var _useState19 = useState(props.extraRenderValues),
+    _useState20 = _slicedToArray(_useState19, 2),
+    extraRenderValues = _useState20[0],
+    setExtraRenderValues = _useState20[1];
   var modalContext = useContext(ModalContext);
   var tabsContext = useContext(TabsContext);
   useEffect(function () {
@@ -204,19 +208,26 @@ export default function (props) {
 
     // 搜索
     if (!searchUrl) {
-      searchUrl = window.location.href;
+      var s = window.location.href;
+      s = s.replace(/page=\d+&?/, '');
+      columns.filter(function (c) {
+        return c.search !== false;
+      }).map(function (c) {
+        s = s.replace(new RegExp("".concat(c.dataIndex, "=[^&]*&?")), '');
+      });
+      setSearchUrl(s);
     }
     setLastQuery(props.defaultSearchValue);
     if (!modalContext.inModal) {
       var query = qs.parse(window.location.search.replace(/^\?/, ''));
       if (query && Object.keys(query).length) {
-        var _formRef$current2;
+        var _formRef$current;
         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);
+        (_formRef$current = formRef.current) === null || _formRef$current === void 0 || _formRef$current.setFieldsValue(query);
       }
     }
   }, []);
@@ -257,7 +268,7 @@ export default function (props) {
     form: {
       initialValues: props.defaultSearchValue,
       onValuesChange: function onValuesChange(changedValues, allValues) {
-        var _formRef$current3;
+        var _formRef$current2;
         var submit = columns.filter(function (c) {
           if (!c.searchOnChange) {
             return false;
@@ -268,7 +279,7 @@ export default function (props) {
           return;
         }
         // 是否立即搜索
-        (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 || _formRef$current3.submit();
+        (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 || _formRef$current2.submit();
       }
     },
     rowSelection: props.rowSelection && {

package/package.json

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