tntd 1.3.51 → 1.3.55

package/lib/QueryListScene/Field/fieldsMap.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.getFieldWidth = exports.defaultFieldWidth = void 0;
+exports["default"] = void 0;
 
 require("antd/lib/date-picker/style");
 
@@ -23,21 +23,6 @@ var _SelectInput = _interopRequireDefault(require("./SelectInput"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-var defaultFieldWidth = '200px';
-exports.defaultFieldWidth = defaultFieldWidth;
-
-var getFieldWidth = function getFieldWidth(type) {
-  if (type === 'dateRange') {
-    return '340px';
-  }
-
-  return {
-    dateRange: '340px',
-    selectInput: '320px'
-  }[type] || defaultFieldWidth;
-};
-
-exports.getFieldWidth = getFieldWidth;
 var _default = {
   string: _input["default"],
   input: _input["default"],

package/lib/QueryListScene/Field/index.js

@@ -9,151 +9,67 @@ require("antd/lib/form/style");
 
 var _form = _interopRequireDefault(require("antd/lib/form"));
 
-var _lodash = require("lodash");
-
-var _fieldsMap = _interopRequireWildcard(require("./fieldsMap"));
+var _react = _interopRequireDefault(require("react"));
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
+var _lodash = require("lodash");
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+var _fieldsMap = _interopRequireDefault(require("./fieldsMap"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
-
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
-
-function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+var FormItem = _form["default"].Item;
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+var _default = function _default(props) {
+  var _props$type = props.type,
+      type = _props$type === void 0 ? 'input' : _props$type,
+      title = props.title,
+      name = props.name,
+      initialValue = props.initialValue,
+      form = props.form,
+      actions = props.actions,
+      _props$className = props.className,
+      className = _props$className === void 0 ? '' : _props$className,
+      component = props.component,
+      fieldProps = props.props;
+  var getFieldDecorator = form.getFieldDecorator;
+  var Field = component || _fieldsMap["default"][type];
+  var isInput = ['input', 'string'].includes(type);
+
+  var onFieldChange = function onFieldChange() {
+    var _ref = fieldProps || {},
+        onChange = _ref.onChange;
+
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+    onChange && onChange.apply(void 0, args); // Input onChange第一个参数为Event对象，取值特殊处理
 
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+    if (!component && isInput) {
+      args[0] = (0, _lodash.get)(args[0], 'target.value');
+    }
 
-var FormItem = _form["default"].Item;
+    actions.emit.apply(actions, ['fieldChange', name].concat(args));
+  };
 
-var isInput = function isInput(type) {
-  return ['input', 'string', 'search'].includes(type);
-};
+  return _react["default"].createElement(FormItem, {
+    label: title,
+    className: className
+  }, getFieldDecorator(name, {
+    initialValue: initialValue
+  })(_react["default"].createElement(Field, _extends({}, isInput ? {
+    onPressEnter: function onPressEnter(evt) {
+      var _actions$search;
 
-var Field =
-/*#__PURE__*/
-function (_React$PureComponent) {
-  _inherits(Field, _React$PureComponent);
-
-  function Field(props) {
-    var _this;
-
-    _classCallCheck(this, Field);
-
-    _this = _possibleConstructorReturn(this, _getPrototypeOf(Field).call(this, props));
-
-    _this.onChange = function () {
-      var _this$props = _this.props,
-          actions = _this$props.actions,
-          name = _this$props.name,
-          _this$props$type = _this$props.type,
-          type = _this$props$type === void 0 ? 'input' : _this$props$type,
-          component = _this$props.component,
-          fieldProps = _this$props.props;
-
-      var _ref = fieldProps || {},
-          onChange = _ref.onChange;
-
-      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
-      }
-
-      onChange && onChange.apply(void 0, args); // Input onChange第一个参数为Event对象，取值特殊处理
-
-      if (!component && isInput(type)) {
-        args[0] = (0, _lodash.get)(args[0], 'target.value');
-      }
-
-      _this.setState({
-        value: args[0]
-      });
-
-      actions.emit.apply(actions, ['fieldChange', name].concat(args));
-    };
-
-    _this.onFormChange = function (formData) {
-      _this.setState({
-        value: (0, _lodash.get)(formData, _this.props.name)
-      });
-    };
-
-    _this.state = {
-      value: props.initialValue
-    };
-    return _this;
-  }
-
-  _createClass(Field, [{
-    key: "render",
-    value: function render() {
-      var _fieldProps$style;
-
-      var _this$props2 = this.props,
-          _this$props2$type = _this$props2.type,
-          type = _this$props2$type === void 0 ? 'input' : _this$props2$type,
-          title = _this$props2.title,
-          name = _this$props2.name,
-          actions = _this$props2.actions,
-          _this$props2$isFieldI = _this$props2.isFieldInDrawer,
-          isFieldInDrawer = _this$props2$isFieldI === void 0 ? false : _this$props2$isFieldI,
-          _this$props2$classNam = _this$props2.className,
-          className = _this$props2$classNam === void 0 ? '' : _this$props2$classNam,
-          component = _this$props2.component,
-          fieldProps = _this$props2.props;
-      var value = this.state.value;
-      var Field = component || _fieldsMap["default"][type];
-      return React.createElement(FormItem, {
-        label: title,
-        className: className
-      }, React.createElement(Field, _extends({
-        value: value
-      }, isInput(type) ? {
-        onPressEnter: function onPressEnter(evt) {
-          var _actions$search;
-
-          return actions.search((_actions$search = {}, _defineProperty(_actions$search, name, evt.target.value), _defineProperty(_actions$search, "current", 1), _actions$search));
-        }
-      } : {}, fieldProps, {
-        style: _objectSpread({}, fieldProps == null ? void 0 : fieldProps.style, {
-          width: isFieldInDrawer ? '100%' : (fieldProps == null ? void 0 : (_fieldProps$style = fieldProps.style) == null ? void 0 : _fieldProps$style.width) || (0, _fieldsMap.getFieldWidth)(type)
-        }),
-        onChange: this.onChange
-      })));
+      return actions.search((_actions$search = {}, _defineProperty(_actions$search, name, evt.target.value), _defineProperty(_actions$search, "current", 1), _actions$search));
     }
-  }, {
-    key: "componentDidMount",
-    value: function componentDidMount() {
-      this.props.actions.on('setFormData', this.onFormChange);
-    }
-  }, {
-    key: "componentWillUnmount",
-    value: function componentWillUnmount() {
-      this.props.actions.off('setFormData', this.onFormChange);
-    }
-  }]);
-
-  return Field;
-}(React.PureComponent);
+  } : {}, fieldProps, {
+    onChange: onFieldChange
+  }))));
+};
 
-exports["default"] = Field;
+exports["default"] = _default;

package/lib/QueryListScene/List.js

@@ -19,6 +19,8 @@ var _lodash = require("lodash");
 
 var _Table = _interopRequireDefault(require("../Table"));
 
+var _locale = require("../locale");
+
 function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -289,7 +291,7 @@ function (_React$PureComponent) {
         showQuickJumper: true,
         showSizeChanger: true,
         showTotal: function showTotal(total) {
-          return "\u5171".concat(total, "\u6761\u8BB0\u5F55");
+          return (0, _locale.getText)('totalRecords', (0, _locale.getLanguage)(), total);
         }
       }, pagination || {});
 

package/lib/QueryListScene/QueryForm/index.js

@@ -5,10 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-require("antd/lib/form/style");
-
-var _form = _interopRequireDefault(require("antd/lib/form"));
-
 require("antd/lib/drawer/style");
 
 var _drawer = _interopRequireDefault(require("antd/lib/drawer"));
@@ -21,16 +17,20 @@ require("antd/lib/button/style");
 
 var _button = _interopRequireDefault(require("antd/lib/button"));
 
+require("antd/lib/form/style");
+
+var _form = _interopRequireDefault(require("antd/lib/form"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _classnames3 = _interopRequireDefault(require("classnames"));
 
 var _lodash = require("lodash");
 
-var _Icon = _interopRequireDefault(require("../../Icon"));
-
 require("./index.less");
 
+var _dec, _class, _temp;
+
 function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -63,12 +63,11 @@ function _inherits(subClass, superClass) { if (typeof superClass !== "function"
 
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
-var clsPrefix = 'tnt-querylistscene-queryform';
-
-var QueryForm =
+var clsPrefix = "tnt-querylistscene-queryform";
+var QueryForm = (_dec = _form["default"].create(), _dec(_class = (_temp =
 /*#__PURE__*/
-function (_React$PureComponent) {
-  _inherits(QueryForm, _React$PureComponent);
+function (_React$Component) {
+  _inherits(QueryForm, _React$Component);
 
   function QueryForm(props) {
     var _this;
@@ -90,9 +89,10 @@ function (_React$PureComponent) {
 
     _this.onSubmit = function () {
       var _this$props = _this.props,
+          form = _this$props.form,
           onSubmit = _this$props.onSubmit,
           actions = _this$props.actions;
-      var values = actions.getFormData();
+      var values = form.getFieldsValue();
 
       var params = _objectSpread({}, values, {
         current: 1
@@ -105,21 +105,18 @@ function (_React$PureComponent) {
 
     _this.onReset = function () {
       var _this$props2 = _this.props,
-          initialValues = _this$props2.initialValues,
-          onReset = _this$props2.onReset,
-          actions = _this$props2.actions;
-      actions.setFormData(initialValues, false);
-      onReset && onReset(initialValues);
+          form = _this$props2.form,
+          onReset = _this$props2.onReset;
+      form.resetFields();
+      var values = form.getFieldsValue();
+      onReset && onReset(values);
 
-      _this.updateDrawerFieldsValueCount(initialValues);
+      _this.updateDrawerFieldsValueCount(values);
 
       _this.onSubmit();
     };
 
     _this.onToggleExpand = function () {
-      var onToggleExpand = _this.props.onToggleExpand;
-      onToggleExpand && onToggleExpand(!_this.state.expanded);
-
       _this.setState({
         expanded: !_this.state.expanded
       });
@@ -133,9 +130,10 @@ function (_React$PureComponent) {
 
     _this.onFieldChange = function (name, value) {
       var _this$props3 = _this.props,
+          form = _this$props3.form,
           onChange = _this$props3.onChange,
           actions = _this$props3.actions;
-      var values = actions.getFormData() || {};
+      var values = form.getFieldsValue();
 
       var newValues = _objectSpread({}, values, _defineProperty({}, name, value));
 
@@ -150,52 +148,54 @@ function (_React$PureComponent) {
       }
 
       onChange && onChange.apply(void 0, [newValues, changedInfo].concat(rest));
-      actions.setFormData(newValues, false);
+      actions.setData('formData', newValues);
+      actions.emit('formChange', newValues, changedInfo);
 
       _this.updateDrawerFieldsValueCount(newValues);
     };
 
     _this.updateDrawerFieldsValueCount = function (values) {
       var _this$props4 = _this.props,
-          actions = _this$props4.actions,
+          form = _this$props4.form,
           showFieldCount = _this$props4.showFieldCount,
           children = _this$props4.children;
 
       if (showFieldCount) {
-        values = values || actions.getFormData();
-        var drawerFieldsValueCount = children.reduce(function (acc, cur, index) {
-          if (index >= showFieldCount && values[(0, _lodash.get)(cur, 'props.name')]) {
-            acc++;
-          }
+        values = values || form.getFieldsValue();
 
-          return acc;
-        }, 0);
+        _this.setState({
+          drawerFieldsValueCount: children.reduce(function (acc, cur, index) {
+            if (index >= showFieldCount && values[(0, _lodash.get)(cur, 'props.name')]) {
+              acc++;
+            }
 
-        if (drawerFieldsValueCount !== _this.state.drawerFieldsValueCount) {
-          _this.setState({
-            drawerFieldsValueCount: drawerFieldsValueCount
-          });
-        }
+            return acc;
+          }, 0)
+        });
       }
     };
 
     _this.setFormData = function (data, needSearch) {
-      var actions = _this.props.actions;
+      var _this$props5 = _this.props,
+          form = _this$props5.form,
+          actions = _this$props5.actions;
+      form.setFieldsValue(data);
       actions.setData('formData', data);
       needSearch && _this.onSubmit();
     };
 
     _this.resetFormData = function (needSearch) {
-      var _this$props5 = _this.props,
-          initialValues = _this$props5.initialValues,
-          actions = _this$props5.actions;
-      actions.setFormData(initialValues, needSearch);
+      var _this$props6 = _this.props,
+          form = _this$props6.form,
+          actions = _this$props6.actions;
+      form.resetFieldsValue();
+      actions.setData('formData', data);
+      needSearch && _this.onSubmit();
     };
 
     var _props$showExpand = props.showExpand,
         showExpand = _props$showExpand === void 0 ? true : _props$showExpand,
-        renderActions = props.renderActions,
-        _actions = props.actions;
+        renderActions = props.renderActions;
     _this.state = {
       showMore: false,
       expanded: !showExpand || renderActions ? true : false,
@@ -204,13 +204,9 @@ function (_React$PureComponent) {
     };
     _this.fieldsRef = (0, _react.createRef)();
     _this.formBoxRef = (0, _react.createRef)();
-
-    _actions.on('setFormData', _this.setFormData);
-
-    _actions.on('resetFormData', _this.resetFormData);
-
-    _actions.on('fieldChange', _this.onFieldChange);
-
+    props.actions.on('setFormData', _this.setFormData);
+    props.actions.on('resetFormData', _this.resetFormData);
+    props.actions.on('fieldChange', _this.onFieldChange);
     return _this;
   }
 
@@ -219,23 +215,24 @@ function (_React$PureComponent) {
     value: function render() {
       var _this2 = this;
 
-      var _this$props6 = this.props,
-          title = _this$props6.title,
-          children = _this$props6.children,
-          _this$props6$classNam = _this$props6.className,
-          className = _this$props6$classNam === void 0 ? '' : _this$props6$classNam,
-          actions = _this$props6.actions,
-          _this$props6$initialV = _this$props6.initialValues,
-          initialValues = _this$props6$initialV === void 0 ? {} : _this$props6$initialV,
-          renderActions = _this$props6.renderActions,
-          _this$props6$showSear = _this$props6.showSearch,
-          showSearch = _this$props6$showSear === void 0 ? true : _this$props6$showSear,
-          _this$props6$showRese = _this$props6.showReset,
-          showReset = _this$props6$showRese === void 0 ? true : _this$props6$showRese,
-          showFieldCount = _this$props6.showFieldCount,
-          _this$props6$drawerPr = _this$props6.drawerProps,
-          drawerProps = _this$props6$drawerPr === void 0 ? {} : _this$props6$drawerPr,
-          size = _this$props6.size; // 前期拼写错误，导致需要兼容错误的api
+      var _this$props7 = this.props,
+          title = _this$props7.title,
+          children = _this$props7.children,
+          _this$props7$classNam = _this$props7.className,
+          className = _this$props7$classNam === void 0 ? '' : _this$props7$classNam,
+          form = _this$props7.form,
+          actions = _this$props7.actions,
+          _this$props7$initialV = _this$props7.initialValues,
+          initialValues = _this$props7$initialV === void 0 ? {} : _this$props7$initialV,
+          renderActions = _this$props7.renderActions,
+          _this$props7$showSear = _this$props7.showSearch,
+          showSearch = _this$props7$showSear === void 0 ? true : _this$props7$showSear,
+          _this$props7$showRese = _this$props7.showReset,
+          showReset = _this$props7$showRese === void 0 ? true : _this$props7$showRese,
+          showFieldCount = _this$props7.showFieldCount,
+          _this$props7$drawerPr = _this$props7.drawerProps,
+          drawerProps = _this$props7$drawerPr === void 0 ? {} : _this$props7$drawerPr,
+          size = _this$props7.size; // 前期拼写错误，导致需要兼容错误的api
 
       var extraActions = this.props.extraActions || this.props.extralActions;
       var _this$state = this.state,
@@ -245,13 +242,7 @@ function (_React$PureComponent) {
           drawerFieldsValueCount = _this$state.drawerFieldsValueCount;
 
       var renderFormActions = renderActions || function () {
-        return _react["default"].createElement(_react.Fragment, null, showFieldCount && _react["default"].createElement(_badge["default"], {
-          count: drawerFieldsValueCount
-        }, _react["default"].createElement(_button["default"], {
-          onClick: _this2.onShowDrawer
-        }, _react["default"].createElement(_Icon["default"], {
-          type: "filter"
-        }), "\u66F4\u591A\u8FC7\u6EE4")), showSearch && _react["default"].createElement(_button["default"], {
+        return _react["default"].createElement(_react.Fragment, null, showSearch && _react["default"].createElement(_button["default"], {
           type: "primary",
           onClick: _this2.onSubmit
         }, "\u641C\u7D22"), showReset && _react["default"].createElement(_button["default"], {
@@ -260,8 +251,15 @@ function (_React$PureComponent) {
           className: "expand-link",
           type: "link",
           onClick: _this2.onToggleExpand
-        }, expanded ? '收起' : '展开'), _react["default"].Children.map(children, function (child) {
-          return child && (0, _lodash.get)(child, 'props.align') === 'right' && _react["default"].cloneElement(child);
+        }, expanded ? '收起' : '展开'), showFieldCount && _react["default"].createElement(_badge["default"], {
+          count: drawerFieldsValueCount
+        }, _react["default"].createElement(_button["default"], {
+          icon: "filter",
+          onClick: _this2.onShowDrawer
+        }, "\u66F4\u591A\u8FC7\u6EE4")), _react["default"].Children.map(children, function (child) {
+          return child && (0, _lodash.get)(child, 'props.align') === 'right' && _react["default"].cloneElement(child, {
+            form: form
+          });
         }));
       };
 
@@ -280,6 +278,7 @@ function (_React$PureComponent) {
         ref: this.fieldsRef
       }, _react["default"].Children.map(children, function (child, index) {
         return child && (0, _lodash.get)(child, 'props.align') !== 'right' && (!showFieldCount || showFieldCount > index) && _react["default"].cloneElement(child, {
+          form: form,
           actions: actions,
           initialValue: initialValues[child.props.name]
         });
@@ -302,7 +301,7 @@ function (_React$PureComponent) {
         }, className, className))
       }), _react["default"].Children.map(children, function (child, index) {
         return child && index >= showFieldCount && _react["default"].cloneElement(child, {
-          isFieldInDrawer: true,
+          form: form,
           actions: actions,
           initialValue: initialValues[child.props.name]
         });
@@ -311,7 +310,7 @@ function (_React$PureComponent) {
         onClick: this.onSubmit
       }, "\u641C\u7D22"), _react["default"].createElement(_button["default"], {
         onClick: this.onReset
-      }, "\u91CD\u7F6E"))), extraActions && _react["default"].createElement("div", {
+      }, "\u6E05\u7A7A"))), extraActions && _react["default"].createElement("div", {
         className: "".concat(clsPrefix, "-extra")
       }, extraActions));
     }
@@ -344,7 +343,7 @@ function (_React$PureComponent) {
         var _current$children;
 
         var current = fieldsRef.current;
-        var height = '32px';
+        var height = "32px";
 
         if (current && ((_current$children = current.children) == null ? void 0 : _current$children[0])) {
           height = window.getComputedStyle(current.children[0]).height;
@@ -372,22 +371,20 @@ function (_React$PureComponent) {
     key: "componentDidMount",
     value: function componentDidMount() {
       var current = this.fieldsRef.current;
-      var _this$props7 = this.props,
-          _this$props7$initialV = _this$props7.initialValues,
-          initialValues = _this$props7$initialV === void 0 ? {} : _this$props7$initialV,
-          actions = _this$props7.actions,
-          qlsProps = _this$props7.qlsProps,
-          showFieldCount = _this$props7.showFieldCount,
-          _this$props7$showExpa = _this$props7.showExpand,
-          showExpand = _this$props7$showExpa === void 0 ? true : _this$props7$showExpa,
-          renderActions = _this$props7.renderActions;
+      var _this$props8 = this.props,
+          actions = _this$props8.actions,
+          qlsProps = _this$props8.qlsProps,
+          form = _this$props8.form,
+          showFieldCount = _this$props8.showFieldCount,
+          _this$props8$showExpa = _this$props8.showExpand,
+          showExpand = _this$props8$showExpa === void 0 ? true : _this$props8$showExpa,
+          renderActions = _this$props8.renderActions;
 
       if (qlsProps.memory) {
-        actions.setFormData(_objectSpread({}, initialValues, {}, actions.getFormData()), false);
-      } else {
-        actions.setData('formData', initialValues);
+        form.setFieldsValue(_objectSpread({}, form.getFieldsValue(), {}, actions.getFormData()));
       }
 
+      actions.setData('formData', form.getFieldsValue());
       this.updateFieldHeight(); // 未设置第一行显示数量且禁止了展开操作 或 自定义了操作区域，则不需要处理展开计算逻辑
 
       if (!showFieldCount && !showExpand || renderActions) {
@@ -417,7 +414,6 @@ function (_React$PureComponent) {
   }]);
 
   return QueryForm;
-}(_react["default"].PureComponent);
-
+}(_react["default"].Component), _temp)) || _class);
 exports["default"] = QueryForm;
 ;

package/lib/QueryListScene/QueryForm/index.less

@@ -21,18 +21,11 @@
         display: inline-block;
         height: 32px;
         line-height: 32px;
-        
-        & > *:not(.expand-link) {
-            margin-right: 10px;
-        }
         & > .expand-link {
             padding: 0;
-            margin-right: 0;
         }
-        & > .ant-badge {
-            .tnt-icon {
-                margin-right: 8px;
-            }
+        & > *:not(:last-child) {
+            margin-right: 10px;
         }
     }
 
@@ -41,9 +34,6 @@
         margin-bottom: 12px;
         display: flex;
         flex: 1;
-        &.ant-form-inline {
-            flex-wrap: unset;
-        }
 
         & > div:nth-child(1) {
             height: 32px;
@@ -75,12 +65,10 @@
 
         &.ant-form-inline .ant-form-item {
             margin-right: 10px;
-            display: inline-block;
         }
 
         .ant-form-item-control {
-            // min-width: 160px;
-            // min-width: 200px;
+            min-width: 160px;
             line-height: unset;
             .ant-calendar-picker-input {
                 padding: 0 11px;
@@ -89,7 +77,6 @@
                 & > .ant-input,
                 & > .ant-input-affix-wrapper {
                     width: 160px;
-                    // width: 200px;
                 }
             }
         }
@@ -112,7 +99,6 @@
                 display: block;
                 margin-right: 0;
                 margin-bottom: 20px;
-                width: 100%;
             }
             .ant-form-item-label {
                 display: block;