cloud-b2b 1.1.64 → 1.1.66

package/lib/Search2/Search.js

@@ -27,9 +27,7 @@ var _bind = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stabl
 var _sort = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/sort"));
 var _isArray = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/array/is-array"));
 var _stringify = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/json/stringify"));
-var _splice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/splice"));
 var _row = _interopRequireDefault(require("antd/lib/row"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/toConsumableArray"));
 var _col = _interopRequireDefault(require("antd/lib/col"));
 var _icon = _interopRequireDefault(require("antd/lib/icon"));
 var _button = _interopRequireDefault(require("antd/lib/button"));
@@ -37,9 +35,10 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/e
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/createClass"));
+var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/assertThisInitialized"));
+var _inherits2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/inherits"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/getPrototypeOf"));
-var _inherits2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/inherits"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
 var _form = _interopRequireDefault(require("antd/lib/form"));
 var _react = _interopRequireDefault(require("react"));
@@ -49,11 +48,12 @@ var _withStyles = _interopRequireDefault(require("isomorphic-style-loader/withSt
 var _Control = _interopRequireWildcard(require("../Control"));
 var _helper = require("../helper");
 var _variables = _interopRequireDefault(require("../variables"));
-function _interopRequireWildcard(e, t) { if ("function" == typeof _WeakMap) var r = new _WeakMap(), n = new _WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = _Object$defineProperty) && _Object$getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
+function _getRequireWildcardCache(e) { if ("function" != typeof _WeakMap) return null; var r = new _WeakMap(), t = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = _Object$defineProperty && _Object$getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? _Object$getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? _Object$defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function ownKeys(e, r) { var t = _Object$keys2(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty2(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context19, _context20; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context19 = ownKeys(Object(t), !0)).call(_context19, function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context20 = ownKeys(Object(t))).call(_context20, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? _Reflect$construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
-function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(_Reflect$construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); } // import helper from '../../common/common';
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context20, _context21; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context20 = ownKeys(Object(t), !0)).call(_context20, function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context21 = ownKeys(Object(t))).call(_context21, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = _Reflect$construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
+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; } } // import helper from '../../common/common';
 // import s from './Search.less';
 // import showAddDialog from './AddDialog';
 // import showDeleteDialog from './DeleteDialog';
@@ -67,11 +67,11 @@ var insertTimeKeyMap = {
 var TYPE = ['text', 'search', 'searchText', 'select', 'number', 'date', 'readonly', 'selectSearch', 'cascader' //级联选择下拉
 ];
 
-/**
- * search: 搜索按钮的标题
- * more：更多按钮的标题
- * reset：重置按钮的标题
- * sort：排序按钮的标题
+/**
+ * search: 搜索按钮的标题
+ * more：更多按钮的标题
+ * reset：重置按钮的标题
+ * sort：排序按钮的标题
  */
 var ConfigType = {
   search: _propTypes["default"].string.isRequired,
@@ -80,11 +80,11 @@ var ConfigType = {
   more: _propTypes["default"].string
 };
 
-/**
- * key: 唯一标识一个表单元素
- * title：表单元素旁边的标题
- * type：表单元素的类型
- * props：传递给表单元素的额外属性
+/**
+ * key: 唯一标识一个表单元素
+ * title：表单元素旁边的标题
+ * type：表单元素的类型
+ * props：传递给表单元素的额外属性
  */
 var FilterType = {
   key: _propTypes["default"].string.isRequired,
@@ -94,16 +94,18 @@ var FilterType = {
   props: _propTypes["default"].object
 };
 
-/**
- * data：传递给filters的默认值，为key:value的形式，此处的key为FilterType中的key
- * isSort：是否需要排序按钮，默认false，当设置为true时，onClick函数需要实现key为sort的响应函数
- * options: 作用同FilterType.options类似，但优先级高于它
- * onClick：按钮点击事件，原型为func(key)
- * onChange：表单控件内容改变时触发，原型为func(key, value)
- * onSearch：search控件发出的事件，原型为func(key, value)
- * displayRow：折叠时需要展示的行数，整数，默认为2
+/**
+ * data：传递给filters的默认值，为key:value的形式，此处的key为FilterType中的key
+ * isSort：是否需要排序按钮，默认false，当设置为true时，onClick函数需要实现key为sort的响应函数
+ * options: 作用同FilterType.options类似，但优先级高于它
+ * onClick：按钮点击事件，原型为func(key)
+ * onChange：表单控件内容改变时触发，原型为func(key, value)
+ * onSearch：search控件发出的事件，原型为func(key, value)
+ * displayRow：折叠时需要展示的行数，整数，默认为2
  */
 var Search2 = /*#__PURE__*/function (_React$Component) {
+  (0, _inherits2["default"])(Search2, _React$Component);
+  var _super = _createSuper(Search2);
   function Search2() {
     var _context;
     var _this;
@@ -111,15 +113,15 @@ var Search2 = /*#__PURE__*/function (_React$Component) {
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-    _this = _callSuper(this, Search2, (0, _concat["default"])(_context = []).call(_context, args));
-    (0, _defineProperty2["default"])(_this, "state", {
+    _this = _super.call.apply(_super, (0, _concat["default"])(_context = [this]).call(_context, args));
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "state", {
       more: false
     });
-    (0, _defineProperty2["default"])(_this, "getPathFun", /*#__PURE__*/function () {
-      var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(key) {
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getPathFun", /*#__PURE__*/function () {
+      var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(key) {
         var _context2, _context8;
         var pathArr, _global$store$getStat, sidebars, navigation, title, body, url;
-        return _regenerator["default"].wrap(function (_context9) {
+        return _regenerator["default"].wrap(function _callee$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
               pathArr = global.location.pathname.split('/');
@@ -156,7 +158,7 @@ var Search2 = /*#__PURE__*/function (_React$Component) {
                 menuName: title
               };
               url = '/api/standard/log'; // await helper.fetchJson(url, helper.postOption(body))
-            case 1:
+            case 5:
             case "end":
               return _context9.stop();
           }
@@ -166,49 +168,49 @@ var Search2 = /*#__PURE__*/function (_React$Component) {
         return _ref.apply(this, arguments);
       };
     }());
-    (0, _defineProperty2["default"])(_this, "onClick", function (key) {
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onClick", function (key) {
       var onClick = _this.props.onClick;
       if (key === 'search') {
         // this.getPathFun(key);
       }
       onClick && onClick(key);
     });
-    (0, _defineProperty2["default"])(_this, "onMore", function () {
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onMore", function () {
       var onHeightChange = _this.props.onHeightChange;
       _this.setState({
         more: !_this.state.more
       });
       onHeightChange && onHeightChange(_this.calHeight(!_this.state.more));
     });
-    (0, _defineProperty2["default"])(_this, "onChange", function (dictionary, key, value) {
-      var _context0, _context1;
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onChange", function (dictionary, key, value) {
+      var _context10, _context11;
       var onChange = _this.props.onChange;
-      if (value && key === 'queryGroup' && dictionary && global.dictionary && global.dictionary[dictionary] && !(0, _includes["default"])(_context0 = (0, _map["default"])(_context1 = global.dictionary[dictionary]).call(_context1, function (item) {
+      if (value && key === 'queryGroup' && dictionary && global.dictionary && global.dictionary[dictionary] && !(0, _includes["default"])(_context10 = (0, _map["default"])(_context11 = global.dictionary[dictionary]).call(_context11, function (item) {
         return item.value;
-      })).call(_context0, value)) {
-        var _context10;
+      })).call(_context10, value)) {
+        var _context12;
         var realValue = JSON.parse(value);
         _this.onClick('reset');
-        (0, _map["default"])(_context10 = (0, _keys["default"])(realValue)).call(_context10, function (objectKey) {
+        (0, _map["default"])(_context12 = (0, _keys["default"])(realValue)).call(_context12, function (objectKey) {
           onChange && objectKey !== 'queryId' && onChange(objectKey, realValue[objectKey]);
         });
       }
       onChange && onChange(key, value);
     });
-    (0, _defineProperty2["default"])(_this, "onPressEnter", function () {
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onPressEnter", function () {
       _reactDom["default"].findDOMNode(_this.refs.search).click();
     });
-    (0, _defineProperty2["default"])(_this, "toButton", function (key) {
-      var _context11;
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "toButton", function (key) {
+      var _context13;
       var props = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var config = _this.props.config;
-      var onClick = (0, _bind["default"])(_context11 = _this.onClick).call(_context11, _this, key);
+      var onClick = (0, _bind["default"])(_context13 = _this.onClick).call(_context13, (0, _assertThisInitialized2["default"])(_this), key);
       return /*#__PURE__*/_react["default"].createElement(_button["default"], (0, _extends2["default"])({
         size: defaultSize,
         onClick: onClick
       }, props), config[key]);
     });
-    (0, _defineProperty2["default"])(_this, "toMore", function () {
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "toMore", function () {
       return /*#__PURE__*/_react["default"].createElement("a", {
         role: "more",
         onClick: _this.onMore
@@ -217,7 +219,7 @@ var Search2 = /*#__PURE__*/function (_React$Component) {
         "data-status": !_this.state.more ? 'down' : 'up'
       }));
     });
-    (0, _defineProperty2["default"])(_this, "toButtons", function () {
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "toButtons", function () {
       var config = _this.props.config;
       return /*#__PURE__*/_react["default"].createElement("div", {
         role: "buttons"
@@ -226,7 +228,7 @@ var Search2 = /*#__PURE__*/function (_React$Component) {
         type: 'primary'
       }), config.reset ? _this.toButton('reset') : null, _this.isSort() ? _this.toButton('sort') : null, _this.isMore() ? _this.toMore() : null);
     });
-    (0, _defineProperty2["default"])(_this, "isSort", function () {
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "isSort", function () {
       var _this$props = _this.props,
         config = _this$props.config,
         _this$props$colNum = _this$props.colNum,
@@ -236,7 +238,7 @@ var Search2 = /*#__PURE__*/function (_React$Component) {
         isSort = _this$props$isSort === void 0 ? false : _this$props$isSort;
       return isSort && (0, _sort["default"])(config) && filters.length > colNum;
     });
-    (0, _defineProperty2["default"])(_this, "isMore", function () {
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "isMore", function () {
       var _this$props2 = _this.props,
         config = _this$props2.config,
         _this$props2$colNum = _this$props2.colNum,
@@ -248,7 +250,7 @@ var Search2 = /*#__PURE__*/function (_React$Component) {
         return !item.hide;
       }).length > colNum * displayRow;
     });
-    (0, _defineProperty2["default"])(_this, "getOptions", function (filter) {
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getOptions", function (filter) {
       var options = _this.props.options;
       if (options && (0, _isArray["default"])(options[filter.key])) {
         return options[filter.key];
@@ -256,21 +258,21 @@ var Search2 = /*#__PURE__*/function (_React$Component) {
         return filter.options || filter.typeRelated || [];
       }
     });
-    (0, _defineProperty2["default"])(_this, "getContainer", function () {
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getContainer", function () {
       return _this.props.getContainer;
     });
-    (0, _defineProperty2["default"])(_this, "getControlProps", function (control) {
-      var _context12;
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getControlProps", function (control) {
+      var _context14;
       var _this$props$data = _this.props.data,
         data = _this$props$data === void 0 ? {} : _this$props$data;
       return _objectSpread(_objectSpread({}, control.props || {}), {}, {
         size: defaultSize,
         type: control.type,
         value: (0, _Control.makeString)(data[control.key]),
-        onChange: (0, _bind["default"])(_context12 = _this.onChange).call(_context12, _this, control.dictionary, control.key)
+        onChange: (0, _bind["default"])(_context14 = _this.onChange).call(_context14, (0, _assertThisInitialized2["default"])(_this), control.dictionary, control.key)
       });
     });
-    (0, _defineProperty2["default"])(_this, "validDate", function (_ref2) {
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "validDate", function (_ref2) {
       var key = _ref2.key,
         type = _ref2.type;
       return function (date) {
@@ -289,16 +291,16 @@ var Search2 = /*#__PURE__*/function (_React$Component) {
         }
       };
     });
-    (0, _defineProperty2["default"])(_this, "toText", function (props) {
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "toText", function (props) {
       props.onPressEnter = _this.onPressEnter;
       return /*#__PURE__*/_react["default"].createElement(_Control["default"], props);
     });
-    (0, _defineProperty2["default"])(_this, "toNumber", function (props) {
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "toNumber", function (props) {
       props.defaultValue = props.value;
       delete props.value;
       return /*#__PURE__*/_react["default"].createElement(_Control["default"], props);
     });
-    (0, _defineProperty2["default"])(_this, "getQueryGroupOptions", function (_ref3) {
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getQueryGroupOptions", function (_ref3) {
       var dictionary = _ref3.dictionary,
         _ref3$configCode = _ref3.configCode,
         configCode = _ref3$configCode === void 0 ? 'unknown' : _ref3$configCode;
@@ -319,14 +321,14 @@ var Search2 = /*#__PURE__*/function (_React$Component) {
         };
       }));
     });
-    (0, _defineProperty2["default"])(_this, "toSelect", function (props, filter) {
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "toSelect", function (props, filter) {
       var container = _this.getContainer();
       container && (props.getPopupContainer = container);
       props.options = filter.key === 'queryGroup' ? _this.getQueryGroupOptions(filter) : _this.getOptions(filter);
       props.dropdownMatchSelectWidth = false;
       return /*#__PURE__*/_react["default"].createElement(_Control["default"], props);
     });
-    (0, _defineProperty2["default"])(_this, "createSearchEvent", function (filter) {
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "createSearchEvent", function (filter) {
       if (_this.props.onSearch) {
         return function (value) {
           return _this.props.onSearch(filter.key, value, filter);
@@ -335,7 +337,7 @@ var Search2 = /*#__PURE__*/function (_React$Component) {
         return null;
       }
     });
-    (0, _defineProperty2["default"])(_this, "toSearch", function (props, filter) {
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "toSearch", function (props, filter) {
       var container = _this.getContainer();
       container && (props.getPopupContainer = container);
       props.options = _this.getOptions(filter);
@@ -343,7 +345,7 @@ var Search2 = /*#__PURE__*/function (_React$Component) {
       props.dropdownMatchSelectWidth = false;
       return /*#__PURE__*/_react["default"].createElement(_Control["default"], props);
     });
-    (0, _defineProperty2["default"])(_this, "selectSearch", function (props, filter) {
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "selectSearch", function (props, filter) {
       var container = _this.getContainer();
       container && (props.getPopupContainer = container);
       props.options = _this.getOptions(filter);
@@ -351,7 +353,7 @@ var Search2 = /*#__PURE__*/function (_React$Component) {
       props.dropdownMatchSelectWidth = false;
       return /*#__PURE__*/_react["default"].createElement(_Control["default"], props);
     });
-    (0, _defineProperty2["default"])(_this, "toDate", function (props, _ref5) {
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "toDate", function (props, _ref5) {
       var rule = _ref5.rule;
       var container = _this.getContainer();
       container && (props.getCalendarContainer = container);
@@ -361,11 +363,11 @@ var Search2 = /*#__PURE__*/function (_React$Component) {
       };
       return /*#__PURE__*/_react["default"].createElement(_Control["default"], props);
     });
-    (0, _defineProperty2["default"])(_this, "toReadonly", function (props, filter) {
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "toReadonly", function (props, filter) {
       props.value = (0, _Control.getTitle)(props.value, _this.getOptions(filter));
       return /*#__PURE__*/_react["default"].createElement(_Control["default"], props);
     });
-    (0, _defineProperty2["default"])(_this, "toCascader", function (props, filter) {
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "toCascader", function (props, filter) {
       var container = _this.getContainer();
       container && (props.getPopupContainer = container);
       props.options = _this.getOptions(filter);
@@ -373,7 +375,7 @@ var Search2 = /*#__PURE__*/function (_React$Component) {
       props.placeholder = filter.placeholder || '';
       return /*#__PURE__*/_react["default"].createElement(_Control["default"], props);
     });
-    (0, _defineProperty2["default"])(_this, "toControl", function (control) {
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "toControl", function (control) {
       var props = _this.getControlProps(control);
       switch (control.type) {
         case 'text':
@@ -397,29 +399,29 @@ var Search2 = /*#__PURE__*/function (_React$Component) {
           return 'type error';
       }
     });
-    (0, _defineProperty2["default"])(_this, "toLabel", function (_ref6) {
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "toLabel", function (_ref6) {
       var title = _ref6.title,
         key = _ref6.key,
         dictionary = _ref6.dictionary,
         _ref6$configCode = _ref6.configCode,
         configCode = _ref6$configCode === void 0 ? 'unknown' : _ref6$configCode;
       if (key === 'queryGroup') {
-        var _context13, _context14;
+        var _context15, _context16;
         //查询组合
         return /*#__PURE__*/_react["default"].createElement("span", null, title, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
           role: "icon",
           type: "plus-circle-o",
-          onClick: (0, _bind["default"])(_context13 = _this.onAddQueryGroup).call(_context13, _this, configCode, _this.props.data, dictionary)
+          onClick: (0, _bind["default"])(_context15 = _this.onAddQueryGroup).call(_context15, (0, _assertThisInitialized2["default"])(_this), configCode, _this.props.data, dictionary)
         }), /*#__PURE__*/_react["default"].createElement(_icon["default"], {
           role: "icon",
           type: "minus-circle-o",
-          onClick: (0, _bind["default"])(_context14 = _this.onDelQueryGroup).call(_context14, _this, configCode, _this.props.data, dictionary)
+          onClick: (0, _bind["default"])(_context16 = _this.onDelQueryGroup).call(_context16, (0, _assertThisInitialized2["default"])(_this), configCode, _this.props.data, dictionary)
         }));
       } else {
         return title;
       }
     });
-    (0, _defineProperty2["default"])(_this, "toCol", function (span, control, more) {
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "toCol", function (span, control, more) {
       var factor = control.span || 1;
       return /*#__PURE__*/_react["default"].createElement(_col["default"], {
         span: span * factor,
@@ -434,49 +436,49 @@ var Search2 = /*#__PURE__*/function (_React$Component) {
         required: control.required
       }, _this.toControl(control)));
     });
-    (0, _defineProperty2["default"])(_this, "toCols", function () {
+    // toCols = () => {
+    //   const {insertTimeKey='from',colNum=defaultColNum, filters, displayRow=filters.length > defaultColNum ? 2 :1} = this.props;
+    //   let span = 24 / Math.min(colNum, filters.filter(item => !item.hide).length);
+    //   let newFilters = filters.filter(item => !item.hide);
+    //   const insertKeys = insertTimeKeyMap[insertTimeKey];
+    //   const insertTimeCols = newFilters.filter(x=>insertKeys.includes(x.key));
+    //   const otherCols = newFilters.filter(x=>!insertKeys.includes(x.key));
+    //   if (insertTimeCols.length>0){
+    //     if (otherCols.length>=defaultColNum){
+    //       otherCols.splice(6,0,...insertTimeCols);
+    //       newFilters = otherCols;
+    //     }else{
+    //       newFilters = otherCols.concat(insertTimeCols);
+    //     }
+    //   }
+    //   if (span == 4.8){ //特殊处理filters为5的时候,span不能为小数
+    //     return newFilters.map((control, index) => this.toCol(index==0?4:5, control, index >= colNum * displayRow));
+    //   }else{
+    //     return newFilters.map((control, index) => this.toCol(span, control, index >= colNum * displayRow));
+    //   }
+    // };
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "toCols", function () {
       var _this$props3 = _this.props,
-        _this$props3$insertTi = _this$props3.insertTimeKey,
-        insertTimeKey = _this$props3$insertTi === void 0 ? 'from' : _this$props3$insertTi,
         _this$props3$colNum = _this$props3.colNum,
         colNum = _this$props3$colNum === void 0 ? defaultColNum : _this$props3$colNum,
         filters = _this$props3.filters,
         _this$props3$displayR = _this$props3.displayRow,
-        displayRow = _this$props3$displayR === void 0 ? filters.length > defaultColNum ? 2 : 1 : _this$props3$displayR;
+        displayRow = _this$props3$displayR === void 0 ? 1 : _this$props3$displayR;
       var span = 24 / Math.min(colNum, (0, _filter["default"])(filters).call(filters, function (item) {
         return !item.hide;
       }).length);
-      var newFilters = (0, _filter["default"])(filters).call(filters, function (item) {
-        return !item.hide;
-      });
-      var insertKeys = insertTimeKeyMap[insertTimeKey];
-      var insertTimeCols = (0, _filter["default"])(newFilters).call(newFilters, function (x) {
-        return (0, _includes["default"])(insertKeys).call(insertKeys, x.key);
-      });
-      var otherCols = (0, _filter["default"])(newFilters).call(newFilters, function (x) {
-        return !(0, _includes["default"])(insertKeys).call(insertKeys, x.key);
-      });
-      if (insertTimeCols.length > 0) {
-        if (otherCols.length >= defaultColNum) {
-          var _context15;
-          (0, _splice["default"])(otherCols).apply(otherCols, (0, _concat["default"])(_context15 = [6, 0]).call(_context15, (0, _toConsumableArray2["default"])(insertTimeCols)));
-          newFilters = otherCols;
-        } else {
-          newFilters = (0, _concat["default"])(otherCols).call(otherCols, insertTimeCols);
-        }
-      }
       if (span == 4.8) {
         //特殊处理filters为5的时候,span不能为小数
-        return (0, _map["default"])(newFilters).call(newFilters, function (control, index) {
+        return (0, _map["default"])(filters).call(filters, function (control, index) {
           return _this.toCol(index == 0 ? 4 : 5, control, index >= colNum * displayRow);
         });
       } else {
-        return (0, _map["default"])(newFilters).call(newFilters, function (control, index) {
+        return (0, _map["default"])(filters).call(filters, function (control, index) {
           return _this.toCol(span, control, index >= colNum * displayRow);
         });
       }
     });
-    (0, _defineProperty2["default"])(_this, "calWidth", function () {
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "calWidth", function () {
       var _this$props4 = _this.props,
         _this$props4$colNum = _this$props4.colNum,
         colNum = _this$props4$colNum === void 0 ? defaultColNum : _this$props4$colNum,
@@ -490,7 +492,7 @@ var Search2 = /*#__PURE__*/function (_React$Component) {
         return "".concat(defaultColNum * 13.6, "%");
       }
     });
-    (0, _defineProperty2["default"])(_this, "calHeight", function (more) {
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "calHeight", function (more) {
       var _this$props5 = _this.props,
         _this$props5$colNum = _this$props5.colNum,
         colNum = _this$props5$colNum === void 0 ? defaultColNum : _this$props5$colNum,
@@ -508,17 +510,16 @@ var Search2 = /*#__PURE__*/function (_React$Component) {
     });
     return _this;
   }
-  (0, _inherits2["default"])(Search2, _React$Component);
-  return (0, _createClass2["default"])(Search2, [{
+  (0, _createClass2["default"])(Search2, [{
     key: "onAddQueryGroup",
     value: function () {
-      var _onAddQueryGroup = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(configCode, searchData, dictionary) {
-        var _context16;
+      var _onAddQueryGroup = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(configCode, searchData, dictionary) {
+        var _context17;
         var filter, dicOptionNameArr, dicOptions;
-        return _regenerator["default"].wrap(function (_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+        return _regenerator["default"].wrap(function _callee2$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
-              filter = (0, _reduce["default"])(_context16 = (0, _keys["default"])(searchData)).call(_context16, function (state, key) {
+              filter = (0, _reduce["default"])(_context17 = (0, _keys["default"])(searchData)).call(_context17, function (state, key) {
                 if (searchData[key] && key !== 'queryGroup') {
                   state[key] = searchData[key];
                 }
@@ -534,9 +535,9 @@ var Search2 = /*#__PURE__*/function (_React$Component) {
               // if (true === await showAddDialog(configCode, filter, dicOptionNameArr)) {
               //   this.onChange(undefined, 'queryGroup', '');
               // }
-            case 1:
+            case 3:
             case "end":
-              return _context17.stop();
+              return _context18.stop();
           }
         }, _callee2);
       }));
@@ -548,10 +549,10 @@ var Search2 = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "onDelQueryGroup",
     value: function () {
-      var _onDelQueryGroup = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(configCode, searchData, dictionary) {
+      var _onDelQueryGroup = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(configCode, searchData, dictionary) {
         var queryGroup, dicOptions, _JSON$parse, queryId;
-        return _regenerator["default"].wrap(function (_context18) {
-          while (1) switch (_context18.prev = _context18.next) {
+        return _regenerator["default"].wrap(function _callee3$(_context19) {
+          while (1) switch (_context19.prev = _context19.next) {
             case 0:
               queryGroup = searchData.queryGroup; // if (!queryGroup) return helper.showError(`请先选择要删除的查询组合`);
               if (dictionary && global.dictionary) {
@@ -560,9 +561,9 @@ var Search2 = /*#__PURE__*/function (_React$Component) {
               _JSON$parse = JSON.parse(queryGroup), queryId = _JSON$parse.queryId; // if(true === await showDeleteDialog(configCode, queryId)) {
               //   this.onClick('reset');
               // }
-            case 1:
+            case 3:
             case "end":
-              return _context18.stop();
+              return _context19.stop();
           }
         }, _callee3);
       }));
@@ -589,6 +590,7 @@ var Search2 = /*#__PURE__*/function (_React$Component) {
       }, this.toCols())), this.toButtons());
     }
   }]);
+  return Search2;
 }(_react["default"].Component);
 (0, _defineProperty2["default"])(Search2, "propTypes", {
   config: _propTypes["default"].shape(ConfigType).isRequired,