@kne/react-form-antd 2.0.25 → 2.0.26

package/dist/index.modern.js

@@ -12,8 +12,8 @@ import { LoadingOutlined, PlusOutlined, UploadOutlined } from '@ant-design/icons
 import AvatarEditor from 'react-avatar-editor';
 import moment from 'moment';
 import useControlValue from '@kne/use-control-value';
-import { withFetch } from '@kne/react-fetch';
 import useEvent from '@kne/use-event';
+import { withFetch as withFetch$1 } from '@kne/react-fetch';
 import groupBy from 'lodash/groupBy';
 import uniqueId from 'lodash/uniqueId';
 
@@ -50,7 +50,7 @@ function _objectWithoutPropertiesLoose(source, excluded) {
   return target;
 }
 
-const _excluded$7 = ["className", "cache", "enterSubmit", "scrollToError", "scrollProps", "type", "size", "children"];
+const _excluded$8 = ["className", "cache", "enterSubmit", "scrollToError", "scrollProps", "type", "size", "children"];
 const {
   ScrollToError,
   EnterSubmit,
@@ -69,7 +69,7 @@ const Form = forwardRef((_ref, ref) => {
     size,
     children
   } = _ref,
-      props = _objectWithoutPropertiesLoose(_ref, _excluded$7);
+      props = _objectWithoutPropertiesLoose(_ref, _excluded$8);
 
   let computedClass = 'react-form';
 
@@ -156,7 +156,7 @@ var preset = (props => {
 });
 
 const {
-  useOnChange: useOnChange$c
+  useOnChange: useOnChange$d
 } = hooks;
 const avatarParams = globalParams.field.avatar;
 
@@ -382,23 +382,23 @@ _Avatar.defaultProps = {
 };
 
 const AvatarInput = props => {
-  const render = useOnChange$c(props);
+  const render = useOnChange$d(props);
   return render(_Avatar);
 };
 
 AvatarInput.field = _Avatar;
 
 const {
-  useOnChange: useOnChange$b
+  useOnChange: useOnChange$c
 } = hooks;
 
 const Cascader$1 = props => {
-  const render = useOnChange$b(props);
+  const render = useOnChange$c(props);
   return render(Cascader$2);
 };
 
 const {
-  useOnChange: useOnChange$a,
+  useOnChange: useOnChange$b,
   useCheckedToValue: useCheckedToValue$1
 } = hooks;
 const {
@@ -408,17 +408,17 @@ const WithCheckbox = withChecked$1(Checkbox$2);
 
 const Checkbox$1 = props => {
   const checkedProps = useCheckedToValue$1(props);
-  const render = useOnChange$a(checkedProps);
+  const render = useOnChange$b(checkedProps);
   return render(WithCheckbox);
 };
 
 const {
-  useOnChange: useOnChange$9
+  useOnChange: useOnChange$a
 } = hooks;
 const _CheckboxGroup = Checkbox$2.Group;
 
 const CheckboxGroup$1 = props => {
-  const render = useOnChange$9(props);
+  const render = useOnChange$a(props);
   return render(_CheckboxGroup);
 };
 
@@ -443,7 +443,7 @@ const getPopupContainer = triggerNode => {
 };
 
 const {
-  useOnChange: useOnChange$8
+  useOnChange: useOnChange$9
 } = hooks;
 const {
   MonthPicker,
@@ -452,7 +452,7 @@ const {
 } = DatePicker$1;
 
 const _DatePicker = props => {
-  const render = useOnChange$8(Object.assign({
+  const render = useOnChange$9(Object.assign({
     placeholder: ['开始时间', '结束时间']
   }, props));
   return render(DatePicker$1);
@@ -463,14 +463,14 @@ _DatePicker.defaultProps = {
 };
 
 const _MonthPicker = props => {
-  const render = useOnChange$8(Object.assign({
+  const render = useOnChange$9(Object.assign({
     placeholder: ['开始时间', '结束时间']
   }, props));
   return render(MonthPicker);
 };
 
 const _RangePicker$1 = props => {
-  const render = useOnChange$8(Object.assign({
+  const render = useOnChange$9(Object.assign({
     placeholder: ['开始时间', '结束时间']
   }, props)); // if(props.selectToday){
   //     return render(RangePickerToday);
@@ -484,7 +484,7 @@ _RangePicker$1.defaultProps = {
 };
 
 const _WeekPicker = props => {
-  const render = useOnChange$8(Object.assign({
+  const render = useOnChange$9(Object.assign({
     placeholder: ['开始时间', '结束时间']
   }, props));
   return render(WeekPicker);
@@ -497,16 +497,16 @@ _DatePicker.MonthPicker = _MonthPicker;
 _DatePicker.RangePicker = _RangePicker$1;
 _DatePicker.WeekPicker = _WeekPicker;
 
-const _excluded$6 = ["soFarText"];
+const _excluded$7 = ["soFarText"];
 const {
-  useOnChange: useOnChange$7
+  useOnChange: useOnChange$8
 } = hooks;
 
 const PickerToday = _ref => {
   let {
     soFarText
   } = _ref,
-      props = _objectWithoutPropertiesLoose(_ref, _excluded$6);
+      props = _objectWithoutPropertiesLoose(_ref, _excluded$7);
 
   const [data, onChange] = useControlValue(props);
   const ref_d = useRef();
@@ -591,7 +591,7 @@ const PickerToday = _ref => {
 };
 
 const RangePickerToday = props => {
-  const render = useOnChange$7(props);
+  const render = useOnChange$8(props);
   return render(PickerToday);
 };
 
@@ -634,16 +634,16 @@ InputNumberField.defaultProps = {
   autoComplete: 'off'
 };
 
-const _excluded$5 = ["onChange"];
+const _excluded$6 = ["onChange"];
 const {
-  useOnChange: useOnChange$6
+  useOnChange: useOnChange$7
 } = hooks;
 
 const RadioGroup$1 = _ref => {
   let {
     onChange
   } = _ref,
-      props = _objectWithoutPropertiesLoose(_ref, _excluded$5);
+      props = _objectWithoutPropertiesLoose(_ref, _excluded$6);
 
   const handler = useCallback(e => {
     onChange && onChange(e.target.value);
@@ -654,12 +654,79 @@ const RadioGroup$1 = _ref => {
 };
 
 const _RadioGroup = props => {
-  const render = useOnChange$6(props);
+  const render = useOnChange$7(props);
   return render(RadioGroup$1);
 };
 
 _RadioGroup.Radio = Radio;
 
+const _excluded$5 = ["data", "setData", "refresh", "reload", "fetchEmitter", "isLoading", "children", "onLoaded", "fetchProps"];
+const {
+  useOnChange: useOnChange$6
+} = hooks;
+
+const withFetch = WrappedComponent => {
+  const FieldInner = withFetch$1(_ref => {
+    let {
+      data,
+      setData,
+      refresh,
+      reload,
+      fetchEmitter,
+      isLoading,
+      children,
+      onLoaded,
+      fetchProps
+    } = _ref,
+        props = _objectWithoutPropertiesLoose(_ref, _excluded$5);
+
+    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(() => {
+      const token1 = fetchEmitter.addListener('select-fetch-refresh', () => refreshRef.current());
+      const token2 = fetchEmitter.addListener('select-fetch-reload', () => reloadRef.current());
+      const token3 = fetchEmitter.addListener('select-fetch-set-data', () => setDataRef.current());
+      return () => {
+        token1 && token1.remove();
+        token2 && token2.remove();
+        token3 && token3.remove();
+      };
+    }, [fetchEmitter]);
+    useEffect(() => {
+      onLoaded && onLoaded(dataRef.current);
+    }, []);
+    return /*#__PURE__*/React.createElement(WrappedComponent, _extends({}, props, children({
+      data,
+      fetchProps,
+      refresh,
+      isLoading,
+      setData
+    })));
+  });
+  const Fetch = 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$6(Object.assign({
+      placeholder: `请选择${props.label}`
+    }, props, {
+      fetchEmitter: emitter
+    }));
+    return render(FieldInner);
+  });
+  return Fetch;
+};
+
 const {
   useOnChange: useOnChange$5
 } = hooks;
@@ -671,9 +738,10 @@ const _Select = props => {
   return render(Select$1);
 };
 
+_Select.Fetch = withFetch(Select$1);
 _Select.Option = Select$1.Option;
 _Select.OptGroup = Select$1.OptGroup;
-_Select.defaultProps = {
+_Select.defaultProps = _Select.Fetch.defaultProps = {
   getPopupContainer
 };
 
@@ -682,7 +750,7 @@ const {
   useOnChange: useOnChange$4
 } = hooks;
 
-const _SelectFetch = withFetch(_ref => {
+const _SelectFetch = withFetch$1(_ref => {
   let {
     data,
     setData,
@@ -703,6 +771,7 @@ const _SelectFetch = withFetch(_ref => {
   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());
@@ -825,7 +894,8 @@ const _TreeSelect = props => {
   return render(TreeSelect$1);
 };
 
-_TreeSelect.defaultProps = {
+_TreeSelect.Fetch = withFetch(Select$1);
+_TreeSelect.defaultProps = _TreeSelect.Fetch.defaultProps = {
   getPopupContainer
 };
 _TreeSelect.TreeNode = TreeSelect$1.TreeNode;
@@ -1024,7 +1094,7 @@ const ResetButton = props => {
 
 const _excluded$1 = ["className", "formProps", "footer", "children"],
       _excluded2 = ["className", "title", "formProps", "footer", "content"];
-const FetchForm = withFetch(Form);
+const FetchForm = withFetch$1(Form);
 
 const CommonModal = ({
   formProps,