@kne/react-form-antd 3.0.3 → 3.0.4

package/dist/index.modern.js

@@ -13,7 +13,7 @@ import withLayer from '@kne/with-layer';
 import { LoadingOutlined, PlusOutlined, UploadOutlined } from '@ant-design/icons';
 import AvatarEditor from 'react-avatar-editor';
 import omit from 'lodash/omit';
-import dayjs from 'dayjs';
+import moment from 'moment';
 import useControlValue from '@kne/use-control-value';
 import useEvent from '@kne/use-event';
 import { withFetch as withFetch$1 } from '@kne/react-fetch';
@@ -57,7 +57,7 @@ const globalParams = {
   field: {
     upload: {
       displayFilename: 'filename',
-      action: '/open-api/upload_static_file/interview-manager',
+      action: '/upload',
       transformResponse: response => {
         const targetPath = get(response, 'results[0].targetPath');
         const filename = get(response, 'results[0].filename');
@@ -92,7 +92,7 @@ var preset = (props => {
   preset$2(globalParams.rules);
 });
 
-const _excluded$9 = ["className", "cache", "enterSubmit", "scrollToError", "scrollProps", "type", "size", "children"];
+const _excluded$8 = ["className", "cache", "enterSubmit", "scrollToError", "scrollProps", "type", "size", "children"];
 const {
   ScrollToError,
   EnterSubmit,
@@ -109,7 +109,7 @@ const Form = forwardRef((originProps, ref) => {
       scrollProps,
       children
     } = originProps,
-    props = _objectWithoutPropertiesLoose(originProps, _excluded$9);
+    props = _objectWithoutPropertiesLoose(originProps, _excluded$8);
   const baseClass = 'react-form';
   let computedClass = baseClass;
   const {
@@ -228,9 +228,9 @@ const getPopupContainer = triggerNode => {
   return findAntdPopupContainer(triggerNode);
 };
 
-const _excluded$8 = ["close", "file", "editor", "onComplete"];
+const _excluded$7 = ["close", "file", "editor", "onComplete"];
 const {
-  useOnChange: useOnChange$d
+  useOnChange: useOnChange$c
 } = hooks;
 const avatarParams = globalParams.field.avatar;
 const createAvatarEditor = withLayer(_ref => {
@@ -240,7 +240,7 @@ const createAvatarEditor = withLayer(_ref => {
       editor,
       onComplete
     } = _ref,
-    props = _objectWithoutPropertiesLoose(_ref, _excluded$8);
+    props = _objectWithoutPropertiesLoose(_ref, _excluded$7);
   const editorRef = useRef(null);
   const [rotate, setRotate] = useState(0);
   const [scale, setScale] = useState(() => {
@@ -471,7 +471,7 @@ _Avatar.defaultProps = {
   openEditor: false
 };
 const AvatarInput = props => {
-  const render = useOnChange$d(props);
+  const render = useOnChange$c(props);
   return render(_Avatar);
 };
 AvatarInput.defaultProps = {
@@ -480,10 +480,10 @@ AvatarInput.defaultProps = {
 AvatarInput.field = _Avatar;
 
 const {
-  useOnChange: useOnChange$c
+  useOnChange: useOnChange$b
 } = hooks;
 const Cascader$1 = props => {
-  const render = useOnChange$c(props);
+  const render = useOnChange$b(props);
   return render(Cascader$2);
 };
 Cascader$1.defaultProps = {
@@ -491,7 +491,7 @@ Cascader$1.defaultProps = {
 };
 
 const {
-  useOnChange: useOnChange$b,
+  useOnChange: useOnChange$a,
   useCheckedToValue: useCheckedToValue$1
 } = hooks;
 const {
@@ -500,7 +500,7 @@ const {
 const WithCheckbox = withChecked$1(Checkbox$2);
 const Checkbox$1 = props => {
   const checkedProps = useCheckedToValue$1(props);
-  const render = useOnChange$b(checkedProps);
+  const render = useOnChange$a(checkedProps);
   return render(WithCheckbox);
 };
 Checkbox$1.defaultProps = {
@@ -508,11 +508,11 @@ Checkbox$1.defaultProps = {
 };
 
 const {
-  useOnChange: useOnChange$a
+  useOnChange: useOnChange$9
 } = hooks;
 const _CheckboxGroup = Checkbox$2.Group;
 const CheckboxGroup$1 = props => {
-  const render = useOnChange$a(props);
+  const render = useOnChange$9(props);
   return render(_CheckboxGroup);
 };
 CheckboxGroup$1.Checkbox = Checkbox$2;
@@ -521,7 +521,7 @@ CheckboxGroup$1.defaultProps = {
 };
 
 const {
-  useOnChange: useOnChange$9
+  useOnChange: useOnChange$8
 } = hooks;
 const {
   MonthPicker,
@@ -529,58 +529,54 @@ const {
   WeekPicker
 } = DatePicker$1;
 const _DatePicker = props => {
-  const render = useOnChange$9(Object.assign({
+  const render = useOnChange$8(Object.assign({
     placeholder: `请选择${props.label || ''}`
   }, props));
   return render(DatePicker$1);
 };
 _DatePicker.defaultProps = {
-  fieldName: 'datePicker',
-  getPopupContainer
+  fieldName: 'datePicker'
 };
 const _MonthPicker = props => {
-  const render = useOnChange$9(Object.assign({
+  const render = useOnChange$8(Object.assign({
     placeholder: ['开始时间', '结束时间']
   }, props));
   return render(MonthPicker);
 };
 _MonthPicker.defaultProps = {
-  fieldName: 'monthDatePicker',
-  getPopupContainer
+  fieldName: 'monthDatePicker'
 };
 const _RangePicker$1 = props => {
-  const render = useOnChange$9(Object.assign({
+  const render = useOnChange$8(Object.assign({
     placeholder: ['开始时间', '结束时间']
   }, props));
   return render(RangePicker$1);
 };
 _RangePicker$1.defaultProps = {
-  fieldName: 'rangeDatePicker',
-  getPopupContainer
+  fieldName: 'rangeDatePicker'
 };
 const _WeekPicker = props => {
-  const render = useOnChange$9(Object.assign({
+  const render = useOnChange$8(Object.assign({
     placeholder: ['开始时间', '结束时间']
   }, props));
   return render(WeekPicker);
 };
 _WeekPicker.defaultProps = {
-  fieldName: 'weekDatePicker',
-  getPopupContainer
+  fieldName: 'weekDatePicker'
 };
 _DatePicker.MonthPicker = _MonthPicker;
 _DatePicker.RangePicker = _RangePicker$1;
 _DatePicker.WeekPicker = _WeekPicker;
 
-const _excluded$7 = ["soFarText"];
+const _excluded$6 = ["soFarText"];
 const {
-  useOnChange: useOnChange$8
+  useOnChange: useOnChange$7
 } = hooks;
 const PickerToday = _ref => {
   let {
       soFarText
     } = _ref,
-    props = _objectWithoutPropertiesLoose(_ref, _excluded$7);
+    props = _objectWithoutPropertiesLoose(_ref, _excluded$6);
   const [data, onChange] = useControlValue(props);
   const ref_d = useRef();
   const newData = useMemo(() => {
@@ -589,8 +585,8 @@ const PickerToday = _ref => {
     const d = get(data, 1, '');
     const p = get(props, ['placeholder'], ['开始日期', '结束日期']);
     return {
-      start: s ? dayjs(s) : '',
-      end: d === '至今' ? null : d ? dayjs(d) : '',
+      start: s ? moment(s) : '',
+      end: d === '至今' ? null : d ? moment(d) : '',
       showZj: d === '至今',
       placeholder: p
     };
@@ -658,7 +654,7 @@ const PickerToday = _ref => {
   }))));
 };
 const RangePickerToday = props => {
-  const render = useOnChange$8(props);
+  const render = useOnChange$7(props);
   return render(PickerToday);
 };
 RangePickerToday.defaultProps = {
@@ -704,15 +700,15 @@ InputNumberField.defaultProps = {
   autoComplete: 'off'
 };
 
-const _excluded$6 = ["onChange"];
+const _excluded$5 = ["onChange"];
 const {
-  useOnChange: useOnChange$7
+  useOnChange: useOnChange$6
 } = hooks;
 const RadioGroup$1 = _ref => {
   let {
       onChange
     } = _ref,
-    props = _objectWithoutPropertiesLoose(_ref, _excluded$6);
+    props = _objectWithoutPropertiesLoose(_ref, _excluded$5);
   const handler = useCallback(e => {
     onChange && onChange(e.target.value);
   }, [onChange]);
@@ -721,7 +717,7 @@ const RadioGroup$1 = _ref => {
   }));
 };
 const _RadioGroup = props => {
-  const render = useOnChange$7(props);
+  const render = useOnChange$6(props);
   return render(RadioGroup$1);
 };
 _RadioGroup.defaultProps = {
@@ -729,9 +725,9 @@ _RadioGroup.defaultProps = {
 };
 _RadioGroup.Radio = Radio;
 
-const _excluded$5 = ["data", "setData", "send", "loadMore", "isComplete", "refresh", "reload", "fetchEmitter", "isLoading", "children", "onLoaded", "fetchProps", "requestParams"];
+const _excluded$4 = ["data", "setData", "send", "loadMore", "isComplete", "refresh", "reload", "fetchEmitter", "isLoading", "children", "onLoaded", "fetchProps", "requestParams"];
 const {
-  useOnChange: useOnChange$6
+  useOnChange: useOnChange$5
 } = hooks;
 const withFetch = WrappedComponent => {
   const FieldInner = withFetch$1(_ref => {
@@ -749,7 +745,7 @@ const withFetch = WrappedComponent => {
         onLoaded,
         fetchProps
       } = _ref,
-      props = _objectWithoutPropertiesLoose(_ref, _excluded$5);
+      props = _objectWithoutPropertiesLoose(_ref, _excluded$4);
     const refreshRef = useRef(refresh);
     refreshRef.current = refresh;
     const reloadRef = useRef(reload);
@@ -795,7 +791,7 @@ const withFetch = WrappedComponent => {
   };
   const Fetch = forwardRef((props, ref) => {
     const emitter = useFetchEmitter(ref);
-    const render = useOnChange$6(Object.assign({
+    const render = useOnChange$5(Object.assign({
       placeholder: `请选择${props.label}`
     }, props, {
       fetchEmitter: emitter
@@ -812,10 +808,10 @@ const withFetch = WrappedComponent => {
 };
 
 const {
-  useOnChange: useOnChange$5
+  useOnChange: useOnChange$4
 } = hooks;
 const _Select = props => {
-  const render = useOnChange$5(Object.assign({
+  const render = useOnChange$4(Object.assign({
     placeholder: `请选择${props.label || ''}`
   }, props));
   return render(Select$1);
@@ -824,89 +820,8 @@ _Select.Fetch = withFetch(Select$1);
 _Select.Option = Select$1.Option;
 _Select.OptGroup = Select$1.OptGroup;
 _Select.defaultProps = _Select.Fetch.defaultProps = {
-  fieldName: 'select',
-  getPopupContainer
-};
-
-const _excluded$4 = ["data", "setData", "refresh", "reload", "emitter", "isLoading", "children", "onLoaded", "loadMore", "send", "isComplete", "fetchProps", "requestParams"];
-const {
-  useOnChange: useOnChange$4
-} = hooks;
-const _SelectFetch = withFetch$1(_ref => {
-  let {
-      data,
-      setData,
-      refresh,
-      reload,
-      emitter,
-      isLoading,
-      children,
-      onLoaded
-    } = _ref,
-    props = _objectWithoutPropertiesLoose(_ref, _excluded$4);
-  const refreshRef = useRef(refresh);
-  refreshRef.current = refresh;
-  const reloadRef = useRef(reload);
-  reloadRef.current = reload;
-  const setDataRef = useRef(setData);
-  setDataRef.current = setData;
-  const dataRef = useRef(data);
-  useEffect(() => {
-    console.warn('请使用Select.Fetch替代该组件，该组件会在未来某个版本被移除');
-    const token1 = emitter.addListener('select-fetch-refresh', () => refreshRef.current());
-    const token2 = emitter.addListener('select-fetch-reload', () => reloadRef.current());
-    const token3 = emitter.addListener('select-fetch-set-data', () => setDataRef.current());
-    return () => {
-      token1 && token1.remove();
-      token2 && token2.remove();
-      token3 && token3.remove();
-    };
-  }, [emitter]);
-  useEffect(() => {
-    onLoaded && onLoaded(dataRef.current);
-  }, []);
-  return /*#__PURE__*/React__default.createElement(Select$1, props, children({
-    data,
-    refresh,
-    isLoading,
-    setData
-  }));
-});
-const SelectFetch$1 = forwardRef((props, ref) => {
-  const emitter = useEvent();
-  useImperativeHandle(ref, () => {
-    return {
-      refresh: () => emitter.emit('select-fetch-refresh'),
-      reload: () => emitter.emit('select-fetch-reload'),
-      setData: data => emitter.emit('select-fetch-set-data', data)
-    };
-  }, [emitter]);
-  const render = useOnChange$4(Object.assign({
-    placeholder: `请选择${props.label}`
-  }, props, {
-    emitter
-  }));
-  return render(_SelectFetch);
-});
-SelectFetch$1.field = forwardRef((props, ref) => {
-  const emitter = useEvent();
-  useImperativeHandle(ref, () => {
-    return {
-      refresh: () => emitter.emit('select-fetch-refresh'),
-      reload: () => emitter.emit('select-fetch-reload'),
-      setData: data => emitter.emit('select-fetch-set-data', data)
-    };
-  }, [emitter]);
-  return /*#__PURE__*/React__default.createElement(_SelectFetch, _extends({}, props, {
-    emitter: emitter
-  }));
-});
-SelectFetch$1.defaultProps = {
-  fieldName: 'selectFetch',
-  getPopupContainer
+  fieldName: 'select'
 };
-SelectFetch$1.Option = Select$1.Option;
-SelectFetch$1.OptGroup = Select$1.OptGroup;
 
 const {
   useOnChange: useOnChange$3,
@@ -951,8 +866,7 @@ const _TimePicker = props => {
   return render(TimePicker$1);
 };
 _TimePicker.defaultProps = {
-  fieldName: 'timePicker',
-  getPopupContainer
+  fieldName: 'timePicker'
 };
 const _RangePicker = props => {
   const render = useOnChange$2(Object.assign({
@@ -961,8 +875,7 @@ const _RangePicker = props => {
   return render(RangePicker);
 };
 _RangePicker.defaultProps = {
-  fieldName: 'rangeTimePicker',
-  getPopupContainer
+  fieldName: 'rangeTimePicker'
 };
 _TimePicker.RangePicker = _RangePicker;
 
@@ -977,8 +890,7 @@ const _TreeSelect = props => {
 };
 _TreeSelect.Fetch = withFetch(TreeSelect$1);
 _TreeSelect.defaultProps = _TreeSelect.Fetch.defaultProps = {
-  fieldName: 'treeSelect',
-  getPopupContainer
+  fieldName: 'treeSelect'
 };
 _TreeSelect.TreeNode = TreeSelect$1.TreeNode;
 
@@ -1056,7 +968,7 @@ const _Upload = _ref => {
   const [list, setList] = useState([]);
   const valueList = useMemo(() => {
     return valueToList(value.filter(url => {
-      return !list.find(file => decodeURIComponentSafe(get(file, 'response.results', '')) === decodeURIComponentSafe(url));
+      return !list.find(file => get(file, 'response.results') === decodeURIComponentSafe(url));
     }), displayFilename).concat(list);
   }, [list, value, displayFilename]);
   const changeHandler = info => {
@@ -1087,7 +999,7 @@ const _Upload = _ref => {
     }
     setList(info.fileList);
   };
-  const beforeUploadHandler = file => {
+  const beforeUploadHandler = (file, fileList) => {
     const isLt = file.size / 1024 / 1024 < size;
     if (!isLt) {
       onError(`文件不能超过${size}MB!`, 'sizeError', {
@@ -1096,6 +1008,10 @@ const _Upload = _ref => {
       });
       return false;
     }
+    if ((fileList == null ? void 0 : fileList.length) > maxLength) {
+      onError(`上传文件不能超过最大允许数量${maxLength}`, 'lengthError', maxLength);
+      return false;
+    }
     if (maxLength === 1) {
       onChange([]);
       setList([]);
@@ -1271,7 +1187,6 @@ const Input = InputField;
 const InputNumber = InputNumberField;
 const RadioGroup = _RadioGroup;
 const Select = _Select;
-const SelectFetch = SelectFetch$1;
 const Switch = Switch$1;
 const TextArea = TextArea$1;
 const TimePicker = _TimePicker;
@@ -1288,7 +1203,6 @@ const fields = {
   InputNumber,
   RadioGroup,
   Select,
-  SelectFetch,
   Switch,
   TextArea,
   TimePicker,
@@ -1296,5 +1210,5 @@ const fields = {
   Upload
 };
 
-export { Avatar, CancelButton, Cascader, Checkbox, CheckboxGroup, DatePicker, DatePickerToday, FormModal, Input, InputNumber, RadioGroup, ResetButton, Select, SelectFetch, SubmitButton, Switch, TextArea, TimePicker, TreeSelect, Upload, Form as default, fields, preset };
+export { Avatar, CancelButton, Cascader, Checkbox, CheckboxGroup, DatePicker, DatePickerToday, FormModal, Input, InputNumber, RadioGroup, ResetButton, Select, SubmitButton, Switch, TextArea, TimePicker, TreeSelect, Upload, Form as default, fields, preset };
 //# sourceMappingURL=index.modern.js.map