tntd 3.0.45 → 3.0.47-beta.1

package/es/query-form/Field/Composition/ValueTag.js

@@ -1,20 +1,13 @@
 "use strict";
 
-function _typeof(o) {
-  "@babel/helpers - typeof";
-
-  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) {
-    return typeof o;
-  } : function (o) {
-    return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o;
-  }, _typeof(o);
-}
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = ValueTag;
+var _cloneDeep2 = _interopRequireDefault(require("lodash/cloneDeep"));
+var _find2 = _interopRequireDefault(require("lodash/find"));
 var _react = _interopRequireWildcard(require("react"));
-var _lodash = require("lodash");
 var _popover = _interopRequireDefault(require("../../../popover"));
 var _tag = _interopRequireDefault(require("../../../tag"));
 var _fieldsMap = _interopRequireDefault(require("../fieldsMap"));
@@ -22,84 +15,15 @@ var _SelectInput = _interopRequireDefault(require("./SelectInput"));
 var _Select = _interopRequireDefault(require("./Select"));
 var _utils = require("./utils");
 require("./FieldPopover.less");
-function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : {
-    "default": e
-  };
-}
-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 && {}.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 _slicedToArray(r, e) {
-  return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest();
-}
-function _nonIterableRest() {
-  throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
-function _unsupportedIterableToArray(r, a) {
-  if (r) {
-    if ("string" == typeof r) return _arrayLikeToArray(r, a);
-    var t = {}.toString.call(r).slice(8, -1);
-    return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0;
-  }
-}
-function _arrayLikeToArray(r, a) {
-  (null == a || a > r.length) && (a = r.length);
-  for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e];
-  return n;
-}
-function _iterableToArrayLimit(r, l) {
-  var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
-  if (null != t) {
-    var e,
-      n,
-      i,
-      u,
-      a = [],
-      f = !0,
-      o = !1;
-    try {
-      if (i = (t = t.call(r)).next, 0 === l) {
-        if (Object(t) !== t) return;
-        f = !1;
-      } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0);
-    } catch (r) {
-      o = !0, n = r;
-    } finally {
-      try {
-        if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return;
-      } finally {
-        if (o) throw n;
-      }
-    }
-    return a;
-  }
-}
-function _arrayWithHoles(r) {
-  if (Array.isArray(r)) return r;
-}
+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 && {}.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 _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 function ValueTag(_ref) {
   var item = _ref.item,
     fieldItems = _ref.fieldItems,
@@ -115,7 +39,7 @@ function ValueTag(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     visible = _useState2[0],
     setVisible = _useState2[1];
-  var propItem = ((_a = (0, _lodash.find)(fieldItems, function (it) {
+  var propItem = ((_a = (0, _find2["default"])(fieldItems, function (it) {
     var _a;
     return ((_a = it.props) === null || _a === void 0 ? void 0 : _a.name) === item.key;
   })) === null || _a === void 0 ? void 0 : _a.props) || {};
@@ -137,7 +61,7 @@ function ValueTag(_ref) {
   };
   var onFieldChange = function onFieldChange() {
     var _a;
-    var copyValue = (0, _lodash.cloneDeep)(value);
+    var copyValue = (0, _cloneDeep2["default"])(value);
     var index = copyValue.findIndex(function (v) {
       return v.key === name;
     });
@@ -150,7 +74,7 @@ function ValueTag(_ref) {
   };
   var onSelectChange = function onSelectChange(v, isMultiple) {
     var _a, _b, _c;
-    var copyValue = (0, _lodash.cloneDeep)(value || []);
+    var copyValue = (0, _cloneDeep2["default"])(value || []);
     var index = copyValue.findIndex(function (v) {
       return v.key === name;
     });
@@ -225,7 +149,7 @@ function ValueTag(_ref) {
       if (!_isInput) {
         setVisible(true);
       } else {
-        handleTag((0, _lodash.cloneDeep)(item));
+        handleTag((0, _cloneDeep2["default"])(item));
       }
     },
     onClose: function onClose(e) {

package/es/query-form/Field/Composition/index.js

@@ -1,139 +1,36 @@
 "use strict";
 
-function _typeof(o) {
-  "@babel/helpers - typeof";
-
-  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) {
-    return typeof o;
-  } : function (o) {
-    return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o;
-  }, _typeof(o);
-}
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+var _isObject2 = _interopRequireDefault(require("lodash/isObject"));
+var _find2 = _interopRequireDefault(require("lodash/find"));
 var _react = _interopRequireWildcard(require("react"));
 var _LocaleReceiver = _interopRequireDefault(require("antd/es/locale-provider/LocaleReceiver"));
-var _lodash = require("lodash");
 var _icon = _interopRequireDefault(require("../../../icon"));
 var _input = _interopRequireDefault(require("../../../input"));
 var _FieldPopover = _interopRequireDefault(require("./FieldPopover"));
 var _ValueTag = _interopRequireDefault(require("./ValueTag"));
 var _utils = require("./utils");
 require("./index.less");
-function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : {
-    "default": e
-  };
-}
-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 && {}.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 _toConsumableArray(r) {
-  return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread();
-}
-function _nonIterableSpread() {
-  throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
-function _iterableToArray(r) {
-  if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r);
-}
-function _arrayWithoutHoles(r) {
-  if (Array.isArray(r)) return _arrayLikeToArray(r);
-}
-function _defineProperty(e, r, t) {
-  return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
-    value: t,
-    enumerable: !0,
-    configurable: !0,
-    writable: !0
-  }) : e[r] = t, e;
-}
-function _toPropertyKey(t) {
-  var i = _toPrimitive(t, "string");
-  return "symbol" == _typeof(i) ? i : i + "";
-}
-function _toPrimitive(t, r) {
-  if ("object" != _typeof(t) || !t) return t;
-  var e = t[Symbol.toPrimitive];
-  if (void 0 !== e) {
-    var i = e.call(t, r || "default");
-    if ("object" != _typeof(i)) return i;
-    throw new TypeError("@@toPrimitive must return a primitive value.");
-  }
-  return ("string" === r ? String : Number)(t);
-}
-function _slicedToArray(r, e) {
-  return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest();
-}
-function _nonIterableRest() {
-  throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
-function _unsupportedIterableToArray(r, a) {
-  if (r) {
-    if ("string" == typeof r) return _arrayLikeToArray(r, a);
-    var t = {}.toString.call(r).slice(8, -1);
-    return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0;
-  }
-}
-function _arrayLikeToArray(r, a) {
-  (null == a || a > r.length) && (a = r.length);
-  for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e];
-  return n;
-}
-function _iterableToArrayLimit(r, l) {
-  var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
-  if (null != t) {
-    var e,
-      n,
-      i,
-      u,
-      a = [],
-      f = !0,
-      o = !1;
-    try {
-      if (i = (t = t.call(r)).next, 0 === l) {
-        if (Object(t) !== t) return;
-        f = !1;
-      } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0);
-    } catch (r) {
-      o = !0, n = r;
-    } finally {
-      try {
-        if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return;
-      } finally {
-        if (o) throw n;
-      }
-    }
-    return a;
-  }
-}
-function _arrayWithHoles(r) {
-  if (Array.isArray(r)) return r;
-}
+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 && {}.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 _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
+function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
+function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 /**
  * @param value: [{
       key: 'key1',
@@ -180,7 +77,7 @@ var CompositionInput = function CompositionInput(_ref, ref) {
     fieldItem = _useState10[0],
     setFieldItem = _useState10[1];
   var fieldItemsRef = (0, _react.useRef)(fieldItems);
-  var _fieldItem = fieldItem ? ((_a = (0, _lodash.find)(fieldItems, function (f) {
+  var _fieldItem = fieldItem ? ((_a = (0, _find2["default"])(fieldItems, function (f) {
     var _a;
     return ((_a = f.props) === null || _a === void 0 ? void 0 : _a.name) === fieldItem.name;
   })) === null || _a === void 0 ? void 0 : _a.props) || fieldItem : {};
@@ -248,7 +145,7 @@ var CompositionInput = function CompositionInput(_ref, ref) {
     e.stopPropagation();
     var inputValue = ((_a = searchText === null || searchText === void 0 ? void 0 : searchText.match(/[^:]+:(.*)/)) === null || _a === void 0 ? void 0 : _a[1]) || null;
     if (tempItem && inputValue) {
-      if ((0, _lodash.isObject)(tempItem.value)) {
+      if ((0, _isObject2["default"])(tempItem.value)) {
         tempItem.value = _defineProperty({}, Object.keys(tempItem.value)[0], inputValue);
       } else {
         tempItem.value = inputValue; // 得到输入值
@@ -285,7 +182,7 @@ var CompositionInput = function CompositionInput(_ref, ref) {
       var deleteKeys = [key];
       onChange((0, _utils.parseArrayToObject)(newValue), deleteKeys, true);
       // 删除的时候也触发Field的onChange --  泳建提的需求
-      var fieldProps = (_a = (0, _lodash.find)(fieldItems, function (it) {
+      var fieldProps = (_a = (0, _find2["default"])(fieldItems, function (it) {
         var _a;
         return ((_a = it.props) === null || _a === void 0 ? void 0 : _a.name) === key;
       })) === null || _a === void 0 ? void 0 : _a.props;
@@ -335,7 +232,7 @@ var CompositionInput = function CompositionInput(_ref, ref) {
     var fieldValue;
     if (tempItem && inputValue) {
       setVisible(false);
-      if ((0, _lodash.isObject)(tempItem.value)) {
+      if ((0, _isObject2["default"])(tempItem.value)) {
         tempItem.value = _defineProperty({}, Object.keys(tempItem.value)[0], inputValue);
       } else {
         tempItem.value = inputValue; // 得到输入值

package/es/query-form/Field/Composition/index.less

@@ -17,7 +17,7 @@
   outline: none;
   transition: all 0.3s @ease-in-out;
   user-select: none;
-  margin-bottom: @margin-sm;
+  margin-bottom: @margin-base;
 
   &-prefix {
     position: absolute;
@@ -25,7 +25,7 @@
     top: 50%;
     transform: translateY(-50%);
     i.anticon {
-      color: #8B919E;
+      color: #8b919e;
     }
   }
 
@@ -109,7 +109,7 @@
     transition: border-color 0.3s @ease-in-out;
     cursor: pointer;
     &:hover {
-      background-color: #E6F4FF;
+      background-color: #e6f4ff;
       i.anticon {
         color: @primary-color;
       }
@@ -119,7 +119,7 @@
   &:focus,
   &:active {
     border-color: @primary-color;
-    box-shadow: 0px 0px 4px 0px rgba(18, 107, 251, 0.10), 0px 0px 5px 0px rgba(18, 107, 251, 0.30);
+    box-shadow: 0px 0px 4px 0px rgba(18, 107, 251, 0.1), 0px 0px 5px 0px rgba(18, 107, 251, 0.3);
     outline: 0;
     .tnt-queryform-composition-input-prefix {
       i.anticon {

package/es/query-form/Field/Composition/utils.js

@@ -10,14 +10,12 @@ exports.highlightSubstring = highlightSubstring;
 exports.isInput = void 0;
 exports.parseArrayToObject = parseArrayToObject;
 exports.parseObjectToArray = parseObjectToArray;
+var _flatten2 = _interopRequireDefault(require("lodash/flatten"));
+var _isString2 = _interopRequireDefault(require("lodash/isString"));
+var _isArray2 = _interopRequireDefault(require("lodash/isArray"));
 var _react = _interopRequireDefault(require("react"));
-var _lodash = require("lodash");
 var _moment = _interopRequireDefault(require("moment"));
-function _interopRequireDefault(e) {
-  return e && e.__esModule ? e : {
-    "default": e
-  };
-}
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function highlightSubstring(str, substring) {
   var highlighted = "<span class=\"tnt-highlight\">".concat(substring, "</span>");
   return str.replace(new RegExp(substring, 'g'), highlighted);
@@ -42,17 +40,17 @@ function getLabelByValue(_ref) {
       return value;
     }
   };
-  if ((0, _lodash.isArray)(value)) {
+  if ((0, _isArray2["default"])(value)) {
     return value.map(getLabel).join(' | ');
   } else {
     return getLabel(value);
   }
 }
 function formatLabel(reactDom) {
-  return (0, _lodash.flatten)(_react["default"].Children.map(reactDom.props.children, function (child) {
+  return (0, _flatten2["default"])(_react["default"].Children.map(reactDom.props.children, function (child) {
     if (_react["default"].isValidElement(child)) {
       return formatLabel(child);
-    } else if ((0, _lodash.isString)(child)) {
+    } else if ((0, _isString2["default"])(child)) {
       return child;
     }
     return '';

package/es/query-form/Field/SelectInput.js

@@ -31,12 +31,15 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
 };
 var Option = _select["default"].Option;
 var _default = exports["default"] = function _default(props) {
-  var form = props.form,
-    _props$options = props.options,
+  var _props$options = props.options,
     options = _props$options === void 0 ? [] : _props$options,
     addonBeforeStyle = props.addonBeforeStyle,
     selectProps = props.selectProps,
-    inputProps = __rest(props, ["form", "options", "addonBeforeStyle", "selectProps"]);
+    form = props.form,
+    close = props.close,
+    name = props.name,
+    _onChange = props._onChange,
+    inputProps = __rest(props, ["options", "addonBeforeStyle", "selectProps", "form", "close", "name", "_onChange"]);
   var _useState = (0, _react.useState)(options),
     _useState2 = _slicedToArray(_useState, 2),
     items = _useState2[0],
@@ -74,22 +77,27 @@ var _default = exports["default"] = function _default(props) {
       value: value
     }, label);
   }));
-  var getInputValue = function getInputValue() {
-    return (0, _get2["default"])(inputProps.value, key);
-  };
+  (0, _react.useEffect)(function () {
+    setItems(options);
+    setKey(getInitialKey());
+  }, [options, inputProps.value]);
   var doSearch = function doSearch(value) {
-    form.emit('search', {
-      current: 1
-    });
+    var newValue = _defineProperty({}, key, value);
+    _onChange && _onChange(newValue);
+    form.emit('search', _defineProperty({}, name, newValue));
+    close && close();
   };
-  return _react["default"].createElement(_input["default"], Object.assign({
+  return _react["default"].createElement(_input["default"].Search, Object.assign({
+    addonBefore: addonBefore,
     onPressEnter: function onPressEnter(evt) {
       var _a;
       return doSearch((_a = evt === null || evt === void 0 ? void 0 : evt.target) === null || _a === void 0 ? void 0 : _a.value);
+    },
+    onSearch: function onSearch(value) {
+      return doSearch(value);
     }
   }, inputProps, {
-    value: getInputValue(),
-    addonBefore: addonBefore,
+    value: (0, _get2["default"])(inputProps.value, key),
     onChange: onChange
   }));
 };

package/es/query-form/Field/SelectInput.js.map

@@ -1 +1 @@
-{"version":3,"file":"SelectInput.js","sourceRoot":"","sources":["../../../src/query-form/Field/SelectInput.js"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAa,MAAM,OAAO,CAAA;AAClD,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAA;AAE5B,OAAO,MAAM,MAAM,cAAc,CAAA;AACjC,OAAO,KAAK,MAAM,aAAa,CAAA;AAE/B,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAA;AAEzB,eAAe,CAAC,KAAK,EAAE,EAAE;IACvB,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,EAAE,EAAE,gBAAgB,EAAE,WAAW,KAAoB,KAAK,EAApB,UAAU,UAAK,KAAK,EAA5E,sDAAoE,CAAQ,CAAA;IAClF,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAA;IAC3C,MAAM,aAAa,GAAG,GAAG,EAAE;QACzB,IAAI,GAAG,GAAG,GAAG,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;QAEjC,IAAI,UAAU,CAAC,KAAK,EAAE;YACpB,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,IAAI,GAAG,CAAA;SACrD;QAED,OAAO,GAAG,CAAA;IACZ,CAAC,CAAA;IACD,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,QAAQ,CAAC,aAAa,EAAE,CAAC,CAAA;IAC/C,MAAM,WAAW,GAAG,CAAC,GAAG,EAAE,EAAE;QAC1B,MAAM,CAAC,GAAG,CAAC,CAAA;QACX,KAAK,CAAC,QAAQ,CAAC;YACb,CAAC,GAAG,CAAC,EAAE,EAAE;SACV,CAAC,CAAA;IACJ,CAAC,CAAA;IACD,MAAM,QAAQ,GAAG,CAAC,GAAG,EAAE,EAAE;QACvB,KAAK,CAAC,QAAQ,CAAC;YACb,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,KAAK;SACxB,CAAC,CAAA;IACJ,CAAC,CAAA;IACD,MAAM,WAAW,GAAG,CAClB,oBAAC,MAAM,kBACL,KAAK,EAAE,GAAG,EACV,QAAQ,EAAE,WAAW,EACrB,KAAK,kBACH,KAAK,EAAE,OAAO,IACX,gBAAgB,GAErB,wBAAwB,EAAE,KAAK,IAC3B,CAAC,WAAW,IAAE,EAAE,CAAC,GAEpB,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAC/B,oBAAC,MAAM,IAAC,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,IAC7B,KAAK,CACC,CACV,CAAC,CACK,CACV,CAAA;IACD,MAAM,aAAa,GAAG,GAAG,EAAE;QACzB,OAAO,GAAG,CAAC,UAAU,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;IACnC,CAAC,CAAA;IAED,MAAM,QAAQ,GAAG,CAAC,KAAK,EAAE,EAAE;QACzB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,OAAO,EAAC,CAAC,EAAE,CAAC,CAAC;IAErC,CAAC,CAAA;IAGD,OAAO,CACL,oBAAC,KAAK,kBACF,YAAY,EAAE,CAAC,GAAG,EAAE,EAAE,WAAC,OAAA,QAAQ,CAAC,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,MAAM,0CAAE,KAAK,CAAC,CAAA,EAAA,IAC/C,UAAU,IACd,KAAK,EAAE,aAAa,EAAE,EACtB,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,IAC9C,CACH,CAAA;AACH,CAAC,CAAA","sourcesContent":["import React, { useState, useEffect } from 'react'\nimport { get } from 'lodash'\n\nimport Select from '../../select'\nimport Input from '../../input'\n\nconst { Option } = Select\n\nexport default (props) => {\n  const { form, options = [], addonBeforeStyle, selectProps, ...inputProps } = props\n  const [items, setItems] = useState(options)\n  const getInitialKey = () => {\n    let key = get(options, '0.value')\n\n    if (inputProps.value) {\n      key = get(Object.keys(inputProps.value), '0') || key\n    }\n\n    return key\n  }\n  const [key, setKey] = useState(getInitialKey())\n  const onKeyChange = (key) => {\n    setKey(key)\n    props.onChange({\n      [key]: '',\n    })\n  }\n  const onChange = (evt) => {\n    props.onChange({\n      [key]: evt.target.value,\n    })\n  }\n  const addonBefore = (\n    <Select\n      value={key}\n      onChange={onKeyChange}\n      style={{\n        width: '120px',\n        ...addonBeforeStyle,\n      }}\n      dropdownMatchSelectWidth={false}\n      {...(selectProps||{})}\n    >\n      {items.map(({ label, value }) => (\n        <Option key={value} value={value}>\n          {label}\n        </Option>\n      ))}\n    </Select>\n  )\n  const getInputValue = () => {\n    return get(inputProps.value, key)\n  }\n\n  const doSearch = (value) => {\n    form.emit('search', { current:1 });\n\n  }\n\n\n  return (\n    <Input\n        onPressEnter={(evt) => doSearch(evt?.target?.value)}\n        {...inputProps}\n        value={getInputValue()}\n        addonBefore={addonBefore} onChange={onChange}\n    />\n  )\n}\n"]}
+{"version":3,"file":"SelectInput.js","sourceRoot":"","sources":["../../../src/query-form/Field/SelectInput.js"],"names":[],"mappings":"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","sourcesContent":["import React, { useState, useEffect } from 'react'\nimport { get } from 'lodash'\nimport Select from '../../select'\nimport Input from '../../input'\n\nconst { Option } = Select\n\nexport default (props) => {\n  const {\n    options = [],\n    addonBeforeStyle,\n    selectProps,\n    form,\n    close,\n    name,\n    _onChange,\n    ...inputProps\n  } = props\n  const [items, setItems] = useState(options)\n  const getInitialKey = () => {\n    let key = get(options, '0.value')\n\n    if (inputProps.value) {\n      key = get(Object.keys(inputProps.value), '0') || key\n    }\n\n    return key\n  }\n  const [key, setKey] = useState(getInitialKey())\n  const onKeyChange = (key) => {\n    setKey(key)\n    props.onChange({\n      [key]: '',\n    })\n  }\n  const onChange = (evt) => {\n    props.onChange({\n      [key]: evt.target.value,\n    })\n  }\n  const addonBefore = (\n    <Select\n      value={key}\n      onChange={onKeyChange}\n      style={{\n        width: '120px',\n        ...addonBeforeStyle,\n      }}\n      dropdownMatchSelectWidth={false}\n      {...(selectProps || {})}\n    >\n      {items.map(({ label, value }) => (\n        <Option key={value} value={value}>\n          {label}\n        </Option>\n      ))}\n    </Select>\n  )\n\n  useEffect(() => {\n    setItems(options)\n    setKey(getInitialKey())\n  }, [options, inputProps.value])\n\n  const doSearch = (value) => {\n    const newValue = { [key]: value }\n    _onChange && _onChange(newValue)\n    form.emit('search', { [name]: newValue })\n    close && close()\n  }\n\n  return (\n    <Input.Search\n      addonBefore={addonBefore}\n      onPressEnter={(evt) => doSearch(evt?.target?.value)}\n      onSearch={(value) => doSearch(value)}\n      {...inputProps}\n      value={get(inputProps.value, key)}\n      onChange={onChange}\n    />\n  )\n}\n"]}

package/es/query-form/Field/fieldsMap.js

@@ -43,8 +43,8 @@ function DataRange(_a) {
   }));
 }
 var _default = exports["default"] = {
-  string: _input["default"],
-  input: _input["default"],
+  string: _input["default"].Search,
+  input: _input["default"].Search,
   search: _input["default"].Search,
   inputNumber: _inputNumber["default"],
   number: _inputNumber["default"],

package/es/query-form/Field/fieldsMap.js.map

@@ -1 +1 @@
-{"version":3,"file":"fieldsMap.js","sourceRoot":"","sources":["../../../src/query-form/Field/fieldsMap.js"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,aAAa,MAAM,YAAY,CAAA;AACtC,OAAO,WAAW,MAAM,UAAU,CAAA;AAClC,OAAO,WAAW,MAAM,eAAe,CAAA;AACvC,OAAO,UAAU,MAAM,mBAAmB,CAAA;AAC1C,OAAO,KAAK,MAAM,aAAa,CAAA;AAC/B,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAE5C,MAAM,CAAC,MAAM,iBAAiB,GAAG,OAAO,CAAA;AAExC,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,IAAI,EAAE,EAAE;IACpC,IAAI,IAAI,KAAK,WAAW,EAAE;QACxB,OAAO,OAAO,CAAA;KACf;IAED,OAAO,CACL;QACE,SAAS,EAAE,OAAO;QAClB,WAAW,EAAE,OAAO;KACrB,CAAC,IAAI,CAAC,IAAI,iBAAiB,CAC7B,CAAA;AACH,CAAC,CAAA;AAED,SAAS,SAAS,CAAC,EAAkC;QAAlC,EAAE,QAAQ,EAAE,KAAK,OAAiB,EAAZ,UAAU,cAAhC,qBAAkC,CAAF;IACjD,OAAO,CACL,oBAAC,UAAU,CAAC,WAAW,oBACjB,UAAU,IACd,QAAQ,EACN,KAAK;YACH,CAAC,CAAC,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE;gBACrB,IAAI,KAAK,CAAC,KAAK,EAAE,WAAW,CAAC,EAAE;oBAC7B,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC,CAAA;iBAC7B;YACH,CAAC;YACH,CAAC,CAAC,QAAQ,IAEd,CACH,CAAA;AACH,CAAC;AAED,eAAe;IACb,MAAM,EAAE,KAAK;IACb,KAAK,EAAE,KAAK;IACZ,MAAM,EAAE,KAAK,CAAC,MAAM;IACpB,WAAW,EAAE,WAAW;IACxB,MAAM,EAAE,WAAW;IACnB,MAAM,EAAE,WAAW;IACnB,QAAQ,EAAE,aAAa;IACvB,IAAI,EAAE,UAAU;IAChB,SAAS,EAAE,SAAS;IACpB,WAAW,EAAE,WAAW;CACzB,CAAA","sourcesContent":["import React from 'react'\nimport CheckboxField from './Checkbox'\nimport SelectField from './Select'\nimport SelectInput from './SelectInput'\nimport DatePicker from '../../date-picker'\nimport Input from '../../input'\nimport InputNumber from '../../input-number'\n\nexport const defaultFieldWidth = '200px'\n\nexport const getFieldWidth = (type) => {\n  if (type === 'dateRange') {\n    return '340px'\n  }\n\n  return (\n    {\n      dateRange: '340px',\n      selectInput: '320px',\n    }[type] || defaultFieldWidth\n  )\n}\n\nfunction DataRange({ onChange, check, ...otherProps }) {\n  return (\n    <DatePicker.RangePicker\n      {...otherProps}\n      onChange={\n        check\n          ? (dates, dateStrings) => {\n              if (check(dates, dateStrings)) {\n                onChange(dates, dateStrings)\n              }\n            }\n          : onChange\n      }\n    />\n  )\n}\n\nexport default {\n  string: Input,\n  input: Input,\n  search: Input.Search,\n  inputNumber: InputNumber,\n  number: InputNumber,\n  select: SelectField,\n  checkbox: CheckboxField,\n  date: DatePicker,\n  dateRange: DataRange,\n  selectInput: SelectInput,\n}\n"]}
+{"version":3,"file":"fieldsMap.js","sourceRoot":"","sources":["../../../src/query-form/Field/fieldsMap.js"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,aAAa,MAAM,YAAY,CAAA;AACtC,OAAO,WAAW,MAAM,UAAU,CAAA;AAClC,OAAO,WAAW,MAAM,eAAe,CAAA;AACvC,OAAO,UAAU,MAAM,mBAAmB,CAAA;AAC1C,OAAO,KAAK,MAAM,aAAa,CAAA;AAC/B,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAE5C,MAAM,CAAC,MAAM,iBAAiB,GAAG,OAAO,CAAA;AAExC,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,IAAI,EAAE,EAAE;IACpC,IAAI,IAAI,KAAK,WAAW,EAAE;QACxB,OAAO,OAAO,CAAA;KACf;IAED,OAAO,CACL;QACE,SAAS,EAAE,OAAO;QAClB,WAAW,EAAE,OAAO;KACrB,CAAC,IAAI,CAAC,IAAI,iBAAiB,CAC7B,CAAA;AACH,CAAC,CAAA;AAED,SAAS,SAAS,CAAC,EAAkC;QAAlC,EAAE,QAAQ,EAAE,KAAK,OAAiB,EAAZ,UAAU,cAAhC,qBAAkC,CAAF;IACjD,OAAO,CACL,oBAAC,UAAU,CAAC,WAAW,oBACjB,UAAU,IACd,QAAQ,EACN,KAAK;YACH,CAAC,CAAC,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE;gBACrB,IAAI,KAAK,CAAC,KAAK,EAAE,WAAW,CAAC,EAAE;oBAC7B,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC,CAAA;iBAC7B;YACH,CAAC;YACH,CAAC,CAAC,QAAQ,IAEd,CACH,CAAA;AACH,CAAC;AAED,eAAe;IACb,MAAM,EAAE,KAAK,CAAC,MAAM;IACpB,KAAK,EAAE,KAAK,CAAC,MAAM;IACnB,MAAM,EAAE,KAAK,CAAC,MAAM;IACpB,WAAW,EAAE,WAAW;IACxB,MAAM,EAAE,WAAW;IACnB,MAAM,EAAE,WAAW;IACnB,QAAQ,EAAE,aAAa;IACvB,IAAI,EAAE,UAAU;IAChB,SAAS,EAAE,SAAS;IACpB,WAAW,EAAE,WAAW;CACzB,CAAA","sourcesContent":["import React from 'react'\nimport CheckboxField from './Checkbox'\nimport SelectField from './Select'\nimport SelectInput from './SelectInput'\nimport DatePicker from '../../date-picker'\nimport Input from '../../input'\nimport InputNumber from '../../input-number'\n\nexport const defaultFieldWidth = '200px'\n\nexport const getFieldWidth = (type) => {\n  if (type === 'dateRange') {\n    return '340px'\n  }\n\n  return (\n    {\n      dateRange: '340px',\n      selectInput: '320px',\n    }[type] || defaultFieldWidth\n  )\n}\n\nfunction DataRange({ onChange, check, ...otherProps }) {\n  return (\n    <DatePicker.RangePicker\n      {...otherProps}\n      onChange={\n        check\n          ? (dates, dateStrings) => {\n              if (check(dates, dateStrings)) {\n                onChange(dates, dateStrings)\n              }\n            }\n          : onChange\n      }\n    />\n  )\n}\n\nexport default {\n  string: Input.Search,\n  input: Input.Search,\n  search: Input.Search,\n  inputNumber: InputNumber,\n  number: InputNumber,\n  select: SelectField,\n  checkbox: CheckboxField,\n  date: DatePicker,\n  dateRange: DataRange,\n  selectInput: SelectInput,\n}\n"]}

package/es/query-form/Field/index.js

@@ -113,7 +113,8 @@ var Field = exports["default"] = /*#__PURE__*/function (_PureComponent) {
         className: className
       }, _react["default"].createElement(_Field, Object.assign({
         form: form,
-        value: value
+        value: value,
+        name: name
       }, isInput(type) ? {
         onPressEnter: function onPressEnter(evt) {
           var _a;

package/es/query-form/Field/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/query-form/Field/index.js"],"names":[],"mappings":"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","sourcesContent":["import React, { PureComponent } from 'react'\nimport { get } from 'lodash'\nimport fieldsMap, { getFieldWidth } from './fieldsMap'\n\nimport Form from '../../form'\n\nconst FormItem = Form.Item\n\nconst isInput = (type) => ['input', 'string', 'search', 'aloneSearch'].includes(type)\n\nexport default class Field extends PureComponent {\n  constructor(props) {\n    super(props)\n\n    this.state = {\n      value: props.initialValue,\n    }\n  }\n\n  render () {\n    const {\n      type = 'input',\n      title,\n      name,\n      isFieldInDrawer = false,\n      className = '',\n      component,\n      form,\n      props: fieldProps,\n    } = this.props\n    const { value } = this.state\n    const Field = component || fieldsMap[type]\n\n    return (\n      <FormItem label={title} className={className}>\n        <Field\n          form={form}\n          value={value}\n          {...(isInput(type)\n            ? {\n              onPressEnter: (evt) =>\n                form.emit('search', { [name]: evt?.target?.value, current: 1 }),\n              onSearch: (value) => form.emit('search', { [name]: value, current: 1 })\n            }\n            : {})}\n          {...fieldProps}\n          style={{\n            ...fieldProps?.style,\n            width: isFieldInDrawer ? '100%' : fieldProps?.style?.width || getFieldWidth(type),\n          }}\n          onChange={this.onChange}\n        />\n      </FormItem>\n    )\n  }\n\n  updateValue = (name, value) => {\n    if (name === this.props.name) {\n      this.setState({ value })\n      this.props.onChange(name, value)\n    }\n  }\n\n  onChange = (...args) => {\n    const { name, type = 'input', component, props: fieldProps } = this.props\n    const { onChange } = fieldProps || {}\n\n    onChange && onChange(...args)\n\n    // Input onChange第一个参数为Event对象，取值特殊处理\n    if (!component && isInput(type)) {\n      args[0] = get(args[0], 'target.value')\n    }\n\n    this.setState({ value: args[0] })\n    this.props.onChange(name, args[0])\n  }\n\n  onFormChange = (formData) => {\n    this.setState({\n      value: get(formData, this.props.name),\n    })\n  }\n\n  componentDidMount () {\n    const { form } = this.props\n\n    form.on('setValue', this.updateValue)\n    form.on('setValues', this.onFormChange)\n  }\n\n  componentWillUnmount () {\n    const { form } = this.props\n\n    form.off('setValue', this.updateValue)\n    form.off('setValues', this.onFormChange)\n  }\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/query-form/Field/index.js"],"names":[],"mappings":"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","sourcesContent":["import React, { PureComponent } from 'react'\nimport { get } from 'lodash'\nimport fieldsMap, { getFieldWidth } from './fieldsMap'\n\nimport Form from '../../form'\n\nconst FormItem = Form.Item\n\nconst isInput = (type) => ['input', 'string', 'search', 'aloneSearch'].includes(type)\n\nexport default class Field extends PureComponent {\n  constructor(props) {\n    super(props)\n\n    this.state = {\n      value: props.initialValue,\n    }\n  }\n\n  render () {\n    const {\n      type = 'input',\n      title,\n      name,\n      isFieldInDrawer = false,\n      className = '',\n      component,\n      form,\n      props: fieldProps,\n    } = this.props\n    const { value } = this.state\n    const Field = component || fieldsMap[type]\n\n    return (\n      <FormItem label={title} className={className}>\n        <Field\n          form={form}\n          value={value}\n          name={name}\n          {...(isInput(type)\n            ? {\n              onPressEnter: (evt) =>\n                form.emit('search', { [name]: evt?.target?.value, current: 1 }),\n              onSearch: (value) => form.emit('search', { [name]: value, current: 1 })\n            }\n            : {})}\n          {...fieldProps}\n          style={{\n            ...fieldProps?.style,\n            width: isFieldInDrawer ? '100%' : fieldProps?.style?.width || getFieldWidth(type),\n          }}\n          onChange={this.onChange}\n        />\n      </FormItem>\n    )\n  }\n\n  updateValue = (name, value) => {\n    if (name === this.props.name) {\n      this.setState({ value })\n      this.props.onChange(name, value)\n    }\n  }\n\n  onChange = (...args) => {\n    const { name, type = 'input', component, props: fieldProps } = this.props\n    const { onChange } = fieldProps || {}\n\n    onChange && onChange(...args)\n\n    // Input onChange第一个参数为Event对象，取值特殊处理\n    if (!component && isInput(type)) {\n      args[0] = get(args[0], 'target.value')\n    }\n\n    this.setState({ value: args[0] })\n    this.props.onChange(name, args[0])\n  }\n\n  onFormChange = (formData) => {\n    this.setState({\n      value: get(formData, this.props.name),\n    })\n  }\n\n  componentDidMount () {\n    const { form } = this.props\n\n    form.on('setValue', this.updateValue)\n    form.on('setValues', this.onFormChange)\n  }\n\n  componentWillUnmount () {\n    const { form } = this.props\n\n    form.off('setValue', this.updateValue)\n    form.off('setValues', this.onFormChange)\n  }\n}\n"]}