@kne/react-form-antd 2.0.25 → 2.0.26

package/dist/index.js

@@ -10,8 +10,8 @@ var icons = require('@ant-design/icons');
 var AvatarEditor = require('react-avatar-editor');
 var moment = require('moment');
 var useControlValue = require('@kne/use-control-value');
-var reactFetch = require('@kne/react-fetch');
 var useEvent = require('@kne/use-event');
+var reactFetch = require('@kne/react-fetch');
 var groupBy = require('lodash/groupBy');
 var uniqueId = require('lodash/uniqueId');
 
@@ -63,7 +63,7 @@ function _objectWithoutPropertiesLoose(source, excluded) {
   return target;
 }
 
-var _excluded$7 = ["className", "cache", "enterSubmit", "scrollToError", "scrollProps", "type", "size", "children"];
+var _excluded$8 = ["className", "cache", "enterSubmit", "scrollToError", "scrollProps", "type", "size", "children"];
 var ScrollToError = reactFormHelper.widget.ScrollToError,
     EnterSubmit = reactFormHelper.widget.EnterSubmit,
     FormStore = reactFormHelper.widget.FormStore,
@@ -78,7 +78,7 @@ var Form = React.forwardRef(function (_ref, ref) {
       type = _ref.type,
       size = _ref.size,
       children = _ref.children,
-      props = _objectWithoutPropertiesLoose(_ref, _excluded$7);
+      props = _objectWithoutPropertiesLoose(_ref, _excluded$8);
 
   var computedClass = 'react-form';
 
@@ -164,7 +164,7 @@ var preset = (function (props) {
   ReactForm.preset(globalParams.rules);
 });
 
-var useOnChange$c = reactFormHelper.hooks.useOnChange;
+var useOnChange$d = reactFormHelper.hooks.useOnChange;
 var avatarParams = globalParams.field.avatar;
 
 var _Avatar = function _Avatar(_ref) {
@@ -408,35 +408,35 @@ _Avatar.defaultProps = {
 };
 
 var AvatarInput = function AvatarInput(props) {
-  var render = useOnChange$c(props);
+  var render = useOnChange$d(props);
   return render(_Avatar);
 };
 
 AvatarInput.field = _Avatar;
 
-var useOnChange$b = reactFormHelper.hooks.useOnChange;
+var useOnChange$c = reactFormHelper.hooks.useOnChange;
 
 var Cascader$1 = function Cascader(props) {
-  var render = useOnChange$b(props);
+  var render = useOnChange$c(props);
   return render(antd.Cascader);
 };
 
-var useOnChange$a = reactFormHelper.hooks.useOnChange,
+var useOnChange$b = 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(props);
-  var render = useOnChange$a(checkedProps);
+  var render = useOnChange$b(checkedProps);
   return render(WithCheckbox);
 };
 
-var useOnChange$9 = reactFormHelper.hooks.useOnChange;
+var useOnChange$a = reactFormHelper.hooks.useOnChange;
 var _CheckboxGroup = antd.Checkbox.Group;
 
 var CheckboxGroup$1 = function CheckboxGroup(props) {
-  var render = useOnChange$9(props);
+  var render = useOnChange$a(props);
   return render(_CheckboxGroup);
 };
 
@@ -462,13 +462,13 @@ var getPopupContainer = function getPopupContainer(triggerNode) {
   return findAntdPopupContainer(triggerNode);
 };
 
-var useOnChange$8 = reactFormHelper.hooks.useOnChange;
+var useOnChange$9 = 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({
+  var render = useOnChange$9(Object.assign({
     placeholder: ['开始时间', '结束时间']
   }, props));
   return render(antd.DatePicker);
@@ -479,14 +479,14 @@ _DatePicker.defaultProps = {
 };
 
 var _MonthPicker = function _MonthPicker(props) {
-  var render = useOnChange$8(Object.assign({
+  var render = useOnChange$9(Object.assign({
     placeholder: ['开始时间', '结束时间']
   }, props));
   return render(MonthPicker);
 };
 
 var _RangePicker$1 = function _RangePicker(props) {
-  var render = useOnChange$8(Object.assign({
+  var render = useOnChange$9(Object.assign({
     placeholder: ['开始时间', '结束时间']
   }, props)); // if(props.selectToday){
   //     return render(RangePickerToday);
@@ -500,7 +500,7 @@ _RangePicker$1.defaultProps = {
 };
 
 var _WeekPicker = function _WeekPicker(props) {
-  var render = useOnChange$8(Object.assign({
+  var render = useOnChange$9(Object.assign({
     placeholder: ['开始时间', '结束时间']
   }, props));
   return render(WeekPicker);
@@ -513,12 +513,12 @@ _DatePicker.MonthPicker = _MonthPicker;
 _DatePicker.RangePicker = _RangePicker$1;
 _DatePicker.WeekPicker = _WeekPicker;
 
-var _excluded$6 = ["soFarText"];
-var useOnChange$7 = reactFormHelper.hooks.useOnChange;
+var _excluded$7 = ["soFarText"];
+var useOnChange$8 = reactFormHelper.hooks.useOnChange;
 
 var PickerToday = function PickerToday(_ref) {
   var soFarText = _ref.soFarText,
-      props = _objectWithoutPropertiesLoose(_ref, _excluded$6);
+      props = _objectWithoutPropertiesLoose(_ref, _excluded$7);
 
   var _useControlValue = useControlValue__default["default"](props),
       data = _useControlValue[0],
@@ -606,7 +606,7 @@ var PickerToday = function PickerToday(_ref) {
 };
 
 var RangePickerToday = function RangePickerToday(props) {
-  var render = useOnChange$7(props);
+  var render = useOnChange$8(props);
   return render(PickerToday);
 };
 
@@ -645,12 +645,12 @@ InputNumberField.defaultProps = {
   autoComplete: 'off'
 };
 
-var _excluded$5 = ["onChange"];
-var useOnChange$6 = reactFormHelper.hooks.useOnChange;
+var _excluded$6 = ["onChange"];
+var useOnChange$7 = reactFormHelper.hooks.useOnChange;
 
 var RadioGroup$1 = function RadioGroup(_ref) {
   var onChange = _ref.onChange,
-      props = _objectWithoutPropertiesLoose(_ref, _excluded$5);
+      props = _objectWithoutPropertiesLoose(_ref, _excluded$6);
 
   var handler = React.useCallback(function (e) {
     onChange && onChange(e.target.value);
@@ -661,12 +661,87 @@ var RadioGroup$1 = function RadioGroup(_ref) {
 };
 
 var _RadioGroup = function _RadioGroup(props) {
-  var render = useOnChange$6(props);
+  var render = useOnChange$7(props);
   return render(RadioGroup$1);
 };
 
 _RadioGroup.Radio = antd.Radio;
 
+var _excluded$5 = ["data", "setData", "refresh", "reload", "fetchEmitter", "isLoading", "children", "onLoaded", "fetchProps"];
+var useOnChange$6 = reactFormHelper.hooks.useOnChange;
+
+var withFetch = function withFetch(WrappedComponent) {
+  var FieldInner = reactFetch.withFetch(function (_ref) {
+    var data = _ref.data,
+        setData = _ref.setData,
+        refresh = _ref.refresh,
+        reload = _ref.reload,
+        fetchEmitter = _ref.fetchEmitter,
+        isLoading = _ref.isLoading,
+        children = _ref.children,
+        onLoaded = _ref.onLoaded,
+        fetchProps = _ref.fetchProps,
+        props = _objectWithoutPropertiesLoose(_ref, _excluded$5);
+
+    var refreshRef = React.useRef(refresh);
+    refreshRef.current = refresh;
+    var reloadRef = React.useRef(reload);
+    reloadRef.current = reload;
+    var setDataRef = React.useRef(setData);
+    setDataRef.current = setData;
+    var dataRef = React.useRef(data);
+    React.useEffect(function () {
+      var token1 = fetchEmitter.addListener('select-fetch-refresh', function () {
+        return refreshRef.current();
+      });
+      var token2 = fetchEmitter.addListener('select-fetch-reload', function () {
+        return reloadRef.current();
+      });
+      var token3 = fetchEmitter.addListener('select-fetch-set-data', function () {
+        return setDataRef.current();
+      });
+      return function () {
+        token1 && token1.remove();
+        token2 && token2.remove();
+        token3 && token3.remove();
+      };
+    }, [fetchEmitter]);
+    React.useEffect(function () {
+      onLoaded && onLoaded(dataRef.current);
+    }, []);
+    return /*#__PURE__*/React__default["default"].createElement(WrappedComponent, _extends({}, props, children({
+      data: data,
+      fetchProps: fetchProps,
+      refresh: refresh,
+      isLoading: isLoading,
+      setData: setData
+    })));
+  });
+  var Fetch = React.forwardRef(function (props, ref) {
+    var emitter = useEvent__default["default"]();
+    React.useImperativeHandle(ref, function () {
+      return {
+        refresh: function refresh() {
+          return emitter.emit('select-fetch-refresh');
+        },
+        reload: function reload() {
+          return emitter.emit('select-fetch-reload');
+        },
+        setData: function setData(data) {
+          return emitter.emit('select-fetch-set-data', data);
+        }
+      };
+    }, [emitter]);
+    var render = useOnChange$6(Object.assign({
+      placeholder: "\u8BF7\u9009\u62E9" + props.label
+    }, props, {
+      fetchEmitter: emitter
+    }));
+    return render(FieldInner);
+  });
+  return Fetch;
+};
+
 var useOnChange$5 = reactFormHelper.hooks.useOnChange;
 
 var _Select = function _Select(props) {
@@ -676,9 +751,10 @@ var _Select = function _Select(props) {
   return render(antd.Select);
 };
 
+_Select.Fetch = withFetch(antd.Select);
 _Select.Option = antd.Select.Option;
 _Select.OptGroup = antd.Select.OptGroup;
-_Select.defaultProps = {
+_Select.defaultProps = _Select.Fetch.defaultProps = {
   getPopupContainer: getPopupContainer
 };
 
@@ -704,6 +780,7 @@ var _SelectFetch = reactFetch.withFetch(function (_ref) {
   setDataRef.current = setData;
   var dataRef = React.useRef(data);
   React.useEffect(function () {
+    console.warn('请使用Select.Fetch替代该组件，该组件会在未来某个版本被移除');
     var token1 = emitter.addListener('select-fetch-refresh', function () {
       return refreshRef.current();
     });
@@ -832,7 +909,8 @@ var _TreeSelect = function _TreeSelect(props) {
   return render(antd.TreeSelect);
 };
 
-_TreeSelect.defaultProps = {
+_TreeSelect.Fetch = withFetch(antd.Select);
+_TreeSelect.defaultProps = _TreeSelect.Fetch.defaultProps = {
   getPopupContainer: getPopupContainer
 };
 _TreeSelect.TreeNode = antd.TreeSelect.TreeNode;