@kne/react-form-antd 2.1.15 → 2.1.18

package/dist/index.modern.js

@@ -1,9 +1,9 @@
 import React, { forwardRef, useState, useRef, useEffect, useMemo, useCallback, useImperativeHandle } from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
-import ReactForm__default, { preset as preset$1, useSubmit, useReset } from '@kne/react-form';
+import ReactForm__default, { preset as preset$2, useSubmit, useReset } from '@kne/react-form';
 export * from '@kne/react-form';
-import { widget, hooks, hoc } from '@kne/react-form-helper';
+import { preset as preset$1, widget, hooks, hoc } from '@kne/react-form-helper';
 export { hooks, utils, widget } from '@kne/react-form-helper';
 import merge from 'lodash/merge';
 import get from 'lodash/get';
@@ -55,6 +55,9 @@ const globalParams = {
   type: 'default',
   size: 'middle',
   rules: {},
+  formModal: {},
+  resetButton: {},
+  submitButton: {},
   field: {
     upload: {
       displayFilename: 'filename',
@@ -83,7 +86,14 @@ const globalParams = {
 };
 var preset = (props => {
   merge(globalParams, props);
-  preset$1(globalParams.rules);
+  const defaultProps = {};
+  Object.keys(globalParams.field).forEach(name => {
+    defaultProps[name] = (globalParams.field[name] || {}).defaultProps;
+  });
+  preset$1({
+    field: defaultProps
+  });
+  preset$2(globalParams.rules);
 });
 
 const _excluded$8 = ["className", "cache", "enterSubmit", "scrollToError", "scrollProps", "type", "size", "children"];
@@ -396,6 +406,9 @@ const AvatarInput = props => {
   return render(_Avatar);
 };
 
+AvatarInput.defaultProps = {
+  fieldName: 'avatar'
+};
 AvatarInput.field = _Avatar;
 
 const {
@@ -407,6 +420,10 @@ const Cascader$1 = props => {
   return render(Cascader$2);
 };
 
+Cascader$1.defaultProps = {
+  fieldName: 'cascader'
+};
+
 const {
   useOnChange: useOnChange$b,
   useCheckedToValue: useCheckedToValue$1
@@ -422,6 +439,10 @@ const Checkbox$1 = props => {
   return render(WithCheckbox);
 };
 
+Checkbox$1.defaultProps = {
+  fieldName: 'checkbox'
+};
+
 const {
   useOnChange: useOnChange$a
 } = hooks;
@@ -433,6 +454,9 @@ const CheckboxGroup$1 = props => {
 };
 
 CheckboxGroup$1.Checkbox = Checkbox$2;
+CheckboxGroup$1.defaultProps = {
+  fieldName: 'checkboxGroup'
+};
 
 const getPopupContainer = triggerNode => {
   const findAntdPopupContainer = el => {
@@ -469,6 +493,7 @@ const _DatePicker = props => {
 };
 
 _DatePicker.defaultProps = {
+  fieldName: 'datePicker',
   getPopupContainer
 };
 
@@ -479,17 +504,20 @@ const _MonthPicker = props => {
   return render(MonthPicker);
 };
 
+_MonthPicker.defaultProps = {
+  fieldName: 'monthDatePicker',
+  getPopupContainer
+};
+
 const _RangePicker$1 = props => {
   const render = useOnChange$9(Object.assign({
     placeholder: ['开始时间', '结束时间']
-  }, props)); // if(props.selectToday){
-  //     return render(RangePickerToday);
-  // }
-
+  }, props));
   return render(RangePicker$1);
 };
 
 _RangePicker$1.defaultProps = {
+  fieldName: 'rangeDatePicker',
   getPopupContainer
 };
 
@@ -501,6 +529,7 @@ const _WeekPicker = props => {
 };
 
 _WeekPicker.defaultProps = {
+  fieldName: 'weekDatePicker',
   getPopupContainer
 };
 _DatePicker.MonthPicker = _MonthPicker;
@@ -605,6 +634,9 @@ const RangePickerToday = props => {
   return render(PickerToday);
 };
 
+RangePickerToday.defaultProps = {
+  fieldName: 'rangePickerToday'
+};
 RangePickerToday.field = PickerToday;
 
 const {
@@ -625,7 +657,12 @@ InputField.Password = props => {
   return render(Input$1.Password);
 };
 
-InputField.Password.defaultProps = InputField.defaultProps = {
+InputField.defaultProps = {
+  fieldName: 'input',
+  autoComplete: 'off'
+};
+InputField.Password.defaultProps = {
+  fieldName: 'password',
   autoComplete: 'off'
 };
 
@@ -641,6 +678,7 @@ const InputNumberField = props => {
 };
 
 InputNumberField.defaultProps = {
+  fieldName: 'inputNumber',
   autoComplete: 'off'
 };
 
@@ -668,6 +706,9 @@ const _RadioGroup = props => {
   return render(RadioGroup$1);
 };
 
+_RadioGroup.defaultProps = {
+  fieldName: 'radioGroup'
+};
 _RadioGroup.Radio = Radio;
 
 const _excluded$5 = ["data", "setData", "send", "loadMore", "isComplete", "refresh", "reload", "fetchEmitter", "isLoading", "children", "onLoaded", "fetchProps", "requestParams"];
@@ -771,6 +812,7 @@ _Select.Fetch = withFetch(Select$1);
 _Select.Option = Select$1.Option;
 _Select.OptGroup = Select$1.OptGroup;
 _Select.defaultProps = _Select.Fetch.defaultProps = {
+  fieldName: 'select',
   getPopupContainer
 };
 
@@ -851,6 +893,7 @@ SelectFetch$1.field = forwardRef((props, ref) => {
   }));
 });
 SelectFetch$1.defaultProps = {
+  fieldName: 'selectFetch',
   getPopupContainer
 };
 SelectFetch$1.Option = Select$1.Option;
@@ -871,6 +914,10 @@ const Switch$1 = props => {
   return render(WithSwitch);
 };
 
+Switch$1.defaultProps = {
+  fieldName: 'switch'
+};
+
 const {
   useDecorator
 } = hooks;
@@ -882,6 +929,10 @@ const TextArea$1 = props => {
   return render(Input$1.TextArea);
 };
 
+TextArea$1.defaultProps = {
+  fieldName: 'textArea'
+};
+
 const {
   useOnChange: useOnChange$2
 } = hooks;
@@ -897,6 +948,7 @@ const _TimePicker = props => {
 };
 
 _TimePicker.defaultProps = {
+  fieldName: 'timePicker',
   getPopupContainer
 };
 
@@ -908,6 +960,7 @@ const _RangePicker = props => {
 };
 
 _RangePicker.defaultProps = {
+  fieldName: 'rangeTimePicker',
   getPopupContainer
 };
 _TimePicker.RangePicker = _RangePicker;
@@ -925,6 +978,7 @@ const _TreeSelect = props => {
 
 _TreeSelect.Fetch = withFetch(TreeSelect$1);
 _TreeSelect.defaultProps = _TreeSelect.Fetch.defaultProps = {
+  fieldName: 'treeSelect',
   getPopupContainer
 };
 _TreeSelect.TreeNode = TreeSelect$1.TreeNode;
@@ -1092,6 +1146,9 @@ const UploadInput = props => {
   return render(_Upload);
 };
 
+UploadInput.defaultProps = {
+  fieldName: 'upload'
+};
 UploadInput.field = _Upload;
 
 const _excluded$2 = ["realTime", "disabled"],
@@ -1127,12 +1184,35 @@ const ResetButton = props => {
   return /*#__PURE__*/React.createElement(Button, _extends({}, resetProps, props));
 };
 
-const _excluded$1 = ["className", "formProps", "footer", "children"],
-      _excluded2 = ["className", "title", "formProps", "footer", "content"];
+const _excluded$1 = ["onClick"];
+const {
+  useCacheRemove
+} = hooks;
+
+const CancelButton = _ref => {
+  let {
+    onClick
+  } = _ref,
+      props = _objectWithoutPropertiesLoose(_ref, _excluded$1);
+
+  const remove = useCacheRemove();
+  return /*#__PURE__*/React.createElement(Button, _extends({}, props, {
+    onClick: (...args) => {
+      remove();
+      onClick && onClick(...args);
+    }
+  }));
+};
+
+const _excluded = ["className", "formProps", "footer", "children", "close", "isReset", "onCancel"],
+      _excluded2 = ["className", "title", "formProps", "footer", "content", "isReset", "onCancel"];
 const FetchForm = withFetch$1(Form);
 const CommonModal = forwardRef(({
   formProps,
   footer,
+  close,
+  onCancel,
+  isReset,
   children
 }, ref) => {
   const TargetForm = formProps.hasOwnProperty('url') ? FetchForm : Form;
@@ -1142,7 +1222,15 @@ const CommonModal = forwardRef(({
     className: "ant-modal-body"
   }, children), /*#__PURE__*/React.createElement("div", {
     className: "ant-modal-footer"
-  }, footer ? footer : /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(ResetButton, null, "\u91CD\u7F6E"), /*#__PURE__*/React.createElement(SubmitButton, {
+  }, footer ? footer : /*#__PURE__*/React.createElement(Space, null, isReset ? /*#__PURE__*/React.createElement(ResetButton, null, "\u91CD\u7F6E") : /*#__PURE__*/React.createElement(CancelButton, {
+    onClick: () => {
+      if (typeof onCancel === 'function') {
+        onCancel(close);
+      } else {
+        close && close();
+      }
+    }
+  }, "\u53D6\u6D88"), /*#__PURE__*/React.createElement(SubmitButton, {
     type: "primary"
   }, "\u786E\u5B9A"))));
 });
@@ -1151,9 +1239,12 @@ const FormModal = forwardRef((_ref, ref) => {
     className,
     formProps = {},
     footer,
-    children
+    children,
+    close,
+    isReset,
+    onCancel
   } = _ref,
-      props = _objectWithoutPropertiesLoose(_ref, _excluded$1);
+      props = _objectWithoutPropertiesLoose(_ref, _excluded);
 
   return /*#__PURE__*/React.createElement(Modal, _extends({}, props, {
     className: classnames(className, 'react-form-modal'),
@@ -1161,7 +1252,10 @@ const FormModal = forwardRef((_ref, ref) => {
   }), /*#__PURE__*/React.createElement(CommonModal, {
     ref: ref,
     formProps: formProps,
-    footer: footer
+    footer: footer,
+    close: close,
+    isReset: isReset,
+    onCancel: onCancel
   }, children));
 });
 
@@ -1171,7 +1265,9 @@ FormModal.modal = _ref2 => {
     title,
     formProps = {},
     footer,
-    content
+    content,
+    isReset,
+    onCancel
   } = _ref2,
       props = _objectWithoutPropertiesLoose(_ref2, _excluded2);
 
@@ -1184,33 +1280,18 @@ FormModal.modal = _ref2 => {
     className: classnames(className, 'react-form-modal'),
     content: /*#__PURE__*/React.createElement(CommonModal, {
       formProps: formProps,
-      footer: footer
+      footer: footer,
+      isReset: isReset,
+      onCancel: onCancel,
+      close: () => {
+        FormModal.modal.destroy();
+      }
     }, content),
     icon: null,
     footer: null
   }));
 };
 
-const _excluded = ["onClick"];
-const {
-  useCacheRemove
-} = hooks;
-
-const CancelButton = _ref => {
-  let {
-    onClick
-  } = _ref,
-      props = _objectWithoutPropertiesLoose(_ref, _excluded);
-
-  const remove = useCacheRemove();
-  return /*#__PURE__*/React.createElement(Button, _extends({}, props, {
-    onClick: (...args) => {
-      remove();
-      onClick && onClick(...args);
-    }
-  }));
-};
-
 const Avatar = AvatarInput;
 const Cascader = Cascader$1;
 const Checkbox = Checkbox$1;