tntd 1.4.20 → 1.4.21

package/lib/QueryListScene/List.js

@@ -1,89 +1,123 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+
 require("antd/lib/spin/style");
+
 var _spin = _interopRequireDefault(require("antd/lib/spin"));
+
 var _react = _interopRequireWildcard(require("react"));
+
 var _reactDom = require("react-dom");
+
 var _classnames = _interopRequireDefault(require("classnames"));
+
 var _lodash = require("lodash");
+
 var _Table = _interopRequireDefault(require("../Table"));
+
 var _locale = require("../locale");
-var _excluded = ["columns", "children", "pagination", "localPagination", "paginationSticky", "className", "qlsProps"];
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-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; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+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; }
+
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
+
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-var QueryList = /*#__PURE__*/function (_React$PureComponent) {
+
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+var QueryList =
+/*#__PURE__*/
+function (_React$PureComponent) {
   _inherits(QueryList, _React$PureComponent);
-  var _super = _createSuper(QueryList);
+
   function QueryList(props) {
     var _props$scroll;
+
     var _this;
+
     _classCallCheck(this, QueryList);
-    _this = _super.call(this, props);
+
+    _this = _possibleConstructorReturn(this, _getPrototypeOf(QueryList).call(this, props));
     _this.onWindowResize = (0, _lodash.debounce)(function () {
       var scroll = _this.state.scroll;
+
       _this.setState({
-        scroll: _objectSpread(_objectSpread({}, scroll), {}, {
+        scroll: _objectSpread({}, scroll, {
           y: window.innerHeight - (_this.initialTop || _this.props.top || 200)
         })
       });
     }, 50);
+
     _this.fetchData = function () {
       var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
       var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-        callback = _ref.callback,
-        _ref$showLoading = _ref.showLoading,
-        showLoading = _ref$showLoading === void 0 ? true : _ref$showLoading,
-        isInterval = _ref.isInterval;
+          callback = _ref.callback,
+          _ref$showLoading = _ref.showLoading,
+          showLoading = _ref$showLoading === void 0 ? true : _ref$showLoading,
+          isInterval = _ref.isInterval;
+
       var _this$props = _this.props,
-        query = _this$props.qlsProps.query,
-        defaultExpandAllRows = _this$props.defaultExpandAllRows,
-        rowKey = _this$props.rowKey,
-        actions = _this$props.actions;
+          query = _this$props.qlsProps.query,
+          defaultExpandAllRows = _this$props.defaultExpandAllRows,
+          rowKey = _this$props.rowKey,
+          actions = _this$props.actions;
       var pagination = _this.state.pagination;
       var hasPagination = _this.props.pagination !== false;
+
       if (hasPagination) {
         params = _objectSpread({
           pageSize: pagination.pageSize,
           current: pagination.current
         }, params);
       }
+
       showLoading && _this.setState({
         loading: true
-      });
+      }); // 当用户操作查询还未得到服务端响应前,不要执行轮询请求时序问题导致覆盖
 
-      // 当用户操作查询还未得到服务端响应前,不要执行轮询请求时序问题导致覆盖
       if (!isInterval) {
         _this.isFetching = true;
       }
+
       actions.setData('submittedFormData', params);
       return query((0, _lodash.pickBy)(params, function (val) {
         return val !== '' && val !== null && val !== undefined;
       })).then(function (result) {
         var dataSource = hasPagination ? result.data || [] : result;
+
         _this.setState(_objectSpread({
           loading: false,
           dataSource: dataSource,
@@ -108,42 +142,50 @@ var QueryList = /*#__PURE__*/function (_React$PureComponent) {
         callback && callback();
       });
     };
+
     _this.updateDataSource = function (dataSource) {
       _this.setState({
         dataSource: dataSource
       });
+
       _this.props.actions.setData('dataSource', dataSource);
     };
+
     _this.updatePagination = function (pagination) {
       _this.setState({
         pagination: pagination
       });
+
       _this.props.actions.setData('pagination', pagination);
     };
+
     _this.onFormChange = function (values) {
-      _this.formData = (0, _lodash.pickBy)(_objectSpread(_objectSpread({}, values), {}, {
+      _this.formData = (0, _lodash.pickBy)(_objectSpread({}, values, {
         sorter: (0, _lodash.get)(_this.formData, 'sorter'),
         filters: (0, _lodash.get)(_this.formData, 'filters')
       }), function (val) {
         return val !== undefined;
       });
     };
+
     _this.onSearch = function (values) {
       var _ref2 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-        callback = _ref2.callback,
-        _ref2$showLoading = _ref2.showLoading,
-        showLoading = _ref2$showLoading === void 0 ? true : _ref2$showLoading;
-      _this.formData = _objectSpread(_objectSpread({}, _this.formData), values);
-      // this.props.actions.setData('formData', this.formData);
+          callback = _ref2.callback,
+          _ref2$showLoading = _ref2.showLoading,
+          showLoading = _ref2$showLoading === void 0 ? true : _ref2$showLoading;
+
+      _this.formData = _objectSpread({}, _this.formData, {}, values); // this.props.actions.setData('formData', this.formData);
+
       return _this.fetchData(_this.formData, {
         callback: callback,
         showLoading: showLoading
       });
     };
+
     _this.onTableChange = function (pagination, filters, sorter) {
       var _this$props2 = _this.props,
-        actions = _this$props2.actions,
-        localPagination = _this$props2.localPagination;
+          actions = _this$props2.actions,
+          localPagination = _this$props2.localPagination;
       var tableParams = {
         pageSize: pagination.pageSize,
         current: pagination.current,
@@ -151,17 +193,17 @@ var QueryList = /*#__PURE__*/function (_React$PureComponent) {
         sorter: (0, _lodash.isEmpty)(sorter) ? undefined : sorter
       };
       console.log('onTableChange...', actions.getSubmittedFormData(), _this.formData);
-      Object.assign(_this.formData, tableParams);
-
-      // 排序变化暂时不处理，因为有时可能是前端sorter不需要走请求
+      Object.assign(_this.formData, tableParams); // 排序变化暂时不处理，因为有时可能是前端sorter不需要走请求
       // 所以暂时排序有使用者自己处理
+
       if (!localPagination) {
-        _this.fetchData(_objectSpread(_objectSpread({}, actions.getSubmittedFormData()), tableParams));
+        _this.fetchData(_objectSpread({}, actions.getSubmittedFormData(), {}, tableParams));
+
         return;
       }
-      var dataSource = _this.state.dataSource;
 
-      // 前端本地分页
+      var dataSource = _this.state.dataSource; // 前端本地分页
+
       if (localPagination) {
         _this.setState({
           dataSource: dataSource,
@@ -176,21 +218,26 @@ var QueryList = /*#__PURE__*/function (_React$PureComponent) {
         });
       }
     };
+
     _this.onTableBodyScroll = (0, _lodash.throttle)(function (evt) {
       console.log('onTableBodyScroll', evt.target.scrollTop);
+
       _this.updateIsScrollToBottom(evt.target);
     }, 50);
+
     _this.updateIsScrollToBottom = function (tableBody) {
       var isScrollToBottom = function isScrollToBottom(tableBody) {
         var scrollHeight = tableBody.scrollHeight,
-          scrollTop = tableBody.scrollTop,
-          offsetHeight = tableBody.offsetHeight;
+            scrollTop = tableBody.scrollTop,
+            offsetHeight = tableBody.offsetHeight;
         return scrollHeight === scrollTop + offsetHeight;
       };
+
       _this.setState({
         hasScrollToBottom: isScrollToBottom(tableBody)
       });
     };
+
     _this.state = {
       loading: false,
       dataSource: [],
@@ -200,40 +247,48 @@ var QueryList = /*#__PURE__*/function (_React$PureComponent) {
         total: 0
       },
       scroll: props.scroll,
-      hasScrollToBottom: !((_props$scroll = props.scroll) != null && _props$scroll.y)
+      hasScrollToBottom: !((_props$scroll = props.scroll) == null ? void 0 : _props$scroll.y)
     };
-    _this.tableRef = /*#__PURE__*/(0, _react.createRef)();
+    _this.tableRef = (0, _react.createRef)();
     var _actions = props.actions;
+
     _actions.on('search', _this.onSearch);
+
     _actions.on('setTableDataSource', _this.updateDataSource);
+
     _actions.on('setPagination', _this.updatePagination);
+
     _actions.on('setFormData', _this.onFormChange);
+
     return _this;
   }
+
   _createClass(QueryList, [{
     key: "render",
     value: function render() {
       var _this$props3 = this.props,
-        columns = _this$props3.columns,
-        children = _this$props3.children,
-        pagination = _this$props3.pagination,
-        _this$props3$localPag = _this$props3.localPagination,
-        localPagination = _this$props3$localPag === void 0 ? false : _this$props3$localPag,
-        _this$props3$paginati = _this$props3.paginationSticky,
-        paginationSticky = _this$props3$paginati === void 0 ? false : _this$props3$paginati,
-        _this$props3$classNam = _this$props3.className,
-        className = _this$props3$classNam === void 0 ? '' : _this$props3$classNam,
-        qlsProps = _this$props3.qlsProps,
-        rest = _objectWithoutProperties(_this$props3, _excluded);
+          columns = _this$props3.columns,
+          children = _this$props3.children,
+          pagination = _this$props3.pagination,
+          _this$props3$localPag = _this$props3.localPagination,
+          localPagination = _this$props3$localPag === void 0 ? false : _this$props3$localPag,
+          _this$props3$paginati = _this$props3.paginationSticky,
+          paginationSticky = _this$props3$paginati === void 0 ? false : _this$props3$paginati,
+          _this$props3$classNam = _this$props3.className,
+          className = _this$props3$classNam === void 0 ? '' : _this$props3$classNam,
+          qlsProps = _this$props3.qlsProps,
+          rest = _objectWithoutProperties(_this$props3, ["columns", "children", "pagination", "localPagination", "paginationSticky", "className", "qlsProps"]);
+
       var _this$state = this.state,
-        dataSource = _this$state.dataSource,
-        loading = _this$state.loading,
-        _this$state$expandedR = _this$state.expandedRowKeys,
-        expandedRowKeys = _this$state$expandedR === void 0 ? [] : _this$state$expandedR,
-        scroll = _this$state.scroll,
-        hasScrollToBottom = _this$state.hasScrollToBottom;
+          dataSource = _this$state.dataSource,
+          loading = _this$state.loading,
+          _this$state$expandedR = _this$state.expandedRowKeys,
+          expandedRowKeys = _this$state$expandedR === void 0 ? [] : _this$state$expandedR,
+          scroll = _this$state.scroll,
+          hasScrollToBottom = _this$state.hasScrollToBottom;
       var hasPagination = typeof pagination !== 'undefined' ? pagination : true;
-      var paginationInfo = _objectSpread(_objectSpread({}, this.state.pagination), {}, {
+
+      var paginationInfo = _objectSpread({}, this.state.pagination, {
         // size: 'small',
         showQuickJumper: true,
         showSizeChanger: true,
@@ -241,18 +296,20 @@ var QueryList = /*#__PURE__*/function (_React$PureComponent) {
           return (0, _locale.getText)('totalRecords', (0, _locale.getLanguage)(), total);
         }
       }, pagination || {});
+
       var expandProps = _objectSpread({}, rest.defaultExpandAllRows ? {
         expandedRowKeys: expandedRowKeys,
         onExpandedRowsChange: this.onExpandedRowsChange
       } : {});
-      return /*#__PURE__*/_react["default"].createElement("div", {
+
+      return _react["default"].createElement("div", {
         className: (0, _classnames["default"])("tnt-querylistscene-list ".concat(className), {
           paginationSticky: paginationSticky,
           hasScrollToBottom: hasScrollToBottom
         })
-      }, /*#__PURE__*/_react["default"].createElement(_spin["default"], {
+      }, _react["default"].createElement(_spin["default"], {
         spinning: loading
-      }, /*#__PURE__*/_react["default"].createElement(_Table["default"], _extends({
+      }, _react["default"].createElement(_Table["default"], _extends({
         ref: this.tableRef
       }, expandProps, rest, columns ? {
         columns: columns
@@ -267,11 +324,13 @@ var QueryList = /*#__PURE__*/function (_React$PureComponent) {
     key: "componentDidMount",
     value: function componentDidMount() {
       var _this2 = this,
-        _this$state$scroll;
+          _this$state$scroll;
+
       var _this$props4 = this.props,
-        qlsProps = _this$props4.qlsProps,
-        actions = _this$props4.actions;
-      this.formData = _objectSpread(_objectSpread({}, actions.getFormData() || {}), qlsProps.memory ? actions.getPagination() : {});
+          qlsProps = _this$props4.qlsProps,
+          actions = _this$props4.actions;
+      this.formData = _objectSpread({}, actions.getFormData() || {}, {}, qlsProps.memory ? actions.getPagination() : {});
+
       if (!qlsProps.initSearch) {
         // 默认进来不请求
         this.fetchData(this.formData)["finally"](function () {
@@ -295,12 +354,15 @@ var QueryList = /*#__PURE__*/function (_React$PureComponent) {
                 }, ms);
               }
             };
+
             doIntervalQuery(qlsProps.interval);
           }
         });
       }
-      if ((_this$state$scroll = this.state.scroll) != null && _this$state$scroll.y) {
+
+      if ((_this$state$scroll = this.state.scroll) == null ? void 0 : _this$state$scroll.y) {
         window.addEventListener('resize', this.onWindowResize);
+
         if (this.tableRef.current) {
           // table内垂直滚动，需要动态设置分页组件上阴影样式
           var tableBody = (0, _reactDom.findDOMNode)(this.tableRef.current).querySelector('.ant-table-body');
@@ -323,7 +385,9 @@ var QueryList = /*#__PURE__*/function (_React$PureComponent) {
       this.timmer && clearTimeout(this.timmer);
     }
   }]);
+
   return QueryList;
 }(_react["default"].PureComponent);
+
 exports["default"] = QueryList;
 ;

package/lib/QueryListScene/QueryForm.js

@@ -1,110 +1,147 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+
 var _react = _interopRequireDefault(require("react"));
+
 var _classnames2 = _interopRequireDefault(require("classnames"));
+
 var _QueryForm = _interopRequireDefault(require("../QueryForm"));
-var _excluded = ["className", "actions", "extraActions", "extralActions", "qlsProps"];
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-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; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+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; }
+
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
+
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
 var clsPrefix = 'tnt-querylistscene-queryform';
-var QueryForm = /*#__PURE__*/function (_React$PureComponent) {
+
+var QueryForm =
+/*#__PURE__*/
+function (_React$PureComponent) {
   _inherits(QueryForm, _React$PureComponent);
-  var _super = _createSuper(QueryForm);
+
   function QueryForm(props) {
     var _this;
+
     _classCallCheck(this, QueryForm);
-    _this = _super.call(this, props);
+
+    _this = _possibleConstructorReturn(this, _getPrototypeOf(QueryForm).call(this, props));
+
     _this.onSearch = function () {
       var _this$props = _this.props,
-        onSearch = _this$props.onSearch,
-        actions = _this$props.actions;
+          onSearch = _this$props.onSearch,
+          actions = _this$props.actions;
       var values = actions.getFormData();
-      var params = _objectSpread(_objectSpread({}, values), {}, {
+
+      var params = _objectSpread({}, values, {
         current: 1
-      });
+      }); // memory 与 url解析setForm时 监听事件异步
+
 
-      // memory 与 url解析setForm时 监听事件异步
       actions.setData('formData', values);
       Promise.resolve().then(function () {
         onSearch && onSearch(params);
         actions.emit('search', params);
       });
     };
+
     _this.onReset = function () {
       var _this$props2 = _this.props,
-        initialValues = _this$props2.initialValues,
-        onReset = _this$props2.onReset,
-        actions = _this$props2.actions;
+          initialValues = _this$props2.initialValues,
+          onReset = _this$props2.onReset,
+          actions = _this$props2.actions;
       actions.setFormData(initialValues, false);
       onReset && onReset(initialValues);
+
       _this.onSearch();
     };
+
     _this.onChange = function (newValues, changedInfo) {
       var _this$props3 = _this.props,
-        onChange = _this$props3.onChange,
-        actions = _this$props3.actions;
+          onChange = _this$props3.onChange,
+          actions = _this$props3.actions;
+
       for (var _len = arguments.length, rest = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
         rest[_key - 2] = arguments[_key];
       }
+
       onChange && onChange.apply(void 0, [newValues, changedInfo].concat(rest));
       actions.setFormData(newValues, false);
     };
+
     _this.setFormData = function (data, needSearch) {
       var actions = _this.props.actions;
       actions.setData('formData', data);
+
       _this.form.setValues(data);
+
       needSearch && _this.onSearch();
     };
+
     _this.resetFormData = function (needSearch) {
       var _this$props4 = _this.props,
-        initialValues = _this$props4.initialValues,
-        actions = _this$props4.actions;
+          initialValues = _this$props4.initialValues,
+          actions = _this$props4.actions;
       actions.setFormData(initialValues, needSearch);
+
       _this.form.resetValues();
     };
+
     var _actions = props.actions,
-      form = props.form;
+        form = props.form;
     _this.form = form || _QueryForm["default"].createForm();
+
     _actions.on('setFormData', _this.setFormData);
+
     _actions.on('resetFormData', _this.resetFormData);
+
     return _this;
   }
+
   _createClass(QueryForm, [{
     key: "render",
     value: function render() {
       var _this$props5 = this.props,
-        className = _this$props5.className,
-        actions = _this$props5.actions,
-        extraActions = _this$props5.extraActions,
-        extralActions = _this$props5.extralActions,
-        qlsProps = _this$props5.qlsProps,
-        props = _objectWithoutProperties(_this$props5, _excluded);
-      return /*#__PURE__*/_react["default"].createElement(_QueryForm["default"], _extends({}, props, {
+          className = _this$props5.className,
+          actions = _this$props5.actions,
+          extraActions = _this$props5.extraActions,
+          extralActions = _this$props5.extralActions,
+          qlsProps = _this$props5.qlsProps,
+          props = _objectWithoutProperties(_this$props5, ["className", "actions", "extraActions", "extralActions", "qlsProps"]);
+
+      return _react["default"].createElement(_QueryForm["default"], _extends({}, props, {
         form: this.form,
-        className: (0, _classnames2["default"])(clsPrefix, _defineProperty({}, className, className))
-        // 前期拼写错误，导致需要兼容错误的api
+        className: (0, _classnames2["default"])(clsPrefix, _defineProperty({}, className, className)) // 前期拼写错误，导致需要兼容错误的api
         ,
         extraActions: extraActions || extralActions,
         onChange: this.onChange,
@@ -116,12 +153,13 @@ var QueryForm = /*#__PURE__*/function (_React$PureComponent) {
     key: "componentDidMount",
     value: function componentDidMount() {
       var _this$props6 = this.props,
-        _this$props6$initialV = _this$props6.initialValues,
-        initialValues = _this$props6$initialV === void 0 ? {} : _this$props6$initialV,
-        actions = _this$props6.actions,
-        qlsProps = _this$props6.qlsProps;
+          _this$props6$initialV = _this$props6.initialValues,
+          initialValues = _this$props6$initialV === void 0 ? {} : _this$props6$initialV,
+          actions = _this$props6.actions,
+          qlsProps = _this$props6.qlsProps;
+
       if (qlsProps.memory) {
-        actions.setFormData(_objectSpread(_objectSpread({}, initialValues), actions.getFormData()), false);
+        actions.setFormData(_objectSpread({}, initialValues, {}, actions.getFormData()), false);
       } else {
         actions.setData('formData', initialValues);
       }
@@ -134,8 +172,10 @@ var QueryForm = /*#__PURE__*/function (_React$PureComponent) {
       actions.removeListener('resetFormData', this.resetFormData);
     }
   }]);
+
   return QueryForm;
 }(_react["default"].PureComponent);
+
 exports["default"] = QueryForm;
 ;
 QueryForm.Field = _QueryForm["default"].Field;