shineout 3.8.0-beta.6 → 3.8.0-beta.8

package/cjs/index.js

@@ -522,5 +522,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.8.0-beta.6'
+  version: '3.8.0-beta.8'
 };

package/dist/shineout.js

@@ -12234,7 +12234,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.8.0-beta.6');
+/* harmony default export */ var version = ('3.8.0-beta.8');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -20543,6 +20543,17 @@ var input_input = objectSpread2_default()(objectSpread2_default()(objectSpread2_
       fontSize: 'inherit'
     }
   },
+  wrapperShowClear: {
+    '& $clearWrapper': {
+      display: 'flex',
+      opacity: 0
+    }
+  },
+  wrapperHasValue: {
+    '& $clearWrapper': {
+      opacity: 1
+    }
+  },
   clearWrapper: {
     position: 'relative',
     flexBasis: "calc(".concat(src.inputIconSize, " + 8px)"),
@@ -23986,8 +23997,6 @@ var useSelectStyle = styled(src_select_select, 'select');
 /* harmony default export */ var shineout_style_src_select = ((/* unused pure expression or super */ null && (useSelectStyle)));
 ;// CONCATENATED MODULE: ../shineout-style/src/skeleton/skeleton.ts
 
-// import token from '@sheinx/theme';
-
 
 var skeleton_animation = {
   '@keyframes skeleton-animation': {
@@ -24006,7 +24015,7 @@ var skeletonStyle = objectSpread2_default()(objectSpread2_default()({}, skeleton
   },
   animation: {
     '& $textItem, & $image, & $buttonItem': {
-      background: "linear-gradient(90deg, ".concat(src.skeletonAnimationFromColor, " 25%, ").concat(src.skeletonAnimationToColor, " 37%, ").concat(src.skeletonAnimationFromColor, " 63%)"),
+      backgroundImage: "linear-gradient(90deg, ".concat(src.skeletonAnimationFromColor, " 25%, ").concat(src.skeletonAnimationToColor, " 37%, ").concat(src.skeletonAnimationFromColor, " 63%)"),
       backgroundSize: '400% 100%',
       animation: '$skeleton-animation 1.4s ease infinite'
     }
@@ -30962,6 +30971,14 @@ function shallowEqual(objA, objB) {
   }
   return true;
 }
+function shallowEqualExceptFalsely(objA, objB) {
+  var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  var falselys = [false, 0, '', null, undefined, NaN];
+  if (falselys.includes(objA) && falselys.includes(objB)) {
+    return true;
+  }
+  return shallowEqual(objA, objB, options);
+}
 /* harmony default export */ var shallow_equal = (shallowEqual);
 ;// CONCATENATED MODULE: ../hooks/src/utils/dom/document.ts
 var cachedZoom = 0;
@@ -35783,7 +35800,7 @@ var simple_input_excluded = ["jssStyle", "className", "style", "status", "clearI
 
 
 var Input = function Input(props) {
-  var _jssStyle$input;
+  var _jssStyle$input, _inputElProps$value;
   var jssStyle = props.jssStyle,
     className = props.className,
     style = props.style,
@@ -35801,20 +35818,41 @@ var Input = function Input(props) {
     addEnd = props.addEnd,
     hasSuffix = props.hasSuffix,
     rest = objectWithoutProperties_default()(props, simple_input_excluded);
+  var _useRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({
+      needTriggerEnter: false
+    }),
+    context = _useRef.current;
   var inputStyle = jssStyle === null || jssStyle === void 0 || (_jssStyle$input = jssStyle.input) === null || _jssStyle$input === void 0 ? void 0 : _jssStyle$input.call(jssStyle);
   var config = useConfig();
   var _useContext = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useContext)(FormFieldContext),
     fieldId = _useContext.fieldId;
+  var showClearFromProp = props.showClear && !props.disabled;
   var _useInput = use_input(objectSpread2_default()(objectSpread2_default()({}, rest), {}, {
-      onFocusedChange: onFocusedChange
+      onFocusedChange: onFocusedChange,
+      // 由于form的原生submit事件是在keydown中触发的，submit校验后触发scrollToError会导致当前焦点的input立即失焦，导致input的回车事件无法触发
+      // 所以这里在onKeyDown时机记录下needTriggerEnter标志，在onBlur时机判断是否需要触发onEnterPress
+      onKeyDown: function onKeyDown(e) {
+        var _props$onKeyDown;
+        if (e.key === 'Enter') {
+          context.needTriggerEnter = true;
+        }
+        (_props$onKeyDown = props.onKeyDown) === null || _props$onKeyDown === void 0 || _props$onKeyDown.call(props, e);
+      },
+      onBlur: function onBlur(e) {
+        var _props$onBlur;
+        if (context.needTriggerEnter) {
+          context.needTriggerEnter = false;
+          _onEnterPress === null || _onEnterPress === void 0 || _onEnterPress(e.target.value || '', e);
+        }
+        (_props$onBlur = props.onBlur) === null || _props$onBlur === void 0 || _props$onBlur.call(props, e);
+      }
     })),
     getRootProps = _useInput.getRootProps,
     getClearProps = _useInput.getClearProps,
     getInputProps = _useInput.getInputProps,
-    showClear = _useInput.showClear,
+    showClearFromClearable = _useInput.showClear,
     focused = _useInput.focused,
     disabled = _useInput.disabled;
-  var rootClass = classnames_default()(className, inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.rootClass, inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapper, !!focused && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperFocus), !!disabled && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperDisabled), status === 'error' && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperError), size === 'small' && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperSmall), size === 'large' && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperLarge), !!underline && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperUnderline), !border && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperNoBorder), hasSuffix && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.password));
   var keyHandler = useKeyEvent({
     onEnterPress: function onEnterPress(e) {
       _onEnterPress === null || _onEnterPress === void 0 || _onEnterPress(e.target.value || '', e);
@@ -35822,6 +35860,10 @@ var Input = function Input(props) {
   });
   var onKeyUp = usePersistFn(function (e) {
     var _props$onKeyUp;
+    if (e.key === 'Enter') {
+      context.needTriggerEnter = false;
+    }
+    ;
     (_props$onKeyUp = props.onKeyUp) === null || _props$onKeyUp === void 0 || _props$onKeyUp.call(props, e);
     keyHandler(e);
   });
@@ -35838,6 +35880,7 @@ var Input = function Input(props) {
   if (typeof renderInput === 'function') {
     inputEl = renderInput(inputEl);
   }
+  var rootClass = classnames_default()(className, inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.rootClass, inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapper, !!focused && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperFocus), !!disabled && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperDisabled), status === 'error' && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperError), size === 'small' && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperSmall), size === 'large' && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperLarge), !!underline && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperUnderline), !border && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperNoBorder), hasSuffix && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.password), showClearFromProp && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperShowClear), showClearFromProp && ((_inputElProps$value = inputElProps.value) === null || _inputElProps$value === void 0 ? void 0 : _inputElProps$value.length) > 0 && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperHasValue));
   return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", objectSpread2_default()(objectSpread2_default()(objectSpread2_default()({
     id: fieldId
   }, getDataAttribute(defineProperty_default()({}, 'input-border', 'true'))), getRootProps({
@@ -35846,7 +35889,7 @@ var Input = function Input(props) {
   })), {}, {
     children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
       className: classnames_default()(inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperInnerTitleTop, inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperInnerTitleBottom, inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperPaddingBox, inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.content),
-      children: [prefix, inputEl, showClear && /*#__PURE__*/(0,jsx_runtime.jsx)("div", objectSpread2_default()(objectSpread2_default()({
+      children: [prefix, inputEl, (showClearFromProp || showClearFromClearable) && /*#__PURE__*/(0,jsx_runtime.jsx)("div", objectSpread2_default()(objectSpread2_default()({
         className: inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.clearWrapper
       }, getClearProps()), {}, {
         children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
@@ -36613,6 +36656,7 @@ var input_Input = function Input(props) {
   return /*#__PURE__*/(0,jsx_runtime.jsx)(simple_input, objectSpread2_default()(objectSpread2_default()(objectSpread2_default()({}, forwardProps), inputFormatProps), {}, {
     value: (_inputFormatProps$val = inputFormatProps.value) !== null && _inputFormatProps$val !== void 0 ? _inputFormatProps$val : '',
     hasSuffix: !!props.suffix,
+    showClear: props.showClear,
     onKeyDown: function onKeyDown(e) {
       var _props$onKeyDown;
       if (e.key === 'Enter' && !e.defaultPrevented) {
@@ -40140,7 +40184,7 @@ var CascaderNode = function CascaderNode(props) {
         className: styles.optionCheckbox,
         checked: datum.getChecked(id),
         disabled: isDisabled,
-        onChange: events.onClick === handleSelect ? undefined : handleChange
+        onChange: isRealLeafNode && multiple ? undefined : handleChange
       }), renderContent(), renderIcon()]
     })
   }));
@@ -40624,7 +40668,7 @@ var Result = function Result(props) {
             var _props$onBlur, _inputRef$current$upd, _inputRef$current;
             e.stopPropagation();
             if (e.relatedTarget === context.inputRefs[1 - info.index]) return;
-            (_props$onBlur = props.onBlur) === null || _props$onBlur === void 0 || _props$onBlur.call(props, e);
+            (_props$onBlur = props.onBlur) === null || _props$onBlur === void 0 || _props$onBlur.call(props, e, info.index);
             if (inputRef.current) (_inputRef$current$upd = (_inputRef$current = inputRef.current).updateValue) === null || _inputRef$current$upd === void 0 || _inputRef$current$upd.call(_inputRef$current);
             context.clickIndex = 0;
           },
@@ -41820,8 +41864,33 @@ var Cascader = function Cascader(props0) {
   var shouldFinal = getFinal();
   var renderItem = getRenderItem;
   var getRenderResult = function getRenderResult(data, index, nodes) {
-    if (!renderResultProp) return renderItem(data);
-    return typeof renderResultProp === 'function' ? renderResultProp(data, nodes) : data[renderResultProp];
+    var _map, _datum$getPath$path, _datum$getPath;
+    // 计算渲染项数组，包含父节点或不含
+    var items = props.showParent ? [].concat(toConsumableArray_default()((_map = ((_datum$getPath$path = (_datum$getPath = datum.getPath(datum.getKey(data))) === null || _datum$getPath === void 0 ? void 0 : _datum$getPath.path) !== null && _datum$getPath$path !== void 0 ? _datum$getPath$path : []).map(function (p) {
+      return datum.getDataByValues(p);
+    })) !== null && _map !== void 0 ? _map : []), [data]) : [data];
+
+    // 根据 renderResultProp 不同类型，返回处理单个元素的函数
+    var renderSingle = function renderSingle(d) {
+      if (!renderResultProp) {
+        return renderItem(d);
+      }
+      if (typeof renderResultProp === 'function') {
+        return renderResultProp(d, nodes);
+      }
+      // renderResultProp 作为属性字符串提取对应字段
+      return d === null || d === void 0 ? void 0 : d[renderResultProp];
+    };
+
+    // 如果包含多个待渲染元素，拼接渲染结果并添加分隔符
+    if (items.length > 1) {
+      return items.map(function (d, i) {
+        return i > 0 ? [' / ', renderSingle(d)] : renderSingle(d);
+      });
+    }
+
+    // 单一项直接渲染
+    return renderSingle(items[0]);
   };
 
   // 点击结果框的处理方法
@@ -44757,8 +44826,18 @@ function isValid(date) {
   if (!(date instanceof Date)) return false;
   return dayjs_min_default()(date).isValid();
 }
-function isValidString(date, fmt) {
+
+/**
+ * @param date 日期字符串
+ * @param fmt 日期格式
+ * @param isLoose 是否为宽松模式
+ * @returns 是否为有效日期
+ */
+function isValidString(date, fmt, isLoose) {
   if (!date) return false;
+  if (isLoose) {
+    return dayjs_min_default()(date).isValid();
+  }
   return dayjs_min_default()(date, fmt, true).isValid();
 }
 function util_parse(d, fmt, options) {
@@ -45246,8 +45325,15 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
     }
     var formatValue = getFormatValueArr(dateArr);
     var v = range ? formatValue : formatValue[0];
-    if (!shallow_equal(v, value)) {
-      onChange === null || onChange === void 0 || onChange(v);
+    if (Array.isArray(value) && value.length && Array.isArray(v) && v.length) {
+      // 针对 range 的情况，['2025-01-01',''] 和 ['2025-01-01',undefined] 无法通过 shallowEqual 出来，这边需要放行
+      if (!shallowEqualExceptFalsely(v[0], value[0]) || !shallowEqualExceptFalsely(v[1], value[1])) {
+        onChange === null || onChange === void 0 || onChange(v);
+      }
+    } else {
+      if (!shallow_equal(v, value)) {
+        onChange === null || onChange === void 0 || onChange(v);
+      }
     }
   };
   var getDateArr = function getDateArr() {
@@ -45320,9 +45406,9 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
     }
     (_props$onClear = props.onClear) === null || _props$onClear === void 0 || _props$onClear.call(props);
   });
-  var handleInputChange = usePersistFn(function (str, index) {
+  var handleInputChange = usePersistFn(function (str, index, isFromBlur) {
     // 比较 日期字符串是否符合format格式, 如果符合返回 true 否则返回 false
-    var isValid = util.isValidString(str, format);
+    var isValid = util.isValidString(str, format, isFromBlur);
     if (!isValid) return;
     var date = util.toDateWithFormat(str, format, undefined, options);
     setInputArr(function (prev) {
@@ -45346,6 +45432,11 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
       return arr;
     });
   });
+
+  // 失焦时，需要宽松模式校验，eg: 2025-06-16 18:00 和 2025-06-16 18 都可以校验通过
+  var handleInputBlur = usePersistFn(function (str, index) {
+    handleInputChange(str, index, true);
+  });
   var handleClearInputArr = usePersistFn(function (index) {
     if (index !== undefined) {
       setInputArr(function (prev) {
@@ -45389,6 +45480,7 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
     handleClear: handleClear,
     handleClearInputArr: handleClearInputArr,
     handleInputChange: handleInputChange,
+    handleInputBlur: handleInputBlur,
     registerModeDisabled: registerModeDisabled,
     setCurrentArrWithParams: setCurrentArrWithParams,
     isDisabledDate: isDisabledDate
@@ -45427,14 +45519,16 @@ var useDate = function useDate(props) {
       cachedDays: []
     }),
     context = _useRef.current;
-  var current = props.current === undefined ? currentState : props.current;
+  var current = props.current === undefined || !props.current ? currentState : props.current;
   var setCurrent = function setCurrent(date) {
     var _props$onCurrentChang2;
     if (props.current !== undefined) {
       var _props$onCurrentChang;
       (_props$onCurrentChang = props.onCurrentChange) === null || _props$onCurrentChang === void 0 || _props$onCurrentChang.call(props, date);
     } else {
-      setCurrentState(date);
+      if (date) {
+        setCurrentState(date);
+      }
     }
     (_props$onCurrentChang2 = props.onCurrentChange) === null || _props$onCurrentChang2 === void 0 || _props$onCurrentChang2.call(props, date);
   };
@@ -45509,9 +45603,15 @@ var useDate = function useDate(props) {
     var _props$onChange;
     if (isDisabled(date)) return;
     var newDate = getDateWithTime(date);
-    props === null || props === void 0 || props.onClearInputArr(position === 'start' ? 0 : 1);
+    var index = position === 'start' ? 0 : 1;
+    if (props.allowSingle && props.rangeDate && Array.isArray(props.rangeDate) && props.rangeDate[index] && util.clearHMS(newDate, options).getTime() === util.clearHMS(props.rangeDate[index], options).getTime()) {
+      newDate = '';
+    }
+    props === null || props === void 0 || props.onClearInputArr(index);
     (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, newDate, noClose);
-    setCurrent(newDate);
+    if (newDate) {
+      setCurrent(newDate);
+    }
   };
   var getTimeStr = function getTimeStr() {
     var format = props.format,
@@ -46042,7 +46142,8 @@ var Time = function Time(props) {
 
 var Day = function Day(props) {
   var _jssStyle$datePicker;
-  var jssStyle = props.jssStyle;
+  var jssStyle = props.jssStyle,
+    allowSingle = props.allowSingle;
   var _useConfig = useConfig(),
     locale = _useConfig.locale,
     direction = _useConfig.direction;
@@ -46061,6 +46162,7 @@ var Day = function Day(props) {
       value: props.value,
       range: props.range,
       onChange: onChange,
+      allowSingle: allowSingle,
       onClearInputArr: props.onClearInputArr,
       position: props.position,
       min: props.min,
@@ -47087,7 +47189,7 @@ var useRangePick = function useRangePick(props) {
     setDateArr(function (arr) {
       var newArr = toConsumableArray_default()(arr);
       newArr[index] = date;
-      if (range && index === 0 && newArr[1]) {
+      if (date && range && index === 0 && newArr[1]) {
         if (typeof range === 'number') {
           var rangeMax = util.addSeconds(date, range, options);
           if (rangeMax.getTime() < newArr[1].getTime()) {
@@ -47116,7 +47218,7 @@ var useRangePick = function useRangePick(props) {
       var newArr = toConsumableArray_default()(arr);
       newArr[index] = date;
       var modeCache = context.modeCache;
-      if (modeCache[0] === modeCache[1]) {
+      if (date && modeCache[0] === modeCache[1]) {
         var mode = modeCache[0];
         if (range && index === 0 && newArr[1]) {
           if (mode === 'year') {
@@ -47361,6 +47463,7 @@ var Picker = function Picker(props) {
       format: props.format,
       disabled: position === 'end' ? func.endDisabled : func.startDisabled,
       rangeDate: dateArr,
+      allowSingle: props.allowSingle,
       min: position === 'end' ? endMin : startMin,
       staticMin: position === 'end' ? endMin : staticStartMin,
       max: position === 'end' ? endMax : startMax,
@@ -47643,11 +47746,14 @@ var DatePicker = function DatePicker(props0) {
     setFocused(true);
     (_props$onFocus = props.onFocus) === null || _props$onFocus === void 0 || _props$onFocus.call(props, e);
   });
-  var handleBlur = usePersistFn(function (e) {
+  var handleBlur = usePersistFn(function (e, index) {
     var _props$onBlur;
     setFocused(false);
-    (_props$onBlur = props.onBlur) === null || _props$onBlur === void 0 || _props$onBlur.call(props, e);
+    (_props$onBlur = props.onBlur) === null || _props$onBlur === void 0 || _props$onBlur.call(props, e, index);
     if (props.needConfirm) return;
+    if (props.inputable && index !== undefined) {
+      func.handleInputBlur(e.target.value, index);
+    }
 
     // 当输入框有值时，失焦时需要立即触发 onChange，否则触控板的轻触模拟出来的click事件就获取不到最新的值
     if (inputArr.some(function (d) {
@@ -47766,6 +47872,7 @@ var DatePicker = function DatePicker(props0) {
           type: type,
           options: options,
           disabled: disabled,
+          allowSingle: props.allowSingle,
           jssStyle: jssStyle,
           closePop: handleClose,
           defaultTime: props.defaultTime,
@@ -50262,6 +50369,7 @@ function use_previous_usePrevious(value) {
 
 
 var globalKey = '__global__&&@@';
+var SUBMIT_TIMEOUT = 10;
 
 
 var emptyObj = {};
@@ -50467,7 +50575,7 @@ var useForm = function useForm(props) {
           docScroll.top -= scrollToError;
         }
       }
-    });
+    }, SUBMIT_TIMEOUT + 10);
   };
   var onChange = use_persist_fn(function (change) {
     var _props$onChange;
@@ -50668,7 +50776,7 @@ var useForm = function useForm(props) {
         var _other$onSubmit;
         submit();
         other === null || other === void 0 || (_other$onSubmit = other.onSubmit) === null || _other$onSubmit === void 0 || _other$onSubmit.call(other, e);
-      }, 10);
+      }, SUBMIT_TIMEOUT);
     };
   };
   var validateFieldset = function validateFieldset(name, config) {
@@ -53403,7 +53511,8 @@ var Password = function Password(props) {
   return /*#__PURE__*/(0,jsx_runtime.jsx)(simple_input, objectSpread2_default()(objectSpread2_default()(objectSpread2_default()({}, forwardProps), inputProps), {}, {
     className: props.className,
     suffix: suffix,
-    hasSuffix: true
+    hasSuffix: true,
+    showClear: props.showClear
   }));
 };
 /* harmony default export */ var input_password = (/*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().memo(Password));
@@ -66751,7 +66860,7 @@ var TransferList = function TransferList(props) {
       className: styles.inputWrapper,
       children: /*#__PURE__*/(0,jsx_runtime.jsx)(base_src_input_input, {
         className: styles.input,
-        clearable: true,
+        showClear: true,
         jssStyle: jssStyle,
         value: filterText,
         suffix: icons_config.transfer.Search,
@@ -71606,7 +71715,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.8.0-beta.6'
+  version: '3.8.0-beta.8'
 });
 }();
 /******/ 	return __webpack_exports__;