@kne/react-form-antd 2.0.15 → 2.0.17

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2019 kne-union
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2019 kne-union
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,35 +1,35 @@
-# react-form
-用于表单验证的react组件
-
-### demo
-``
-
-            <Avatar editor={{open: true, width: 250, height: 250, borderRadius: 1}}
-                    beforeUpload={(file) => {}}/>
-
-            <Input realtime debounce={1000} name="name" label="姓名" rule="REQ TEL EXIT"/>
-            {isShow ? <Input name="rname" label="姓名哈哈哈" rule="REQ TEL EXIT"/> : null}
-            <Select name="select" label="选项" rule="REQ">
-                <Select.Option value="1">选项一</Select.Option>
-                <Select.Option value="2">选项二</Select.Option>
-                <Select.Option value="3">选项三</Select.Option>
-            </Select>
-            <DatePicker name="date" label="日期" rule="REQ" format="" YYYY-MM-DD/>
-            <RadioGroup name="radio" label="单选" rule="REQ">
-                <RadioGroup.Radio value="1">选项一</RadioGroup.Radio>
-                <RadioGroup.Radio value="2">选项二</RadioGroup.Radio>
-                <RadioGroup.Radio value="3">选项三</RadioGroup.Radio>
-            </RadioGroup>
-      
-``
-
-# Change Log
-
-20200430 v0.1.13 添加了SelectFetch和SelectSearch控件
-20200430 v0.1.14 修改Select组件样式的默认宽度为100%
-20200508 v0.1.16 删除field last-child 样式 margin-bottom 为0
-20200509 v0.1.17 修改导出文件结构，增加fields导出所有field组件
-20200522 v0.1.20 添加头像上传组件
-20200525 v0.1.22 更新@kne/react-fetch以支持setData方法
-20200529 v0.1.23 添加头像上传组件field Avatar
-20200603 v0.1.24 修正Switch的值转换bug
+# react-form
+用于表单验证的react组件
+
+### demo
+``
+
+            <Avatar editor={{open: true, width: 250, height: 250, borderRadius: 1}}
+                    beforeUpload={(file) => {}}/>
+
+            <Input realtime debounce={1000} name="name" label="姓名" rule="REQ TEL EXIT"/>
+            {isShow ? <Input name="rname" label="姓名哈哈哈" rule="REQ TEL EXIT"/> : null}
+            <Select name="select" label="选项" rule="REQ">
+                <Select.Option value="1">选项一</Select.Option>
+                <Select.Option value="2">选项二</Select.Option>
+                <Select.Option value="3">选项三</Select.Option>
+            </Select>
+            <DatePicker name="date" label="日期" rule="REQ" format="" YYYY-MM-DD/>
+            <RadioGroup name="radio" label="单选" rule="REQ">
+                <RadioGroup.Radio value="1">选项一</RadioGroup.Radio>
+                <RadioGroup.Radio value="2">选项二</RadioGroup.Radio>
+                <RadioGroup.Radio value="3">选项三</RadioGroup.Radio>
+            </RadioGroup>
+      
+``
+
+# Change Log
+
+20200430 v0.1.13 添加了SelectFetch和SelectSearch控件
+20200430 v0.1.14 修改Select组件样式的默认宽度为100%
+20200508 v0.1.16 删除field last-child 样式 margin-bottom 为0
+20200509 v0.1.17 修改导出文件结构，增加fields导出所有field组件
+20200522 v0.1.20 添加头像上传组件
+20200525 v0.1.22 更新@kne/react-fetch以支持setData方法
+20200529 v0.1.23 添加头像上传组件field Avatar
+20200603 v0.1.24 修正Switch的值转换bug

package/dist/index.js

@@ -11,6 +11,7 @@ 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 groupBy = require('lodash/groupBy');
 var uniqueId = require('lodash/uniqueId');
 
@@ -25,6 +26,7 @@ var get__default = /*#__PURE__*/_interopDefaultLegacy(get);
 var AvatarEditor__default = /*#__PURE__*/_interopDefaultLegacy(AvatarEditor);
 var moment__default = /*#__PURE__*/_interopDefaultLegacy(moment);
 var useControlValue__default = /*#__PURE__*/_interopDefaultLegacy(useControlValue);
+var useEvent__default = /*#__PURE__*/_interopDefaultLegacy(useEvent);
 var groupBy__default = /*#__PURE__*/_interopDefaultLegacy(groupBy);
 var uniqueId__default = /*#__PURE__*/_interopDefaultLegacy(uniqueId);
 
@@ -61,7 +63,7 @@ function _objectWithoutPropertiesLoose(source, excluded) {
   return target;
 }
 
-var _excluded$6 = ["className", "cache", "enterSubmit", "scrollToError", "scrollProps", "type", "size", "children"];
+var _excluded$7 = ["className", "cache", "enterSubmit", "scrollToError", "scrollProps", "type", "size", "children"];
 var ScrollToError = reactFormHelper.widget.ScrollToError,
     EnterSubmit = reactFormHelper.widget.EnterSubmit,
     FormStore = reactFormHelper.widget.FormStore,
@@ -76,7 +78,7 @@ var Form = React.forwardRef(function (_ref, ref) {
       type = _ref.type,
       size = _ref.size,
       children = _ref.children,
-      props = _objectWithoutPropertiesLoose(_ref, _excluded$6);
+      props = _objectWithoutPropertiesLoose(_ref, _excluded$7);
 
   var computedClass = 'react-form';
 
@@ -446,17 +448,23 @@ var MonthPicker = antd.DatePicker.MonthPicker,
     WeekPicker = antd.DatePicker.WeekPicker;
 
 var _DatePicker = function _DatePicker(props) {
-  var render = useOnChange$8(props);
+  var render = useOnChange$8(Object.assign({
+    placeholder: "\u8BF7\u9009\u62E9" + props.label
+  }, props));
   return render(antd.DatePicker);
 };
 
 var _MonthPicker = function _MonthPicker(props) {
-  var render = useOnChange$8(props);
+  var render = useOnChange$8(Object.assign({
+    placeholder: "\u8BF7\u9009\u62E9" + props.label
+  }, props));
   return render(MonthPicker);
 };
 
 var _RangePicker$1 = function _RangePicker(props) {
-  var render = useOnChange$8(props); // if(props.selectToday){
+  var render = useOnChange$8(Object.assign({
+    placeholder: "\u8BF7\u9009\u62E9" + props.label
+  }, props)); // if(props.selectToday){
   //     return render(RangePickerToday);
   // }
 
@@ -464,7 +472,9 @@ var _RangePicker$1 = function _RangePicker(props) {
 };
 
 var _WeekPicker = function _WeekPicker(props) {
-  var render = useOnChange$8(props);
+  var render = useOnChange$8(Object.assign({
+    placeholder: "\u8BF7\u9009\u62E9" + props.label
+  }, props));
   return render(WeekPicker);
 };
 
@@ -472,9 +482,13 @@ _DatePicker.MonthPicker = _MonthPicker;
 _DatePicker.RangePicker = _RangePicker$1;
 _DatePicker.WeekPicker = _WeekPicker;
 
+var _excluded$6 = ["soFarButtonText"];
 var useOnChange$7 = reactFormHelper.hooks.useOnChange;
 
-var PickerToday = function PickerToday(props) {
+var PickerToday = function PickerToday(_ref) {
+  var soFarButtonText = _ref.soFarButtonText,
+      props = _objectWithoutPropertiesLoose(_ref, _excluded$6);
+
   // console.log('>>>>data', data);
   var _useControlValue = useControlValue__default["default"](props),
       data = _useControlValue[0],
@@ -519,7 +533,7 @@ var PickerToday = function PickerToday(props) {
         ref_d.current.blur();
         onChange([newData.start || '', '至今']);
       }
-    }, "\u81F3\u4ECA");
+    }, soFarButtonText || '至今');
   };
 
   return /*#__PURE__*/React__default["default"].createElement("div", {
@@ -571,7 +585,9 @@ RangePickerToday.field = PickerToday;
 var useDecorator$2 = reactFormHelper.hooks.useDecorator;
 
 var InputField = function InputField(props) {
-  var render = useDecorator$2(props);
+  var render = useDecorator$2(Object.assign({
+    placeholder: "\u8BF7\u8F93\u5165" + props.label
+  }, props));
   return render(antd.Input);
 };
 
@@ -582,7 +598,9 @@ InputField.defaultProps = {
 var useDecorator$1 = reactFormHelper.hooks.useDecorator;
 
 var InputNumberField = function InputNumberField(props) {
-  var render = useDecorator$1(props);
+  var render = useDecorator$1(Object.assign({
+    placeholder: "\u8BF7\u8F93\u5165" + props.label
+  }, props));
   return render(antd.InputNumber);
 };
 
@@ -615,24 +633,55 @@ _RadioGroup.Radio = antd.Radio;
 var useOnChange$5 = reactFormHelper.hooks.useOnChange;
 
 var _Select = function _Select(props) {
-  var render = useOnChange$5(props);
+  var render = useOnChange$5(Object.assign({
+    placeholder: "\u8BF7\u9009\u62E9" + props.label
+  }, props));
   return render(antd.Select);
 };
 
 _Select.Option = antd.Select.Option;
 _Select.OptGroup = antd.Select.OptGroup;
 
-var _excluded$4 = ["data", "setData", "refresh", "isLoading", "children"];
+var _excluded$4 = ["data", "setData", "refresh", "reload", "emitter", "isLoading", "children", "onLoaded"];
 var useOnChange$4 = reactFormHelper.hooks.useOnChange;
 
 var _SelectFetch = reactFetch.withFetch(function (_ref) {
   var data = _ref.data,
       setData = _ref.setData,
       refresh = _ref.refresh,
+      reload = _ref.reload,
+      emitter = _ref.emitter,
       isLoading = _ref.isLoading,
       children = _ref.children,
+      onLoaded = _ref.onLoaded,
       props = _objectWithoutPropertiesLoose(_ref, _excluded$4);
 
+  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 = emitter.addListener('select-fetch-refresh', function () {
+      return refreshRef.current();
+    });
+    var token2 = emitter.addListener('select-fetch-reload', function () {
+      return reloadRef.current();
+    });
+    var token3 = emitter.addListener('select-fetch-set-data', function () {
+      return setDataRef.current();
+    });
+    return function () {
+      token1 && token1.remove();
+      token2 && token2.remove();
+      token3 && token3.remove();
+    };
+  }, [emitter]);
+  React.useEffect(function () {
+    onLoaded && onLoaded(dataRef.current);
+  }, []);
   return /*#__PURE__*/React__default["default"].createElement(antd.Select, props, children({
     data: data,
     refresh: refresh,
@@ -641,11 +690,28 @@ var _SelectFetch = reactFetch.withFetch(function (_ref) {
   }));
 });
 
-var SelectFetch$1 = function SelectFetch(props) {
-  var render = useOnChange$4(props);
+var SelectFetch$1 = 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$4(Object.assign({
+    placeholder: "\u8BF7\u9009\u62E9" + props.label
+  }, props, {
+    emitter: emitter
+  }));
   return render(_SelectFetch);
-};
-
+});
 SelectFetch$1.Option = antd.Select.Option;
 SelectFetch$1.OptGroup = antd.Select.OptGroup;
 
@@ -663,7 +729,9 @@ var Switch$1 = function Switch(props) {
 var useDecorator = reactFormHelper.hooks.useDecorator;
 
 var TextArea$1 = function TextArea(props) {
-  var render = useDecorator(props);
+  var render = useDecorator(Object.assign({
+    placeholder: "\u8BF7\u8F93\u5165" + props.label
+  }, props));
   return render(antd.Input.TextArea);
 };
 
@@ -671,12 +739,16 @@ var useOnChange$2 = reactFormHelper.hooks.useOnChange;
 var RangePicker = antd.TimePicker.RangePicker;
 
 var _TimePicker = function _TimePicker(props) {
-  var render = useOnChange$2(props);
+  var render = useOnChange$2(Object.assign({
+    placeholder: "\u8BF7\u9009\u62E9" + props.label
+  }, props));
   return render(antd.TimePicker);
 };
 
 var _RangePicker = function _RangePicker(props) {
-  var render = useOnChange$2(props);
+  var render = useOnChange$2(Object.assign({
+    placeholder: "\u8BF7\u9009\u62E9" + props.label
+  }, props));
   return render(RangePicker);
 };
 
@@ -685,7 +757,9 @@ _TimePicker.RangePicker = _RangePicker;
 var useOnChange$1 = reactFormHelper.hooks.useOnChange;
 
 var _TreeSelect = function _TreeSelect(props) {
-  var render = useOnChange$1(props);
+  var render = useOnChange$1(Object.assign({
+    placeholder: "\u8BF7\u9009\u62E9" + props.label
+  }, props));
   return render(antd.TreeSelect);
 };
 
@@ -876,7 +950,7 @@ var SubmitButton = function SubmitButton(_ref) {
 
   return /*#__PURE__*/React__default["default"].createElement(antd.Button, _extends({
     loading: isLoading,
-    disabled: disabled && (realTime ? !isPass : false)
+    disabled: disabled || (realTime ? !isPass : false)
   }, submitProps, props));
 };