tntd 1.3.58 → 1.3.63

package/babel.config.js

@@ -26,7 +26,7 @@ const plugins = [
         {
             loose: true
         }
-    ],
+    ]
     // ['babel-plugin-styless']
 ];
 
@@ -35,7 +35,7 @@ if (process.env.BUILD_ENV !== 'umd' && !process.env.WEBPACK_DEV_SERVER) {
         'import',
         {
             libraryName: 'antd',
-            // libraryDirectory: 'es',
+            libraryDirectory: 'es',
             style: true,
 
         }

package/components/Layout/Application.js

@@ -81,7 +81,7 @@ const AppContent = props => {
                     ).map(({ appKey: key }) => (
                         <AppItem
                             key={key}
-                            className={cn({ active: appKey === key})}
+                            className={cn({ active: appKey === key })}
                             onClick={changeApp.bind(this, key)}
                         >
                             <img

package/components/QueryForm/Field/index.js

@@ -1,3 +1,4 @@
+import { PureComponent } from 'react';
 import { Form } from 'antd';
 import { get } from 'lodash';
 import fieldsMap, { getFieldWidth } from './fieldsMap';
@@ -6,7 +7,7 @@ const FormItem = Form.Item;
 
 const isInput = type => ['input', 'string', 'search'].includes(type);
 
-export default class Field extends React.PureComponent {
+export default class Field extends PureComponent {
     constructor(props) {
         super(props);
 

package/components/QueryListScene/List.js

@@ -3,7 +3,7 @@
  * @author you.zhang
  */
 import React, { createRef } from 'react';
-import { findDOMNode } from 'react-dom'; 
+import { findDOMNode } from 'react-dom';
 import cn from 'classnames';
 import { get, pickBy, isEmpty, debounce, throttle } from 'lodash';
 import { Spin } from 'antd';
@@ -91,7 +91,7 @@ export default class QueryList extends React.PureComponent {
     }
 
     onWindowResize = debounce(() => {
-        const {scroll} = this.state;
+        const { scroll } = this.state;
 
         this.setState({
             scroll: {
@@ -102,7 +102,7 @@ export default class QueryList extends React.PureComponent {
     }, 50)
 
     componentDidMount() {
-        const {qlsProps, actions} = this.props;
+        const { qlsProps, actions } = this.props;
 
         this.formData = {
             ...(actions.getFormData() || {}),
@@ -110,32 +110,33 @@ export default class QueryList extends React.PureComponent {
             ...(qlsProps.memory ? actions.getPagination() : {})
         };
 
-        this.fetchData(this.formData).finally(() => {
-            // 轮询
-            if (qlsProps.interval && !this.isUnmounted) {
-                const doIntervalQuery = ms => {
-                    // 组件unmounted后，不执行轮训逻辑
-                    if (!this.isUnmounted) {
-                        this.timmer = setTimeout(() => {
-                            // 如果有查询请求还未结束，则该次轮询不执行，重新设置下次轮询
-                            if (!this.isFetching) {
-                                this.fetchData(actions.getSubmittedFormData(), {
-                                    isInterval: true,
-                                    showLoading: false
-                                }).then(() => {
+        if (!qlsProps.initSearch) {  // 默认进来不请求
+            this.fetchData(this.formData).finally(() => {
+                // 轮询
+                if (qlsProps.interval && !this.isUnmounted) {
+                    const doIntervalQuery = ms => {
+                        // 组件unmounted后，不执行轮训逻辑
+                        if (!this.isUnmounted) {
+                            this.timmer = setTimeout(() => {
+                                // 如果有查询请求还未结束，则该次轮询不执行，重新设置下次轮询
+                                if (!this.isFetching) {
+                                    this.fetchData(actions.getSubmittedFormData(), {
+                                        isInterval: true,
+                                        showLoading: false
+                                    }).then(() => {
+                                        doIntervalQuery(ms);
+                                    });
+                                }
+                                else {
                                     doIntervalQuery(ms);
-                                });
-                            }
-                            else {
-                                doIntervalQuery(ms);
-                            }
-                        }, ms);
-                    }
-                };
-                doIntervalQuery(qlsProps.interval);
-            }
-        });
-
+                                }
+                            }, ms);
+                        }
+                    };
+                    doIntervalQuery(qlsProps.interval);
+                }
+            });
+        }
         if (this.state.scroll?.y) {
             window.addEventListener('resize', this.onWindowResize);
 
@@ -169,7 +170,7 @@ export default class QueryList extends React.PureComponent {
             rowKey,
             actions
         } = this.props;
-        const {pagination} = this.state;
+        const { pagination } = this.state;
         const hasPagination = this.props.pagination !== false;
 
         if (hasPagination) {
@@ -245,30 +246,34 @@ export default class QueryList extends React.PureComponent {
         }, val => val !== undefined);
     }
 
-    onSearch = (values, {callback, showLoading = true} = {}) => {
+    onSearch = (values, { callback, showLoading = true } = {}) => {
         this.formData = {
             ...this.formData,
             ...values
         };
         // this.props.actions.setData('formData', this.formData);
-        return this.fetchData(this.formData, {callback, showLoading});
+        return this.fetchData(this.formData, { callback, showLoading });
     };
 
     onTableChange = (pagination, filters, sorter) => {
         const { actions, localPagination } = this.props;
-
-        this.formData = {
-            ...this.formData,
+        const tableParams = {
             pageSize: pagination.pageSize,
             current: pagination.current,
             filters: isEmpty(filters) ? undefined : filters,
             sorter: isEmpty(sorter) ? undefined : sorter
         };
+        console.log('onTableChange...', actions.getSubmittedFormData(), this.formData);
+
+        Object.assign(this.formData, tableParams);
 
         // 排序变化暂时不处理，因为有时可能是前端sorter不需要走请求
         // 所以暂时排序有使用者自己处理
         if (!localPagination) {
-            this.fetchData(this.formData);
+            this.fetchData({
+                ...actions.getSubmittedFormData(),
+                ...tableParams
+            });
             return;
         }
 
@@ -292,7 +297,7 @@ export default class QueryList extends React.PureComponent {
             );
         }
     };
-    
+
     onTableBodyScroll = throttle(evt => {
         console.log('onTableBodyScroll', evt.target.scrollTop);
         this.updateIsScrollToBottom(evt.target);
@@ -306,7 +311,7 @@ export default class QueryList extends React.PureComponent {
         };
 
         this.setState({
-            hasScrollToBottom: isScrollToBottom(tableBody) 
-        }); 
+            hasScrollToBottom: isScrollToBottom(tableBody)
+        });
     }
 };

package/lib/ArrayInput/index.js

@@ -7,21 +7,21 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = ArrayInput;
 
-require("antd/lib/row/style");
+require("antd/es/row/style");
 
-var _row = _interopRequireDefault(require("antd/lib/row"));
+var _row = _interopRequireDefault(require("antd/es/row"));
 
-require("antd/lib/tooltip/style");
+require("antd/es/tooltip/style");
 
-var _tooltip = _interopRequireDefault(require("antd/lib/tooltip"));
+var _tooltip = _interopRequireDefault(require("antd/es/tooltip"));
 
-require("antd/lib/col/style");
+require("antd/es/col/style");
 
-var _col = _interopRequireDefault(require("antd/lib/col"));
+var _col = _interopRequireDefault(require("antd/es/col"));
 
-require("antd/lib/table/style");
+require("antd/es/table/style");
 
-var _table = _interopRequireDefault(require("antd/lib/table"));
+var _table = _interopRequireDefault(require("antd/es/table"));
 
 var _react = _interopRequireWildcard(require("react"));
 

package/lib/Columns/index.js

@@ -5,13 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = exports.Item = void 0;
 
-require("antd/lib/row/style");
+require("antd/es/row/style");
 
-var _row = _interopRequireDefault(require("antd/lib/row"));
+var _row = _interopRequireDefault(require("antd/es/row"));
 
-require("antd/lib/col/style");
+require("antd/es/col/style");
 
-var _col = _interopRequireDefault(require("antd/lib/col"));
+var _col = _interopRequireDefault(require("antd/es/col"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 

package/lib/DevelopmentLogin/LoginModal.js

@@ -5,21 +5,21 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-require("antd/lib/modal/style");
+require("antd/es/modal/style");
 
-var _modal = _interopRequireDefault(require("antd/lib/modal"));
+var _modal = _interopRequireDefault(require("antd/es/modal"));
 
-require("antd/lib/form/style");
+require("antd/es/form/style");
 
-var _form = _interopRequireDefault(require("antd/lib/form"));
+var _form = _interopRequireDefault(require("antd/es/form"));
 
-require("antd/lib/input/style");
+require("antd/es/input/style");
 
-var _input = _interopRequireDefault(require("antd/lib/input"));
+var _input = _interopRequireDefault(require("antd/es/input"));
 
-require("antd/lib/message/style");
+require("antd/es/message/style");
 
-var _message2 = _interopRequireDefault(require("antd/lib/message"));
+var _message2 = _interopRequireDefault(require("antd/es/message"));
 
 var _react = require("react");
 

package/lib/Ellipsis/index.js

@@ -5,13 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-require("antd/lib/tooltip/style");
+require("antd/es/tooltip/style");
 
-var _tooltip = _interopRequireDefault(require("antd/lib/tooltip"));
+var _tooltip = _interopRequireDefault(require("antd/es/tooltip"));
 
-require("antd/lib/popover/style");
+require("antd/es/popover/style");
 
-var _popover2 = _interopRequireDefault(require("antd/lib/popover"));
+var _popover2 = _interopRequireDefault(require("antd/es/popover"));
 
 var _react = require("react");
 

package/lib/Handle/index.js

@@ -5,17 +5,17 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-require("antd/lib/dropdown/style");
+require("antd/es/dropdown/style");
 
-var _dropdown = _interopRequireDefault(require("antd/lib/dropdown"));
+var _dropdown = _interopRequireDefault(require("antd/es/dropdown"));
 
-require("antd/lib/menu/style");
+require("antd/es/menu/style");
 
-var _menu = _interopRequireDefault(require("antd/lib/menu"));
+var _menu = _interopRequireDefault(require("antd/es/menu"));
 
-require("antd/lib/divider/style");
+require("antd/es/divider/style");
 
-var _divider = _interopRequireDefault(require("antd/lib/divider"));
+var _divider = _interopRequireDefault(require("antd/es/divider"));
 
 var _react = require("react");
 

package/lib/Layout/AppList.js

@@ -7,25 +7,25 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-require("antd/lib/dropdown/style");
+require("antd/es/dropdown/style");
 
-var _dropdown = _interopRequireDefault(require("antd/lib/dropdown"));
+var _dropdown = _interopRequireDefault(require("antd/es/dropdown"));
 
-require("antd/lib/input/style");
+require("antd/es/input/style");
 
-var _input = _interopRequireDefault(require("antd/lib/input"));
+var _input = _interopRequireDefault(require("antd/es/input"));
 
-require("antd/lib/tree-select/style");
+require("antd/es/tree-select/style");
 
-var _treeSelect = _interopRequireDefault(require("antd/lib/tree-select"));
+var _treeSelect = _interopRequireDefault(require("antd/es/tree-select"));
 
-require("antd/lib/menu/style");
+require("antd/es/menu/style");
 
-var _menu = _interopRequireDefault(require("antd/lib/menu"));
+var _menu = _interopRequireDefault(require("antd/es/menu"));
 
-require("antd/lib/select/style");
+require("antd/es/select/style");
 
-var _select = _interopRequireDefault(require("antd/lib/select"));
+var _select = _interopRequireDefault(require("antd/es/select"));
 
 var _react = require("react");
 

package/lib/Layout/Application.js

@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-require("antd/lib/popover/style");
+require("antd/es/popover/style");
 
-var _popover = _interopRequireDefault(require("antd/lib/popover"));
+var _popover = _interopRequireDefault(require("antd/es/popover"));
 
 var _react = require("react");
 

package/lib/Layout/Avatar.js

@@ -7,13 +7,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-require("antd/lib/popover/style");
+require("antd/es/popover/style");
 
-var _popover = _interopRequireDefault(require("antd/lib/popover"));
+var _popover = _interopRequireDefault(require("antd/es/popover"));
 
-require("antd/lib/button/style");
+require("antd/es/button/style");
 
-var _button = _interopRequireDefault(require("antd/lib/button"));
+var _button = _interopRequireDefault(require("antd/es/button"));
 
 var _react = require("react");
 

package/lib/Layout/CompatibleLanguage.js

@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-require("antd/lib/popover/style");
+require("antd/es/popover/style");
 
-var _popover = _interopRequireDefault(require("antd/lib/popover"));
+var _popover = _interopRequireDefault(require("antd/es/popover"));
 
 var _react = require("react");
 

package/lib/Layout/EnterpriseLayout/Avatar.js

@@ -7,17 +7,17 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-require("antd/lib/popover/style");
+require("antd/es/popover/style");
 
-var _popover = _interopRequireDefault(require("antd/lib/popover"));
+var _popover = _interopRequireDefault(require("antd/es/popover"));
 
-require("antd/lib/row/style");
+require("antd/es/row/style");
 
-var _row = _interopRequireDefault(require("antd/lib/row"));
+var _row = _interopRequireDefault(require("antd/es/row"));
 
-require("antd/lib/divider/style");
+require("antd/es/divider/style");
 
-var _divider = _interopRequireDefault(require("antd/lib/divider"));
+var _divider = _interopRequireDefault(require("antd/es/divider"));
 
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 

package/lib/Layout/EnterpriseLayout/Theme.js

@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-require("antd/lib/row/style");
+require("antd/es/row/style");
 
-var _row = _interopRequireDefault(require("antd/lib/row"));
+var _row = _interopRequireDefault(require("antd/es/row"));
 
 var _react = require("react");
 

package/lib/Layout/HeaderActions.js

@@ -7,9 +7,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-require("antd/lib/divider/style");
+require("antd/es/divider/style");
 
-var _divider = _interopRequireDefault(require("antd/lib/divider"));
+var _divider = _interopRequireDefault(require("antd/es/divider"));
 
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
 

package/lib/Layout/Layout.js

@@ -7,9 +7,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-require("antd/lib/layout/style");
+require("antd/es/layout/style");
 
-var _layout = _interopRequireDefault(require("antd/lib/layout"));
+var _layout = _interopRequireDefault(require("antd/es/layout"));
 
 var _react = require("react");
 

package/lib/Layout/OrgAppList.js

@@ -7,17 +7,17 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-require("antd/lib/select/style");
+require("antd/es/select/style");
 
-var _select = _interopRequireDefault(require("antd/lib/select"));
+var _select = _interopRequireDefault(require("antd/es/select"));
 
-require("antd/lib/tree-select/style");
+require("antd/es/tree-select/style");
 
-var _treeSelect = _interopRequireDefault(require("antd/lib/tree-select"));
+var _treeSelect = _interopRequireDefault(require("antd/es/tree-select"));
 
-require("antd/lib/input/style");
+require("antd/es/input/style");
 
-var _input = _interopRequireDefault(require("antd/lib/input"));
+var _input = _interopRequireDefault(require("antd/es/input"));
 
 var _react = require("react");
 

package/lib/Layout/SideMenu.js

@@ -7,9 +7,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-require("antd/lib/menu/style");
+require("antd/es/menu/style");
 
-var _menu = _interopRequireDefault(require("antd/lib/menu"));
+var _menu = _interopRequireDefault(require("antd/es/menu"));
 
 var _react = require("react");
 

package/lib/Layout/Theme.js

@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-require("antd/lib/popover/style");
+require("antd/es/popover/style");
 
-var _popover = _interopRequireDefault(require("antd/lib/popover"));
+var _popover = _interopRequireDefault(require("antd/es/popover"));
 
 var _react = require("react");
 

package/lib/Layout/paaslayout/index.js

@@ -7,9 +7,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-require("antd/lib/layout/style");
+require("antd/es/layout/style");
 
-var _layout = _interopRequireDefault(require("antd/lib/layout"));
+var _layout = _interopRequireDefault(require("antd/es/layout"));
 
 var _react = require("react");
 

package/lib/LoadingButton/index.js

@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-require("antd/lib/button/style");
+require("antd/es/button/style");
 
-var _button = _interopRequireDefault(require("antd/lib/button"));
+var _button = _interopRequireDefault(require("antd/es/button"));
 
 var _react = require("react");
 

package/lib/Modal/index.js

@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-require("antd/lib/modal/style");
+require("antd/es/modal/style");
 
-var _modal = _interopRequireDefault(require("antd/lib/modal"));
+var _modal = _interopRequireDefault(require("antd/es/modal"));
 
 var _react = require("react");
 

package/lib/Page/Box.js

@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-require("antd/lib/card/style");
+require("antd/es/card/style");
 
-var _card = _interopRequireDefault(require("antd/lib/card"));
+var _card = _interopRequireDefault(require("antd/es/card"));
 
 var _react = _interopRequireDefault(require("react"));
 

package/lib/QueryForm/Field/Checkbox.js

@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-require("antd/lib/checkbox/style");
+require("antd/es/checkbox/style");
 
-var _checkbox = _interopRequireDefault(require("antd/lib/checkbox"));
+var _checkbox = _interopRequireDefault(require("antd/es/checkbox"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 

package/lib/QueryForm/Field/Select.js

@@ -7,9 +7,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-require("antd/lib/select/style");
+require("antd/es/select/style");
 
-var _select = _interopRequireDefault(require("antd/lib/select"));
+var _select = _interopRequireDefault(require("antd/es/select"));
 
 var _react = _interopRequireWildcard(require("react"));
 

package/lib/QueryForm/Field/SelectInput.js

@@ -7,13 +7,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-require("antd/lib/input/style");
+require("antd/es/input/style");
 
-var _input = _interopRequireDefault(require("antd/lib/input"));
+var _input = _interopRequireDefault(require("antd/es/input"));
 
-require("antd/lib/select/style");
+require("antd/es/select/style");
 
-var _select = _interopRequireDefault(require("antd/lib/select"));
+var _select = _interopRequireDefault(require("antd/es/select"));
 
 var _react = _interopRequireWildcard(require("react"));
 

package/lib/QueryForm/Field/fieldsMap.js

@@ -5,17 +5,17 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = exports.getFieldWidth = exports.defaultFieldWidth = void 0;
 
-require("antd/lib/date-picker/style");
+require("antd/es/date-picker/style");
 
-var _datePicker = _interopRequireDefault(require("antd/lib/date-picker"));
+var _datePicker = _interopRequireDefault(require("antd/es/date-picker"));
 
-require("antd/lib/input-number/style");
+require("antd/es/input-number/style");
 
-var _inputNumber = _interopRequireDefault(require("antd/lib/input-number"));
+var _inputNumber = _interopRequireDefault(require("antd/es/input-number"));
 
-require("antd/lib/input/style");
+require("antd/es/input/style");
 
-var _input = _interopRequireDefault(require("antd/lib/input"));
+var _input = _interopRequireDefault(require("antd/es/input"));
 
 var _Select = _interopRequireDefault(require("./Select"));
 

package/lib/QueryForm/Field/index.js

@@ -5,9 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-require("antd/lib/form/style");
+require("antd/es/form/style");
 
-var _form = _interopRequireDefault(require("antd/lib/form"));
+var _form = _interopRequireDefault(require("antd/es/form"));
+
+var _react = require("react");
 
 var _lodash = require("lodash");
 
@@ -53,8 +55,8 @@ var isInput = function isInput(type) {
 
 var Field =
 /*#__PURE__*/
-function (_React$PureComponent) {
-  _inherits(Field, _React$PureComponent);
+function (_PureComponent) {
+  _inherits(Field, _PureComponent);
 
   function Field(props) {
     var _this;
@@ -167,6 +169,6 @@ function (_React$PureComponent) {
   }]);
 
   return Field;
-}(React.PureComponent);
+}(_react.PureComponent);
 
 exports["default"] = Field;

package/lib/QueryForm/index.js

@@ -5,21 +5,21 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-require("antd/lib/form/style");
+require("antd/es/form/style");
 
-var _form = _interopRequireDefault(require("antd/lib/form"));
+var _form = _interopRequireDefault(require("antd/es/form"));
 
-require("antd/lib/drawer/style");
+require("antd/es/drawer/style");
 
-var _drawer = _interopRequireDefault(require("antd/lib/drawer"));
+var _drawer = _interopRequireDefault(require("antd/es/drawer"));
 
-require("antd/lib/badge/style");
+require("antd/es/badge/style");
 
-var _badge = _interopRequireDefault(require("antd/lib/badge"));
+var _badge = _interopRequireDefault(require("antd/es/badge"));
 
-require("antd/lib/button/style");
+require("antd/es/button/style");
 
-var _button = _interopRequireDefault(require("antd/lib/button"));
+var _button = _interopRequireDefault(require("antd/es/button"));
 
 var _react = _interopRequireWildcard(require("react"));
 

package/lib/QueryListScene/List.js

@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-require("antd/lib/spin/style");
+require("antd/es/spin/style");
 
-var _spin = _interopRequireDefault(require("antd/lib/spin"));
+var _spin = _interopRequireDefault(require("antd/es/spin"));
 
 var _react = _interopRequireWildcard(require("react"));
 
@@ -186,16 +186,18 @@ function (_React$PureComponent) {
       var _this$props2 = _this.props,
           actions = _this$props2.actions,
           localPagination = _this$props2.localPagination;
-      _this.formData = _objectSpread({}, _this.formData, {
+      var tableParams = {
         pageSize: pagination.pageSize,
         current: pagination.current,
         filters: (0, _lodash.isEmpty)(filters) ? undefined : filters,
         sorter: (0, _lodash.isEmpty)(sorter) ? undefined : sorter
-      }); // 排序变化暂时不处理，因为有时可能是前端sorter不需要走请求
+      };
+      console.log('onTableChange...', actions.getSubmittedFormData(), _this.formData);
+      Object.assign(_this.formData, tableParams); // 排序变化暂时不处理，因为有时可能是前端sorter不需要走请求
       // 所以暂时排序有使用者自己处理
 
       if (!localPagination) {
-        _this.fetchData(_this.formData);
+        _this.fetchData(_objectSpread({}, actions.getSubmittedFormData(), {}, tableParams));
 
         return;
       }
@@ -328,31 +330,35 @@ function (_React$PureComponent) {
           qlsProps = _this$props4.qlsProps,
           actions = _this$props4.actions;
       this.formData = _objectSpread({}, actions.getFormData() || {}, {}, qlsProps.memory ? actions.getPagination() : {});
-      this.fetchData(this.formData)["finally"](function () {
-        // 轮询
-        if (qlsProps.interval && !_this2.isUnmounted) {
-          var doIntervalQuery = function doIntervalQuery(ms) {
-            // 组件unmounted后，不执行轮训逻辑
-            if (!_this2.isUnmounted) {
-              _this2.timmer = setTimeout(function () {
-                // 如果有查询请求还未结束，则该次轮询不执行，重新设置下次轮询
-                if (!_this2.isFetching) {
-                  _this2.fetchData(actions.getSubmittedFormData(), {
-                    isInterval: true,
-                    showLoading: false
-                  }).then(function () {
+
+      if (!qlsProps.initSearch) {
+        // 默认进来不请求
+        this.fetchData(this.formData)["finally"](function () {
+          // 轮询
+          if (qlsProps.interval && !_this2.isUnmounted) {
+            var doIntervalQuery = function doIntervalQuery(ms) {
+              // 组件unmounted后，不执行轮训逻辑
+              if (!_this2.isUnmounted) {
+                _this2.timmer = setTimeout(function () {
+                  // 如果有查询请求还未结束，则该次轮询不执行，重新设置下次轮询
+                  if (!_this2.isFetching) {
+                    _this2.fetchData(actions.getSubmittedFormData(), {
+                      isInterval: true,
+                      showLoading: false
+                    }).then(function () {
+                      doIntervalQuery(ms);
+                    });
+                  } else {
                     doIntervalQuery(ms);
-                  });
-                } else {
-                  doIntervalQuery(ms);
-                }
-              }, ms);
-            }
-          };
-
-          doIntervalQuery(qlsProps.interval);
-        }
-      });
+                  }
+                }, ms);
+              }
+            };
+
+            doIntervalQuery(qlsProps.interval);
+          }
+        });
+      }
 
       if ((_this$state$scroll = this.state.scroll) == null ? void 0 : _this$state$scroll.y) {
         window.addEventListener('resize', this.onWindowResize);

package/lib/Select/index.js

@@ -5,13 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-require("antd/lib/empty/style");
+require("antd/es/empty/style");
 
-var _empty = _interopRequireDefault(require("antd/lib/empty"));
+var _empty = _interopRequireDefault(require("antd/es/empty"));
 
-require("antd/lib/select/style");
+require("antd/es/select/style");
 
-var _select = _interopRequireDefault(require("antd/lib/select"));
+var _select = _interopRequireDefault(require("antd/es/select"));
 
 var _react = _interopRequireWildcard(require("react"));
 

package/lib/Table/ResizableTable/index.js

@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-require("antd/lib/table/style");
+require("antd/es/table/style");
 
-var _table = _interopRequireDefault(require("antd/lib/table"));
+var _table = _interopRequireDefault(require("antd/es/table"));
 
 var _react = require("react");
 

package/lib/Table/index.js

@@ -7,9 +7,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-require("antd/lib/table/style");
+require("antd/es/table/style");
 
-var _table = _interopRequireDefault(require("antd/lib/table"));
+var _table = _interopRequireDefault(require("antd/es/table"));
 
 var _react = _interopRequireWildcard(require("react"));
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tntd",
-    "version": "1.3.58",
+    "version": "1.3.63",
     "description": "ued tnt design",
     "main": "lib/index.js",
     "scripts": {