@kne/react-form-antd 3.0.27 → 3.0.29

package/dist/index.cjs

@@ -3,54 +3,22 @@ var PropTypes = require('prop-types');
 var classnames = require('classnames');
 var reactForm = require('@kne/react-form');
 var reactFormHelper = require('@kne/react-form-helper');
-var merge = require('lodash/merge');
-var get = require('lodash/get');
+var lodash = require('lodash');
 var antd = require('antd');
-var withLayer = require('@kne/with-layer');
 var icons = require('@ant-design/icons');
-var AvatarEditor = require('react-avatar-editor');
-var omit = require('lodash/omit');
-var dayjs = require('dayjs');
-var useControlValue = require('@kne/use-control-value');
 var useEvent = require('@kne/use-event');
 var reactFetch = require('@kne/react-fetch');
-var groupBy = require('lodash/groupBy');
-var uniqueId = require('lodash/uniqueId');
+var dayjs = require('dayjs');
+var useControlValue = require('@kne/use-control-value');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-function _interopNamespace(e) {
-  if (e && e.__esModule) return e;
-  var n = Object.create(null);
-  if (e) {
-    Object.keys(e).forEach(function (k) {
-      if (k !== 'default') {
-        var d = Object.getOwnPropertyDescriptor(e, k);
-        Object.defineProperty(n, k, d.get ? d : {
-          enumerable: true,
-          get: function () { return e[k]; }
-        });
-      }
-    });
-  }
-  n["default"] = e;
-  return n;
-}
-
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-var React__namespace = /*#__PURE__*/_interopNamespace(React);
 var PropTypes__default = /*#__PURE__*/_interopDefaultLegacy(PropTypes);
 var classnames__default = /*#__PURE__*/_interopDefaultLegacy(classnames);
-var merge__default = /*#__PURE__*/_interopDefaultLegacy(merge);
-var get__default = /*#__PURE__*/_interopDefaultLegacy(get);
-var withLayer__default = /*#__PURE__*/_interopDefaultLegacy(withLayer);
-var AvatarEditor__default = /*#__PURE__*/_interopDefaultLegacy(AvatarEditor);
-var omit__default = /*#__PURE__*/_interopDefaultLegacy(omit);
+var useEvent__default = /*#__PURE__*/_interopDefaultLegacy(useEvent);
 var dayjs__default = /*#__PURE__*/_interopDefaultLegacy(dayjs);
 var useControlValue__default = /*#__PURE__*/_interopDefaultLegacy(useControlValue);
-var useEvent__default = /*#__PURE__*/_interopDefaultLegacy(useEvent);
-var groupBy__default = /*#__PURE__*/_interopDefaultLegacy(groupBy);
-var uniqueId__default = /*#__PURE__*/_interopDefaultLegacy(uniqueId);
 
 function _extends() {
   _extends = Object.assign ? Object.assign.bind() : function (target) {
@@ -91,8 +59,8 @@ var globalParams = {
       displayFilename: 'filename',
       action: '/upload',
       transformResponse: function transformResponse(response) {
-        var targetPath = get__default["default"](response, 'results[0].targetPath');
-        var filename = get__default["default"](response, 'results[0].filename');
+        var targetPath = lodash.get(response, 'results[0].targetPath');
+        var filename = lodash.get(response, 'results[0].filename');
         return {
           code: response.code,
           msg: response.msg,
@@ -114,7 +82,7 @@ var globalParams = {
 };
 var preset = (function (props) {
   var defaultProps = {};
-  merge__default["default"](globalParams, props);
+  lodash.merge(globalParams, props);
   Object.keys(globalParams.field).forEach(function (name) {
     defaultProps[name] = (globalParams.field[name] || {}).defaultProps;
   });
@@ -125,7 +93,7 @@ var preset = (function (props) {
   reactForm.preset(globalParams.rules);
 });
 
-var _excluded$8 = ["className", "cache", "enterSubmit", "scrollToError", "scrollProps", "type", "size", "children"];
+var _excluded$6 = ["className", "cache", "enterSubmit", "scrollToError", "scrollProps", "type", "size", "children"];
 var ScrollToError = reactFormHelper.widget.ScrollToError,
   EnterSubmit = reactFormHelper.widget.EnterSubmit,
   FormStore = reactFormHelper.widget.FormStore,
@@ -138,7 +106,7 @@ var Form = React.forwardRef(function (originProps, ref) {
     scrollToError = originProps.scrollToError,
     scrollProps = originProps.scrollProps,
     children = originProps.children,
-    props = _objectWithoutPropertiesLoose(originProps, _excluded$8);
+    props = _objectWithoutPropertiesLoose(originProps, _excluded$6);
   var baseClass = 'react-form';
   var computedClass = baseClass;
   var _Object$assign = Object.assign({
@@ -192,571 +160,196 @@ Form.propTypes = {
   })
 };
 
-var RotateIcon = function RotateIcon(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends({
-    width: "1em",
-    height: "1em",
-    viewBox: "0 0 14 14",
-    xmlns: "http://www.w3.org/2000/svg",
-    xmlnsXlink: "http://www.w3.org/1999/xlink"
-  }, props), /*#__PURE__*/React__namespace.createElement("title", null, "\u65CB\u8F6C"), /*#__PURE__*/React__namespace.createElement("g", {
-    id: "PC\\u7AEF",
-    stroke: "none",
-    strokeWidth: 1,
-    fill: "none",
-    fillRule: "evenodd"
-  }, /*#__PURE__*/React__namespace.createElement("g", {
-    id: "\\u56FE\\u6807",
-    transform: "translate(-77.000000, -1567.000000)",
-    fill: "#222222",
-    fillRule: "nonzero"
-  }, /*#__PURE__*/React__namespace.createElement("g", {
-    id: "\\u65CB\\u8F6C",
-    transform: "translate(77.000000, 1567.000000)"
-  }, /*#__PURE__*/React__namespace.createElement("path", {
-    d: "M9.16414904,5.6345426 C9.35110931,5.6345426 9.53041217,5.70881228 9.66261304,5.84101315 C9.79481391,5.97321402 9.86908359,6.15251688 9.86908359,6.33947715 L9.86908359,12.683888 C9.86908359,13.0732126 9.55347364,13.3888226 9.16414904,13.3888226 L0.704934547,13.3888226 C0.315609953,13.3888226 1.8189894e-12,13.0732126 1.8189894e-12,12.683888 L1.8189894e-12,6.33947715 C1.8189894e-12,6.15251688 0.0742696765,5.97321402 0.206470548,5.84101315 C0.33867142,5.70881228 0.517974281,5.6345426 0.704934547,5.6345426 L9.16414904,5.6345426 Z M8.4592145,7.04441168 L1.40986909,7.04441168 L1.40986909,11.9789535 L8.4592145,11.9789535 L8.4592145,7.04441168 Z M7.58258803,0.714885198 C7.63035214,0.738767256 7.66052367,0.787585825 7.66052367,0.840987728 L7.66052367,2.02739256 C11.1625178,2.03011634 14,4.86980822 14,8.37180343 C14,8.62367799 13.8656872,8.85643618 13.6475639,8.98238459 C13.4294405,9.108333 13.1606904,9.108333 12.942567,8.98238459 C12.7244437,8.85643618 12.5900924,8.62367799 12.5901309,8.37180343 C12.5901323,5.64845715 10.3838686,3.43998499 7.66052367,3.43726164 L7.66052367,4.50664733 C7.66052367,4.56004923 7.63035214,4.6088678 7.58258803,4.63274986 C7.53482391,4.65663192 7.47766614,4.65147801 7.43494462,4.61943686 L4.99093655,2.78660706 C4.95543522,2.75998107 4.93454178,2.71819419 4.93454178,2.67381753 C4.93454178,2.62944087 4.95543522,2.58765399 4.99093655,2.561028 L7.43494462,0.728198195 C7.47766614,0.696157053 7.53482391,0.691003139 7.58258803,0.714885198 Z",
-    id: "\\u5F62\\u72B6\\u7ED3\\u5408"
-  })))));
-};
-
-var FullIcon = function FullIcon(props) {
-  return /*#__PURE__*/React__namespace.createElement("svg", _extends({
-    width: "1em",
-    height: "1em",
-    viewBox: "0 0 14 14",
-    xmlns: "http://www.w3.org/2000/svg",
-    xmlnsXlink: "http://www.w3.org/1999/xlink"
-  }, props), /*#__PURE__*/React__namespace.createElement("title", null, "\u5145\u6EE1"), /*#__PURE__*/React__namespace.createElement("g", {
-    id: "PC\\u7AEF",
-    stroke: "none",
-    strokeWidth: 1,
-    fill: "none",
-    fillRule: "evenodd"
-  }, /*#__PURE__*/React__namespace.createElement("g", {
-    id: "\\u56FE\\u6807",
-    transform: "translate(-145.000000, -1567.000000)",
-    fill: "#222222",
-    fillRule: "nonzero"
-  }, /*#__PURE__*/React__namespace.createElement("g", {
-    id: "\\u5145\\u6EE1",
-    transform: "translate(145.000000, 1567.000000)"
-  }, /*#__PURE__*/React__namespace.createElement("path", {
-    d: "M12.09375,0 C12.35,0 12.6,0.05 12.8359375,0.15 C13.0640625,0.2453125 13.2671875,0.3828125 13.4421875,0.5578125 C13.6171875,0.7328125 13.7546875,0.9375 13.85,1.1640625 C13.95,1.4 14,1.65 14,1.90625 L14,1.90625 L14,12.09375 C14,12.35 13.95,12.6 13.85,12.8359375 C13.7546875,13.0640625 13.6171875,13.2671875 13.4421875,13.4421875 C13.2671875,13.6171875 13.0625,13.7546875 12.8359375,13.85 C12.6,13.95 12.35,14 12.09375,14 L12.09375,14 L1.90625,14 C1.65,14 1.4,13.95 1.1640625,13.85 C0.9359375,13.7546875 0.7328125,13.6171875 0.5578125,13.4421875 C0.3828125,13.2671875 0.2453125,13.0625 0.15,12.8359375 C0.05,12.6 0,12.35 0,12.09375 L0,12.09375 L0,1.90625 C0,1.65 0.05,1.4 0.15,1.1640625 C0.2453125,0.9359375 0.3828125,0.7328125 0.5578125,0.5578125 C0.7328125,0.3828125 0.9375,0.2453125 1.1640625,0.15 C1.4,0.05 1.65,0 1.90625,0 L1.90625,0 Z M12.09375,1.125 L1.90625,1.125 C1.475,1.125 1.125,1.475 1.125,1.90625 L1.125,1.90625 L1.125,12.09375 C1.125,12.525 1.475,12.875 1.90625,12.875 L1.90625,12.875 L12.09375,12.875 C12.525,12.875 12.875,12.525 12.875,12.09375 L12.875,12.09375 L12.875,1.90625 C12.875,1.475 12.525,1.125 12.09375,1.125 L12.09375,1.125 Z M2.5734375,7.484375 C2.878125,7.490625 3.125,7.740625 3.125,8.046875 L3.125,8.046875 L3.125,10.0640625 L5.1265625,8.0625 C5.3453125,7.84375 5.703125,7.84375 5.921875,8.0625 C6.140625,8.28125 6.140625,8.6390625 5.921875,8.8578125 L5.921875,8.8578125 L3.903125,10.875 L5.909375,10.875 C6.2265625,10.875 6.4890625,11.13125 6.484375,11.4484375 C6.478125,11.7546875 6.228125,12 5.921875,12 L5.921875,12 L2.5734375,12 C2.25625,12 2,11.74375 2,11.4265625 L2,11.4265625 L2,8.0578125 C2,7.740625 2.2578125,7.478125 2.5734375,7.484375 Z M11.4296875,2 C11.7453125,2 12,2.25625 12,2.5703125 L12,2.5703125 L12,5.940625 C12,6.2578125 11.7421875,6.5203125 11.4265625,6.5140625 C11.121875,6.5078125 10.875,6.2578125 10.875,5.9515625 L10.875,5.9515625 L10.875,3.9359375 L8.8734375,5.9375 C8.6546875,6.15625 8.296875,6.15625 8.078125,5.9375 C7.859375,5.71875 7.859375,5.3609375 8.078125,5.1421875 L8.078125,5.1421875 L10.0953125,3.125 L8.0890625,3.125 C7.771875,3.125 7.509375,2.86875 7.515625,2.5515625 C7.521875,2.2453125 7.771875,2 8.078125,2 L8.078125,2 Z",
-    id: "\\u5F62\\u72B6\\u7ED3\\u5408"
-  })))));
+var _excluded$5 = ["action", "value", "onChange", "drag", "children", "displayFilename", "accept", "fileSize", "onError", "onUploadComplete", "onBeforeUpload", "maxLength", "transformResponse"];
+var useOnChange$b = reactFormHelper.hooks.useOnChange;
+var Dragger = antd.Upload.Dragger;
+var uploadParams = globalParams.field.upload;
+var decodeURIComponentSafe = function decodeURIComponentSafe(str) {
+  try {
+    return decodeURIComponent(str);
+  } catch (e) {
+    return str;
+  }
 };
-
-var getPopupContainer = function getPopupContainer(triggerNode) {
-  var findAntdPopupContainer = function findAntdPopupContainer(el) {
-    if (el === document.body || !el.parentElement) {
-      return document.body;
-    }
-    var targetEl = [].slice.call(el.classList, 0).find(function (className) {
-      return ['ant-modal-body', 'ant-modal-content', 'ant-popover-content'].indexOf(className) > -1;
+var computedFilename = function computedFilename(path, displayFilename) {
+  if (displayFilename === void 0) {
+    displayFilename = 'filename';
+  }
+  var strArray = path.split('?');
+  if (strArray[1]) {
+    var query = {};
+    strArray[1].split('&').forEach(function (str) {
+      var _str$split = str.split('='),
+        key = _str$split[0],
+        value = _str$split[1];
+      query[key] = value;
     });
-    if (targetEl) {
-      return el;
+    if (query[displayFilename]) {
+      return decodeURIComponentSafe(query[displayFilename]);
     }
-    return findAntdPopupContainer(el.parentElement);
-  };
-  return findAntdPopupContainer(triggerNode);
+  }
+  return path;
 };
-
-var _excluded$7 = ["close", "file", "editor", "onComplete"];
-var useOnChange$c = reactFormHelper.hooks.useOnChange;
-var avatarParams = globalParams.field.avatar;
-var createAvatarEditor = withLayer__default["default"](function (_ref) {
-  var close = _ref.close,
-    file = _ref.file,
-    editor = _ref.editor,
-    onComplete = _ref.onComplete,
-    props = _objectWithoutPropertiesLoose(_ref, _excluded$7);
-  var editorRef = React.useRef(null);
-  var _useState = React.useState(0),
-    rotate = _useState[0],
-    setRotate = _useState[1];
-  var _useState2 = React.useState(function () {
-      if (editor.width === editor.height) {
-        return 1;
+var valueToList = function valueToList(value, displayFilename) {
+  if (!value) {
+    return [];
+  }
+  return value.map(function (item) {
+    return {
+      uid: lodash.uniqueId(),
+      name: computedFilename(item.substr(item.lastIndexOf('/') + 1), displayFilename),
+      status: 'done',
+      response: {
+        code: 200,
+        results: item
       }
-      return 0.35;
-    }),
-    scale = _useState2[0],
-    setScale = _useState2[1];
-  return /*#__PURE__*/React__default["default"].createElement(antd.Modal, _extends({}, props, {
-    className: editor.className,
-    centered: true,
-    onOk: function onOk() {
-      onComplete && onComplete(editorRef.current.getImage().toDataURL());
-      close();
-    }
-  }), editor.tips ? /*#__PURE__*/React__default["default"].createElement("div", {
-    className: "react-form-avatar-tips"
-  }, editor.tips) : null, /*#__PURE__*/React__default["default"].createElement("div", {
-    style: {
-      "width": editor.width,
-      "margin": "auto"
-    }
-  }, /*#__PURE__*/React__default["default"].createElement(AvatarEditor__default["default"], {
-    ref: editorRef,
-    image: file,
-    width: editor.width,
-    height: editor.height,
-    border: 1,
-    borderRadius: editor.borderRadius,
-    color: [24, 144, 255, 1] // RGBA
-    ,
-    scale: scale,
-    rotate: rotate
-  }), /*#__PURE__*/React__default["default"].createElement(antd.Row, {
-    gutter: 4,
-    align: "middle"
-  }, /*#__PURE__*/React__default["default"].createElement(antd.Col, {
-    span: 4
-  }, /*#__PURE__*/React__default["default"].createElement(antd.Tooltip, {
-    title: "\u65CB\u8F6C",
-    placement: "bottom",
-    getPopupContainer: getPopupContainer
-  }, /*#__PURE__*/React__default["default"].createElement(RotateIcon, {
-    className: "react-form-avatar-btn",
-    onClick: function onClick() {
-      setRotate(function (rotate) {
-        return (rotate - 90) % 360;
+    };
+  });
+};
+var listToValue = function listToValue(value) {
+  return (value || []).slice(0).filter(function (_ref) {
+    var status = _ref.status;
+    return status === 'done';
+  }).map(function (_ref2) {
+    var response = _ref2.response;
+    return response.results;
+  });
+};
+var _Upload = function _Upload(_ref3) {
+  var action = _ref3.action,
+    value = _ref3.value,
+    onChange = _ref3.onChange,
+    drag = _ref3.drag,
+    children = _ref3.children,
+    displayFilename = _ref3.displayFilename,
+    accept = _ref3.accept,
+    size = _ref3.fileSize,
+    onError = _ref3.onError,
+    onUploadComplete = _ref3.onUploadComplete,
+    onBeforeUpload = _ref3.onBeforeUpload,
+    maxLength = _ref3.maxLength,
+    transformResponse = _ref3.transformResponse,
+    props = _objectWithoutPropertiesLoose(_ref3, _excluded$5);
+  displayFilename = displayFilename || uploadParams.displayFilename;
+  value = value || [];
+  var _useState = React.useState([]),
+    list = _useState[0],
+    setList = _useState[1];
+  var valueList = React.useMemo(function () {
+    return valueToList(value.filter(function (url) {
+      return !list.find(function (file) {
+        return decodeURIComponentSafe(lodash.get(file, 'response.results', '')) === decodeURIComponentSafe(url);
       });
+    }), displayFilename).concat(list);
+  }, [list, value, displayFilename]);
+  var changeHandler = function changeHandler(info) {
+    var _info$fileList;
+    if (['uploading', 'done', 'error', 'removed'].indexOf(info.file.status) === -1) {
+      return;
     }
-  }))), /*#__PURE__*/React__default["default"].createElement(antd.Col, {
-    span: 4
-  }, /*#__PURE__*/React__default["default"].createElement(antd.Tooltip, {
-    title: "\u8FD8\u539F",
-    placement: "bottom",
-    getPopupContainer: getPopupContainer
-  }, /*#__PURE__*/React__default["default"].createElement(FullIcon, {
-    className: "react-form-avatar-btn",
-    onClick: function onClick() {
-      setScale(1);
+    if (((_info$fileList = info.fileList) == null ? void 0 : _info$fileList.length) > maxLength) {
+      var _info$fileList2;
+      if (JSON.stringify(info.file) === JSON.stringify(info.fileList[((_info$fileList2 = info.fileList) == null ? void 0 : _info$fileList2.length) - 1])) {
+        onError("\u4E0A\u4F20\u6587\u4EF6\u4E0D\u80FD\u8D85\u8FC7\u6700\u5927\u5141\u8BB8\u6570\u91CF" + maxLength, 'lengthError', maxLength);
+      }
+      return;
     }
-  }))), /*#__PURE__*/React__default["default"].createElement(antd.Col, {
-    flex: 1
-  }, /*#__PURE__*/React__default["default"].createElement(antd.Slider, {
-    className: "react-form-avatar-slider",
-    tooltip: {
-      placement: "bottom",
-      formatter: function formatter() {
-        return '大小';
-      },
-      getPopupContainer: getPopupContainer
-    },
-    value: scale,
-    step: 0.05,
-    min: 0.2,
-    max: 3,
-    onChange: setScale
-  })))));
-});
-var _Avatar = function _Avatar(_ref2) {
-  var className = _ref2.className,
-    imageUrl = _ref2.value,
-    propsChange = _ref2.onChange,
-    onBeforeUpload = _ref2.beforeUpload,
-    transformResponse = _ref2.transformResponse,
-    action = _ref2.action,
-    imageType = _ref2.imageType,
-    size = _ref2.fileSize,
-    children = _ref2.children,
-    extraRender = _ref2.extraRender,
-    onError = _ref2.onError,
-    openEditor = _ref2.openEditor,
-    editorTips = _ref2.editorTips,
-    targetEditor = _ref2.editor,
-    previewImg = _ref2.previewImg,
-    previewRender = _ref2.previewRender;
-  var _useState3 = React.useState(false),
-    loading = _useState3[0],
-    setLoading = _useState3[1];
-  var _useState4 = React.useState(imageUrl),
-    showImageUrl = _useState4[0],
-    setImageUrl = _useState4[1];
-  React.useRef();
-  var defaultEditor = {
-    open: false,
-    width: 250,
-    height: 250,
-    borderRadius: 1,
-    text: "确定",
-    cancelText: '取消',
-    title: "裁剪图片",
-    tips: null
-  };
-  var editor = merge__default["default"]({}, defaultEditor, {
-    open: openEditor,
-    tips: editorTips
-  }, targetEditor);
-  React.useEffect(function () {
-    setImageUrl(imageUrl);
-  }, [imageUrl]);
-
-  /* base64转blob */
-  var dataURLtoBlob = function dataURLtoBlob(dataurl) {
-    var arr = dataurl.split(",");
-    // 注意base64的最后面中括号和引号是不转译的
-    var _arr = arr[1].substring(0, arr[1].length - 2);
-    var mime = arr[0].match(/:(.*?);/)[1],
-      bstr = atob(_arr),
-      n = bstr.length,
-      u8arr = new Uint8Array(n);
-    while (n--) {
-      u8arr[n] = bstr.charCodeAt(n);
+    if (info.file.status === 'done' && info.fileList.find(function (_ref4) {
+      var uid = _ref4.uid;
+      return uid === info.file.uid;
+    })) {
+      info.file.response = (transformResponse || uploadParams.transformResponse)(info.file.response);
+      if (info.file.response.code === 200) {
+        info.file.name = computedFilename(info.file.response.results.substr(info.file.response.results.lastIndexOf('/') + 1), displayFilename);
+        onUploadComplete(info);
+      } else {
+        info.file.status = 'error';
+        onError(info.file.response.msg, 'xhrError', info.file.response);
+      }
     }
-    return new Blob([u8arr], {
-      type: mime
-    });
-  };
-  var uploadButton = /*#__PURE__*/React__default["default"].createElement("div", null, loading ? /*#__PURE__*/React__default["default"].createElement(icons.LoadingOutlined, null) : /*#__PURE__*/React__default["default"].createElement(icons.PlusOutlined, null), children);
-  var beforeUpload = function beforeUpload(file) {
-    try {
-      return Promise.resolve(new Promise(function (resolve, reject) {
-        var isJpgOrPng = imageType.indexOf(file.type) > -1;
-        if (!isJpgOrPng) {
-          onError("\u53EA\u652F\u6301" + imageType.map(function (str) {
-            return str.replace("image/", "");
-          }).join("/") + "\u683C\u5F0F\u56FE\u7247!", "typeError", {
-            type: imageType,
-            fileType: file.type
-          });
-          reject();
-          return false;
-        }
-        var isLt = file.size / 1024 / 1024 < size;
-        if (!isLt) {
-          onError("\u56FE\u7247\u4E0D\u80FD\u8D85\u8FC7" + size + "MB!", "sizeError", {
-            size: size,
-            fileSize: file.size
-          });
-          reject();
-          return false;
-        }
-
-        /*剪切图像*/
-        // editor:{open:false,width:250,height:250,borderRadius:0-100,text:'剪切'}
-        if (editor.open) {
-          createAvatarEditor({
-            editor: editor,
-            file: file,
-            title: editor.title,
-            icon: "",
-            width: editor.width * 2,
-            cancelText: editor.cancelText,
-            okText: editor.text,
-            onComplete: function onComplete(base64) {
-              setImageUrl(base64);
-              var blob = dataURLtoBlob(base64);
-              var files = new window.File([blob], file.name, {
-                type: file.type
-              });
-              onBeforeUpload && onBeforeUpload(files);
-              resolve(files);
-            }
-          });
-        } else {
-          onBeforeUpload && onBeforeUpload(file);
-          resolve(file);
-        }
-      }));
-    } catch (e) {
-      return Promise.reject(e);
+    var _groupBy = lodash.groupBy(info.fileList, function (file) {
+        return file.status === 'done' ? 'done' : 'uploading';
+      }),
+      done = _groupBy.done;
+    if (['done', 'removed'].indexOf(info.file.status) > -1) {
+      onChange(listToValue(done));
     }
+    setList(function (list) {
+      var newList = list.slice(0);
+      var index = list.findIndex(function (_ref5) {
+        var uid = _ref5.uid;
+        return uid === info.file.uid;
+      });
+      if (info.file.status === 'removed') {
+        index > -1 && newList.splice(index, 1);
+        return newList;
+      }
+      if (index === -1) {
+        newList.push(info.file);
+        return newList;
+      }
+      newList.splice(index, 1, info.file);
+      return newList;
+    });
   };
-  var onChange = function onChange(info) {
-    if (info.file.status === "uploading") {
-      setLoading(true);
-      return;
+  var beforeUploadHandler = function beforeUploadHandler(file) {
+    var isLt = file.size / 1024 / 1024 < size;
+    if (!isLt) {
+      onError("\u6587\u4EF6\u4E0D\u80FD\u8D85\u8FC7" + size + "MB!", 'sizeError', {
+        size: size,
+        fileSize: file.size
+      });
+      return false;
     }
-    if (info.file.status === "done") {
-      setLoading(false);
-      var response = (transformResponse || avatarParams.transformResponse)(info.file.response);
-      if (response.code === 200) {
-        propsChange(response.results);
-      } else {
-        onError(response.msg, "xhrError", response);
-      }
+    if (maxLength === 1) {
+      onChange([]);
+      setList([]);
     }
+    return onBeforeUpload && onBeforeUpload(file);
   };
-  var headers = Object.assign({}, avatarParams.headers);
-  if (typeof avatarParams.getHeaders === 'function') {
-    Object.assign(headers, avatarParams.getHeaders());
+  var headers = Object.assign({}, uploadParams.headers);
+  if (typeof uploadParams.getHeaders === 'function') {
+    Object.assign(headers, uploadParams.getHeaders());
   }
-  return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(antd.Upload, _extends({}, omit__default["default"](avatarParams, ['action', 'transformResponse', 'headers', 'getHeaders']), {
+  var UploadComponent = drag ? Dragger : antd.Upload;
+  return /*#__PURE__*/React__default["default"].createElement(UploadComponent, _extends({}, lodash.omit(uploadParams, ['action', 'transformResponse']), props, {
     headers: headers,
-    className: classnames__default["default"](className, "react-form-avatar"),
-    listType: "picture-card",
-    showUploadList: false,
-    action: action || avatarParams.action,
-    beforeUpload: beforeUpload,
-    onChange: onChange
-  }), /*#__PURE__*/React__default["default"].createElement("div", {
-    className: "react-form-avatar-inner"
-  }, previewImg && showImageUrl ? previewRender ? previewRender(showImageUrl) : /*#__PURE__*/React__default["default"].createElement("div", {
-    className: "preview"
-  }, /*#__PURE__*/React__default["default"].createElement("img", {
-    src: showImageUrl,
-    alt: "avatar"
-  })) : uploadButton, extraRender ? extraRender(showImageUrl) : '')));
+    action: action || uploadParams.action,
+    fileList: valueList,
+    accept: accept.join(','),
+    onChange: changeHandler,
+    beforeUpload: beforeUploadHandler
+  }), typeof children === 'function' ? children({
+    size: props.size
+  }) : children);
 };
-_Avatar.defaultProps = {
-  imageType: ["image/jpeg", "image/png"],
+_Upload.defaultProps = {
+  value: [],
+  accept: [],
   fileSize: 2,
-  // 单位MB
-  children: /*#__PURE__*/React__default["default"].createElement("div", {
-    className: "ant-upload-text"
-  }, "\u70B9\u51FB\u4E0A\u4F20"),
-  extraRender: null,
+  maxLength: 1,
+  children: function children(_ref6) {
+    var size = _ref6.size;
+    return /*#__PURE__*/React__default["default"].createElement(antd.Button, {
+      size: size
+    }, /*#__PURE__*/React__default["default"].createElement(icons.UploadOutlined, null), "\u70B9\u51FB\u4E0A\u4F20");
+  },
   onError: function onError(info) {
     return antd.message.error(info);
   },
-  previewImg: true,
-  previewRender: null,
-  openEditor: false
-};
-var AvatarInput = function AvatarInput(props) {
-  var render = useOnChange$c(props);
-  return render(_Avatar);
-};
-AvatarInput.defaultProps = {
-  fieldName: 'avatar'
+  onUploadComplete: function onUploadComplete() {}
 };
-AvatarInput.field = _Avatar;
-
-var useOnChange$b = reactFormHelper.hooks.useOnChange;
-var Cascader$1 = function Cascader(props) {
+var UploadInput = function UploadInput(props) {
   var render = useOnChange$b(props);
-  return render(antd.Cascader);
-};
-Cascader$1.defaultProps = {
-  fieldName: 'cascader'
-};
-
-var useOnChange$a = reactFormHelper.hooks.useOnChange,
-  useCheckedToValue$1 = reactFormHelper.hooks.useCheckedToValue;
-var withChecked$1 = reactFormHelper.hoc.withChecked;
-var WithCheckbox = withChecked$1(antd.Checkbox);
-var Checkbox$1 = function Checkbox(props) {
-  var checkedProps = useCheckedToValue$1(Object.assign({}, props, {
-    onChange: function onChange(e) {
-      e.target.type = 'checkbox';
-      props.onChange && props.onChange(e);
-    }
-  }));
-  var render = useOnChange$a(checkedProps);
-  return render(WithCheckbox);
-};
-Checkbox$1.defaultProps = {
-  fieldName: 'checkbox'
-};
-
-var useOnChange$9 = reactFormHelper.hooks.useOnChange;
-var _CheckboxGroup = antd.Checkbox.Group;
-var CheckboxGroup$1 = function CheckboxGroup(props) {
-  var render = useOnChange$9(props);
-  return render(_CheckboxGroup);
+  return render(_Upload);
 };
-CheckboxGroup$1.Checkbox = antd.Checkbox;
-CheckboxGroup$1.defaultProps = {
-  fieldName: 'checkboxGroup'
+UploadInput.defaultProps = {
+  fieldName: 'upload'
 };
-
-var useOnChange$8 = reactFormHelper.hooks.useOnChange;
-var MonthPicker = antd.DatePicker.MonthPicker,
-  RangePicker$1 = antd.DatePicker.RangePicker,
-  WeekPicker = antd.DatePicker.WeekPicker;
-var _DatePicker = function _DatePicker(props) {
-  var render = useOnChange$8(Object.assign({
-    placeholder: "\u8BF7\u9009\u62E9" + (props.label || '')
-  }, props));
-  return render(antd.DatePicker);
-};
-_DatePicker.defaultProps = {
-  fieldName: 'datePicker'
-};
-var _MonthPicker = function _MonthPicker(props) {
-  var render = useOnChange$8(Object.assign({
-    placeholder: ['开始时间', '结束时间']
-  }, props));
-  return render(MonthPicker);
-};
-_MonthPicker.defaultProps = {
-  fieldName: 'monthDatePicker'
-};
-var _RangePicker$1 = function _RangePicker(props) {
-  var render = useOnChange$8(Object.assign({
-    placeholder: ['开始时间', '结束时间']
-  }, props));
-  return render(RangePicker$1);
-};
-_RangePicker$1.defaultProps = {
-  fieldName: 'rangeDatePicker'
-};
-var _WeekPicker = function _WeekPicker(props) {
-  var render = useOnChange$8(Object.assign({
-    placeholder: ['开始时间', '结束时间']
-  }, props));
-  return render(WeekPicker);
-};
-_WeekPicker.defaultProps = {
-  fieldName: 'weekDatePicker'
-};
-_DatePicker.MonthPicker = _MonthPicker;
-_DatePicker.RangePicker = _RangePicker$1;
-_DatePicker.WeekPicker = _WeekPicker;
-
-var _excluded$6 = ["soFarText"];
-var useOnChange$7 = reactFormHelper.hooks.useOnChange;
-var PickerToday = function PickerToday(_ref) {
-  var soFarText = _ref.soFarText,
-    props = _objectWithoutPropertiesLoose(_ref, _excluded$6);
-  var _useControlValue = useControlValue__default["default"](props),
-    data = _useControlValue[0],
-    onChange = _useControlValue[1];
-  var ref_d = React.useRef();
-  var newData = React.useMemo(function () {
-    // console.log('......', data);
-    var s = get__default["default"](data, 0, '');
-    var d = get__default["default"](data, 1, '');
-    var p = get__default["default"](props, ['placeholder'], ['开始日期', '结束日期']);
-    return {
-      start: s ? dayjs__default["default"](s) : '',
-      end: d === '至今' ? null : d ? dayjs__default["default"](d) : '',
-      showZj: d === '至今',
-      placeholder: p
-    };
-  }, [data]);
-  var startChange = function startChange(v) {
-    // 比较日期大小
-    if (!newData.showZj && newData.end && v && newData.end.isBefore(v)) {
-      onChange([newData.end, v]);
-      return;
-    }
-    onChange([v || '', newData.showZj ? '至今' : newData.end]);
-  };
-  var endChange = function endChange(v) {
-    if (newData.start && v && v.isBefore(newData.start)) {
-      onChange([v, newData.start]);
-      return;
-    }
-    onChange([newData.start, v || '']);
-  };
-  var foot = function foot() {
-    return /*#__PURE__*/React__default["default"].createElement(antd.Button, {
-      type: newData.showZj ? 'primary' : 'default',
-      onClick: function onClick(v) {
-        ref_d.current.blur();
-        onChange([newData.start || '', '至今']);
-      }
-    }, soFarText || '至今');
-  };
-  return /*#__PURE__*/React__default["default"].createElement("div", {
-    style: {
-      display: 'flex'
-    }
-  }, /*#__PURE__*/React__default["default"].createElement(antd.DatePicker, _extends({}, _extends({
-    showToday: false
-  }, props, {
-    placeholder: newData.placeholder[0],
-    value: newData.start
-  }), {
-    onChange: startChange
-  })), /*#__PURE__*/React__default["default"].createElement("div", {
-    className: 'svg_box'
-  }, /*#__PURE__*/React__default["default"].createElement("svg", {
-    viewBox: "0 0 1024 1024",
-    focusable: "false",
-    "data-icon": "swap-right",
-    width: "1em",
-    height: "1em",
-    fill: "currentColor",
-    "aria-hidden": "true"
-  }, /*#__PURE__*/React__default["default"].createElement("path", {
-    d: "M873.1 596.2l-164-208A32 32 0 00684 376h-64.8c-6.7 0-10.4 7.7-6.3 13l144.3 183H152c-4.4 0-8 3.6-8 8v60c0 4.4 3.6 8 8 8h695.9c26.8 0 41.7-30.8 25.2-51.8z"
-  }))), /*#__PURE__*/React__default["default"].createElement("div", {
-    className: newData.showZj ? 'data_range_picker data_range_picker_dis' : 'data_range_picker'
-  }, /*#__PURE__*/React__default["default"].createElement("span", {
-    className: newData.showZj ? 'zhijin zhijin_show' : 'zhijin'
-  }, soFarText || '至今'), /*#__PURE__*/React__default["default"].createElement(antd.DatePicker, _extends({}, _extends({
-    showToday: false
-  }, props, {
-    placeholder: newData.showZj ? '' : newData.placeholder[1],
-    value: newData.end
-  }), {
-    ref: ref_d,
-    onChange: endChange,
-    renderExtraFooter: foot
-  }))));
-};
-var RangePickerToday = function RangePickerToday(props) {
-  var render = useOnChange$7(props);
-  return render(PickerToday);
-};
-RangePickerToday.defaultProps = {
-  fieldName: 'rangePickerToday'
-};
-RangePickerToday.field = PickerToday;
-
-var useDecorator$2 = reactFormHelper.hooks.useDecorator;
-var InputField = function InputField(props) {
-  var render = useDecorator$2(Object.assign({
-    placeholder: "\u8BF7\u8F93\u5165" + props.label
-  }, props));
-  return render(antd.Input);
-};
-InputField.Password = function (props) {
-  var render = useDecorator$2(Object.assign({
-    placeholder: "\u8BF7\u8F93\u5165" + props.label
-  }, props));
-  return render(antd.Input.Password);
-};
-InputField.defaultProps = {
-  fieldName: 'input',
-  autoComplete: 'off'
-};
-InputField.Password.defaultProps = {
-  fieldName: 'password',
-  autoComplete: 'off'
-};
-
-var useDecorator$1 = reactFormHelper.hooks.useDecorator;
-var InputNumberField = function InputNumberField(props) {
-  var render = useDecorator$1(Object.assign({
-    placeholder: "\u8BF7\u8F93\u5165" + props.label
-  }, props));
-  return render(antd.InputNumber);
-};
-InputNumberField.defaultProps = {
-  fieldName: 'inputNumber',
-  autoComplete: 'off'
-};
-
-var _excluded$5 = ["onChange"];
-var useOnChange$6 = reactFormHelper.hooks.useOnChange;
-var RadioGroup$1 = function RadioGroup(_ref) {
-  var onChange = _ref.onChange,
-    props = _objectWithoutPropertiesLoose(_ref, _excluded$5);
-  var handler = React.useCallback(function (e) {
-    onChange && onChange(e.target.value);
-  }, [onChange]);
-  return /*#__PURE__*/React__default["default"].createElement(antd.Radio.Group, _extends({}, props, {
-    onChange: handler
-  }));
-};
-var _RadioGroup = function _RadioGroup(props) {
-  var render = useOnChange$6(props);
-  return render(RadioGroup$1);
-};
-_RadioGroup.defaultProps = {
-  fieldName: 'radioGroup'
-};
-_RadioGroup.Radio = antd.Radio;
+UploadInput.field = _Upload;
 
 var _excluded$4 = ["data", "setData", "send", "loadMore", "isComplete", "refresh", "reload", "fetchEmitter", "isLoading", "children", "onLoaded", "fetchProps", "requestParams"];
-var useOnChange$5 = reactFormHelper.hooks.useOnChange;
+var useOnChange$a = reactFormHelper.hooks.useOnChange;
 var withFetch = function withFetch(WrappedComponent) {
   var FieldInner = reactFetch.withFetch(function (_ref) {
     var data = _ref.data,
@@ -829,7 +422,7 @@ var withFetch = function withFetch(WrappedComponent) {
   };
   var Fetch = React.forwardRef(function (props, ref) {
     var emitter = useFetchEmitter(ref);
-    var render = useOnChange$5(Object.assign({
+    var render = useOnChange$a(Object.assign({
       placeholder: "\u8BF7\u9009\u62E9" + props.label
     }, props, {
       fetchEmitter: emitter
@@ -845,277 +438,323 @@ var withFetch = function withFetch(WrappedComponent) {
   return Fetch;
 };
 
-var useOnChange$4 = reactFormHelper.hooks.useOnChange;
-var _Select = function _Select(props) {
-  var render = useOnChange$4(Object.assign({
+var useOnChange$9 = reactFormHelper.hooks.useOnChange;
+var _TreeSelect = function _TreeSelect(props) {
+  var render = useOnChange$9(Object.assign({
     placeholder: "\u8BF7\u9009\u62E9" + (props.label || '')
   }, props));
-  return render(antd.Select);
+  return render(antd.TreeSelect);
 };
-_Select.Fetch = withFetch(antd.Select);
-_Select.Option = antd.Select.Option;
-_Select.OptGroup = antd.Select.OptGroup;
-_Select.defaultProps = _Select.Fetch.defaultProps = {
-  fieldName: 'select'
+_TreeSelect.Fetch = withFetch(antd.TreeSelect);
+_TreeSelect.defaultProps = _TreeSelect.Fetch.defaultProps = {
+  fieldName: 'treeSelect'
 };
+_TreeSelect.TreeNode = antd.TreeSelect.TreeNode;
 
-var useOnChange$3 = reactFormHelper.hooks.useOnChange,
-  useCheckedToValue = reactFormHelper.hooks.useCheckedToValue;
-var withChecked = reactFormHelper.hoc.withChecked;
-var WithSwitch = withChecked(antd.Switch);
-var Switch$1 = function Switch(props) {
-  var checkedProps = useCheckedToValue(props);
-  var render = useOnChange$3(checkedProps);
-  return render(WithSwitch);
+var useOnChange$8 = reactFormHelper.hooks.useOnChange;
+var RangePicker$1 = antd.TimePicker.RangePicker;
+var _TimePicker = function _TimePicker(props) {
+  var render = useOnChange$8(Object.assign({
+    placeholder: "\u8BF7\u9009\u62E9" + (props.label || '')
+  }, props));
+  return render(antd.TimePicker);
 };
-Switch$1.defaultProps = {
-  fieldName: 'switch'
+_TimePicker.defaultProps = {
+  fieldName: 'timePicker'
+};
+var _RangePicker$1 = function _RangePicker(props) {
+  var render = useOnChange$8(Object.assign({
+    placeholder: "\u8BF7\u9009\u62E9" + (props.label || '')
+  }, props));
+  return render(RangePicker$1);
 };
+_RangePicker$1.defaultProps = {
+  fieldName: 'rangeTimePicker'
+};
+_TimePicker.RangePicker = _RangePicker$1;
 
-var useDecorator = reactFormHelper.hooks.useDecorator;
-var TextArea$1 = function TextArea(props) {
-  var render = useDecorator(Object.assign({
+var useDecorator$2 = reactFormHelper.hooks.useDecorator;
+var TextArea = function TextArea(props) {
+  var render = useDecorator$2(Object.assign({
     placeholder: "\u8BF7\u8F93\u5165" + props.label
   }, props));
   return render(antd.Input.TextArea);
 };
-TextArea$1.defaultProps = {
+TextArea.defaultProps = {
   fieldName: 'textArea'
 };
 
-var useOnChange$2 = reactFormHelper.hooks.useOnChange;
-var RangePicker = antd.TimePicker.RangePicker;
-var _TimePicker = function _TimePicker(props) {
-  var render = useOnChange$2(Object.assign({
-    placeholder: "\u8BF7\u9009\u62E9" + (props.label || '')
-  }, props));
-  return render(antd.TimePicker);
+var useOnChange$7 = reactFormHelper.hooks.useOnChange,
+  useCheckedToValue$1 = reactFormHelper.hooks.useCheckedToValue;
+var withChecked$1 = reactFormHelper.hoc.withChecked;
+var WithSwitch = withChecked$1(antd.Switch);
+var Switch = function Switch(props) {
+  var checkedProps = useCheckedToValue$1(props);
+  var render = useOnChange$7(checkedProps);
+  return render(WithSwitch);
 };
-_TimePicker.defaultProps = {
-  fieldName: 'timePicker'
+Switch.defaultProps = {
+  fieldName: 'switch'
 };
-var _RangePicker = function _RangePicker(props) {
-  var render = useOnChange$2(Object.assign({
+
+var useOnChange$6 = reactFormHelper.hooks.useOnChange;
+var _Select = function _Select(props) {
+  var render = useOnChange$6(Object.assign({
     placeholder: "\u8BF7\u9009\u62E9" + (props.label || '')
   }, props));
-  return render(RangePicker);
+  return render(antd.Select);
 };
-_RangePicker.defaultProps = {
-  fieldName: 'rangeTimePicker'
+_Select.Fetch = withFetch(antd.Select);
+_Select.Option = antd.Select.Option;
+_Select.OptGroup = antd.Select.OptGroup;
+_Select.defaultProps = _Select.Fetch.defaultProps = {
+  fieldName: 'select'
 };
-_TimePicker.RangePicker = _RangePicker;
 
-var useOnChange$1 = reactFormHelper.hooks.useOnChange;
-var _TreeSelect = function _TreeSelect(props) {
-  var render = useOnChange$1(Object.assign({
-    placeholder: "\u8BF7\u9009\u62E9" + (props.label || '')
+var _excluded$3 = ["onChange"];
+var useOnChange$5 = reactFormHelper.hooks.useOnChange;
+var RadioGroup = function RadioGroup(_ref) {
+  var onChange = _ref.onChange,
+    props = _objectWithoutPropertiesLoose(_ref, _excluded$3);
+  var handler = React.useCallback(function (e) {
+    onChange && onChange(e.target.value);
+  }, [onChange]);
+  return /*#__PURE__*/React__default["default"].createElement(antd.Radio.Group, _extends({}, props, {
+    onChange: handler
+  }));
+};
+var _RadioGroup = function _RadioGroup(props) {
+  var render = useOnChange$5(props);
+  return render(RadioGroup);
+};
+_RadioGroup.defaultProps = {
+  fieldName: 'radioGroup'
+};
+_RadioGroup.Radio = antd.Radio;
+
+var useDecorator$1 = reactFormHelper.hooks.useDecorator;
+var InputNumberField = function InputNumberField(props) {
+  var render = useDecorator$1(Object.assign({
+    placeholder: "\u8BF7\u8F93\u5165" + props.label
   }, props));
-  return render(antd.TreeSelect);
+  return render(antd.InputNumber);
 };
-_TreeSelect.Fetch = withFetch(antd.TreeSelect);
-_TreeSelect.defaultProps = _TreeSelect.Fetch.defaultProps = {
-  fieldName: 'treeSelect'
+InputNumberField.defaultProps = {
+  fieldName: 'inputNumber',
+  autoComplete: 'off'
 };
-_TreeSelect.TreeNode = antd.TreeSelect.TreeNode;
 
-var _excluded$3 = ["action", "value", "onChange", "drag", "children", "displayFilename", "accept", "fileSize", "onError", "onUploadComplete", "onBeforeUpload", "maxLength", "transformResponse"];
-var useOnChange = reactFormHelper.hooks.useOnChange;
-var Dragger = antd.Upload.Dragger;
-var uploadParams = globalParams.field.upload;
-var decodeURIComponentSafe = function decodeURIComponentSafe(str) {
-  try {
-    return decodeURIComponent(str);
-  } catch (e) {
-    return str;
-  }
+var useDecorator = reactFormHelper.hooks.useDecorator;
+var InputField = function InputField(props) {
+  var render = useDecorator(Object.assign({
+    placeholder: "\u8BF7\u8F93\u5165" + props.label
+  }, props));
+  return render(antd.Input);
 };
-var computedFilename = function computedFilename(path, displayFilename) {
-  if (displayFilename === void 0) {
-    displayFilename = 'filename';
-  }
-  var strArray = path.split('?');
-  if (strArray[1]) {
-    var query = {};
-    strArray[1].split('&').forEach(function (str) {
-      var _str$split = str.split('='),
-        key = _str$split[0],
-        value = _str$split[1];
-      query[key] = value;
-    });
-    if (query[displayFilename]) {
-      return decodeURIComponentSafe(query[displayFilename]);
-    }
-  }
-  return path;
+InputField.Password = function (props) {
+  var render = useDecorator(Object.assign({
+    placeholder: "\u8BF7\u8F93\u5165" + props.label
+  }, props));
+  return render(antd.Input.Password);
 };
-var valueToList = function valueToList(value, displayFilename) {
-  if (!value) {
-    return [];
-  }
-  return value.map(function (item) {
-    return {
-      uid: uniqueId__default["default"](),
-      name: computedFilename(item.substr(item.lastIndexOf('/') + 1), displayFilename),
-      status: 'done',
-      response: {
-        code: 200,
-        results: item
-      }
-    };
-  });
+InputField.defaultProps = {
+  fieldName: 'input',
+  autoComplete: 'off'
 };
-var listToValue = function listToValue(value) {
-  return (value || []).slice(0).filter(function (_ref) {
-    var status = _ref.status;
-    return status === 'done';
-  }).map(function (_ref2) {
-    var response = _ref2.response;
-    return response.results;
-  });
+InputField.Password.defaultProps = {
+  fieldName: 'password',
+  autoComplete: 'off'
 };
-var _Upload = function _Upload(_ref3) {
-  var action = _ref3.action,
-    value = _ref3.value,
-    onChange = _ref3.onChange,
-    drag = _ref3.drag,
-    children = _ref3.children,
-    displayFilename = _ref3.displayFilename,
-    accept = _ref3.accept,
-    size = _ref3.fileSize,
-    onError = _ref3.onError,
-    onUploadComplete = _ref3.onUploadComplete,
-    onBeforeUpload = _ref3.onBeforeUpload,
-    maxLength = _ref3.maxLength,
-    transformResponse = _ref3.transformResponse,
-    props = _objectWithoutPropertiesLoose(_ref3, _excluded$3);
-  displayFilename = displayFilename || uploadParams.displayFilename;
-  value = value || [];
-  var _useState = React.useState([]),
-    list = _useState[0],
-    setList = _useState[1];
-  var valueList = React.useMemo(function () {
-    return valueToList(value.filter(function (url) {
-      return !list.find(function (file) {
-        return decodeURIComponentSafe(get__default["default"](file, 'response.results', '')) === decodeURIComponentSafe(url);
-      });
-    }), displayFilename).concat(list);
-  }, [list, value, displayFilename]);
-  var changeHandler = function changeHandler(info) {
-    var _info$fileList;
-    if (['uploading', 'done', 'error', 'removed'].indexOf(info.file.status) === -1) {
+
+var _excluded$2 = ["soFarText"];
+var useOnChange$4 = reactFormHelper.hooks.useOnChange;
+var PickerToday = function PickerToday(_ref) {
+  var soFarText = _ref.soFarText,
+    props = _objectWithoutPropertiesLoose(_ref, _excluded$2);
+  var _useControlValue = useControlValue__default["default"](props),
+    data = _useControlValue[0],
+    onChange = _useControlValue[1];
+  var ref_d = React.useRef();
+  var newData = React.useMemo(function () {
+    // console.log('......', data);
+    var s = lodash.get(data, 0, '');
+    var d = lodash.get(data, 1, '');
+    var p = lodash.get(props, ['placeholder'], ['开始日期', '结束日期']);
+    return {
+      start: s ? dayjs__default["default"](s) : '',
+      end: d === '至今' ? null : d ? dayjs__default["default"](d) : '',
+      showZj: d === '至今',
+      placeholder: p
+    };
+  }, [data]);
+  var startChange = function startChange(v) {
+    // 比较日期大小
+    if (!newData.showZj && newData.end && v && newData.end.isBefore(v)) {
+      onChange([newData.end, v]);
       return;
     }
-    if (((_info$fileList = info.fileList) == null ? void 0 : _info$fileList.length) > maxLength) {
-      var _info$fileList2;
-      if (JSON.stringify(info.file) === JSON.stringify(info.fileList[((_info$fileList2 = info.fileList) == null ? void 0 : _info$fileList2.length) - 1])) {
-        onError("\u4E0A\u4F20\u6587\u4EF6\u4E0D\u80FD\u8D85\u8FC7\u6700\u5927\u5141\u8BB8\u6570\u91CF" + maxLength, 'lengthError', maxLength);
-      }
+    onChange([v || '', newData.showZj ? '至今' : newData.end]);
+  };
+  var endChange = function endChange(v) {
+    if (newData.start && v && v.isBefore(newData.start)) {
+      onChange([v, newData.start]);
       return;
     }
-    if (info.file.status === 'done' && info.fileList.find(function (_ref4) {
-      var uid = _ref4.uid;
-      return uid === info.file.uid;
-    })) {
-      info.file.response = (transformResponse || uploadParams.transformResponse)(info.file.response);
-      if (info.file.response.code === 200) {
-        info.file.name = computedFilename(info.file.response.results.substr(info.file.response.results.lastIndexOf('/') + 1), displayFilename);
-        onUploadComplete(info);
-      } else {
-        info.file.status = 'error';
-        onError(info.file.response.msg, 'xhrError', info.file.response);
-      }
-    }
-    var _groupBy = groupBy__default["default"](info.fileList, function (file) {
-        return file.status === 'done' ? 'done' : 'uploading';
-      }),
-      done = _groupBy.done;
-    if (['done', 'removed'].indexOf(info.file.status) > -1) {
-      onChange(listToValue(done));
-    }
-    setList(function (list) {
-      var newList = list.slice(0);
-      var index = list.findIndex(function (_ref5) {
-        var uid = _ref5.uid;
-        return uid === info.file.uid;
-      });
-      if (info.file.status === 'removed') {
-        index > -1 && newList.splice(index, 1);
-        return newList;
-      }
-      if (index === -1) {
-        newList.push(info.file);
-        return newList;
+    onChange([newData.start, v || '']);
+  };
+  var foot = function foot() {
+    return /*#__PURE__*/React__default["default"].createElement(antd.Button, {
+      type: newData.showZj ? 'primary' : 'default',
+      onClick: function onClick(v) {
+        ref_d.current.blur();
+        onChange([newData.start || '', '至今']);
       }
-      newList.splice(index, 1, info.file);
-      return newList;
-    });
+    }, soFarText || '至今');
   };
-  var beforeUploadHandler = function beforeUploadHandler(file) {
-    var isLt = file.size / 1024 / 1024 < size;
-    if (!isLt) {
-      onError("\u6587\u4EF6\u4E0D\u80FD\u8D85\u8FC7" + size + "MB!", 'sizeError', {
-        size: size,
-        fileSize: file.size
-      });
-      return false;
+  return /*#__PURE__*/React__default["default"].createElement("div", {
+    style: {
+      display: 'flex'
     }
-    if (maxLength === 1) {
-      onChange([]);
-      setList([]);
+  }, /*#__PURE__*/React__default["default"].createElement(antd.DatePicker, _extends({}, _extends({
+    showToday: false
+  }, props, {
+    placeholder: newData.placeholder[0],
+    value: newData.start
+  }), {
+    onChange: startChange
+  })), /*#__PURE__*/React__default["default"].createElement("div", {
+    className: 'svg_box'
+  }, /*#__PURE__*/React__default["default"].createElement("svg", {
+    viewBox: "0 0 1024 1024",
+    focusable: "false",
+    "data-icon": "swap-right",
+    width: "1em",
+    height: "1em",
+    fill: "currentColor",
+    "aria-hidden": "true"
+  }, /*#__PURE__*/React__default["default"].createElement("path", {
+    d: "M873.1 596.2l-164-208A32 32 0 00684 376h-64.8c-6.7 0-10.4 7.7-6.3 13l144.3 183H152c-4.4 0-8 3.6-8 8v60c0 4.4 3.6 8 8 8h695.9c26.8 0 41.7-30.8 25.2-51.8z"
+  }))), /*#__PURE__*/React__default["default"].createElement("div", {
+    className: newData.showZj ? 'data_range_picker data_range_picker_dis' : 'data_range_picker'
+  }, /*#__PURE__*/React__default["default"].createElement("span", {
+    className: newData.showZj ? 'zhijin zhijin_show' : 'zhijin'
+  }, soFarText || '至今'), /*#__PURE__*/React__default["default"].createElement(antd.DatePicker, _extends({}, _extends({
+    showToday: false
+  }, props, {
+    placeholder: newData.showZj ? '' : newData.placeholder[1],
+    value: newData.end
+  }), {
+    ref: ref_d,
+    onChange: endChange,
+    renderExtraFooter: foot
+  }))));
+};
+var RangePickerToday = function RangePickerToday(props) {
+  var render = useOnChange$4(props);
+  return render(PickerToday);
+};
+RangePickerToday.defaultProps = {
+  fieldName: 'rangePickerToday'
+};
+RangePickerToday.field = PickerToday;
+
+var useOnChange$3 = reactFormHelper.hooks.useOnChange;
+var MonthPicker = antd.DatePicker.MonthPicker,
+  RangePicker = antd.DatePicker.RangePicker,
+  WeekPicker = antd.DatePicker.WeekPicker;
+var _DatePicker = function _DatePicker(props) {
+  var render = useOnChange$3(Object.assign({
+    placeholder: "\u8BF7\u9009\u62E9" + (props.label || '')
+  }, props));
+  return render(antd.DatePicker);
+};
+_DatePicker.defaultProps = {
+  fieldName: 'datePicker'
+};
+var _MonthPicker = function _MonthPicker(props) {
+  var render = useOnChange$3(Object.assign({
+    placeholder: ['开始时间', '结束时间']
+  }, props));
+  return render(MonthPicker);
+};
+_MonthPicker.defaultProps = {
+  fieldName: 'monthDatePicker'
+};
+var _RangePicker = function _RangePicker(props) {
+  var render = useOnChange$3(Object.assign({
+    placeholder: ['开始时间', '结束时间']
+  }, props));
+  return render(RangePicker);
+};
+_RangePicker.defaultProps = {
+  fieldName: 'rangeDatePicker'
+};
+var _WeekPicker = function _WeekPicker(props) {
+  var render = useOnChange$3(Object.assign({
+    placeholder: ['开始时间', '结束时间']
+  }, props));
+  return render(WeekPicker);
+};
+_WeekPicker.defaultProps = {
+  fieldName: 'weekDatePicker'
+};
+_DatePicker.MonthPicker = _MonthPicker;
+_DatePicker.RangePicker = _RangePicker;
+_DatePicker.WeekPicker = _WeekPicker;
+
+var useOnChange$2 = reactFormHelper.hooks.useOnChange;
+var _CheckboxGroup = antd.Checkbox.Group;
+var CheckboxGroup = function CheckboxGroup(props) {
+  var render = useOnChange$2(props);
+  return render(_CheckboxGroup);
+};
+CheckboxGroup.Checkbox = antd.Checkbox;
+CheckboxGroup.defaultProps = {
+  fieldName: 'checkboxGroup'
+};
+
+var useOnChange$1 = reactFormHelper.hooks.useOnChange,
+  useCheckedToValue = reactFormHelper.hooks.useCheckedToValue;
+var withChecked = reactFormHelper.hoc.withChecked;
+var WithCheckbox = withChecked(antd.Checkbox);
+var Checkbox = function Checkbox(props) {
+  var checkedProps = useCheckedToValue(Object.assign({}, props, {
+    onChange: function onChange(e) {
+      e.target.type = 'checkbox';
+      props.onChange && props.onChange(e);
     }
-    return onBeforeUpload && onBeforeUpload(file);
-  };
-  var headers = Object.assign({}, uploadParams.headers);
-  if (typeof uploadParams.getHeaders === 'function') {
-    Object.assign(headers, uploadParams.getHeaders());
-  }
-  var UploadComponent = drag ? Dragger : antd.Upload;
-  return /*#__PURE__*/React__default["default"].createElement(UploadComponent, _extends({}, omit__default["default"](uploadParams, ['action', 'transformResponse']), props, {
-    headers: headers,
-    action: action || uploadParams.action,
-    fileList: valueList,
-    accept: accept.join(','),
-    onChange: changeHandler,
-    beforeUpload: beforeUploadHandler
-  }), typeof children === 'function' ? children({
-    size: props.size
-  }) : children);
+  }));
+  var render = useOnChange$1(checkedProps);
+  return render(WithCheckbox);
 };
-_Upload.defaultProps = {
-  value: [],
-  accept: [],
-  fileSize: 2,
-  maxLength: 1,
-  children: function children(_ref6) {
-    var size = _ref6.size;
-    return /*#__PURE__*/React__default["default"].createElement(antd.Button, {
-      size: size
-    }, /*#__PURE__*/React__default["default"].createElement(icons.UploadOutlined, null), "\u70B9\u51FB\u4E0A\u4F20");
-  },
-  onError: function onError(info) {
-    return antd.message.error(info);
-  },
-  onUploadComplete: function onUploadComplete() {}
+Checkbox.defaultProps = {
+  fieldName: 'checkbox'
 };
-var UploadInput = function UploadInput(props) {
+
+var useOnChange = reactFormHelper.hooks.useOnChange;
+var Cascader = function Cascader(props) {
   var render = useOnChange(props);
-  return render(_Upload);
+  return render(antd.Cascader);
 };
-UploadInput.defaultProps = {
-  fieldName: 'upload'
+Cascader.defaultProps = {
+  fieldName: 'cascader'
+};
+
+var ResetButton = function ResetButton(props) {
+  var resetProps = reactForm.useReset();
+  return /*#__PURE__*/React__default["default"].createElement(antd.Button, _extends({}, resetProps, props));
 };
-UploadInput.field = _Upload;
 
-var _excluded$2 = ["realTime", "disabled"],
-  _excluded2$1 = ["isPass", "isLoading"];
+var _excluded$1 = ["realTime", "disabled"],
+  _excluded2 = ["isPass", "isLoading"];
 var SubmitButton = function SubmitButton(_ref) {
   var realTime = _ref.realTime,
     disabled = _ref.disabled,
-    props = _objectWithoutPropertiesLoose(_ref, _excluded$2);
+    props = _objectWithoutPropertiesLoose(_ref, _excluded$1);
   var _useSubmit = reactForm.useSubmit(props),
     isPass = _useSubmit.isPass,
     isLoading = _useSubmit.isLoading,
-    submitProps = _objectWithoutPropertiesLoose(_useSubmit, _excluded2$1);
+    submitProps = _objectWithoutPropertiesLoose(_useSubmit, _excluded2);
   return /*#__PURE__*/React__default["default"].createElement(antd.Button, _extends({
     loading: isLoading,
     disabled: disabled || (realTime ? !isPass : false)
@@ -1126,16 +765,11 @@ SubmitButton.defaultProps = {
   disabled: false
 };
 
-var ResetButton = function ResetButton(props) {
-  var resetProps = reactForm.useReset();
-  return /*#__PURE__*/React__default["default"].createElement(antd.Button, _extends({}, resetProps, props));
-};
-
-var _excluded$1 = ["onClick"];
+var _excluded = ["onClick"];
 var useCacheRemove = reactFormHelper.hooks.useCacheRemove;
 var CancelButton = function CancelButton(_ref) {
   var _onClick = _ref.onClick,
-    props = _objectWithoutPropertiesLoose(_ref, _excluded$1);
+    props = _objectWithoutPropertiesLoose(_ref, _excluded);
   var remove = useCacheRemove();
   return /*#__PURE__*/React__default["default"].createElement(antd.Button, _extends({}, props, {
     onClick: function onClick() {
@@ -1145,107 +779,21 @@ var CancelButton = function CancelButton(_ref) {
   }));
 };
 
-var _excluded = ["className", "formProps", "footer", "children", "isReset"],
-  _excluded2 = ["className", "title", "formProps", "footer", "content", "isReset"];
-var FetchForm = reactFetch.withFetch(Form);
-var CommonModal = React.forwardRef(function (_ref, ref) {
-  var formProps = _ref.formProps,
-    footer = _ref.footer,
-    onCancel = _ref.onCancel,
-    isReset = _ref.isReset,
-    children = _ref.children;
-  var TargetForm = formProps.hasOwnProperty('url') ? FetchForm : Form;
-  return /*#__PURE__*/React__default["default"].createElement(TargetForm, _extends({}, formProps, {
-    ref: ref
-  }), /*#__PURE__*/React__default["default"].createElement("div", {
-    className: "ant-modal-body"
-  }, children), /*#__PURE__*/React__default["default"].createElement("div", {
-    className: "ant-modal-footer"
-  }, footer ? footer : /*#__PURE__*/React__default["default"].createElement(antd.Space, null, isReset ? /*#__PURE__*/React__default["default"].createElement(ResetButton, null, "\u91CD\u7F6E") : /*#__PURE__*/React__default["default"].createElement(CancelButton, {
-    onClick: function onClick() {
-      onCancel && onCancel();
-    }
-  }, "\u53D6\u6D88"), /*#__PURE__*/React__default["default"].createElement(SubmitButton, {
-    type: "primary"
-  }, "\u786E\u5B9A"))));
-});
-var FormModal = React.forwardRef(function (_ref2, ref) {
-  var className = _ref2.className,
-    _ref2$formProps = _ref2.formProps,
-    formProps = _ref2$formProps === void 0 ? {} : _ref2$formProps,
-    footer = _ref2.footer,
-    children = _ref2.children,
-    isReset = _ref2.isReset,
-    props = _objectWithoutPropertiesLoose(_ref2, _excluded);
-  return /*#__PURE__*/React__default["default"].createElement(antd.Modal, _extends({}, props, {
-    className: classnames__default["default"](className, 'react-form-modal'),
-    footer: null
-  }), /*#__PURE__*/React__default["default"].createElement(CommonModal, {
-    ref: ref,
-    formProps: formProps,
-    footer: footer,
-    isReset: isReset,
-    onCancel: props.onCancel
-  }, children));
-});
-FormModal.modal = function (_ref3) {
-  var className = _ref3.className,
-    title = _ref3.title,
-    _ref3$formProps = _ref3.formProps,
-    formProps = _ref3$formProps === void 0 ? {} : _ref3$formProps,
-    footer = _ref3.footer,
-    content = _ref3.content,
-    isReset = _ref3.isReset,
-    props = _objectWithoutPropertiesLoose(_ref3, _excluded2);
-  return antd.Modal.info(_extends({}, props, {
-    title: title ? /*#__PURE__*/React__default["default"].createElement("div", {
-      className: "ant-modal-header"
-    }, /*#__PURE__*/React__default["default"].createElement("div", {
-      className: "ant-modal-title"
-    }, title)) : null,
-    className: classnames__default["default"](className, 'react-form-modal'),
-    content: /*#__PURE__*/React__default["default"].createElement(CommonModal, {
-      formProps: formProps,
-      footer: footer,
-      isReset: isReset,
-      onCancel: props.onCancel
-    }, content),
-    icon: null,
-    footer: null
-  }));
-};
-
-var Avatar = AvatarInput;
-var Cascader = Cascader$1;
-var Checkbox = Checkbox$1;
-var CheckboxGroup = CheckboxGroup$1;
-var DatePicker = _DatePicker;
-var DatePickerToday = RangePickerToday;
-var Input = InputField;
-var InputNumber = InputNumberField;
-var RadioGroup = _RadioGroup;
-var Select = _Select;
-var Switch = Switch$1;
-var TextArea = TextArea$1;
-var TimePicker = _TimePicker;
-var TreeSelect = _TreeSelect;
-var Upload = UploadInput;
 var fields = {
-  Avatar: Avatar,
-  Cascader: Cascader,
-  Checkbox: Checkbox,
-  CheckboxGroup: CheckboxGroup,
-  DatePicker: DatePicker,
-  DatePickerToday: DatePickerToday,
-  Input: Input,
-  InputNumber: InputNumber,
-  RadioGroup: RadioGroup,
-  Select: Select,
-  Switch: Switch,
+  Upload: UploadInput,
+  TreeSelect: _TreeSelect,
+  TimePicker: _TimePicker,
   TextArea: TextArea,
-  TimePicker: TimePicker,
-  TreeSelect: TreeSelect,
-  Upload: Upload
+  Switch: Switch,
+  Select: _Select,
+  RadioGroup: _RadioGroup,
+  InputNumber: InputNumberField,
+  Input: InputField,
+  DatePickerToday: RangePickerToday,
+  DatePicker: _DatePicker,
+  CheckboxGroup: CheckboxGroup,
+  Checkbox: Checkbox,
+  Cascader: Cascader
 };
 
 Object.defineProperty(exports, 'hooks', {
@@ -1260,26 +808,23 @@ Object.defineProperty(exports, 'widget', {
   enumerable: true,
   get: function () { return reactFormHelper.widget; }
 });
-exports.Avatar = Avatar;
 exports.CancelButton = CancelButton;
 exports.Cascader = Cascader;
 exports.Checkbox = Checkbox;
 exports.CheckboxGroup = CheckboxGroup;
-exports.DatePicker = DatePicker;
-exports.DatePickerToday = DatePickerToday;
-exports.FormAntd = Form;
-exports.FormModal = FormModal;
-exports.Input = Input;
-exports.InputNumber = InputNumber;
-exports.RadioGroup = RadioGroup;
+exports.DatePicker = _DatePicker;
+exports.DatePickerToday = RangePickerToday;
+exports.Input = InputField;
+exports.InputNumber = InputNumberField;
+exports.RadioGroup = _RadioGroup;
 exports.ResetButton = ResetButton;
-exports.Select = Select;
+exports.Select = _Select;
 exports.SubmitButton = SubmitButton;
 exports.Switch = Switch;
 exports.TextArea = TextArea;
-exports.TimePicker = TimePicker;
-exports.TreeSelect = TreeSelect;
-exports.Upload = Upload;
+exports.TimePicker = _TimePicker;
+exports.TreeSelect = _TreeSelect;
+exports.Upload = UploadInput;
 exports["default"] = Form;
 exports.fields = fields;
 exports.preset = preset;