@kne/react-form-antd 3.0.30 → 3.0.33

package/dist/index.modern.js

@@ -1,4 +1,5 @@
-import React, { forwardRef, useState, useMemo, useRef, useEffect, useImperativeHandle, useCallback } from 'react';
+import * as React from 'react';
+import React__default, { forwardRef, useRef, useState, useEffect, useMemo, useImperativeHandle, useCallback } from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import { preset as preset$2, Form as Form$1, useReset, useSubmit } from '@kne/react-form';
@@ -6,8 +7,10 @@ export * from '@kne/react-form';
 import { preset as preset$1, widget, hooks, hoc } from '@kne/react-form-helper';
 export { hooks, utils, widget } from '@kne/react-form-helper';
 import { merge, get, omit, uniqueId, groupBy } from 'lodash';
-import { Button, message, Upload, TreeSelect, TimePicker, Input, Switch as Switch$1, Select, Radio, InputNumber, DatePicker, Checkbox as Checkbox$1, Cascader as Cascader$1 } from 'antd';
-import { UploadOutlined } from '@ant-design/icons';
+import { App, Modal, Row, Col, Tooltip, Slider, message, Upload, Button, TreeSelect, TimePicker, Input, Switch as Switch$1, Select, Radio, InputNumber, DatePicker, Checkbox as Checkbox$1, Cascader as Cascader$1 } from 'antd';
+import { LoadingOutlined, PlusOutlined, UploadOutlined } from '@ant-design/icons';
+import withLayer from '@kne/with-layer';
+import AvatarEditor from 'react-avatar-editor';
 import useEvent from '@kne/use-event';
 import { withFetch as withFetch$1 } from '@kne/react-fetch';
 import dayjs from 'dayjs';
@@ -86,7 +89,7 @@ var preset = (props => {
   preset$2(globalParams.rules);
 });
 
-const _excluded$6 = ["className", "cache", "enterSubmit", "scrollToError", "scrollProps", "type", "size", "children"];
+const _excluded$7 = ["className", "cache", "enterSubmit", "scrollToError", "scrollProps", "type", "size", "children"];
 const {
   ScrollToError,
   EnterSubmit,
@@ -103,7 +106,7 @@ const Form = forwardRef((originProps, ref) => {
       scrollProps,
       children
     } = originProps,
-    props = _objectWithoutPropertiesLoose(originProps, _excluded$6);
+    props = _objectWithoutPropertiesLoose(originProps, _excluded$7);
   const baseClass = 'react-form';
   let computedClass = baseClass;
   const {
@@ -119,24 +122,24 @@ const Form = forwardRef((originProps, ref) => {
   if (size !== 'middle') {
     computedClass += `--${size}`;
   }
-  const maxLabel = /*#__PURE__*/React.createElement(MaxLabelProvider, null, children);
-  return /*#__PURE__*/React.createElement("form", {
+  const maxLabel = /*#__PURE__*/React__default.createElement(MaxLabelProvider, null, children);
+  return /*#__PURE__*/React__default.createElement("form", {
     className: classnames(baseClass, computedClass, className),
     onSubmit: e => {
       e.preventDefault();
       e.stopPropagation();
     }
-  }, /*#__PURE__*/React.createElement(SizeProvider, {
+  }, /*#__PURE__*/React__default.createElement(SizeProvider, {
     value: {
       size
     }
-  }, /*#__PURE__*/React.createElement(Form$1, _extends({}, props, {
+  }, /*#__PURE__*/React__default.createElement(Form$1, _extends({}, props, {
     ref: ref
-  }), cache ? /*#__PURE__*/React.createElement(FormStore, {
+  }), cache ? /*#__PURE__*/React__default.createElement(FormStore, {
     cache: cache
-  }) : null, scrollToError ? /*#__PURE__*/React.createElement(ScrollToError, {
+  }) : null, scrollToError ? /*#__PURE__*/React__default.createElement(ScrollToError, {
     scrollProps: scrollProps
-  }) : null, enterSubmit ? /*#__PURE__*/React.createElement(EnterSubmit, null, maxLabel) : maxLabel)));
+  }) : null, enterSubmit ? /*#__PURE__*/React__default.createElement(EnterSubmit, null, maxLabel) : maxLabel)));
 });
 Form.defaultProps = {
   scrollToError: true,
@@ -158,6 +161,322 @@ Form.propTypes = {
   })
 };
 
+const RotateIcon = props => /*#__PURE__*/React.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.createElement("title", null, "\u65CB\u8F6C"), /*#__PURE__*/React.createElement("g", {
+  id: "PC\\u7AEF",
+  stroke: "none",
+  strokeWidth: 1,
+  fill: "none",
+  fillRule: "evenodd"
+}, /*#__PURE__*/React.createElement("g", {
+  id: "\\u56FE\\u6807",
+  transform: "translate(-77.000000, -1567.000000)",
+  fill: "#222222",
+  fillRule: "nonzero"
+}, /*#__PURE__*/React.createElement("g", {
+  id: "\\u65CB\\u8F6C",
+  transform: "translate(77.000000, 1567.000000)"
+}, /*#__PURE__*/React.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"
+})))));
+
+const FullIcon = props => /*#__PURE__*/React.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.createElement("title", null, "\u5145\u6EE1"), /*#__PURE__*/React.createElement("g", {
+  id: "PC\\u7AEF",
+  stroke: "none",
+  strokeWidth: 1,
+  fill: "none",
+  fillRule: "evenodd"
+}, /*#__PURE__*/React.createElement("g", {
+  id: "\\u56FE\\u6807",
+  transform: "translate(-145.000000, -1567.000000)",
+  fill: "#222222",
+  fillRule: "nonzero"
+}, /*#__PURE__*/React.createElement("g", {
+  id: "\\u5145\\u6EE1",
+  transform: "translate(145.000000, 1567.000000)"
+}, /*#__PURE__*/React.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"
+})))));
+
+const getPopupContainer = triggerNode => {
+  const findAntdPopupContainer = el => {
+    if (el === document.body || !el.parentElement) {
+      return document.body;
+    }
+    const targetEl = [].slice.call(el.classList, 0).find(className => ['ant-modal-body', 'ant-modal-content', 'ant-popover-content'].indexOf(className) > -1);
+    if (targetEl) {
+      return el;
+    }
+    return findAntdPopupContainer(el.parentElement);
+  };
+  return findAntdPopupContainer(triggerNode);
+};
+
+const _excluded$6 = ["close", "file", "editor", "onComplete"];
+const {
+  useOnChange: useOnChange$c
+} = hooks;
+const avatarParams = globalParams.field.avatar;
+const createAvatarEditor = withLayer(_ref => {
+  let {
+      close,
+      file,
+      editor,
+      onComplete
+    } = _ref,
+    props = _objectWithoutPropertiesLoose(_ref, _excluded$6);
+  const editorRef = useRef(null);
+  const [rotate, setRotate] = useState(0);
+  const [scale, setScale] = useState(() => {
+    if (editor.width === editor.height) {
+      return 1;
+    }
+    return 0.35;
+  });
+  App.useApp();
+  return /*#__PURE__*/React__default.createElement(Modal, _extends({}, props, {
+    className: editor.className,
+    centered: true,
+    onOk: () => {
+      onComplete && onComplete(editorRef.current.getImage().toDataURL());
+      close();
+    }
+  }), editor.tips ? /*#__PURE__*/React__default.createElement("div", {
+    className: "react-form-avatar-tips"
+  }, editor.tips) : null, /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      "width": editor.width,
+      "margin": "auto"
+    }
+  }, /*#__PURE__*/React__default.createElement(AvatarEditor, {
+    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.createElement(Row, {
+    gutter: 4,
+    align: "middle"
+  }, /*#__PURE__*/React__default.createElement(Col, {
+    span: 4
+  }, /*#__PURE__*/React__default.createElement(Tooltip, {
+    title: "\u65CB\u8F6C",
+    placement: "bottom",
+    getPopupContainer: getPopupContainer
+  }, /*#__PURE__*/React__default.createElement(RotateIcon, {
+    className: "react-form-avatar-btn",
+    onClick: () => {
+      setRotate(rotate => {
+        return (rotate - 90) % 360;
+      });
+    }
+  }))), /*#__PURE__*/React__default.createElement(Col, {
+    span: 4
+  }, /*#__PURE__*/React__default.createElement(Tooltip, {
+    title: "\u8FD8\u539F",
+    placement: "bottom",
+    getPopupContainer: getPopupContainer
+  }, /*#__PURE__*/React__default.createElement(FullIcon, {
+    className: "react-form-avatar-btn",
+    onClick: () => {
+      setScale(1);
+    }
+  }))), /*#__PURE__*/React__default.createElement(Col, {
+    flex: 1
+  }, /*#__PURE__*/React__default.createElement(Slider, {
+    className: "react-form-avatar-slider",
+    tooltip: {
+      placement: "bottom",
+      formatter: () => '大小',
+      getPopupContainer
+    },
+    value: scale,
+    step: 0.05,
+    min: 0.2,
+    max: 3,
+    onChange: setScale
+  })))));
+});
+const _Avatar = ({
+  className,
+  value: imageUrl,
+  onChange: propsChange,
+  beforeUpload: onBeforeUpload,
+  transformResponse,
+  action,
+  imageType,
+  fileSize: size,
+  children,
+  extraRender,
+  onError,
+  openEditor,
+  editorTips,
+  editor: targetEditor,
+  previewImg,
+  previewRender
+}) => {
+  const [loading, setLoading] = useState(false);
+  const [showImageUrl, setImageUrl] = useState(imageUrl);
+  useRef();
+  const defaultEditor = {
+    open: false,
+    width: 250,
+    height: 250,
+    borderRadius: 1,
+    text: "确定",
+    cancelText: '取消',
+    title: "裁剪图片",
+    tips: null
+  };
+  const editor = merge({}, defaultEditor, {
+    open: openEditor,
+    tips: editorTips
+  }, targetEditor);
+  useEffect(() => {
+    setImageUrl(imageUrl);
+  }, [imageUrl]);
+
+  /* base64转blob */
+  const dataURLtoBlob = dataurl => {
+    let arr = dataurl.split(",");
+    // 注意base64的最后面中括号和引号是不转译的
+    let _arr = arr[1].substring(0, arr[1].length - 2);
+    let mime = arr[0].match(/:(.*?);/)[1],
+      bstr = atob(_arr),
+      n = bstr.length,
+      u8arr = new Uint8Array(n);
+    while (n--) {
+      u8arr[n] = bstr.charCodeAt(n);
+    }
+    return new Blob([u8arr], {
+      type: mime
+    });
+  };
+  const uploadButton = /*#__PURE__*/React__default.createElement("div", null, loading ? /*#__PURE__*/React__default.createElement(LoadingOutlined, null) : /*#__PURE__*/React__default.createElement(PlusOutlined, null), children);
+  const beforeUpload = async file => {
+    return new Promise((resolve, reject) => {
+      const isJpgOrPng = imageType.indexOf(file.type) > -1;
+      if (!isJpgOrPng) {
+        onError(`只支持${imageType.map(str => str.replace("image/", "")).join("/")}格式图片!`, "typeError", {
+          type: imageType,
+          fileType: file.type
+        });
+        reject();
+        return false;
+      }
+      const isLt = file.size / 1024 / 1024 < size;
+      if (!isLt) {
+        onError(`图片不能超过${size}MB!`, "sizeError", {
+          size,
+          fileSize: file.size
+        });
+        reject();
+        return false;
+      }
+
+      /*剪切图像*/
+      // editor:{open:false,width:250,height:250,borderRadius:0-100,text:'剪切'}
+      if (editor.open) {
+        createAvatarEditor({
+          editor,
+          file,
+          title: editor.title,
+          icon: "",
+          width: editor.width * 2,
+          cancelText: editor.cancelText,
+          okText: editor.text,
+          onComplete: base64 => {
+            setImageUrl(base64);
+            let blob = dataURLtoBlob(base64);
+            const files = new window.File([blob], file.name, {
+              type: file.type
+            });
+            onBeforeUpload && onBeforeUpload(files);
+            resolve(files);
+          }
+        });
+      } else {
+        onBeforeUpload && onBeforeUpload(file);
+        resolve(file);
+      }
+    });
+  };
+  const onChange = info => {
+    if (info.file.status === "uploading") {
+      setLoading(true);
+      return;
+    }
+    if (info.file.status === "done") {
+      setLoading(false);
+      const response = (transformResponse || avatarParams.transformResponse)(info.file.response);
+      if (response.code === 200) {
+        propsChange(response.results);
+      } else {
+        onError(response.msg, "xhrError", response);
+      }
+    }
+  };
+  const headers = Object.assign({}, avatarParams.headers);
+  if (typeof avatarParams.getHeaders === 'function') {
+    Object.assign(headers, avatarParams.getHeaders());
+  }
+  return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(Upload, _extends({}, omit(avatarParams, ['action', 'transformResponse', 'headers', 'getHeaders']), {
+    headers: headers,
+    className: classnames(className, "react-form-avatar"),
+    listType: "picture-card",
+    showUploadList: false,
+    action: action || avatarParams.action,
+    beforeUpload: beforeUpload,
+    onChange: onChange
+  }), /*#__PURE__*/React__default.createElement("div", {
+    className: "react-form-avatar-inner"
+  }, previewImg && showImageUrl ? previewRender ? previewRender(showImageUrl) : /*#__PURE__*/React__default.createElement("div", {
+    className: "preview"
+  }, /*#__PURE__*/React__default.createElement("img", {
+    src: showImageUrl,
+    alt: "avatar"
+  })) : uploadButton, extraRender ? extraRender(showImageUrl) : '')));
+};
+_Avatar.defaultProps = {
+  imageType: ["image/jpeg", "image/png"],
+  fileSize: 2,
+  // 单位MB
+  children: /*#__PURE__*/React__default.createElement("div", {
+    className: "ant-upload-text"
+  }, "\u70B9\u51FB\u4E0A\u4F20"),
+  extraRender: null,
+  onError: info => message.error(info),
+  previewImg: true,
+  previewRender: null,
+  openEditor: false
+};
+const AvatarInput = props => {
+  const render = useOnChange$c(props);
+  return render(_Avatar);
+};
+AvatarInput.defaultProps = {
+  fieldName: 'avatar'
+};
+AvatarInput.field = _Avatar;
+
 const _excluded$5 = ["action", "value", "onChange", "drag", "children", "displayFilename", "accept", "fileSize", "onError", "onUploadComplete", "onBeforeUpload", "maxLength", "transformResponse"];
 const {
   useOnChange: useOnChange$b
@@ -302,7 +621,7 @@ const _Upload = _ref => {
     Object.assign(headers, uploadParams.getHeaders());
   }
   const UploadComponent = drag ? Dragger : Upload;
-  return /*#__PURE__*/React.createElement(UploadComponent, _extends({}, omit(uploadParams, ['action', 'transformResponse']), props, {
+  return /*#__PURE__*/React__default.createElement(UploadComponent, _extends({}, omit(uploadParams, ['action', 'transformResponse']), props, {
     headers: headers,
     action: action || uploadParams.action,
     fileList: valueList,
@@ -320,9 +639,9 @@ _Upload.defaultProps = {
   maxLength: 1,
   children: ({
     size
-  }) => /*#__PURE__*/React.createElement(Button, {
+  }) => /*#__PURE__*/React__default.createElement(Button, {
     size: size
-  }, /*#__PURE__*/React.createElement(UploadOutlined, null), "\u70B9\u51FB\u4E0A\u4F20"),
+  }, /*#__PURE__*/React__default.createElement(UploadOutlined, null), "\u70B9\u51FB\u4E0A\u4F20"),
   onError: info => message.error(info),
   onUploadComplete: () => {}
 };
@@ -333,7 +652,7 @@ const UploadInput = props => {
 UploadInput.defaultProps = {
   fieldName: 'upload'
 };
-UploadInput.field = _Upload;
+UploadInput.field = AvatarInput.Field = _Upload;
 
 const _excluded$4 = ["data", "setData", "send", "loadMore", "isComplete", "refresh", "reload", "fetchEmitter", "isLoading", "children", "onLoaded", "fetchProps", "requestParams"];
 const {
@@ -376,7 +695,7 @@ const withFetch = WrappedComponent => {
     useEffect(() => {
       onLoaded && onLoaded(dataRef.current);
     }, []);
-    return /*#__PURE__*/React.createElement(WrappedComponent, _extends({}, props, children({
+    return /*#__PURE__*/React__default.createElement(WrappedComponent, _extends({}, props, children({
       data,
       fetchProps,
       loadMore,
@@ -410,7 +729,7 @@ const withFetch = WrappedComponent => {
   });
   Fetch.field = forwardRef((props, ref) => {
     const emitter = useFetchEmitter(ref);
-    return /*#__PURE__*/React.createElement(FieldInner, _extends({}, props, {
+    return /*#__PURE__*/React__default.createElement(FieldInner, _extends({}, props, {
       fetchEmitter: emitter
     }));
   });
@@ -516,7 +835,7 @@ const RadioGroup = _ref => {
   const handler = useCallback(e => {
     onChange && onChange(e.target.value);
   }, [onChange]);
-  return /*#__PURE__*/React.createElement(Radio.Group, _extends({}, props, {
+  return /*#__PURE__*/React__default.createElement(Radio.Group, _extends({}, props, {
     onChange: handler
   }));
 };
@@ -567,13 +886,15 @@ InputField.Password.defaultProps = {
   autoComplete: 'off'
 };
 
-const _excluded$2 = ["soFarText"];
+const _excluded$2 = ["soFarText", "startProps", "endProps"];
 const {
   useOnChange: useOnChange$4
 } = hooks;
 const PickerToday = _ref => {
   let {
-      soFarText
+      soFarText,
+      startProps,
+      endProps
     } = _ref,
     props = _objectWithoutPropertiesLoose(_ref, _excluded$2);
   const [data, onChange] = useControlValue(props);
@@ -606,7 +927,7 @@ const PickerToday = _ref => {
     onChange([newData.start, v || '']);
   };
   const foot = () => {
-    return /*#__PURE__*/React.createElement(Button, {
+    return /*#__PURE__*/React__default.createElement(Button, {
       type: newData.showZj ? 'primary' : 'default',
       onClick: v => {
         ref_d.current.blur();
@@ -614,20 +935,21 @@ const PickerToday = _ref => {
       }
     }, soFarText || '至今');
   };
-  return /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React__default.createElement("div", {
     style: {
       display: 'flex'
     }
-  }, /*#__PURE__*/React.createElement(DatePicker, _extends({}, _extends({
+  }, /*#__PURE__*/React__default.createElement(DatePicker, _extends({}, _extends({
     showToday: false
   }, props, {
-    placeholder: newData.placeholder[0],
+    placeholder: newData.placeholder[0]
+  }, startProps, {
     value: newData.start
   }), {
     onChange: startChange
-  })), /*#__PURE__*/React.createElement("div", {
+  })), /*#__PURE__*/React__default.createElement("div", {
     className: 'svg_box'
-  }, /*#__PURE__*/React.createElement("svg", {
+  }, /*#__PURE__*/React__default.createElement("svg", {
     viewBox: "0 0 1024 1024",
     focusable: "false",
     "data-icon": "swap-right",
@@ -635,16 +957,17 @@ const PickerToday = _ref => {
     height: "1em",
     fill: "currentColor",
     "aria-hidden": "true"
-  }, /*#__PURE__*/React.createElement("path", {
+  }, /*#__PURE__*/React__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.createElement("div", {
+  }))), /*#__PURE__*/React__default.createElement("div", {
     className: newData.showZj ? 'data_range_picker data_range_picker_dis' : 'data_range_picker'
-  }, /*#__PURE__*/React.createElement("span", {
+  }, /*#__PURE__*/React__default.createElement("span", {
     className: newData.showZj ? 'zhijin zhijin_show' : 'zhijin'
-  }, soFarText || '至今'), /*#__PURE__*/React.createElement(DatePicker, _extends({}, _extends({
+  }, soFarText || '至今'), /*#__PURE__*/React__default.createElement(DatePicker, _extends({}, _extends({
     showToday: false
   }, props, {
-    placeholder: newData.showZj ? '' : newData.placeholder[1],
+    placeholder: newData.showZj ? '' : newData.placeholder[1]
+  }, endProps, {
     value: newData.end
   }), {
     ref: ref_d,
@@ -757,7 +1080,7 @@ Cascader.defaultProps = {
 
 const ResetButton = props => {
   const resetProps = useReset();
-  return /*#__PURE__*/React.createElement(Button, _extends({}, resetProps, props));
+  return /*#__PURE__*/React__default.createElement(Button, _extends({}, resetProps, props));
 };
 
 const _excluded$1 = ["realTime", "disabled"],
@@ -774,7 +1097,7 @@ const SubmitButton = _ref => {
       isLoading
     } = _useSubmit,
     submitProps = _objectWithoutPropertiesLoose(_useSubmit, _excluded2);
-  return /*#__PURE__*/React.createElement(Button, _extends({
+  return /*#__PURE__*/React__default.createElement(Button, _extends({
     loading: isLoading,
     disabled: disabled || (realTime ? !isPass : false)
   }, props, submitProps));
@@ -794,7 +1117,7 @@ const CancelButton = _ref => {
     } = _ref,
     props = _objectWithoutPropertiesLoose(_ref, _excluded);
   const remove = useCacheRemove();
-  return /*#__PURE__*/React.createElement(Button, _extends({}, props, {
+  return /*#__PURE__*/React__default.createElement(Button, _extends({}, props, {
     onClick: (...args) => {
       remove();
       onClick && onClick(...args);
@@ -817,8 +1140,9 @@ const fields = {
   DatePicker: _DatePicker,
   CheckboxGroup,
   Checkbox,
-  Cascader
+  Cascader,
+  Avatar: AvatarInput
 };
 
-export { CancelButton, Cascader, Checkbox, CheckboxGroup, _DatePicker as DatePicker, RangePickerToday as DatePickerToday, FormAntd, InputField as Input, InputNumberField as InputNumber, _RadioGroup as RadioGroup, ResetButton, _Select as Select, SubmitButton, Switch, TextArea, _TimePicker as TimePicker, _TreeSelect as TreeSelect, UploadInput as Upload, Form as default, fields, preset };
+export { AvatarInput as Avatar, CancelButton, Cascader, Checkbox, CheckboxGroup, _DatePicker as DatePicker, RangePickerToday as DatePickerToday, FormAntd, InputField as Input, InputNumberField as InputNumber, _RadioGroup as RadioGroup, ResetButton, _Select as Select, SubmitButton, Switch, TextArea, _TimePicker as TimePicker, _TreeSelect as TreeSelect, UploadInput as Upload, Form as default, fields, preset };
 //# sourceMappingURL=index.modern.js.map