shineout 3.4.0-beta.5 → 3.4.0-beta.6

package/cjs/date-picker/date-picker.js

@@ -19,7 +19,8 @@ var jssStyle = {
   datePicker: _shineoutStyle.useDatePickerStyle,
   button: _shineoutStyle.useButtonStyle,
   innerTitle: _shineoutStyle.useInnerTitleStyle,
-  popover: _shineoutStyle.usePopoverStyle
+  popover: _shineoutStyle.usePopoverStyle,
+  link: _shineoutStyle.useLinkStyle
 };
 var BaseDatePicker = function BaseDatePicker(props) {
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_base.DatePicker, _objectSpread({

package/cjs/index.js

@@ -492,5 +492,5 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // 此文件由脚本自动生成，请勿直接修改。
 // This file was generated automatically by a script. Please do not modify it directly.
 var _default = exports.default = {
-  version: '3.4.0-beta.5'
+  version: '3.4.0-beta.6'
 };

package/dist/shineout.js

@@ -11991,7 +11991,7 @@ var handleStyle = function handleStyle(style) {
 };
 /* harmony default export */ var jss_style_handleStyle = (handleStyle);
 ;// CONCATENATED MODULE: ../shineout-style/src/version.ts
-/* harmony default export */ var version = ('3.4.0-beta.5');
+/* harmony default export */ var version = ('3.4.0-beta.6');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -17800,16 +17800,29 @@ var datePickerStyle = objectSpread2_default()(objectSpread2_default()({
     display: 'flex',
     justifyContent: 'space-between'
   },
-  pickerFooterLeft: {
+  pickerFooterTime: {
     padding: "".concat(src.datePickerPanelFooterPaddingY, " ").concat(src.datePickerPanelFooterPaddingX)
   },
-  pickerFooterRight: {
+  pickerFooterNow: {
     padding: "".concat(src.datePickerPanelFooterPaddingY, " ").concat(src.datePickerPanelFooterPaddingX),
     '&:only-child': {
       width: '100%',
       textAlign: 'center'
     }
   },
+  pickerFooterConfirm: {
+    textAlign: 'right',
+    padding: "".concat(src.datePickerPanelFooterPaddingY, " ").concat(src.datePickerPanelFooterPaddingX)
+  },
+  pickerRange: {},
+  pickerRangeBody: {
+    display: 'flex'
+  },
+  pickerRangeFooter: {
+    borderTop: "1px solid ".concat(src.datePickerPanelHeaderBorderColor),
+    display: 'flex',
+    justifyContent: 'flex-end'
+  },
   pickerRow: {},
   pickerRowWeek: {
     '& $pickerCell:nth-child(2)': {
@@ -41070,7 +41083,7 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
   var handleClear = usePersistFn(function (e) {
     var _props$onClear;
     if (!clearable) return;
-    e.stopPropagation();
+    e === null || e === void 0 || e.stopPropagation();
     if (disabledStatus === 'all') return;
     if (edit) {
       if (range) {
@@ -41533,6 +41546,49 @@ var useTime = function useTime(props) {
   };
 };
 /* harmony default export */ var use_time = (useTime);
+;// CONCATENATED MODULE: ../base/src/link/link.tsx
+
+
+
+var link_excluded = ["jssStyle", "className", "type", "underline", "disabled", "size", "icon", "href", "target", "children"];
+// import { } from '@sheinx/hooks';
+
+
+// import from icons
+
+
+
+var Link = function Link(props) {
+  var _jssStyle$link;
+  var jssStyle = props.jssStyle,
+    className = props.className,
+    _props$type = props.type,
+    type = _props$type === void 0 ? 'primary' : _props$type,
+    underline = props.underline,
+    disabled = props.disabled,
+    size = props.size,
+    icon = props.icon,
+    href = props.href,
+    target = props.target,
+    children = props.children,
+    restProps = objectWithoutProperties_default()(props, link_excluded);
+  var linkClasses = (jssStyle === null || jssStyle === void 0 || (_jssStyle$link = jssStyle.link) === null || _jssStyle$link === void 0 ? void 0 : _jssStyle$link.call(jssStyle)) || {};
+  var rootClass = classnames_default()(className, linkClasses.wrapper, defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()({}, linkClasses.underline, underline === true), linkClasses.underlineHover, underline === 'hover'), linkClasses.disabled, disabled), linkClasses.sizeSmall, size === 'small'), linkClasses.sizeLarge, size === 'large'), linkClasses.primary, type === 'primary'), linkClasses.secondary, type === 'secondary'), linkClasses.danger, type === 'danger'), linkClasses.warning, type === 'warning'), linkClasses.success, type === 'success'));
+  return /*#__PURE__*/(0,jsx_runtime.jsxs)("a", objectSpread2_default()(objectSpread2_default()({
+    href: disabled ? undefined : href,
+    target: target,
+    className: rootClass
+  }, restProps), {}, {
+    children: [typeof icon === 'boolean' && icon && /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+      className: linkClasses.icon,
+      children: icons_config.link.prefixIcon
+    }), /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().isValidElement(icon) && /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+      className: linkClasses.icon,
+      children: icon
+    }), children]
+  }));
+};
+/* harmony default export */ var base_src_link_link = (Link);
 ;// CONCATENATED MODULE: ../base/src/date-picker/pickerTitle.tsx
 
 
@@ -41552,6 +41608,31 @@ var PickerTitle = function PickerTitle(props) {
   });
 };
 /* harmony default export */ var pickerTitle = (PickerTitle);
+;// CONCATENATED MODULE: ../base/src/date-picker/confirm.tsx
+
+
+
+
+var Confirm = function Confirm(props) {
+  var _jssStyle$datePicker;
+  var jssStyle = props.jssStyle,
+    closeByConfirm = props.closeByConfirm;
+  var styles = jssStyle === null || jssStyle === void 0 || (_jssStyle$datePicker = jssStyle.datePicker) === null || _jssStyle$datePicker === void 0 ? void 0 : _jssStyle$datePicker.call(jssStyle);
+  var _useConfig = useConfig(),
+    locale = _useConfig.locale;
+  return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+    className: styles === null || styles === void 0 ? void 0 : styles.pickerFooterConfirm,
+    children: /*#__PURE__*/(0,jsx_runtime.jsx)(base_src_button_button, {
+      size: 'small',
+      type: "primary",
+      jssStyle: jssStyle,
+      className: styles === null || styles === void 0 ? void 0 : styles.pickerFooterBtn,
+      onClick: closeByConfirm,
+      children: getLocale(locale, 'ok')
+    })
+  });
+};
+/* harmony default export */ var date_picker_confirm = (Confirm);
 ;// CONCATENATED MODULE: ../base/src/date-picker/time.tsx
 
 
@@ -41561,6 +41642,7 @@ var PickerTitle = function PickerTitle(props) {
 
 
 
+
 var TimeScroll = function TimeScroll(props) {
   var _jssStyle$datePicker;
   var mode = props.mode,
@@ -41672,21 +41754,26 @@ var Time = function Time(props) {
   var renderFooter = function renderFooter() {
     var showRight = props.showSelNow;
     if (!showRight) return null;
-    return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+    return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
       className: styles === null || styles === void 0 ? void 0 : styles.pickerFooter,
       dir: direction,
-      children: showRight && /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-        className: styles === null || styles === void 0 ? void 0 : styles.pickerFooterRight,
-        children: /*#__PURE__*/(0,jsx_runtime.jsx)(base_src_button_button, {
+      style: {
+        borderTop: props.needConfirm && props.range ? 'none' : ''
+      },
+      children: [showRight && /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+        className: styles === null || styles === void 0 ? void 0 : styles.pickerFooterNow,
+        children: /*#__PURE__*/(0,jsx_runtime.jsx)(base_src_link_link, {
           size: 'small',
-          mode: "text",
           type: "primary",
           jssStyle: props.jssStyle,
           className: styles === null || styles === void 0 ? void 0 : styles.pickerFooterBtn,
           onClick: selNow,
           children: getLocale(locale, 'current')
         })
-      })
+      }), props.needConfirm && !props.range && /*#__PURE__*/(0,jsx_runtime.jsx)(date_picker_confirm, {
+        closeByConfirm: props.closeByConfirm,
+        jssStyle: props.jssStyle
+      })]
     });
   };
   return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
@@ -41726,6 +41813,7 @@ var Time = function Time(props) {
 
 
 
+
 var Day = function Day(props) {
   var _jssStyle$datePicker;
   var jssStyle = props.jssStyle;
@@ -41765,7 +41853,10 @@ var Day = function Day(props) {
     var now = new Date();
     if (func.isDisabled(now)) return;
     props.setCurrent(new Date(), areaType);
-    props.onChange(new Date(), props.type === 'datetime');
+    props.onChange(new Date(), props.needConfirm || props.type === 'datetime');
+    setTimeout(function () {
+      if (props.closeByConfirm && !props.range) props.closeByConfirm();
+    }, 0);
   };
   var renderDay = function renderDay(item, index) {
     var isActive = func.isActive(item);
@@ -41778,10 +41869,10 @@ var Day = function Day(props) {
       className: classnames_default()(styles === null || styles === void 0 ? void 0 : styles.pickerCell, isActive && (styles === null || styles === void 0 ? void 0 : styles.pickerCellActive), !isCurrentMonth && (styles === null || styles === void 0 ? void 0 : styles.pickerCellBound), isDisabled && (styles === null || styles === void 0 ? void 0 : styles.pickerCellDisabled), isToday && (styles === null || styles === void 0 ? void 0 : styles.pickerCellToday), isInRange && (styles === null || styles === void 0 ? void 0 : styles.pickerCellInRange), (isInRange === 'start' || isInRange === 'start-end') && props.position === 'start' && (styles === null || styles === void 0 ? void 0 : styles.pickerCellInRangeStart), (isInRange === 'end' || isInRange === 'start-end') && props.position === 'end' && (styles === null || styles === void 0 ? void 0 : styles.pickerCellInRangeEnd)),
       onClick: function onClick() {
         if (props.range) {
-          func.handleDayClick(item, props.clickTimes < 1);
+          func.handleDayClick(item, props.needConfirm || props.clickTimes < 1);
           props.setClickTimes(props.clickTimes + 1);
         } else {
-          func.handleDayClick(item);
+          func.handleDayClick(item, props.needConfirm);
         }
       },
       onDoubleClick: function onDoubleClick() {
@@ -41828,7 +41919,6 @@ var Day = function Day(props) {
   var renderFooter = function renderFooter() {
     var _props$rangeDate, _props$rangeDate2;
     var showLeft = props.type === 'datetime' && (((_props$rangeDate = props.rangeDate) === null || _props$rangeDate === void 0 ? void 0 : _props$rangeDate[0]) || ((_props$rangeDate2 = props.rangeDate) === null || _props$rangeDate2 === void 0 ? void 0 : _props$rangeDate2[1]));
-    var showRight = props.showSelNow;
     var timeStr = func.getTimeStr();
     if (!showLeft && !props.showSelNow) return null;
     var format = props.format;
@@ -41839,11 +41929,18 @@ var Day = function Day(props) {
       // eslint-disable-next-line
       if (match) format = match[0];
     }
+    var showNeedConfirm = props.needConfirm && !props.range;
     return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
       className: styles === null || styles === void 0 ? void 0 : styles.pickerFooter,
       dir: direction,
+      style: {
+        borderTop: props.needConfirm && props.range ? 'none' : ''
+      },
       children: [props.type === 'datetime' && /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-        className: classnames_default()(styles === null || styles === void 0 ? void 0 : styles.pickerFooterLeft, styles === null || styles === void 0 ? void 0 : styles.datetime, !timeStr && (styles === null || styles === void 0 ? void 0 : styles.datetimeHide)),
+        className: classnames_default()(styles === null || styles === void 0 ? void 0 : styles.pickerFooterTime, styles === null || styles === void 0 ? void 0 : styles.datetime, !timeStr && (styles === null || styles === void 0 ? void 0 : styles.datetimeHide)),
+        style: {
+          paddingRight: showNeedConfirm ? 0 : undefined
+        },
         children: /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
           children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", {
             children: icons_config.datepicker.Time
@@ -41855,25 +41952,30 @@ var Day = function Day(props) {
             children: timeStr
           })]
         })
-      }), showRight && /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
-        className: styles === null || styles === void 0 ? void 0 : styles.pickerFooterRight,
-        children: [props.showSelNow && props.type === 'date' && /*#__PURE__*/(0,jsx_runtime.jsx)(base_src_button_button, {
-          size: 'small',
-          mode: "text",
+      }), props.showSelNow && /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+        className: styles === null || styles === void 0 ? void 0 : styles.pickerFooterNow,
+        style: {
+          marginRight: showNeedConfirm ? 'auto' : undefined,
+          paddingLeft: showNeedConfirm ? 6 : undefined
+        },
+        children: [props.showSelNow && props.type === 'date' && /*#__PURE__*/(0,jsx_runtime.jsx)(base_src_link_link, {
+          size: "small",
           type: "primary",
           jssStyle: jssStyle,
           className: styles === null || styles === void 0 ? void 0 : styles.pickerFooterBtn,
           onClick: selNow,
           children: getLocale(locale, 'now')
-        }), props.showSelNow && props.type === 'datetime' && /*#__PURE__*/(0,jsx_runtime.jsx)(base_src_button_button, {
-          size: 'small',
-          mode: "text",
+        }), props.showSelNow && props.type === 'datetime' && /*#__PURE__*/(0,jsx_runtime.jsx)(base_src_link_link, {
+          size: "small",
           type: "primary",
           jssStyle: jssStyle,
           className: styles === null || styles === void 0 ? void 0 : styles.pickerFooterBtn,
           onClick: selNow,
           children: getLocale(locale, 'current')
         })]
+      }), showNeedConfirm && /*#__PURE__*/(0,jsx_runtime.jsx)(date_picker_confirm, {
+        closeByConfirm: props.closeByConfirm,
+        jssStyle: jssStyle
       })]
     });
   };
@@ -42036,11 +42138,11 @@ var useMonth = function useMonth(props) {
   var getMonthStr = function getMonthStr(date) {
     return util.getDateInfo(date, 'month', options) + 1;
   };
-  var handleMonthClick = function handleMonthClick(date) {
+  var handleMonthClick = function handleMonthClick(date, onClose) {
     var _props$onChange;
     if (isDisabled(date)) return;
     var newDate = util.toDate(date);
-    (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, newDate);
+    (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, newDate, onClose);
     setCurrent(newDate);
   };
   var isInRange = function isInRange(date) {
@@ -42084,6 +42186,7 @@ var useMonth = function useMonth(props) {
 
 
 
+
 var Month = function Month(props) {
   var _jssStyle$datePicker;
   var jssStyle = props.jssStyle;
@@ -42127,7 +42230,7 @@ var Month = function Month(props) {
         props.setTarget(undefined);
       },
       onClick: function onClick() {
-        func.handleMonthClick(item);
+        func.handleMonthClick(item, props.needConfirm);
       },
       children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
         className: styles === null || styles === void 0 ? void 0 : styles.pickerCellContent,
@@ -42189,6 +42292,9 @@ var Month = function Month(props) {
           })
         })
       })
+    }), props.needConfirm && !props.range && /*#__PURE__*/(0,jsx_runtime.jsx)(date_picker_confirm, {
+      closeByConfirm: props.closeByConfirm,
+      jssStyle: props.jssStyle
     })]
   });
 };
@@ -42265,11 +42371,11 @@ var useYear = function useYear(props) {
   var getYearStr = function getYearStr(date) {
     return util.getDateInfo(date, 'year', options);
   };
-  var handleYearClick = function handleYearClick(date) {
+  var handleYearClick = function handleYearClick(date, noClose) {
     var _props$onChange;
     if (isDisabled(date)) return;
     var newDate = util.toDate(date);
-    (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, newDate);
+    (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, newDate, noClose);
     setCurrent(newDate);
   };
   var isInRange = function isInRange(date) {
@@ -42316,6 +42422,7 @@ var useYear = function useYear(props) {
 
 
 
+
 var Year = function Year(props) {
   var _jssStyle$datePicker;
   var jssStyle = props.jssStyle;
@@ -42353,7 +42460,7 @@ var Year = function Year(props) {
       dir: config.direction,
       className: classnames_default()(styles === null || styles === void 0 ? void 0 : styles.pickerCell, func.isActive(item) && (styles === null || styles === void 0 ? void 0 : styles.pickerCellActive), (index === 0 || index === 11) && (styles === null || styles === void 0 ? void 0 : styles.pickerCellBound), isDisabled && (styles === null || styles === void 0 ? void 0 : styles.pickerCellDisabled), func.isNow(item) && (styles === null || styles === void 0 ? void 0 : styles.pickerCellToday), isInRange && (styles === null || styles === void 0 ? void 0 : styles.pickerCellInRange), (isInRange === 'start' || isInRange === 'start-end') && props.position === 'start' && (styles === null || styles === void 0 ? void 0 : styles.pickerCellInRangeStart), (isInRange === 'end' || isInRange === 'start-end') && props.position === 'end' && (styles === null || styles === void 0 ? void 0 : styles.pickerCellInRangeEnd)),
       onClick: function onClick() {
-        func.handleYearClick(item);
+        func.handleYearClick(item, props.needConfirm);
       },
       onMouseEnter: isDisabled ? undefined : function () {
         props.setTarget(item);
@@ -42421,6 +42528,9 @@ var Year = function Year(props) {
           })
         })
       })
+    }), props.needConfirm && !props.range && /*#__PURE__*/(0,jsx_runtime.jsx)(date_picker_confirm, {
+      closeByConfirm: props.closeByConfirm,
+      jssStyle: props.jssStyle
     })]
   });
 };
@@ -42498,11 +42608,11 @@ var useQuarter = function useQuarter(props) {
   var getQuarterStr = function getQuarterStr(date) {
     return util.getDateInfo(date, 'quarter', options);
   };
-  var handleQuarterClick = function handleQuarterClick(date) {
+  var handleQuarterClick = function handleQuarterClick(date, noClose) {
     var _props$onChange;
     if (isDisabled(date)) return;
     var newDate = util.toDate(date);
-    (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, newDate);
+    (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, newDate, noClose);
     setCurrent(newDate);
   };
   var isInRange = function isInRange(date) {
@@ -42546,6 +42656,7 @@ var useQuarter = function useQuarter(props) {
 
 
 
+
 var Quarter = function Quarter(props) {
   var _jssStyle$datePicker;
   var jssStyle = props.jssStyle;
@@ -42578,7 +42689,7 @@ var Quarter = function Quarter(props) {
       dir: config.direction,
       className: classnames_default()(styles === null || styles === void 0 ? void 0 : styles.pickerCell, func.isActive(item) && (styles === null || styles === void 0 ? void 0 : styles.pickerCellActive), isDisabled && (styles === null || styles === void 0 ? void 0 : styles.pickerCellDisabled), func.isNow(item) && (styles === null || styles === void 0 ? void 0 : styles.pickerCellToday), isInRange && (styles === null || styles === void 0 ? void 0 : styles.pickerCellInRange), (isInRange === 'start' || isInRange === 'start-end') && props.position === 'start' && (styles === null || styles === void 0 ? void 0 : styles.pickerCellInRangeStart), (isInRange === 'end' || isInRange === 'start-end') && props.position === 'end' && (styles === null || styles === void 0 ? void 0 : styles.pickerCellInRangeEnd)),
       onClick: function onClick() {
-        func.handleQuarterClick(item);
+        func.handleQuarterClick(item, props.needConfirm);
       },
       onMouseEnter: isDisabled ? undefined : function () {
         props.setTarget(item);
@@ -42646,6 +42757,9 @@ var Quarter = function Quarter(props) {
           })
         })
       })
+    }), props.needConfirm && !props.range && /*#__PURE__*/(0,jsx_runtime.jsx)(date_picker_confirm, {
+      closeByConfirm: props.closeByConfirm,
+      jssStyle: props.jssStyle
     })]
   });
 };
@@ -42932,6 +43046,7 @@ var useRangePick = function useRangePick(props) {
 
 
 
+
 var Picker = function Picker(props) {
   var _jssStyle$datePicker;
   var range = props.range,
@@ -42974,6 +43089,9 @@ var Picker = function Picker(props) {
   var handleLeave = usePersistFn(function () {
     props.setActiveIndex(-1);
   });
+  var closeByConfirm = function closeByConfirm() {
+    return props.closePop(true);
+  };
   var renderPicker = function renderPicker(position) {
     var index = position === 'end' ? 1 : 0;
     var mode = props.mode[index];
@@ -43000,7 +43118,9 @@ var Picker = function Picker(props) {
       onMouseLeave: function onMouseLeave() {},
       range: range,
       setClickTimes: props.setClickTimes,
-      clickTimes: props.clickTimes
+      clickTimes: props.clickTimes,
+      needConfirm: props.needConfirm,
+      closeByConfirm: closeByConfirm
     };
     if (range) {
       commonProps['onMouseEnter'] = position === 'end' ? handleEnterEnd : handleEnterStart;
@@ -43062,8 +43182,20 @@ var Picker = function Picker(props) {
       format: props.format,
       options: props.options,
       children: props.children
-    }), range ? ['start', 'end'].map(function (item) {
-      return renderPicker(item);
+    }), range ? /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+      className: styles === null || styles === void 0 ? void 0 : styles.pickerRange,
+      children: [/*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+        className: styles === null || styles === void 0 ? void 0 : styles.pickerRangeBody,
+        children: ['start', 'end'].map(function (item) {
+          return renderPicker(item);
+        })
+      }), props.needConfirm && /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+        className: styles === null || styles === void 0 ? void 0 : styles.pickerRangeFooter,
+        children: /*#__PURE__*/(0,jsx_runtime.jsx)(date_picker_confirm, {
+          closeByConfirm: closeByConfirm,
+          jssStyle: jssStyle
+        })
+      })]
     }) : renderPicker()]
   });
 };
@@ -43118,16 +43250,24 @@ var DatePicker = function DatePicker(props0) {
     _React$useState4 = slicedToArray_default()(_React$useState3, 2),
     clickTimes = _React$useState4[0],
     setClickTimes = _React$useState4[1];
+  var _React$useState5 = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useState(false),
+    _React$useState6 = slicedToArray_default()(_React$useState5, 2),
+    isCloseFromConfirm = _React$useState6[0],
+    setIsCloseFromConfirm = _React$useState6[1];
+  var _React$useState7 = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useState([]),
+    _React$useState8 = slicedToArray_default()(_React$useState7, 2),
+    oldDateArr = _React$useState8[0],
+    setOldDateArr = _React$useState8[1];
   var inputRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({
     inputRef: null
   });
   var styles = jssStyle === null || jssStyle === void 0 || (_jssStyle$datePicker = jssStyle.datePicker) === null || _jssStyle$datePicker === void 0 ? void 0 : _jssStyle$datePicker.call(jssStyle);
   var isRTL = direction === 'rtl';
   var dfp = isRTL ? 'bottom-right' : 'bottom-left';
-  var _React$useState5 = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useState(false),
-    _React$useState6 = slicedToArray_default()(_React$useState5, 2),
-    focused = _React$useState6[0],
-    setFocused = _React$useState6[1];
+  var _React$useState9 = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useState(false),
+    _React$useState10 = slicedToArray_default()(_React$useState9, 2),
+    focused = _React$useState10[0],
+    setFocused = _React$useState10[1];
   var listPosition = props.position || dfp;
   if (date_picker_horizontalPosition.includes(listPosition)) {
     listPosition = listPosition.split('-').reverse().join('-');
@@ -43174,9 +43314,20 @@ var DatePicker = function DatePicker(props0) {
   var onCollapse = usePersistFn(function (isOpen) {
     var _props$onCollapse;
     if (isOpen) {
+      setOldDateArr(dateArr);
       func.startEdit();
     } else {
-      func.finishEdit();
+      setClickTimes(0);
+      if (props.needConfirm) {
+        if (!isCloseFromConfirm) {
+          func.handleClear();
+          // 点击空白处关闭面板时，还原到上次的值
+          func.setDateArr(oldDateArr);
+        }
+      } else {
+        func.finishEdit();
+      }
+      setIsCloseFromConfirm(false);
     }
     (_props$onCollapse = props.onCollapse) === null || _props$onCollapse === void 0 || _props$onCollapse.call(props, isOpen);
   });
@@ -43220,10 +43371,13 @@ var DatePicker = function DatePicker(props0) {
     setFocused(false);
     (_props$onBlur = props.onBlur) === null || _props$onBlur === void 0 || _props$onBlur.call(props, e);
   });
-  var handleClose = function handleClose() {
+  var handleClose = function handleClose(isFromConfirm) {
     var _inputRef$current$inp;
+    setIsCloseFromConfirm(isFromConfirm || false);
     closePop();
-    setClickTimes(0);
+    if (isFromConfirm) {
+      func.finishEdit();
+    }
     (_inputRef$current$inp = inputRef.current.inputRef) === null || _inputRef$current$inp === void 0 || _inputRef$current$inp.blur();
   };
   var handleResultClick = usePersistFn(function () {
@@ -43340,6 +43494,7 @@ var DatePicker = function DatePicker(props0) {
           secondStep: props.secondStep,
           registerModeDisabled: func.registerModeDisabled,
           isDisabledDate: func.isDisabledDate,
+          needConfirm: props.needConfirm,
           children: props.children
         })
       })
@@ -43357,7 +43512,8 @@ var date_picker_jssStyle = {
   datePicker: useDatePickerStyle,
   button: useButtonStyle,
   innerTitle: useInnerTitleStyle,
-  popover: usePopoverStyle
+  popover: usePopoverStyle,
+  link: useLinkStyle
 };
 var BaseDatePicker = function BaseDatePicker(props) {
   return /*#__PURE__*/(0,jsx_runtime.jsx)(src_date_picker_date_picker, objectSpread2_default()({
@@ -48532,48 +48688,6 @@ InputComp.Group.displayName = 'ShineoutInputGroup';
 InputComp.Password.displayName = 'ShineoutInputPassword';
 InputComp.Number.displayName = 'ShineoutInputNumber';
 /* harmony default export */ var src_input_0 = (InputComp);
-;// CONCATENATED MODULE: ../base/src/link/link.tsx
-
-
-
-var link_excluded = ["jssStyle", "className", "type", "underline", "disabled", "size", "icon", "href", "target", "children"];
-// import { } from '@sheinx/hooks';
-
-
-// import from icons
-
-
-
-var Link = function Link(props) {
-  var jssStyle = props.jssStyle,
-    className = props.className,
-    _props$type = props.type,
-    type = _props$type === void 0 ? 'primary' : _props$type,
-    underline = props.underline,
-    disabled = props.disabled,
-    size = props.size,
-    icon = props.icon,
-    href = props.href,
-    target = props.target,
-    children = props.children,
-    restProps = objectWithoutProperties_default()(props, link_excluded);
-  var linkClasses = (jssStyle === null || jssStyle === void 0 ? void 0 : jssStyle.link()) || {};
-  var rootClass = classnames_default()(className, linkClasses.wrapper, defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()({}, linkClasses.underline, underline === true), linkClasses.underlineHover, underline === 'hover'), linkClasses.disabled, disabled), linkClasses.sizeSmall, size === 'small'), linkClasses.sizeLarge, size === 'large'), linkClasses.primary, type === 'primary'), linkClasses.secondary, type === 'secondary'), linkClasses.danger, type === 'danger'), linkClasses.warning, type === 'warning'), linkClasses.success, type === 'success'));
-  return /*#__PURE__*/(0,jsx_runtime.jsxs)("a", objectSpread2_default()(objectSpread2_default()({
-    href: disabled ? undefined : href,
-    target: target,
-    className: rootClass
-  }, restProps), {}, {
-    children: [typeof icon === 'boolean' && icon && /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
-      className: linkClasses.icon,
-      children: icons_config.link.prefixIcon
-    }), /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().isValidElement(icon) && /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
-      className: linkClasses.icon,
-      children: icon
-    }), children]
-  }));
-};
-/* harmony default export */ var base_src_link_link = (Link);
 ;// CONCATENATED MODULE: ./src/link/link.tsx
 
 
@@ -53725,7 +53839,7 @@ var confirm_excluded = ["children", "type", "text", "onOk", "okType", "onCancel"
 
 
 
-var Confirm = function Confirm(props) {
+var confirm_Confirm = function Confirm(props) {
   var _jssStyle$popover;
   var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(false),
     _useState2 = slicedToArray_default()(_useState, 2),
@@ -53822,7 +53936,7 @@ var Confirm = function Confirm(props) {
     }
   }));
 };
-/* harmony default export */ var popover_confirm = (Confirm);
+/* harmony default export */ var popover_confirm = (confirm_Confirm);
 ;// CONCATENATED MODULE: ./src/popover/confirm.tsx
 
 
@@ -58563,8 +58677,16 @@ var emptyRef = {
       }
     };
   }, [theadRef.current, isScrollY]);
+  var getRenderIndexByData = function getRenderIndexByData(data) {
+    var originKey = typeof data === 'string' ? data : getKey(props.keygen, data);
+    var index = treeData.findIndex(function (item) {
+      return getKey(props.keygen, item) === originKey;
+    });
+    return index;
+  };
   var tableFunc = useLatestObj({
-    scrollToIndex: virtualInfo.scrollToIndex
+    scrollToIndex: virtualInfo.scrollToIndex,
+    getRenderIndexByData: getRenderIndexByData
   });
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     if (props.tableRef) {
@@ -64741,7 +64863,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.4.0-beta.5'
+  version: '3.4.0-beta.6'
 });
 }();
 /******/ 	return __webpack_exports__;