@innoways/drip-form-theme-antd 9.0.13 → 9.0.14

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## 9.0.14
+
+### Patch Changes
+
+- refactor: simplify DatePickerField component by extracting value and change handlers 9.0.14
+- Updated dependencies
+  - @innoways/hooks@9.0.14
+  - @innoways/utils@9.0.14
+
 ## 9.0.13
 
 ### Patch Changes

package/dist/index.js

@@ -22510,6 +22510,8 @@ function _objectSpread$4(target) { for (var i = 1; i < arguments.length; i++) {
 _DatePicker.RangePicker;
 
 var DatePickerField = function DatePickerField(_ref) {
+  var _restProps$formData;
+
   var disabled = _ref.disabled,
       onChange = _ref.onChange,
       fieldData = _ref.fieldData,
@@ -22578,49 +22580,57 @@ var DatePickerField = function DatePickerField(_ref) {
   if (formMode === 'view') return fieldData ? typeCheck(fieldData) === 'Array' ? fieldData.map(function (item) {
     return moment(item).format(format);
   }).join(' ~ ') : moment(fieldData).format(format) : null;
-  return /*#__PURE__*/React.createElement(React.Fragment, null, range ? /*#__PURE__*/React.createElement(StyledFlatPicker, {
-    id: "".concat(fieldKey, "-range-picker"),
-    className: "form-control border-0",
-    value: fieldData ? [fieldData[0], fieldData[1]] : [],
-    onChange: function onChange(date, isCleared) {
-      if (isCleared) {
-        _onChange(null);
-      } else {
-        _onChange(date);
+
+  var getFlatpickrValue = function getFlatpickrValue() {
+    if (!fieldData) return [];
+
+    if (range) {
+      if (Array.isArray(fieldData) && fieldData.length === 2) {
+        return [moment(fieldData[0], format).toDate(), moment(fieldData[1], format).toDate()];
       }
-    },
-    themeColor: themeColor,
-    style: style,
-    allowClear: allowClear,
-    options: _objectSpread$4({
-      mode: 'range',
-      allowInput: true
-    }, options)
-  }) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(StyledFlatPicker, {
-    disabled: disabled,
-    value: fieldData ? [typeof fieldData === 'string' ? moment(fieldData, format, true).isValid() ? moment(fieldData, format).toDate() : moment(fieldData).toDate() : moment(fieldData).toDate()] : [],
-    onChange: function onChange(date, isCleared) {
-      if (isCleared) {
-        _onChange(null);
+
+      return [];
+    }
+
+    return [typeof fieldData === 'string' ? moment(fieldData, format, true).isValid() ? moment(fieldData, format).toDate() : moment(fieldData).toDate() : moment(fieldData).toDate()];
+  };
+
+  var handleFlatpickrChange = function handleFlatpickrChange(date, isCleared) {
+    if (isCleared) {
+      _onChange(null);
+
+      return;
+    }
+
+    if (range) {
+      if (date.length === 2) {
+        _onChange([moment(date[0]).format(format), moment(date[1]).format(format)]);
       } else if (date.length) {
         _onChange(moment(date[0]).format(format));
       }
-    },
+    }
+  };
+
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(StyledFlatPicker, {
+    disabled: disabled,
+    value: getFlatpickrValue(),
+    onChange: handleFlatpickrChange,
     id: "".concat(fieldKey, "-default-picker"),
     themeColor: themeColor,
     style: style,
     allowClear: allowClear,
     options: _objectSpread$4(_objectSpread$4({
+      mode: range ? 'range' : 'single',
       enableTime: showTime,
       altInput: true,
       allowInput: false,
       altFormat: showTime ? flatpickrFormat + ' H:i' : flatpickrFormat,
       dateFormat: showTime ? 'Y-m-d H:i' : 'Y-m-d',
       altInputClass: disabled ? 'drip_date_picker_input_disabled' : 'drip_date_picker_input'
-    }, can_not_select_previous_date_of && fieldData && restProps.formData && restProps.formData[can_not_select_previous_date_of] && moment(restProps.formData[can_not_select_previous_date_of], format).isValid() ? {
+    }, can_not_select_previous_date_of && fieldData && (_restProps$formData = restProps.formData) !== null && _restProps$formData !== void 0 && _restProps$formData[can_not_select_previous_date_of] && moment(restProps.formData[can_not_select_previous_date_of], format).isValid() ? {
       minDate: moment(restProps.formData[can_not_select_previous_date_of], format).toDate()
     } : {}), options)
-  })));
+  }));
 };
 
 DatePickerField.propTypes = {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@innoways/drip-form-theme-antd",
-	"version": "9.0.13",
+	"version": "9.0.14",
 	"author": "JDFED",
 	"description": "drip-form antd主题包",
 	"main": "dist/index.js",
@@ -31,8 +31,8 @@
 	"dependencies": {
 		"@ant-design/icons": "^4.7.0",
 		"@babel/runtime": "^7.10.2",
-		"@innoways/hooks": "^9.0.13",
-		"@innoways/utils": "^9.0.13",
+		"@innoways/hooks": "^9.0.14",
+		"@innoways/utils": "^9.0.14",
 		"antd": "^4.16.13",
 		"flatpickr": "4.6.3",
 		"moment": "^2.26.0",