@teamix/pro 1.2.17 → 1.2.18

package/dist/pro.js

@@ -60305,7 +60305,6 @@ var useAutoSubmit = function useAutoSubmit(onSubmit, context) {
 /* harmony export */   "Z": () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
 /* harmony import */ var _formily_react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(61006);
-/* harmony import */ var _teamix_utils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(80653);
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -60313,18 +60312,11 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 
-
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (function () {
   var field = (0,_formily_react__WEBPACK_IMPORTED_MODULE_0__.useField)();
 
   var refresh = function refresh() {
-    if (!(0,_teamix_utils__WEBPACK_IMPORTED_MODULE_1__.isPlainObj)(field.data)) {
-      field.data = {
-        refresh: {}
-      };
-    } else {
-      field.data.refresh = _objectSpread({}, field.data.refresh);
-    }
+    field.data.refresh = _objectSpread({}, field.data.refresh);
   };
 
   return {
@@ -60819,7 +60811,9 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
         rules: defaultRules,
         reactions: defaultReactions,
         dataSource: defaultDataSource,
-        data: data
+        data: data || {
+          placeholder: true
+        }
       })); // 递归子组件
 
       var recursiveProperties = children != null && children.length ? {
@@ -62367,7 +62361,7 @@ _teamix_icon__WEBPACK_IMPORTED_MODULE_13__/* ["default"].setConfig */ .Z.setConf
 
  // export * from './sidebar';
 
-var version = '1.2.16';
+var version = '1.2.17';
 
 
 /***/ }),
@@ -67233,6 +67227,15 @@ var ProTable = function ProTable(props) {
     },
     request: function request(params) {
       if (dataFilterForm.validate()) {
+        // 如果请求中还有翻页相关信息，需要自动设置到指定页
+        if (params != null && params[targetPageKey]) {
+          setCurrentPage(params[targetPageKey]);
+        }
+
+        if (params != null && params[targetPageSizeKey]) {
+          setPageSize(params[targetPageSizeKey]);
+        }
+
         _request(params);
       }
     },
@@ -67263,6 +67266,7 @@ var ProTable = function ProTable(props) {
       targetPageSizeKey: targetPageSizeKey,
       pageSize: pageSize
     },
+    data: data,
     dataFilterForm: dataFilterForm,
     resetTableMaxBodyHeight: function resetTableMaxBodyHeight() {
       getHeaderHeight().then(function (height) {
@@ -67464,8 +67468,10 @@ var ProTable = function ProTable(props) {
       (propsDataFilter == null ? void 0 : propsDataFilter.onFilter) && (propsDataFilter == null ? void 0 : propsDataFilter.onFilter(_objectSpread({}, toJS(dataFilterForm.values))));
 
       if (dataFilterForm.validate()) {
-        var _request3;
+        var _actionRef$current6, _request3;
 
+        // 搜索变化时，暂时先清空选择
+        (_actionRef$current6 = actionRef.current) == null ? void 0 : _actionRef$current6.clearRowSelection == null ? void 0 : _actionRef$current6.clearRowSelection();
         setCurrentPage(1); // const { mode, schema } = propsDataFilter as ProTableDataFilterProps;
         // TODO: 针对 inline 模式下的 search 组件做一下处理，如果空值切换下拉的时候不触发请求
         // if (mode === 'inline') {
@@ -67565,20 +67571,24 @@ var ProTable = function ProTable(props) {
 
   var renderFooter = function renderFooter() {
     function onChangePagination(currentPage, params) {
-      var _objectSpread3;
+      var _actionRef$current7, _objectSpread3;
 
       if (params === void 0) {
         params = {};
       }
 
+      // 翻页暂时先清空选择
+      (_actionRef$current7 = actionRef.current) == null ? void 0 : _actionRef$current7.clearRowSelection == null ? void 0 : _actionRef$current7.clearRowSelection();
       setCurrentPage(currentPage);
 
       _request(_objectSpread((_objectSpread3 = {}, _objectSpread3[targetPageKey] = currentPage, _objectSpread3), params));
     }
 
     function onChangePaginationSize(currentPageSize) {
-      var _request5;
+      var _actionRef$current8, _request5;
 
+      // 翻页暂时先清空选择
+      (_actionRef$current8 = actionRef.current) == null ? void 0 : _actionRef$current8.clearRowSelection == null ? void 0 : _actionRef$current8.clearRowSelection();
       setPageSize(currentPageSize);
       setCurrentPage(1);