cloud-b2b 1.1.58 → 1.1.60

package/es/SuperTable2/SuperTable2.js

@@ -257,7 +257,7 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
         onChange: function onChange(e) {
           _this.onChange(key, index)(e.target.value);
         },
-        value: value
+        value: String(value)
       };
       return /*#__PURE__*/React.createElement(RadioGroup, radioGroupProps, _mapInstanceProperty(options).call(options, _this.toRadio));
     });
@@ -473,8 +473,8 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
                 type: col.bsStyle
               }, record[col.key] || col.typeRelated);
             }
-          case 'radioGroup':
-            return _this.renderRadioGroup(col, value, record.key);
+          // case 'radioGroup':
+          //   return  this.renderRadioGroup(col, value, record.key);
           case 'switch':
             return typeof value === 'string' ? /*#__PURE__*/React.createElement("div", null, value) : /*#__PURE__*/React.createElement(_Switch, {
               checkedChildren: col.props.checkedChildren || '',

package/es/SuperTable2/SuperTableCell.js

@@ -127,6 +127,11 @@ var SuperTableCell = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_assertThisInitialized(_this), "toSelectWriting", function (props) {
       return /*#__PURE__*/React.createElement(Control, props);
     });
+    _defineProperty(_assertThisInitialized(_this), "toRadioGroup", function (props) {
+      console.log(props);
+      props.options = _this.options();
+      return /*#__PURE__*/React.createElement(Control, props);
+    });
     // 确保value的值为字符串(包含value和title的对象除外)
     _defineProperty(_assertThisInitialized(_this), "makeString", function (value) {
       if (value === null || typeof value === 'undefined') {
@@ -201,6 +206,10 @@ var SuperTableCell = /*#__PURE__*/function (_React$Component) {
           return /*#__PURE__*/React.createElement("div", {
             className: className
           }, this.toSelectWriting(props));
+        case 'radioGroup':
+          return /*#__PURE__*/React.createElement("div", {
+            className: className
+          }, this.toRadioGroup(props));
         case 'double':
           return /*#__PURE__*/React.createElement("div", {
             className: className

package/es/index.js

@@ -34,4 +34,5 @@ export { default as SuperTable } from './SuperTable';
 export { default as SuperPagination } from './SuperPagination';
 export { default as SuperTab } from './SuperTab';
 export { default as SuperTab2 } from './SuperTab2';
-export { default as Indent } from './Indent';
+export { default as Indent } from './Indent';
+export { default as Search2 } from './Search2';

package/lib/Search2/Search.js

@@ -0,0 +1,609 @@
+"use strict";
+
+var _typeof = require("@babel/runtime-corejs3/helpers/typeof");
+var _Reflect$construct = require("@babel/runtime-corejs3/core-js-stable/reflect/construct");
+var _Object$keys2 = require("@babel/runtime-corejs3/core-js-stable/object/keys");
+var _Object$getOwnPropertySymbols = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols");
+var _filterInstanceProperty2 = require("@babel/runtime-corejs3/core-js-stable/instance/filter");
+var _Object$getOwnPropertyDescriptor = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor");
+var _forEachInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/for-each");
+var _Object$getOwnPropertyDescriptors = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors");
+var _Object$defineProperties = require("@babel/runtime-corejs3/core-js-stable/object/define-properties");
+var _Object$defineProperty = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
+var _WeakMap = require("@babel/runtime-corejs3/core-js-stable/weak-map");
+var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
+_Object$defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+var _regenerator = _interopRequireDefault(require("@babel/runtime-corejs3/regenerator"));
+var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
+var _reduce = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/reduce"));
+var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/keys"));
+var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
+var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
+var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
+var _bind = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/bind"));
+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"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
+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 _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
+var _form = _interopRequireDefault(require("antd/lib/form"));
+var _react = _interopRequireDefault(require("react"));
+var _propTypes = _interopRequireDefault(require("prop-types"));
+var _reactDom = _interopRequireDefault(require("react-dom"));
+var _withStyles = _interopRequireDefault(require("isomorphic-style-loader/withStyles"));
+var _Control = _interopRequireWildcard(require("../Control"));
+var _helper = require("../helper");
+var _variables = _interopRequireDefault(require("../variables"));
+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 _context21, _context22; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context21 = ownKeys(Object(t), !0)).call(_context21, function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context22 = ownKeys(Object(t))).call(_context22, 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';
+var FormItem = _form["default"].Item;
+var defaultSize = 'small';
+var defaultColNum = 6;
+var insertTimeKeyMap = {
+  from: ["insertTimeTo", "insertTimeFrom"],
+  start: ["insertTimeStart", "insertTimeEnd"]
+};
+var TYPE = ['text', 'search', 'searchText', 'select', 'number', 'date', 'readonly', 'selectSearch', 'cascader' //级联选择下拉
+];
+
+/**
+ * search: 搜索按钮的标题
+ * more：更多按钮的标题
+ * reset：重置按钮的标题
+ * sort：排序按钮的标题
+ */
+var ConfigType = {
+  search: _propTypes["default"].string.isRequired,
+  reset: _propTypes["default"].string,
+  sort: _propTypes["default"].string,
+  more: _propTypes["default"].string
+};
+
+/**
+ * key: 唯一标识一个表单元素
+ * title：表单元素旁边的标题
+ * type：表单元素的类型
+ * props：传递给表单元素的额外属性
+ */
+var FilterType = {
+  key: _propTypes["default"].string.isRequired,
+  title: _propTypes["default"].string.isRequired,
+  type: _propTypes["default"].oneOf(TYPE).isRequired,
+  options: _propTypes["default"].array,
+  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
+ */
+var Search2 = /*#__PURE__*/function (_React$Component) {
+  (0, _inherits2["default"])(Search2, _React$Component);
+  var _super = _createSuper(Search2);
+  function Search2() {
+    var _context;
+    var _this;
+    (0, _classCallCheck2["default"])(this, Search2);
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    _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"])((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 _callee$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
+            case 0:
+              pathArr = global.location.pathname.split('/');
+              _global$store$getStat = global.store.getState().layout, sidebars = _global$store$getStat.sidebars, navigation = _global$store$getStat.navigation;
+              title = (0, _reduce["default"])(_context2 = (0, _keys["default"])(sidebars)).call(_context2, function (t, i) {
+                var _context3;
+                (0, _map["default"])(_context3 = sidebars[i]).call(_context3, function (item) {
+                  if (item.children) {
+                    var _context4;
+                    var filterArr = (0, _filter["default"])(_context4 = item.children).call(_context4, function (c) {
+                      return c.href === global.location.pathname;
+                    });
+                    if (filterArr.length !== 0) {
+                      var _context5, _context6;
+                      t = (0, _concat["default"])(_context5 = (0, _filter["default"])(navigation).call(navigation, function (n) {
+                        return n.key === i;
+                      })[0].title).call(_context5, (0, _concat["default"])(_context6 = "-".concat(item.title, "-")).call(_context6, filterArr[0].title));
+                    }
+                  } else {
+                    if (item.href === global.location.pathname) {
+                      var _context7;
+                      t = (0, _concat["default"])(_context7 = (0, _filter["default"])(navigation).call(navigation, function (n) {
+                        return n.key === i;
+                      })[0].title).call(_context7, "-".concat(item.title));
+                    }
+                  }
+                  return item;
+                });
+                return t;
+              }, '');
+              body = {
+                action: (0, _concat["default"])(_context8 = "".concat(pathArr[pathArr.length - 1], "_")).call(_context8, key),
+                actionName: "".concat(title, "-\u641C\u7D22"),
+                menuName: title
+              };
+              url = '/api/standard/log'; // await helper.fetchJson(url, helper.postOption(body))
+            case 5:
+            case "end":
+              return _context9.stop();
+          }
+        }, _callee);
+      }));
+      return function (_x) {
+        return _ref.apply(this, arguments);
+      };
+    }());
+    (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"])((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"])((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"])(_context10 = (0, _map["default"])(_context11 = global.dictionary[dictionary]).call(_context11, function (item) {
+        return item.value;
+      })).call(_context10, value)) {
+        var _context12;
+        var realValue = JSON.parse(value);
+        _this.onClick('reset');
+        (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"])((0, _assertThisInitialized2["default"])(_this), "onPressEnter", function () {
+      _reactDom["default"].findDOMNode(_this.refs.search).click();
+    });
+    (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"])(_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"])((0, _assertThisInitialized2["default"])(_this), "toMore", function () {
+      return /*#__PURE__*/_react["default"].createElement("a", {
+        role: "more",
+        onClick: _this.onMore
+      }, _this.props.config.more, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
+        type: "down",
+        "data-status": !_this.state.more ? 'down' : 'up'
+      }));
+    });
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "toButtons", function () {
+      var config = _this.props.config;
+      return /*#__PURE__*/_react["default"].createElement("div", {
+        role: "buttons"
+      }, _this.toButton('search', {
+        ref: 'search',
+        type: 'primary'
+      }), config.reset ? _this.toButton('reset') : null, _this.isSort() ? _this.toButton('sort') : null, _this.isMore() ? _this.toMore() : null);
+    });
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "isSort", function () {
+      var _this$props = _this.props,
+        config = _this$props.config,
+        _this$props$colNum = _this$props.colNum,
+        colNum = _this$props$colNum === void 0 ? defaultColNum : _this$props$colNum,
+        filters = _this$props.filters,
+        _this$props$isSort = _this$props.isSort,
+        isSort = _this$props$isSort === void 0 ? false : _this$props$isSort;
+      return isSort && (0, _sort["default"])(config) && filters.length > colNum;
+    });
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "isMore", function () {
+      var _this$props2 = _this.props,
+        config = _this$props2.config,
+        _this$props2$colNum = _this$props2.colNum,
+        colNum = _this$props2$colNum === void 0 ? defaultColNum : _this$props2$colNum,
+        filters = _this$props2.filters,
+        _this$props2$displayR = _this$props2.displayRow,
+        displayRow = _this$props2$displayR === void 0 ? filters.length > 4 ? 2 : 1 : _this$props2$displayR;
+      return config.more && (0, _filter["default"])(filters).call(filters, function (item) {
+        return !item.hide;
+      }).length > colNum * displayRow;
+    });
+    (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];
+      } else {
+        return filter.options || filter.typeRelated || [];
+      }
+    });
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getContainer", function () {
+      return _this.props.getContainer;
+    });
+    (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"])(_context14 = _this.onChange).call(_context14, (0, _assertThisInitialized2["default"])(_this), control.dictionary, control.key)
+      });
+    });
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "validDate", function (_ref2) {
+      var key = _ref2.key,
+        type = _ref2.type;
+      return function (date) {
+        var _this$props$data2 = _this.props.data,
+          data = _this$props$data2 === void 0 ? {} : _this$props$data2;
+        if (!date || !data[key]) {
+          return false;
+        } else {
+          if (type === '>') {
+            return date.format('YYYY-MM-DD HH:mm:ss') <= data[key].valueOf();
+          } else if (type === '<') {
+            return date.format('YYYY-MM-DD HH:mm:ss') >= data[key].valueOf();
+          } else {
+            return false;
+          }
+        }
+      };
+    });
+    (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"])((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"])((0, _assertThisInitialized2["default"])(_this), "getQueryGroupOptions", function (_ref3) {
+      var dictionary = _ref3.dictionary,
+        _ref3$configCode = _ref3.configCode,
+        configCode = _ref3$configCode === void 0 ? 'unknown' : _ref3$configCode;
+      var realOptions = [];
+      if (dictionary && global.dictionary) {
+        var dicOptions = global.dictionary[dictionary] || [];
+        realOptions = (0, _concat["default"])(realOptions).call(realOptions, dicOptions);
+      }
+      var state = global.store.getState();
+      var path = ['layout', 'tableColsSetting', configCode];
+      var _ref4 = (0, _helper.getPathValue)(state, path) || {},
+        _ref4$queryList = _ref4.queryList,
+        queryList = _ref4$queryList === void 0 ? [] : _ref4$queryList;
+      return (0, _concat["default"])(realOptions).call(realOptions, (0, _map["default"])(queryList).call(queryList, function (item) {
+        return {
+          title: item.name,
+          value: (0, _stringify["default"])(item.query)
+        };
+      }));
+    });
+    (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"])((0, _assertThisInitialized2["default"])(_this), "createSearchEvent", function (filter) {
+      if (_this.props.onSearch) {
+        return function (value) {
+          return _this.props.onSearch(filter.key, value, filter);
+        };
+      } else {
+        return null;
+      }
+    });
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "toSearch", function (props, filter) {
+      var container = _this.getContainer();
+      container && (props.getPopupContainer = container);
+      props.options = _this.getOptions(filter);
+      props.onSearch = _this.createSearchEvent(filter);
+      props.dropdownMatchSelectWidth = false;
+      return /*#__PURE__*/_react["default"].createElement(_Control["default"], props);
+    });
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "selectSearch", function (props, filter) {
+      var container = _this.getContainer();
+      container && (props.getPopupContainer = container);
+      props.options = _this.getOptions(filter);
+      props.onSearch = _this.createSearchEvent(filter);
+      props.dropdownMatchSelectWidth = false;
+      return /*#__PURE__*/_react["default"].createElement(_Control["default"], props);
+    });
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "toDate", function (props, _ref5) {
+      var rule = _ref5.rule;
+      var container = _this.getContainer();
+      container && (props.getCalendarContainer = container);
+      rule && (props.disabledDate = _this.validDate(rule));
+      props.style = {
+        width: '100%'
+      };
+      return /*#__PURE__*/_react["default"].createElement(_Control["default"], props);
+    });
+    (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"])((0, _assertThisInitialized2["default"])(_this), "toCascader", function (props, filter) {
+      var container = _this.getContainer();
+      container && (props.getPopupContainer = container);
+      props.options = _this.getOptions(filter);
+      props.onSearch = _this.createSearchEvent(filter);
+      props.placeholder = filter.placeholder || '';
+      return /*#__PURE__*/_react["default"].createElement(_Control["default"], props);
+    });
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "toControl", function (control) {
+      var props = _this.getControlProps(control);
+      switch (control.type) {
+        case 'text':
+          return _this.toText(props, control);
+        case 'number':
+          return _this.toNumber(props, control);
+        case 'select':
+          return _this.toSelect(props, control);
+        case 'selectSearch':
+          return _this.selectSearch(props, control);
+        case 'search':
+        case 'searchText':
+          return _this.toSearch(props, control);
+        case 'date':
+          return _this.toDate(props, control);
+        case 'readonly':
+          return _this.toReadonly(props, control);
+        case 'cascader':
+          return _this.toCascader(props, control);
+        default:
+          return 'type error';
+      }
+    });
+    (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 _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"])(_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"])(_context16 = _this.onDelQueryGroup).call(_context16, (0, _assertThisInitialized2["default"])(_this), configCode, _this.props.data, dictionary)
+        }));
+      } else {
+        return title;
+      }
+    });
+    (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,
+        key: control.key,
+        onFocus: more ? function () {
+          _this.setState({
+            more: true
+          });
+        } : undefined
+      }, /*#__PURE__*/_react["default"].createElement(FormItem, {
+        label: _this.toLabel(control),
+        required: control.required
+      }, _this.toControl(control)));
+    });
+    (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;
+      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 _context17;
+          (0, _splice["default"])(otherCols).apply(otherCols, (0, _concat["default"])(_context17 = [6, 0]).call(_context17, (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 _this.toCol(index == 0 ? 4 : 5, control, index >= colNum * displayRow);
+        });
+      } else {
+        return (0, _map["default"])(newFilters).call(newFilters, function (control, index) {
+          return _this.toCol(span, control, index >= colNum * displayRow);
+        });
+      }
+    });
+    (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,
+        filters = _this$props4.filters;
+      var length = (0, _filter["default"])(filters).call(filters, function (item) {
+        return !item.hide;
+      }).length;
+      if (length < colNum) {
+        return "".concat(length * 13.6, "%");
+      } else {
+        return "".concat(defaultColNum * 13.6, "%");
+      }
+    });
+    (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,
+        filters = _this$props5.filters,
+        _this$props5$displayR = _this$props5.displayRow,
+        displayRow = _this$props5$displayR === void 0 ? filters.length > defaultColNum ? 2 : 1 : _this$props5$displayR;
+      if (more) {
+        var row = Math.ceil((0, _filter["default"])(filters).call(filters, function (item) {
+          return !item.hide;
+        }).length / colNum);
+        return row * 36 + (row - 1) * 10;
+      } else {
+        return displayRow * 36 + (displayRow - 1) * 10;
+      }
+    });
+    return _this;
+  }
+  (0, _createClass2["default"])(Search2, [{
+    key: "onAddQueryGroup",
+    value: function () {
+      var _onAddQueryGroup = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(configCode, searchData, dictionary) {
+        var _context18;
+        var filter, dicOptionNameArr, dicOptions;
+        return _regenerator["default"].wrap(function _callee2$(_context19) {
+          while (1) switch (_context19.prev = _context19.next) {
+            case 0:
+              filter = (0, _reduce["default"])(_context18 = (0, _keys["default"])(searchData)).call(_context18, function (state, key) {
+                if (searchData[key] && key !== 'queryGroup') {
+                  state[key] = searchData[key];
+                }
+                return state;
+              }, {}); // if (Object.keys(filter).length < 1) return helper.showError(`查询条件不能为空`);
+              dicOptionNameArr = [];
+              if (dictionary && global.dictionary) {
+                dicOptions = global.dictionary[dictionary] || [];
+                dicOptionNameArr = (0, _map["default"])(dicOptions).call(dicOptions, function (item) {
+                  return item.title;
+                });
+              }
+              // if (true === await showAddDialog(configCode, filter, dicOptionNameArr)) {
+              //   this.onChange(undefined, 'queryGroup', '');
+              // }
+            case 3:
+            case "end":
+              return _context19.stop();
+          }
+        }, _callee2);
+      }));
+      function onAddQueryGroup(_x2, _x3, _x4) {
+        return _onAddQueryGroup.apply(this, arguments);
+      }
+      return onAddQueryGroup;
+    }()
+  }, {
+    key: "onDelQueryGroup",
+    value: function () {
+      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 _callee3$(_context20) {
+          while (1) switch (_context20.prev = _context20.next) {
+            case 0:
+              queryGroup = searchData.queryGroup; // if (!queryGroup) return helper.showError(`请先选择要删除的查询组合`);
+              if (dictionary && global.dictionary) {
+                dicOptions = global.dictionary[dictionary] || []; // if (dicOptions.map(item => item.value).includes(queryGroup)) return helper.showError(`系统固定查询组合不允许删除`);
+              }
+              _JSON$parse = JSON.parse(queryGroup), queryId = _JSON$parse.queryId; // if(true === await showDeleteDialog(configCode, queryId)) {
+              //   this.onClick('reset');
+              // }
+            case 3:
+            case "end":
+              return _context20.stop();
+          }
+        }, _callee3);
+      }));
+      function onDelQueryGroup(_x5, _x6, _x7) {
+        return _onDelQueryGroup.apply(this, arguments);
+      }
+      return onDelQueryGroup;
+    }()
+  }, {
+    key: "render",
+    value: function render() {
+      return /*#__PURE__*/_react["default"].createElement("div", {
+        className: (0, _variables["default"])('Search2'),
+        style: {
+          height: this.calHeight(this.state.more)
+        }
+      }, /*#__PURE__*/_react["default"].createElement(_form["default"], {
+        layout: "vertical",
+        style: {
+          width: this.calWidth()
+        }
+      }, /*#__PURE__*/_react["default"].createElement(_row["default"], {
+        gutter: 20
+      }, this.toCols())), this.toButtons());
+    }
+  }]);
+  return Search2;
+}(_react["default"].Component);
+(0, _defineProperty2["default"])(Search2, "propTypes", {
+  config: _propTypes["default"].shape(ConfigType).isRequired,
+  filters: _propTypes["default"].arrayOf(_propTypes["default"].shape(FilterType)).isRequired,
+  data: _propTypes["default"].object,
+  options: _propTypes["default"].object,
+  getContainer: _propTypes["default"].func,
+  onClick: _propTypes["default"].func,
+  onChange: _propTypes["default"].func,
+  onSearch: _propTypes["default"].func,
+  onHeightChange: _propTypes["default"].func,
+  displayRow: _propTypes["default"].number
+});
+var _default = exports["default"] = Search2;