shineout 3.9.0-beta.11 → 3.9.0-beta.12

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.9.0-beta.11'
+  version: '3.9.0-beta.12'
 };

package/dist/shineout.js

@@ -12386,7 +12386,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.9.0-beta.11');
+/* harmony default export */ var version = ('3.9.0-beta.12');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -33720,7 +33720,15 @@ var BreadcrumbItem = function BreadcrumbItem(_ref) {
     }
   }
   if (renderItem) {
-    return renderItem(dataItem);
+    if (max !== undefined) {
+      item = /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+        className: contentClass,
+        ref: contentRef,
+        children: renderItem(dataItem)
+      });
+    } else {
+      return renderItem(dataItem);
+    }
   }
   if (isOverflow && d.title && max !== undefined) {
     return /*#__PURE__*/(0,jsx_runtime.jsx)(src_tooltip_tooltip, {
@@ -33798,17 +33806,18 @@ var Breadcrumb = function Breadcrumb(props) {
     };
     return [first, more].concat(toConsumableArray_default()(reset));
   };
+  var lastIndex = Math.min(data.length - 1, maxCount !== undefined ? maxCount : data.length - 1);
   return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
     className: className,
     style: props.style,
     children: data && getRenderData().map(function (d, index) {
       var itemFirst = Array.isArray(d) ? d[0] : d;
-      var isLastItem = index === (maxCount !== undefined ? maxCount : data.length - 1);
+      var isLastItem = index === lastIndex;
       return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
         className: breadcrumbClasses === null || breadcrumbClasses === void 0 ? void 0 : breadcrumbClasses.item,
         children: [Array.isArray(d) ? renderArray(d) : /*#__PURE__*/(0,jsx_runtime.jsx)(breadcrumb_item, {
           dataItem: d,
-          renderItem: renderItem,
+          renderItem: props.renderItem,
           jssStyle: props.jssStyle,
           max: maxCount
         }), !isLastItem && /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
@@ -37757,9 +37766,21 @@ CardGroupComp.Item = card_group_Item;
 var useCarousel = function useCarousel(props) {
   var total = props.total,
     _props$interval = props.interval,
-    interval = _props$interval === void 0 ? 0 : _props$interval;
+    interval = _props$interval === void 0 ? 0 : _props$interval,
+    _props$defaultValue = props.defaultValue,
+    defaultValue = _props$defaultValue === void 0 ? 0 : _props$defaultValue,
+    valueProp = props.value,
+    onChange = props.onChange;
+
+  // 规范化初始值，确保在有效范围内
+  var normalizeIndex = function normalizeIndex(index) {
+    if (index < 0) return 0;
+    if (index >= total) return Math.max(0, total - 1);
+    return index;
+  };
+  var initialValue = normalizeIndex(valueProp !== undefined ? valueProp : defaultValue);
   var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)({
-      current: 0,
+      current: initialValue,
       pre: -1,
       direction: 'stop'
     }),
@@ -37772,14 +37793,32 @@ var useCarousel = function useCarousel(props) {
   var _useRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({
       timer: null,
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      setNext: function setNext(next) {}
+      setNext: function setNext(next) {},
+      prevValue: initialValue // 用于追踪上一次的值
     }),
     context = _useRef.current;
+
+  // 判断是否为受控模式
+  var isControlled = valueProp !== undefined;
+  // 获取实际使用的 current 值
+  var actualCurrent = isControlled ? normalizeIndex(valueProp) : current;
+
+  // 在受控模式下，计算 direction 和 pre
+  var actualPre = pre;
+  var actualDirection = direction;
+  if (isControlled) {
+    if (actualCurrent !== context.prevValue) {
+      actualPre = context.prevValue;
+      actualDirection = actualCurrent > context.prevValue ? 'forward' : 'backward';
+      context.prevValue = actualCurrent;
+    }
+  }
   var autoPlay = interval > 0 && total > 1;
   var moveTo = usePersistFn(function (i) {
     var next = i;
-    if (next === current) return;
-    var dir = next > current ? 'forward' : 'backward';
+    var prevCurrent = actualCurrent;
+    if (next === prevCurrent) return;
+    var dir = next > prevCurrent ? 'forward' : 'backward';
     if (next >= total) {
       dir = 'forward';
       next = 0;
@@ -37787,14 +37826,26 @@ var useCarousel = function useCarousel(props) {
       dir = 'backward';
       next = total - 1;
     }
-    setState({
-      current: next,
-      pre: current,
-      direction: dir
-    });
+
+    // 非受控模式下更新内部状态
+    if (!isControlled) {
+      setState({
+        current: next,
+        pre: prevCurrent,
+        direction: dir
+      });
+    }
+    // 受控模式下不更新内部状态，由外部 value 控制
+
+    // 触发 onChange 回调
+    if (onChange) {
+      onChange(next);
+    }
+
+    // 触发 onMove 回调（向后兼容）
     if (props.onMove) {
       props.onMove(next, {
-        prev: current,
+        prev: prevCurrent,
         direction: dir,
         moveTo: moveTo
       });
@@ -37816,13 +37867,13 @@ var useCarousel = function useCarousel(props) {
   });
   context.setNext = setNext;
   var start = usePersistFn(function () {
-    setNext(current + 1);
+    setNext(actualCurrent + 1);
   });
   var forward = usePersistFn(function () {
-    moveTo(current + 1);
+    moveTo(actualCurrent + 1);
   });
   var backward = usePersistFn(function () {
-    moveTo(current - 1);
+    moveTo(actualCurrent - 1);
   });
   var func = use_latest_obj({
     start: start,
@@ -37836,10 +37887,18 @@ var useCarousel = function useCarousel(props) {
       start();
     }
   }, []);
+
+  // 受控模式下，当外部 value 变化时，重置自动轮播定时器
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
+    if (isControlled && autoPlay && valueProp !== undefined) {
+      stop();
+      context.setNext(actualCurrent + 1);
+    }
+  }, [valueProp]);
   return {
-    current: current,
-    pre: pre,
-    direction: direction,
+    current: actualCurrent,
+    pre: actualPre,
+    direction: actualDirection,
     func: func
   };
 };
@@ -37871,6 +37930,9 @@ var Carousel = function Carousel(props) {
   var _useCarousel = use_carousel({
       total: total,
       interval: props.interval,
+      defaultValue: props.defaultValue,
+      value: props.value,
+      onChange: props.onChange,
       onMove: props.onMove
     }),
     current = _useCarousel.current,
@@ -43608,7 +43670,7 @@ function getRule(rule, props) {
         return;
       }
       if (reg.global) reg.lastIndex = 0;
-      if (typeof value === 'string' && reg.test(value)) {
+      if (reg.test(value)) {
         callback(true);
       } else {
         callback(new FormError(po.message, po));
@@ -66595,7 +66657,7 @@ var emptyRef = {
     columns: columns,
     colgroup: colgroup,
     rowsInView: props.rowsInView || 20,
-    rowHeight: props.rowHeight || 100,
+    rowHeight: props.rowHeight || 40,
     strictRowHeight: props.strictRowHeight,
     scrollRef: scrollRef,
     innerRef: tbodyRef,
@@ -73549,7 +73611,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.9.0-beta.11'
+  version: '3.9.0-beta.12'
 });
 }();
 /******/ 	return __webpack_exports__;