ds-web-all 1.0.1-beta.92 → 1.0.1-beta.94

package/lib/components/DateRangeOnePicker/index.js

@@ -49,7 +49,8 @@ var DateRangeOnePicker = function DateRangeOnePicker(_ref) {
     style = _ref$style === void 0 ? {} : _ref$style,
     className = _ref.className,
     _ref$allowClear = _ref.allowClear,
-    allowClear = _ref$allowClear === void 0 ? true : _ref$allowClear;
+    allowClear = _ref$allowClear === void 0 ? true : _ref$allowClear,
+    _disabledDate = _ref.disabledDate;
   var _useRefState = (0, _useRefState3.default)(value ? value.map(function (el) {
       return el ? (0, _moment.default)(el) : el;
     }) : value),
@@ -112,8 +113,9 @@ var DateRangeOnePicker = function DateRangeOnePicker(_ref) {
   }, [value]);
   (0, _react.useEffect)(function () {
     if (!open.first && !open.second) {
+      var _rangeValueRef$curren;
       selectedNum.current = 0;
-      if ((rangeValueRef.current || []).every(function (el) {
+      if (((_rangeValueRef$curren = rangeValueRef.current) === null || _rangeValueRef$curren === void 0 ? void 0 : _rangeValueRef$curren.length) > 0 && (rangeValueRef.current || []).every(function (el) {
         return !!el;
       })) {
         onChange(rangeValueRef.current ? rangeValueRef.current.map(function (el) {
@@ -178,6 +180,9 @@ var DateRangeOnePicker = function DateRangeOnePicker(_ref) {
       });
     },
     onFocus: function onFocus() {
+      if (!open.first && !open.second) {
+        setRangeValue(null);
+      }
       setOpen(function (old) {
         return old.first === true ? old : _objectSpread(_objectSpread({}, old), {}, {
           first: true
@@ -185,7 +190,7 @@ var DateRangeOnePicker = function DateRangeOnePicker(_ref) {
       });
     },
     disabledDate: function disabledDate(date) {
-      return (rangeValue === null || rangeValue === void 0 ? void 0 : rangeValue[1]) ? date >= (rangeValue === null || rangeValue === void 0 ? void 0 : rangeValue[1]) : false;
+      return typeof _disabledDate === 'function' ? _disabledDate(date, rangeValue || [], 'start') : (rangeValue === null || rangeValue === void 0 ? void 0 : rangeValue[1]) ? date >= (rangeValue === null || rangeValue === void 0 ? void 0 : rangeValue[1]) : false;
     },
     renderExtraFooter: renderExtraFooter
   }), /*#__PURE__*/_react.default.createElement("div", {
@@ -210,6 +215,9 @@ var DateRangeOnePicker = function DateRangeOnePicker(_ref) {
       });
     },
     onFocus: function onFocus() {
+      if (!open.first && !open.second) {
+        setRangeValue(null);
+      }
       setOpen(function (old) {
         return old.second === true ? old : _objectSpread(_objectSpread({}, old), {}, {
           second: true
@@ -217,7 +225,7 @@ var DateRangeOnePicker = function DateRangeOnePicker(_ref) {
       });
     },
     disabledDate: function disabledDate(date) {
-      return (rangeValue === null || rangeValue === void 0 ? void 0 : rangeValue[0]) ? date <= (rangeValue === null || rangeValue === void 0 ? void 0 : rangeValue[0]) : false;
+      return typeof _disabledDate === 'function' ? _disabledDate(date, rangeValue || [], 'end') : (rangeValue === null || rangeValue === void 0 ? void 0 : rangeValue[0]) ? date <= (rangeValue === null || rangeValue === void 0 ? void 0 : rangeValue[0]) : false;
     },
     renderExtraFooter: renderExtraFooter
   }), allowClear && (value || []).some(function (el) {

package/lib/components/compose-manage/index.js

@@ -356,6 +356,7 @@ var ComposeManage = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   // 执行查询的逻辑;
   var handleSearch = function handleSearch() {
     var values = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    var isSetField = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     filterProps === null || filterProps === void 0 ? void 0 : filterProps.map(function (item) {
       if (item.type === 'datepicker') {
         values[item.name] = values[item.name] ? (0, _dayjs.default)(values[item.name]).format(item.props._format) : undefined;
@@ -386,6 +387,9 @@ var ComposeManage = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     }
     setPageNo(1);
     setSearch(newSearch);
+    if (isSetField && formRef.current) {
+      formRef.current.setFieldsValue(newSearch);
+    }
     if (isCacheListFilter) {
       var _window$history$state22;
       window.history.replaceState(_objectSpread(_objectSpread({}, (_window$history$state22 = window.history.state) !== null && _window$history$state22 !== void 0 ? _window$history$state22 : {}), {}, {

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "ds-web-all",
-  "version": "1.0.1-beta.92",
+  "version": "1.0.1-beta.94",
   "scripts": {
     "start": "cross-env BUILD_ENV=dev && dumi dev",
     "docs:build": "cross-env BUILD_ENV=production && dumi build",