@innoways/drip-form-theme-antd 8.0.19 → 9.0.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## 9.0.0
+
+### Major Changes
+
+- fixed datepicker field porps issue and style issues 8.0.20
+
+### Patch Changes
+
+- Updated dependencies
+  - @innoways/hooks@9.0.0
+  - @innoways/utils@9.0.0
+
 ## 8.0.19
 
 ### Patch Changes

package/dist/index.css

@@ -166,9 +166,9 @@
   top: 1616.09px !important;
 }
 
-/* .icon-box::before {
+.icon-box::before {
   content: '';
-} */
+}
 
 .numInputWrapper span {
   opacity: 1 !important;

package/dist/index.js

@@ -594,7 +594,7 @@ var config$l = {
   }
 };
 
-var _excluded$n = ["multiline", "disabled", "onChange", "fieldData", "fieldKey", "dispatch", "disabled_input", "style", "asyncValidate", "getKey", "formMode", "autoSize", "type", "globalState", "searchUrl"];
+var _excluded$m = ["multiline", "disabled", "onChange", "fieldData", "fieldKey", "dispatch", "disabled_input", "style", "asyncValidate", "getKey", "formMode", "autoSize", "type", "globalState", "searchUrl"];
 
 function ownKeys$g(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
@@ -617,7 +617,7 @@ var PlaceAutoCompleteField = function PlaceAutoCompleteField(_ref) {
       _ref.type;
       var globalState = _ref.globalState,
       searchUrl = _ref.searchUrl,
-      restProps = _objectWithoutProperties(_ref, _excluded$n);
+      restProps = _objectWithoutProperties(_ref, _excluded$m);
 
   var _onChange = useField(_objectSpread$g({
     fieldKey: fieldKey,
@@ -747,7 +747,7 @@ var config$k = {
   }
 };
 
-var _excluded$m = ["multiline", "disabled", "onChange", "fieldData", "fieldKey", "dispatch", "disabled_input", "style", "asyncValidate", "getKey", "formMode", "autoSize", "type"];
+var _excluded$l = ["multiline", "disabled", "onChange", "fieldData", "fieldKey", "dispatch", "disabled_input", "style", "asyncValidate", "getKey", "formMode", "autoSize", "type"];
 
 function ownKeys$f(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
@@ -769,7 +769,7 @@ var TextField = function TextField(_ref) {
       _ref$autoSize = _ref.autoSize,
       autoSize = _ref$autoSize === void 0 ? 1 : _ref$autoSize,
       type = _ref.type,
-      restProps = _objectWithoutProperties(_ref, _excluded$m);
+      restProps = _objectWithoutProperties(_ref, _excluded$l);
 
   if (formMode === 'view') return fieldData !== undefined ? fieldData : null;
 
@@ -1862,7 +1862,7 @@ var config$j = {
   }
 };
 
-var _excluded$l = ["fieldKey", "fieldData", "dispatch", "options", "buttonStyle", "onChange", "asyncValidate", "getKey", "formMode", "renderType", "style"],
+var _excluded$k = ["fieldKey", "fieldData", "dispatch", "options", "buttonStyle", "onChange", "asyncValidate", "getKey", "formMode", "renderType", "style"],
     _excluded2$2 = ["value", "label", "description"];
 
 function ownKeys$e(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -1883,7 +1883,7 @@ var RadioField = function RadioField(_ref) {
       formMode = _ref.formMode,
       renderType = _ref.renderType,
       style = _ref.style,
-      restProps = _objectWithoutProperties(_ref, _excluded$l);
+      restProps = _objectWithoutProperties(_ref, _excluded$k);
 
   var _onChange = useField({
     getKey: getKey,
@@ -1971,7 +1971,7 @@ RadioField.propTypes = {
 };
 var radio = /*#__PURE__*/memo(RadioField);
 
-var _excluded$k = ["fieldKey", "fieldData", "dispatch", "options", "onChange", "asyncValidate", "getKey"],
+var _excluded$j = ["fieldKey", "fieldData", "dispatch", "options", "onChange", "asyncValidate", "getKey"],
     _excluded2$1 = ["value", "label", "more", "hideStyle", "disabled"];
 
 var isOptionValue = function isOptionValue(value, options) {
@@ -2002,7 +2002,7 @@ var RadioTextField = function RadioTextField(_ref) {
       onChange = _ref.onChange,
       asyncValidate = _ref.asyncValidate,
       getKey = _ref.getKey,
-      restProps = _objectWithoutProperties(_ref, _excluded$k);
+      restProps = _objectWithoutProperties(_ref, _excluded$j);
 
   var _onChange = useField({
     getKey: getKey,
@@ -19353,7 +19353,7 @@ var config$i = {
   }
 };
 
-var _excluded$j = ["disabled", "onChange", "fieldData", "fieldKey", "dispatch", "style", "asyncValidate", "getKey", "formMode", "renderType"];
+var _excluded$i = ["disabled", "onChange", "fieldData", "fieldKey", "dispatch", "style", "asyncValidate", "getKey", "formMode", "renderType"];
 
 function ownKeys$d(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
@@ -19370,7 +19370,7 @@ var NumberField = function NumberField(_ref) {
       getKey = _ref.getKey,
       formMode = _ref.formMode,
       renderType = _ref.renderType,
-      restProps = _objectWithoutProperties(_ref, _excluded$j);
+      restProps = _objectWithoutProperties(_ref, _excluded$i);
 
   if (formMode === 'view') return fieldData || null;
 
@@ -19907,7 +19907,7 @@ var config$h = {
   }
 };
 
-var _excluded$i = ["disabled", "onChange", "fieldData", "fieldKey", "dispatch", "multiple", "options", "allowClear", "queryFunc", "asyncValidate", "requestCache", "style", "getKey", "queryConfigCountry", "token"];
+var _excluded$h = ["disabled", "onChange", "fieldData", "fieldKey", "dispatch", "multiple", "options", "allowClear", "queryFunc", "asyncValidate", "requestCache", "style", "getKey", "queryConfigCountry", "token"];
 
 function ownKeys$c(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
@@ -19930,7 +19930,7 @@ var SelectField$5 = function SelectField(_ref) {
       queryConfigCountry = _ref.queryConfigCountry,
       _ref$token = _ref.token,
       token = _ref$token === void 0 ? '' : _ref$token,
-      restProps = _objectWithoutProperties(_ref, _excluded$i);
+      restProps = _objectWithoutProperties(_ref, _excluded$h);
 
   var _useCountryStateCityO = useCountryStateCityOptions(fieldData || '', _objectSpread$c(_objectSpread$c({}, queryConfigCountry), {}, {
     token: token
@@ -20093,7 +20093,7 @@ var config$g = {
   }
 };
 
-var _excluded$h = ["disabled", "onChange", "fieldData", "fieldKey", "dispatch", "multiple", "options", "allowClear", "queryFunc", "asyncValidate", "requestCache", "style", "getKey", "queryConfig", "queryConfigState", "formData", "token"];
+var _excluded$g = ["disabled", "onChange", "fieldData", "fieldKey", "dispatch", "multiple", "options", "allowClear", "queryFunc", "asyncValidate", "requestCache", "style", "getKey", "queryConfig", "queryConfigState", "formData", "token"];
 
 function ownKeys$b(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
@@ -20118,7 +20118,7 @@ var SelectField$4 = function SelectField(_ref) {
       formData = _ref.formData,
       _ref$token = _ref.token,
       token = _ref$token === void 0 ? '' : _ref$token,
-      restProps = _objectWithoutProperties(_ref, _excluded$h);
+      restProps = _objectWithoutProperties(_ref, _excluded$g);
 
   var prev = usePrevious(formData[queryConfig.country]);
 
@@ -20314,7 +20314,7 @@ var config$f = {
   }
 };
 
-var _excluded$g = ["disabled", "onChange", "fieldData", "fieldKey", "dispatch", "multiple", "options", "allowClear", "queryFunc", "asyncValidate", "requestCache", "style", "getKey", "queryConfigState", "queryConfigCity", "queryConfig", "formData", "token"];
+var _excluded$f = ["disabled", "onChange", "fieldData", "fieldKey", "dispatch", "multiple", "options", "allowClear", "queryFunc", "asyncValidate", "requestCache", "style", "getKey", "queryConfigState", "queryConfigCity", "queryConfig", "formData", "token"];
 
 function ownKeys$a(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
@@ -20340,7 +20340,7 @@ var SelectField$3 = function SelectField(_ref) {
       formData = _ref.formData,
       _ref$token = _ref.token,
       token = _ref$token === void 0 ? '' : _ref$token,
-      restProps = _objectWithoutProperties(_ref, _excluded$g);
+      restProps = _objectWithoutProperties(_ref, _excluded$f);
 
   var prev = usePrevious(formData[queryConfig.state]);
 
@@ -20525,7 +20525,7 @@ var config$e = {
   }
 };
 
-var _excluded$f = ["disabled", "onChange", "fieldData", "fieldKey", "dispatch", "multiple", "options", "allowClear", "queryFunc", "asyncValidate", "requestCache", "style", "getKey", "queryConfigCountry", "queryConfigCity", "queryConfig", "formData", "token"];
+var _excluded$e = ["disabled", "onChange", "fieldData", "fieldKey", "dispatch", "multiple", "options", "allowClear", "queryFunc", "asyncValidate", "requestCache", "style", "getKey", "queryConfigCountry", "queryConfigCity", "queryConfig", "formData", "token"];
 
 function ownKeys$9(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
@@ -20551,7 +20551,7 @@ var SelectField$2 = function SelectField(_ref) {
       formData = _ref.formData,
       _ref$token = _ref.token,
       token = _ref$token === void 0 ? '' : _ref$token,
-      restProps = _objectWithoutProperties(_ref, _excluded$f);
+      restProps = _objectWithoutProperties(_ref, _excluded$e);
 
   var prev = usePrevious(formData[queryConfig.country]);
 
@@ -20644,7 +20644,7 @@ var getIconComponent = function getIconComponent(iconName) {
   }
 };
 
-var _excluded$e = ["disabled", "onChange", "fieldData", "fieldKey", "dispatch", "multiple", "options", "allowClear", "queryFunc", "asyncValidate", "requestCache", "style", "getKey", "renderType", "queryConfig", "renderOptionAsChildren"];
+var _excluded$d = ["disabled", "onChange", "fieldData", "fieldKey", "dispatch", "multiple", "options", "allowClear", "queryFunc", "asyncValidate", "requestCache", "style", "getKey", "renderType", "queryConfig", "renderOptionAsChildren"];
 
 function ownKeys$8(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
@@ -20671,7 +20671,7 @@ var SelectField$1 = function SelectField(props) {
       queryConfig = props.queryConfig,
       _props$renderOptionAs = props.renderOptionAsChildren,
       renderOptionAsChildren = _props$renderOptionAs === void 0 ? false : _props$renderOptionAs,
-      restProps = _objectWithoutProperties(props, _excluded$e);
+      restProps = _objectWithoutProperties(props, _excluded$d);
 
   var queryOptionsFuc = useQuery({
     getKey: getKey,
@@ -21330,7 +21330,7 @@ var config$b = {
   }
 };
 
-var _excluded$d = ["disabled", "onChange", "fieldData", "fieldKey", "dispatch", "style", "asyncValidate", "getKey", "formMode"];
+var _excluded$c = ["disabled", "onChange", "fieldData", "fieldKey", "dispatch", "style", "asyncValidate", "getKey", "formMode"];
 
 var SwitchField = function SwitchField(_ref) {
   var disabled = _ref.disabled,
@@ -21342,7 +21342,7 @@ var SwitchField = function SwitchField(_ref) {
       asyncValidate = _ref.asyncValidate,
       getKey = _ref.getKey,
       formMode = _ref.formMode,
-      restProps = _objectWithoutProperties(_ref, _excluded$d);
+      restProps = _objectWithoutProperties(_ref, _excluded$c);
 
   var _onChange = useField({
     fieldKey: fieldKey,
@@ -21535,7 +21535,7 @@ var config$a = {
   }
 };
 
-var _excluded$c = ["disabled", "onChange", "fieldData", "fieldKey", "style", "range", "dispatch", "vertical", "showNumber", "min", "max", "step", "asyncValidate", "getKey"];
+var _excluded$b = ["disabled", "onChange", "fieldData", "fieldKey", "style", "range", "dispatch", "vertical", "showNumber", "min", "max", "step", "asyncValidate", "getKey"];
 
 var SliderField = function SliderField(_ref) {
   var _ref$disabled = _ref.disabled,
@@ -21558,7 +21558,7 @@ var SliderField = function SliderField(_ref) {
       step = _ref.step,
       asyncValidate = _ref.asyncValidate,
       getKey = _ref.getKey,
-      restProps = _objectWithoutProperties(_ref, _excluded$c);
+      restProps = _objectWithoutProperties(_ref, _excluded$b);
 
   /**
    * 暂时不支持的slider功能: tipFormatter 自定义提示 | 带icon的滑块
@@ -21811,7 +21811,7 @@ var config$9 = {
   }
 };
 
-var _excluded$b = ["disabled", "onChange", "fieldData", "fieldKey", "dispatch", "style", "allowClear", "range", "use12Hours", "asyncValidate", "format", "getKey", "formMode"];
+var _excluded$a = ["disabled", "onChange", "fieldData", "fieldKey", "dispatch", "style", "allowClear", "range", "use12Hours", "asyncValidate", "format", "getKey", "formMode"];
 var RangePicker = _TimePicker.RangePicker;
 
 var TimePickerField = function TimePickerField(_ref) {
@@ -21834,7 +21834,7 @@ var TimePickerField = function TimePickerField(_ref) {
       format = _ref$format === void 0 ? 'HH:mm:ss' : _ref$format,
       getKey = _ref.getKey,
       formMode = _ref.formMode,
-      restProps = _objectWithoutProperties(_ref, _excluded$b);
+      restProps = _objectWithoutProperties(_ref, _excluded$a);
 
   /**
    * 暂时不支持的TimePicker功能
@@ -21899,8 +21899,6 @@ var TimePickerField = function TimePickerField(_ref) {
 
 var timePicker = /*#__PURE__*/memo(TimePickerField);
 
-var _excluded$a = ["value", "onChange", "options", "className", "themeColor", "disabled", "style", "allowClear"];
-
 function ownKeys$5(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread$5(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$5(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$5(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -21914,8 +21912,7 @@ var StyledFlatPicker = function StyledFlatPicker(props) {
       disabled = props.disabled,
       style = props.style,
       _props$allowClear = props.allowClear,
-      allowClear = _props$allowClear === void 0 ? true : _props$allowClear,
-      rest = _objectWithoutProperties(props, _excluded$a);
+      allowClear = _props$allowClear === void 0 ? true : _props$allowClear;
 
   var _useState = useState(Date.now()),
       _useState2 = _slicedToArray(_useState, 2),
@@ -22015,7 +22012,17 @@ var StyledFlatPicker = function StyledFlatPicker(props) {
 
   var createYearItem = function createYearItem(instance, list, year, isSelected) {
     var listItem = document.createElement('li');
-    listItem.textContent = String(year);
+    listItem.textContent = String(year); // Check if year is disabled by minDate or maxDate
+
+    var minDate = options !== null && options !== void 0 && options.minDate ? new Date(options.minDate) : null;
+    var maxDate = options !== null && options !== void 0 && options.maxDate ? new Date(options.maxDate) : null;
+    var isDisabled = minDate && year < minDate.getFullYear() || maxDate && year > maxDate.getFullYear();
+
+    if (isDisabled) {
+      listItem.style.opacity = '0.4';
+      listItem.style.cursor = 'not-allowed';
+      listItem.style.pointerEvents = 'none';
+    }
 
     if (isSelected) {
       listItem.classList.add('selected');
@@ -22023,22 +22030,25 @@ var StyledFlatPicker = function StyledFlatPicker(props) {
       listItem.style.setProperty('background-color', color, 'important');
     }
 
-    listItem.addEventListener('click', function () {
-      var _instance$calendarCon2;
+    if (!isDisabled) {
+      listItem.addEventListener('click', function () {
+        var _instance$calendarCon2;
 
-      loadMonths(instance, year);
-      fp.current.flatpickr.setDate(new Date(parseInt(this.textContent || '0'), 0, 1), true);
-      list.querySelectorAll('li').forEach(function (item) {
-        item.classList.remove('selected');
-        item.style.removeProperty('background-color');
+        loadMonths(instance, year);
+        fp.current.flatpickr.setDate(new Date(parseInt(this.textContent || '0'), 0, 1), true);
+        list.querySelectorAll('li').forEach(function (item) {
+          item.classList.remove('selected');
+          item.style.removeProperty('background-color');
+        });
+        this.classList.add('selected');
+        var color = themeColor || 'var(--ant-primary-color)';
+        this.style.setProperty('background-color', color, 'important');
+        list.innerHTML = '';
+        loadYears(instance, list);
+        (_instance$calendarCon2 = instance.calendarContainer.querySelector('.year-1')) === null || _instance$calendarCon2 === void 0 ? void 0 : _instance$calendarCon2.remove();
       });
-      this.classList.add('selected');
-      var color = themeColor || 'var(--ant-primary-color)';
-      this.style.setProperty('background-color', color, 'important');
-      list.innerHTML = '';
-      loadYears(instance, list);
-      (_instance$calendarCon2 = instance.calendarContainer.querySelector('.year-1')) === null || _instance$calendarCon2 === void 0 ? void 0 : _instance$calendarCon2.remove();
-    });
+    }
+
     return listItem;
   };
 
@@ -22159,7 +22169,7 @@ var StyledFlatPicker = function StyledFlatPicker(props) {
     style: _objectSpread$5(_objectSpread$5({}, dateFieldStyle), {}, {
       position: 'relative'
     })
-  }, /*#__PURE__*/React.createElement(Flatpickr, _extends({}, rest, {
+  }, /*#__PURE__*/React.createElement(Flatpickr, {
     key: key,
     ref: fp,
     value: value,
@@ -22169,7 +22179,7 @@ var StyledFlatPicker = function StyledFlatPicker(props) {
     options: flatpickrOptions,
     disabled: disabled,
     className: "".concat(className ? className : '', " form-control flat-date-picker")
-  })), allowClear && showClear && /*#__PURE__*/React.createElement(X, {
+  }), allowClear && showClear && /*#__PURE__*/React.createElement(X, {
     type: "button",
     className: "cross-padding",
     onClick: clearDatePicker,
@@ -22485,8 +22495,8 @@ var DatePickerField = function DatePickerField(_ref) {
       formMode = _ref.formMode;
       _ref.showCurrentDate;
       var themeColor = _ref.themeColor,
-      options = _ref.options,
-      restProps = _objectWithoutProperties(_ref, _excluded$9);
+      options = _ref.options;
+      _objectWithoutProperties(_ref, _excluded$9);
 
   /**
    * 暂时不支持的DatePicker功能
@@ -22548,7 +22558,7 @@ var DatePickerField = function DatePickerField(_ref) {
       mode: 'range',
       allowInput: true
     }, options)
-  }) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(StyledFlatPicker, _extends({
+  }) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(StyledFlatPicker, {
     disabled: disabled,
     value: fieldData ? [typeof fieldData === 'string' ? moment(fieldData, format).toDate() : moment(fieldData).toDate()] : [],
     onChange: function onChange(date, isCleared) {
@@ -22570,7 +22580,7 @@ var DatePickerField = function DatePickerField(_ref) {
       dateFormat: showTime ? 'Y-m-d H:i' : 'Y-m-d',
       altInputClass: disabled ? 'drip_date_picker_input_disabled' : 'drip_date_picker_input'
     }, options)
-  }, restProps))));
+  })));
 };
 
 DatePickerField.propTypes = {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@innoways/drip-form-theme-antd",
-	"version": "8.0.19",
+	"version": "9.0.0",
 	"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": "^8.0.19",
-		"@innoways/utils": "^8.0.19",
+		"@innoways/hooks": "^9.0.0",
+		"@innoways/utils": "^9.0.0",
 		"antd": "^4.16.13",
 		"flatpickr": "^4.6.13",
 		"moment": "^2.26.0",