cloud-b2b 1.1.64 → 1.1.65

package/es/Search2/Search.js

@@ -6,7 +6,6 @@ import _Object$getOwnPropertyDescriptors from "@babel/runtime-corejs3/core-js-st
 import _Object$defineProperties from "@babel/runtime-corejs3/core-js-stable/object/define-properties";
 import _Object$defineProperty from "@babel/runtime-corejs3/core-js-stable/object/define-property";
 import _Row from "antd/es/row";
-import _toConsumableArray from "@babel/runtime-corejs3/helpers/toConsumableArray";
 import _Col from "antd/es/col";
 import _Icon from "antd/es/icon";
 import _Button from "antd/es/button";
@@ -14,13 +13,14 @@ import _extends from "@babel/runtime-corejs3/helpers/extends";
 import _asyncToGenerator from "@babel/runtime-corejs3/helpers/asyncToGenerator";
 import _classCallCheck from "@babel/runtime-corejs3/helpers/classCallCheck";
 import _createClass from "@babel/runtime-corejs3/helpers/createClass";
+import _assertThisInitialized from "@babel/runtime-corejs3/helpers/assertThisInitialized";
+import _inherits from "@babel/runtime-corejs3/helpers/inherits";
 import _possibleConstructorReturn from "@babel/runtime-corejs3/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime-corejs3/helpers/getPrototypeOf";
-import _inherits from "@babel/runtime-corejs3/helpers/inherits";
 import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
 import _Form from "antd/es/form";
 function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(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) { _defineProperty(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 _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) { _defineProperty(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; }
 import _regeneratorRuntime from "@babel/runtime-corejs3/regenerator";
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
 import _reduceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/reduce";
@@ -32,9 +32,8 @@ import _bindInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instanc
 import _sortInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/sort";
 import _Array$isArray from "@babel/runtime-corejs3/core-js-stable/array/is-array";
 import _JSON$stringify from "@babel/runtime-corejs3/core-js-stable/json/stringify";
-import _spliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/splice";
-function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? _Reflect$construct(o, e || [], _getPrototypeOf(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; })(); }
+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 _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 React from 'react';
 import PropTypes from 'prop-types';
 import ReactDOM from 'react-dom';
@@ -56,11 +55,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.string.isRequired,
@@ -69,11 +68,11 @@ var ConfigType = {
   more: PropTypes.string
 };
 
-/**
- * key: 唯一标识一个表单元素
- * title：表单元素旁边的标题
- * type：表单元素的类型
- * props：传递给表单元素的额外属性
+/**
+ * key: 唯一标识一个表单元素
+ * title：表单元素旁边的标题
+ * type：表单元素的类型
+ * props：传递给表单元素的额外属性
  */
 var FilterType = {
   key: PropTypes.string.isRequired,
@@ -83,16 +82,18 @@ var FilterType = {
   props: PropTypes.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) {
+  _inherits(Search2, _React$Component);
+  var _super = _createSuper(Search2);
   function Search2() {
     var _context;
     var _this;
@@ -100,15 +101,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, _concatInstanceProperty(_context = []).call(_context, args));
-    _defineProperty(_this, "state", {
+    _this = _super.call.apply(_super, _concatInstanceProperty(_context = [this]).call(_context, args));
+    _defineProperty(_assertThisInitialized(_this), "state", {
       more: false
     });
-    _defineProperty(_this, "getPathFun", /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(key) {
+    _defineProperty(_assertThisInitialized(_this), "getPathFun", /*#__PURE__*/function () {
+      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(key) {
         var _context2, _context8;
         var pathArr, _global$store$getStat, sidebars, navigation, title, body, url;
-        return _regeneratorRuntime.wrap(function (_context9) {
+        return _regeneratorRuntime.wrap(function _callee$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
               pathArr = global.location.pathname.split('/');
@@ -145,7 +146,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();
           }
@@ -155,49 +156,49 @@ var Search2 = /*#__PURE__*/function (_React$Component) {
         return _ref.apply(this, arguments);
       };
     }());
-    _defineProperty(_this, "onClick", function (key) {
+    _defineProperty(_assertThisInitialized(_this), "onClick", function (key) {
       var onClick = _this.props.onClick;
       if (key === 'search') {
         // this.getPathFun(key);
       }
       onClick && onClick(key);
     });
-    _defineProperty(_this, "onMore", function () {
+    _defineProperty(_assertThisInitialized(_this), "onMore", function () {
       var onHeightChange = _this.props.onHeightChange;
       _this.setState({
         more: !_this.state.more
       });
       onHeightChange && onHeightChange(_this.calHeight(!_this.state.more));
     });
-    _defineProperty(_this, "onChange", function (dictionary, key, value) {
-      var _context0, _context1;
+    _defineProperty(_assertThisInitialized(_this), "onChange", function (dictionary, key, value) {
+      var _context10, _context11;
       var onChange = _this.props.onChange;
-      if (value && key === 'queryGroup' && dictionary && global.dictionary && global.dictionary[dictionary] && !_includesInstanceProperty(_context0 = _mapInstanceProperty(_context1 = global.dictionary[dictionary]).call(_context1, function (item) {
+      if (value && key === 'queryGroup' && dictionary && global.dictionary && global.dictionary[dictionary] && !_includesInstanceProperty(_context10 = _mapInstanceProperty(_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');
-        _mapInstanceProperty(_context10 = _Object$keys(realValue)).call(_context10, function (objectKey) {
+        _mapInstanceProperty(_context12 = _Object$keys(realValue)).call(_context12, function (objectKey) {
           onChange && objectKey !== 'queryId' && onChange(objectKey, realValue[objectKey]);
         });
       }
       onChange && onChange(key, value);
     });
-    _defineProperty(_this, "onPressEnter", function () {
+    _defineProperty(_assertThisInitialized(_this), "onPressEnter", function () {
       ReactDOM.findDOMNode(_this.refs.search).click();
     });
-    _defineProperty(_this, "toButton", function (key) {
-      var _context11;
+    _defineProperty(_assertThisInitialized(_this), "toButton", function (key) {
+      var _context13;
       var props = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var config = _this.props.config;
-      var onClick = _bindInstanceProperty(_context11 = _this.onClick).call(_context11, _this, key);
+      var onClick = _bindInstanceProperty(_context13 = _this.onClick).call(_context13, _assertThisInitialized(_this), key);
       return /*#__PURE__*/React.createElement(_Button, _extends({
         size: defaultSize,
         onClick: onClick
       }, props), config[key]);
     });
-    _defineProperty(_this, "toMore", function () {
+    _defineProperty(_assertThisInitialized(_this), "toMore", function () {
       return /*#__PURE__*/React.createElement("a", {
         role: "more",
         onClick: _this.onMore
@@ -206,7 +207,7 @@ var Search2 = /*#__PURE__*/function (_React$Component) {
         "data-status": !_this.state.more ? 'down' : 'up'
       }));
     });
-    _defineProperty(_this, "toButtons", function () {
+    _defineProperty(_assertThisInitialized(_this), "toButtons", function () {
       var config = _this.props.config;
       return /*#__PURE__*/React.createElement("div", {
         role: "buttons"
@@ -215,7 +216,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);
     });
-    _defineProperty(_this, "isSort", function () {
+    _defineProperty(_assertThisInitialized(_this), "isSort", function () {
       var _this$props = _this.props,
         config = _this$props.config,
         _this$props$colNum = _this$props.colNum,
@@ -225,7 +226,7 @@ var Search2 = /*#__PURE__*/function (_React$Component) {
         isSort = _this$props$isSort === void 0 ? false : _this$props$isSort;
       return isSort && _sortInstanceProperty(config) && filters.length > colNum;
     });
-    _defineProperty(_this, "isMore", function () {
+    _defineProperty(_assertThisInitialized(_this), "isMore", function () {
       var _this$props2 = _this.props,
         config = _this$props2.config,
         _this$props2$colNum = _this$props2.colNum,
@@ -237,7 +238,7 @@ var Search2 = /*#__PURE__*/function (_React$Component) {
         return !item.hide;
       }).length > colNum * displayRow;
     });
-    _defineProperty(_this, "getOptions", function (filter) {
+    _defineProperty(_assertThisInitialized(_this), "getOptions", function (filter) {
       var options = _this.props.options;
       if (options && _Array$isArray(options[filter.key])) {
         return options[filter.key];
@@ -245,21 +246,21 @@ var Search2 = /*#__PURE__*/function (_React$Component) {
         return filter.options || filter.typeRelated || [];
       }
     });
-    _defineProperty(_this, "getContainer", function () {
+    _defineProperty(_assertThisInitialized(_this), "getContainer", function () {
       return _this.props.getContainer;
     });
-    _defineProperty(_this, "getControlProps", function (control) {
-      var _context12;
+    _defineProperty(_assertThisInitialized(_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: makeString(data[control.key]),
-        onChange: _bindInstanceProperty(_context12 = _this.onChange).call(_context12, _this, control.dictionary, control.key)
+        onChange: _bindInstanceProperty(_context14 = _this.onChange).call(_context14, _assertThisInitialized(_this), control.dictionary, control.key)
       });
     });
-    _defineProperty(_this, "validDate", function (_ref2) {
+    _defineProperty(_assertThisInitialized(_this), "validDate", function (_ref2) {
       var key = _ref2.key,
         type = _ref2.type;
       return function (date) {
@@ -278,16 +279,16 @@ var Search2 = /*#__PURE__*/function (_React$Component) {
         }
       };
     });
-    _defineProperty(_this, "toText", function (props) {
+    _defineProperty(_assertThisInitialized(_this), "toText", function (props) {
       props.onPressEnter = _this.onPressEnter;
       return /*#__PURE__*/React.createElement(Control, props);
     });
-    _defineProperty(_this, "toNumber", function (props) {
+    _defineProperty(_assertThisInitialized(_this), "toNumber", function (props) {
       props.defaultValue = props.value;
       delete props.value;
       return /*#__PURE__*/React.createElement(Control, props);
     });
-    _defineProperty(_this, "getQueryGroupOptions", function (_ref3) {
+    _defineProperty(_assertThisInitialized(_this), "getQueryGroupOptions", function (_ref3) {
       var dictionary = _ref3.dictionary,
         _ref3$configCode = _ref3.configCode,
         configCode = _ref3$configCode === void 0 ? 'unknown' : _ref3$configCode;
@@ -308,14 +309,14 @@ var Search2 = /*#__PURE__*/function (_React$Component) {
         };
       }));
     });
-    _defineProperty(_this, "toSelect", function (props, filter) {
+    _defineProperty(_assertThisInitialized(_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.createElement(Control, props);
     });
-    _defineProperty(_this, "createSearchEvent", function (filter) {
+    _defineProperty(_assertThisInitialized(_this), "createSearchEvent", function (filter) {
       if (_this.props.onSearch) {
         return function (value) {
           return _this.props.onSearch(filter.key, value, filter);
@@ -324,7 +325,7 @@ var Search2 = /*#__PURE__*/function (_React$Component) {
         return null;
       }
     });
-    _defineProperty(_this, "toSearch", function (props, filter) {
+    _defineProperty(_assertThisInitialized(_this), "toSearch", function (props, filter) {
       var container = _this.getContainer();
       container && (props.getPopupContainer = container);
       props.options = _this.getOptions(filter);
@@ -332,7 +333,7 @@ var Search2 = /*#__PURE__*/function (_React$Component) {
       props.dropdownMatchSelectWidth = false;
       return /*#__PURE__*/React.createElement(Control, props);
     });
-    _defineProperty(_this, "selectSearch", function (props, filter) {
+    _defineProperty(_assertThisInitialized(_this), "selectSearch", function (props, filter) {
       var container = _this.getContainer();
       container && (props.getPopupContainer = container);
       props.options = _this.getOptions(filter);
@@ -340,7 +341,7 @@ var Search2 = /*#__PURE__*/function (_React$Component) {
       props.dropdownMatchSelectWidth = false;
       return /*#__PURE__*/React.createElement(Control, props);
     });
-    _defineProperty(_this, "toDate", function (props, _ref5) {
+    _defineProperty(_assertThisInitialized(_this), "toDate", function (props, _ref5) {
       var rule = _ref5.rule;
       var container = _this.getContainer();
       container && (props.getCalendarContainer = container);
@@ -350,11 +351,11 @@ var Search2 = /*#__PURE__*/function (_React$Component) {
       };
       return /*#__PURE__*/React.createElement(Control, props);
     });
-    _defineProperty(_this, "toReadonly", function (props, filter) {
+    _defineProperty(_assertThisInitialized(_this), "toReadonly", function (props, filter) {
       props.value = getTitle(props.value, _this.getOptions(filter));
       return /*#__PURE__*/React.createElement(Control, props);
     });
-    _defineProperty(_this, "toCascader", function (props, filter) {
+    _defineProperty(_assertThisInitialized(_this), "toCascader", function (props, filter) {
       var container = _this.getContainer();
       container && (props.getPopupContainer = container);
       props.options = _this.getOptions(filter);
@@ -362,7 +363,7 @@ var Search2 = /*#__PURE__*/function (_React$Component) {
       props.placeholder = filter.placeholder || '';
       return /*#__PURE__*/React.createElement(Control, props);
     });
-    _defineProperty(_this, "toControl", function (control) {
+    _defineProperty(_assertThisInitialized(_this), "toControl", function (control) {
       var props = _this.getControlProps(control);
       switch (control.type) {
         case 'text':
@@ -386,29 +387,29 @@ var Search2 = /*#__PURE__*/function (_React$Component) {
           return 'type error';
       }
     });
-    _defineProperty(_this, "toLabel", function (_ref6) {
+    _defineProperty(_assertThisInitialized(_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.createElement("span", null, title, /*#__PURE__*/React.createElement(_Icon, {
           role: "icon",
           type: "plus-circle-o",
-          onClick: _bindInstanceProperty(_context13 = _this.onAddQueryGroup).call(_context13, _this, configCode, _this.props.data, dictionary)
+          onClick: _bindInstanceProperty(_context15 = _this.onAddQueryGroup).call(_context15, _assertThisInitialized(_this), configCode, _this.props.data, dictionary)
         }), /*#__PURE__*/React.createElement(_Icon, {
           role: "icon",
           type: "minus-circle-o",
-          onClick: _bindInstanceProperty(_context14 = _this.onDelQueryGroup).call(_context14, _this, configCode, _this.props.data, dictionary)
+          onClick: _bindInstanceProperty(_context16 = _this.onDelQueryGroup).call(_context16, _assertThisInitialized(_this), configCode, _this.props.data, dictionary)
         }));
       } else {
         return title;
       }
     });
-    _defineProperty(_this, "toCol", function (span, control, more) {
+    _defineProperty(_assertThisInitialized(_this), "toCol", function (span, control, more) {
       var factor = control.span || 1;
       return /*#__PURE__*/React.createElement(_Col, {
         span: span * factor,
@@ -423,49 +424,49 @@ var Search2 = /*#__PURE__*/function (_React$Component) {
         required: control.required
       }, _this.toControl(control)));
     });
-    _defineProperty(_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));
+    //   }
+    // };
+    _defineProperty(_assertThisInitialized(_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, _filterInstanceProperty(filters).call(filters, function (item) {
         return !item.hide;
       }).length);
-      var newFilters = _filterInstanceProperty(filters).call(filters, function (item) {
-        return !item.hide;
-      });
-      var insertKeys = insertTimeKeyMap[insertTimeKey];
-      var insertTimeCols = _filterInstanceProperty(newFilters).call(newFilters, function (x) {
-        return _includesInstanceProperty(insertKeys).call(insertKeys, x.key);
-      });
-      var otherCols = _filterInstanceProperty(newFilters).call(newFilters, function (x) {
-        return !_includesInstanceProperty(insertKeys).call(insertKeys, x.key);
-      });
-      if (insertTimeCols.length > 0) {
-        if (otherCols.length >= defaultColNum) {
-          var _context15;
-          _spliceInstanceProperty(otherCols).apply(otherCols, _concatInstanceProperty(_context15 = [6, 0]).call(_context15, _toConsumableArray(insertTimeCols)));
-          newFilters = otherCols;
-        } else {
-          newFilters = _concatInstanceProperty(otherCols).call(otherCols, insertTimeCols);
-        }
-      }
       if (span == 4.8) {
         //特殊处理filters为5的时候,span不能为小数
-        return _mapInstanceProperty(newFilters).call(newFilters, function (control, index) {
+        return _mapInstanceProperty(filters).call(filters, function (control, index) {
           return _this.toCol(index == 0 ? 4 : 5, control, index >= colNum * displayRow);
         });
       } else {
-        return _mapInstanceProperty(newFilters).call(newFilters, function (control, index) {
+        return _mapInstanceProperty(filters).call(filters, function (control, index) {
           return _this.toCol(span, control, index >= colNum * displayRow);
         });
       }
     });
-    _defineProperty(_this, "calWidth", function () {
+    _defineProperty(_assertThisInitialized(_this), "calWidth", function () {
       var _this$props4 = _this.props,
         _this$props4$colNum = _this$props4.colNum,
         colNum = _this$props4$colNum === void 0 ? defaultColNum : _this$props4$colNum,
@@ -479,7 +480,7 @@ var Search2 = /*#__PURE__*/function (_React$Component) {
         return "".concat(defaultColNum * 13.6, "%");
       }
     });
-    _defineProperty(_this, "calHeight", function (more) {
+    _defineProperty(_assertThisInitialized(_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,
@@ -497,17 +498,16 @@ var Search2 = /*#__PURE__*/function (_React$Component) {
     });
     return _this;
   }
-  _inherits(Search2, _React$Component);
-  return _createClass(Search2, [{
+  _createClass(Search2, [{
     key: "onAddQueryGroup",
     value: function () {
-      var _onAddQueryGroup = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(configCode, searchData, dictionary) {
-        var _context16;
+      var _onAddQueryGroup = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(configCode, searchData, dictionary) {
+        var _context17;
         var filter, dicOptionNameArr, dicOptions;
-        return _regeneratorRuntime.wrap(function (_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+        return _regeneratorRuntime.wrap(function _callee2$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
-              filter = _reduceInstanceProperty(_context16 = _Object$keys(searchData)).call(_context16, function (state, key) {
+              filter = _reduceInstanceProperty(_context17 = _Object$keys(searchData)).call(_context17, function (state, key) {
                 if (searchData[key] && key !== 'queryGroup') {
                   state[key] = searchData[key];
                 }
@@ -523,9 +523,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);
       }));
@@ -537,10 +537,10 @@ var Search2 = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "onDelQueryGroup",
     value: function () {
-      var _onDelQueryGroup = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(configCode, searchData, dictionary) {
+      var _onDelQueryGroup = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(configCode, searchData, dictionary) {
         var queryGroup, dicOptions, _JSON$parse, queryId;
-        return _regeneratorRuntime.wrap(function (_context18) {
-          while (1) switch (_context18.prev = _context18.next) {
+        return _regeneratorRuntime.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) {
@@ -549,9 +549,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);
       }));
@@ -578,6 +578,7 @@ var Search2 = /*#__PURE__*/function (_React$Component) {
       }, this.toCols())), this.toButtons());
     }
   }]);
+  return Search2;
 }(React.Component);
 _defineProperty(Search2, "propTypes", {
   config: PropTypes.shape(ConfigType).isRequired,

package/es/Search2/Search.less

@@ -1,64 +1,64 @@
-@import '../variables.less';
-
-.@{cloudlink-prefix}-Search2 {
-  transition: all 0.3s;
-  > *:first-child {
-    display: inline-block;
-    vertical-align: top;
-    margin-bottom: -10px;
-
-    :global(.ant-form-item) {
-      margin-bottom: 10px;
-
-      :global(.ant-select-selection--multiple) {
-        border-top-width: 1px;
-        height: 22px;
-        overflow: auto;
-      }
-
-      [role='icon'] {
-        cursor: pointer;
-        margin-left: 10px;
-        color: @primary-color;
-      }
-    }
-  }
-
-  > *:last-child {
-    display: inline-block;
-    vertical-align: top;
-    padding-left: 20px;
-    padding-top: 14px;
-    width: 18%;
-  }
-
-  :global(.ant-form-item-control) input,
-  :global(.ant-calendar-picker),
-  :global(.ant-select) {
-    display: block;
-  }
-  :global(.ant-calendar-picker-small) {
-    min-width: 100px !important;
-  }
-  [role='buttons'] > * {
-    margin-right: 5px;
-  }
-
-  [role='more'] {
-    color: rgba(0, 0, 0, 0.65);
-    user-select: none;
-
-    &:hover {
-      color: @brand-primary;
-    }
-
-    > i {
-      transform: scale(0.75);
-      transition: all 0.2s;
-
-      &[data-status='up'] {
-        transform: scale(0.75) rotate(-180deg);
-      }
-    }
-  }
-}
+@import '../variables.less';
+
+.@{cloudlink-prefix}-Search2 {
+  transition: all 0.3s;
+  > *:first-child {
+    display: inline-block;
+    vertical-align: top;
+    margin-bottom: -10px;
+
+    :global(.ant-form-item) {
+      margin-bottom: 10px;
+
+      :global(.ant-select-selection--multiple) {
+        border-top-width: 1px;
+        height: 22px;
+        overflow: auto;
+      }
+
+      [role='icon'] {
+        cursor: pointer;
+        margin-left: 10px;
+        color: @primary-color;
+      }
+    }
+  }
+
+  > *:last-child {
+    display: inline-block;
+    vertical-align: top;
+    padding-left: 20px;
+    padding-top: 14px;
+    width: 18%;
+  }
+
+  :global(.ant-form-item-control) input,
+  :global(.ant-calendar-picker),
+  :global(.ant-select) {
+    display: block;
+  }
+  :global(.ant-calendar-picker-small) {
+    min-width: 100px !important;
+  }
+  [role='buttons'] > * {
+    margin-right: 5px;
+  }
+
+  [role='more'] {
+    color: rgba(0, 0, 0, 0.65);
+    user-select: none;
+
+    &:hover {
+      color: @brand-primary;
+    }
+
+    > i {
+      transform: scale(0.75);
+      transition: all 0.2s;
+
+      &[data-status='up'] {
+        transform: scale(0.75) rotate(-180deg);
+      }
+    }
+  }
+}