@vtx/components 4.0.0-beta.2 → 4.0.0-beta.21

package/es/vtx-scrollable-row/index.js

@@ -52,44 +52,54 @@ function VtxScrollableRow(props) {
       setNextPrev();
     }, 200);
     window.addEventListener('resize', debouncedResize);
-    setNextPrev();
+    // 使用 requestAnimationFrame 确保 DOM 已渲染
+    requestAnimationFrame(function () {
+      setNextPrev();
+    });
     return function () {
+      debouncedResize.cancel();
       window.removeEventListener('resize', debouncedResize);
     };
-  }, [navRef === null || navRef === void 0 ? void 0 : navRef.current, containerRef.current, navWrapRef.current]);
+  }, []);
   function setNextPrev() {
     if (navRef !== null && navRef !== void 0 && navRef.current && containerRef.current && navWrapRef.current) {
       var navNodeW = navRef.current.scrollWidth;
       var containerW = containerRef.current.offsetWidth;
       var navWrapNodeW = navWrapRef.current.offsetWidth;
       var minOffset = containerW - navNodeW;
-      var _next = state.next,
-        _prev = state.prev;
-      if (minOffset >= 0) {
-        _next = false;
-        setOffset(0, false);
-        offset.current = 0;
-      } else if (minOffset < offset.current) {
-        _next = true;
-      } else {
-        _next = false;
-        var realOffset = navWrapNodeW - navNodeW;
-        setOffset(realOffset, false);
-        offset.current = realOffset;
-      }
-      if (offset.current < 0) {
-        _prev = true;
-      } else {
-        _prev = false;
-      }
-      setState({
-        next: _next,
-        prev: _prev
+
+      // ✅ 使用函数式更新确保状态一致性
+      setState(function (prevState) {
+        var next = prevState.next,
+          prev = prevState.prev;
+        var newOffset = offset.current;
+        if (minOffset >= 0) {
+          next = false;
+          setOffset(0, false);
+          newOffset = 0;
+        } else if (minOffset < newOffset) {
+          next = true;
+        } else {
+          next = false;
+          var realOffset = navWrapNodeW - navNodeW;
+          setOffset(realOffset, false);
+          newOffset = realOffset;
+        }
+        if (newOffset < 0) {
+          prev = true;
+        } else {
+          prev = false;
+        }
+
+        // 同步更新 ref 值
+        offset.current = newOffset;
+
+        // 返回新的状态对象
+        return {
+          next: next,
+          prev: prev
+        };
       });
-      return {
-        next: _next,
-        prev: _prev
-      };
     }
   }
   var setOffset = function setOffset(os) {

package/es/vtx-search/index.js

@@ -94,7 +94,7 @@ function VtxSearch(props) {
     return !!item;
   }) : props === null || props === void 0 ? void 0 : props.children;
   var grid = useMemo(function () {
-    var weightArr = props.gridWeight.filter(function (item) {
+    var weightArr = (props.gridWeight || []).filter(function (item) {
       return !!item;
     });
     var sum = 0;
@@ -121,7 +121,7 @@ function VtxSearch(props) {
       cumulative: cumulative,
       // 总数量
       len: cumulative[cumulative.length - 1],
-      lenWeight: cumulativeWeight[cumulative.length - 2] + weightArr[(weightArr === null || weightArr === void 0 ? void 0 : weightArr.length) - 1],
+      lenWeight: cumulativeWeight[Math.max(0, cumulative.length - 2)] + (weightArr[(weightArr === null || weightArr === void 0 ? void 0 : weightArr.length) - 1] || 0),
       // 几个children
       count: count,
       // 兼容的处理
@@ -218,12 +218,13 @@ function VtxSearch(props) {
     } else {
       var chData = [];
       cData.forEach(function (item) {
-        if (typeof item == 'function') {
+        if (typeof item === 'function') {
           var ite = item();
           if (Array.isArray(ite)) {
             chData.push.apply(chData, _toConsumableArray(ite));
+          } else {
+            chData.push(ite);
           }
-          chData.push(ite);
           return;
         }
         if (Array.isArray(item)) {

package/es/vtx-search/style/index.js

@@ -16,7 +16,8 @@ var genVtxStyle = function genVtxStyle(token) {
     transitionDuration: token.toggleSpeed,
     transitionProperty: 'height',
     boxSizing: 'border-box',
-    overflow: 'hidden'
+    overflow: 'hidden',
+    color: token.colorText
   }, "".concat(componentCls, "-element"), {}), "".concat(componentCls, "-label_v"), {
     overflow: 'hidden',
     lineHeight: 1,

package/es/vtx-select/index.js

@@ -3,6 +3,7 @@ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableTo
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -31,7 +32,7 @@ var VtxSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     popWidth = _useState2[0],
     setPopWidth = _useState2[1];
   var elRef = useRef();
-  var elId = useRef("vtx-select-".concat(Date.now()));
+  var elId = useRef("vtx-select-".concat(Math.random().toString(36).substr(2, 9)));
   var _useState3 = useState(''),
     _useState4 = _slicedToArray(_useState3, 2),
     searchValue = _useState4[0],
@@ -64,20 +65,33 @@ var VtxSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     emptyDescriptionText: intl.getMessage('select.empty', '暂无数据')
   }, customEnumText);
   useEffect(function () {
-    if (mode === 'multiple' || mode === 'tags') {
-      var timer = setInterval(function () {
-        var _elRef$current;
-        var _width = (_elRef$current = elRef.current) === null || _elRef$current === void 0 ? void 0 : _elRef$current.clientWidth;
-        if (_width > 0) {
-          setPopWidth(_width);
-          clearInterval(timer);
+    if ((mode === 'multiple' || mode === 'tags') && elRef.current) {
+      var element = elRef.current;
+
+      // 立即设置一次
+      setPopWidth(element.clientWidth);
+
+      // 使用 ResizeObserver 监听尺寸变化
+      var resizeObserver = new ResizeObserver(function (entries) {
+        var _iterator = _createForOfIteratorHelper(entries),
+          _step;
+        try {
+          for (_iterator.s(); !(_step = _iterator.n()).done;) {
+            var entry = _step.value;
+            setPopWidth(entry.contentRect.width);
+          }
+        } catch (err) {
+          _iterator.e(err);
+        } finally {
+          _iterator.f();
         }
-      }, 1000);
+      });
+      resizeObserver.observe(element);
       return function () {
-        return clearInterval(timer);
+        resizeObserver.disconnect();
       };
     }
-  }, []);
+  }, [mode]);
   var newChildren = props.children ? Array.isArray(props.children) ? props.children : [props.children] : [];
   var getContent = function getContent() {
     var child = {};

package/es/vtx-signature/index.js

@@ -1,4 +1,4 @@
-import React, { forwardRef, useRef, useEffect, useContext } from 'react';
+import React, { forwardRef, useRef, useLayoutEffect, useContext } from 'react';
 import SignaturePad from 'signature_pad';
 import debounce from 'lodash-es/debounce';
 import PropTypes from 'prop-types';
@@ -44,7 +44,7 @@ var VtxSignature = /*#__PURE__*/forwardRef(function (props, ref) {
       clear();
     }
   }
-  useEffect(function () {
+  useLayoutEffect(function () {
     signaturePad.current = new SignaturePad(canvasRef.current, {
       dotSize: dotSize,
       minWidth: minWidth,
@@ -65,7 +65,9 @@ var VtxSignature = /*#__PURE__*/forwardRef(function (props, ref) {
         _onEnd && _onEnd();
       }
     });
-    resizeCanvas();
+    setTimeout(function () {
+      resizeCanvas();
+    }, 0);
     window.addEventListener('resize', debounce(resizeCanvas, 150));
     return function () {
       window.removeEventListener('resize', debounce(resizeCanvas, 150));
@@ -82,7 +84,6 @@ var VtxSignature = /*#__PURE__*/forwardRef(function (props, ref) {
   };
   return wrapSSR( /*#__PURE__*/_jsxs("div", {
     className: classnames(prefixCls, hashId),
-    ref: ref,
     children: [/*#__PURE__*/_jsx("div", {
       className: classnames("".concat(prefixCls, "--body")),
       children: /*#__PURE__*/_jsx("canvas", {

package/es/vtx-signature/style/index.js

@@ -11,7 +11,7 @@ var genVtxSignatureStyle = function genVtxSignatureStyle(token) {
     position: 'relative',
     display: 'flex',
     flexDirection: 'column',
-    height: '300px',
+    height: 300,
     padding: '16px',
     backgroundColor: token.colorBgBase,
     border: "1px solid ".concat(token.colorBorder),

package/es/vtx-split-pane/SplitPane.js

@@ -1,12 +1,20 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+var _excluded = ["children", "defaultSize", "minSize", "maxSize", "style"];
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import classnames from 'classnames';
 import React, { cloneElement, useContext, useRef } from 'react';
-import { Panel, PanelGroup, PanelResizeHandle } from 'react-resizable-panels';
+import { Splitter } from 'antd';
 import Resizer from "./Resizer";
 import { useStyle } from "./style";
 import { VtxProvider } from "../vtx-provider";
-import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 function removeNullChildren(children) {
   return React.Children.toArray(children).filter(function (c) {
     return c;
@@ -21,40 +29,42 @@ function VtxSplitPane(props) {
     hashId = _useStyle.hashId;
   var splitPane = useRef();
   var children = props.children,
+    defaultSize = props.defaultSize,
+    minSize = props.minSize,
+    maxSize = props.maxSize,
     style = props.style,
-    _props$direction = props.direction,
-    direction = _props$direction === void 0 ? 'horizontal' : _props$direction;
+    rest = _objectWithoutProperties(props, _excluded);
   var notNullChildren = removeNullChildren(children);
   var refs = useRef([]);
   return wrapSSR( /*#__PURE__*/_jsx("div", {
-    className: classnames("".concat(prefixCls, " ").concat(prefixCls, "-").concat(direction), hashId),
+    className: classnames("".concat(prefixCls), hashId),
     ref: splitPane,
     style: style,
-    children: /*#__PURE__*/_jsx(PanelGroup, {
-      direction: direction,
+    children: /*#__PURE__*/_jsx(Splitter, _objectSpread(_objectSpread({}, rest), {}, {
       children: notNullChildren === null || notNullChildren === void 0 ? void 0 : notNullChildren.map(function (v, index) {
-        return /*#__PURE__*/_jsxs(_Fragment, {
-          children: [/*#__PURE__*/cloneElement(notNullChildren[index], {
+        var _v$props;
+        return /*#__PURE__*/_jsx(_Fragment, {
+          children: /*#__PURE__*/cloneElement(notNullChildren[index], _objectSpread(_objectSpread(_objectSpread({
             ref: function ref(el) {
               refs.current[index] = el;
-            },
-            collapsible: true
-          }), index !== (notNullChildren === null || notNullChildren === void 0 ? void 0 : notNullChildren.length) - 1 && /*#__PURE__*/_jsx(_Fragment, {
-            children: /*#__PURE__*/_jsx(PanelResizeHandle, {
-              className: classnames("".concat(prefixCls, "-outer"), hashId),
-              children: /*#__PURE__*/_jsx(Resizer, {
-                refs: refs,
-                index: index,
-                direction: direction
-              })
-            })
-          })]
+            }
+          }, index === 0 ? {
+            max: maxSize,
+            min: minSize,
+            size: defaultSize
+          } : {}), v.props), {}, {
+            collapsible: _objectSpread({
+              start: true,
+              end: true,
+              showCollapsibleIcon: 'auto'
+            }, (_v$props = v.props) === null || _v$props === void 0 ? void 0 : _v$props.collapsible)
+          }))
         });
       })
-    })
+    }))
   }));
 }
 VtxSplitPane.propTypes = {};
 VtxSplitPane.defaultProps = {};
-VtxSplitPane.Pane = Panel;
+VtxSplitPane.Pane = Splitter.Panel;
 export default VtxSplitPane;

package/es/vtx-split-pane/style/index.js

@@ -7,121 +7,16 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { useStyle as useAntdStyle } from "../../vtx-provider";
 var genVtxSplitPaneStyle = function genVtxSplitPaneStyle(token) {
   var componentCls = token.componentCls;
-  return _defineProperty(_defineProperty({}, componentCls, _defineProperty(_defineProperty(_defineProperty(_defineProperty({
+  return _defineProperty({}, componentCls, {
     height: '100%',
     overflow: 'hidden',
-    '&-outer': _defineProperty(_defineProperty(_defineProperty(_defineProperty({
-      backgroundColor: 'transparent',
-      position: 'relative',
-      outline: 'none',
-      '&-resizer': _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
-        position: 'absolute',
-        height: '100%',
-        width: 6,
-        zIndex: 1
-      }, '&-left,&-right', {
-        position: 'absolute',
-        top: '50%',
-        zIndex: 1001,
-        opacity: 0,
-        width: '16px !important',
-        height: '24px !important',
-        backgroundColor: token.colorBorder,
-        color: token.colorTextSecondary,
-        borderColor: "transparent !important",
-        fontSize: 12,
-        '&:hover': {
-          color: token.colorTextSecondary,
-          backgroundColor: "".concat(token.colorPrimaryBg, " !important")
-        }
-      }), '&-left', {
-        transform: 'translate(-16px,-50%)'
-      }), '&-right', {
-        transform: 'translate(6px,-50%)'
-      }), '&::after', {
-        position: 'absolute',
-        content: "' '",
-        left: 0,
-        top: 0,
-        bottom: 0,
-        right: 4,
-        borderRadius: token.borderRadius
-      }), '&:hover', _defineProperty({}, '.vtx-split-pane-outer-resizer-left,.vtx-split-pane-outer-resizer-right', {
-        opacity: 1
-      })), '.ant-btn-icon', {
-        color: token.colorTextSecondary
-      })
-    }, "&[data-resize-handle-state='hover']", _defineProperty(_defineProperty({}, '.vtx-split-pane-outer-resizer-left,.vtx-split-pane-outer-resizer-right', {
-      opacity: 1
-    }), '.vtx-split-pane-outer-resizer::after', {
-      background: "linear-gradient(to bottom , rgba(0,0,0,0), ".concat(token.colorSplit, ", rgba(0,0,0,0)) !important")
-    })), "&[data-resize-handle-state='active']", _defineProperty(_defineProperty({}, '.vtx-split-pane-outer-resizer-left,.vtx-split-pane-outer-resizer-right', {
-      opacity: 1
-    }), '.vtx-split-pane-outer-resizer::after', {
-      background: "linear-gradient(to bottom , rgba(0,0,0,0), ".concat(token.colorSplit, ", rgba(0,0,0,0)) !important")
-    })), "&[data-resize-handle-state='drag']", _defineProperty(_defineProperty({}, '.vtx-split-pane-outer-resizer-left,.vtx-split-pane-outer-resizer-right', {
-      opacity: 1
-    }), '.vtx-split-pane-outer-resizer::after', {
-      background: "linear-gradient(to bottom , rgba(0,0,0,0), ".concat(token.colorSplit, ", rgba(0,0,0,0)) !important")
-    })), "&[data-resize-handle-state='inactive']", {
-      backgroundColor: 'transparent'
-    }),
-    '&-item': {
-      position: 'relative',
-      display: 'inline-block',
-      height: '100%',
-      verticalAlign: 'top'
+    '.ant-splitter-bar .ant-splitter-bar-dragger::before': {
+      background: 'transparent'
+    },
+    '.ant-splitter-bar .ant-splitter-bar-dragger-active::before': {
+      background: 'var(--ant-control-item-bg-active)'
     }
-  }, '&-resizer-left', {
-    borderRight: "1px solid ".concat(token.colorBorderSecondary),
-    '&:hover': {
-      borderRight: "1px solid ".concat(token.colorBorderSecondary),
-      transition: 'border-right 0.2s ease-in-out'
-    }
-  }), '&-resizer-right', {
-    borderLeft: "1px solid ".concat(token.colorBorderSecondary),
-    '&:hover': {
-      borderLeft: "1px solid ".concat(token.colorBorderSecondary),
-      transition: 'border-right 0.2s ease-in-out'
-    }
-  }), '&-resizer.disabled', {
-    cursor: 'not-allowed'
-  }), '&-resizer.disabled:hover', {
-    borderColor: 'transparent'
-  })), "".concat(componentCls, "-vertical"), _defineProperty({}, "".concat(componentCls, "-outer"), _defineProperty(_defineProperty(_defineProperty(_defineProperty({
-    '&-resizer': _defineProperty(_defineProperty(_defineProperty(_defineProperty({
-      width: '100%',
-      height: 6
-    }, '&-left,&-right', {
-      top: 'auto',
-      left: '50%',
-      height: '16px !important',
-      width: '24px !important'
-    }), '&-left', {
-      transform: 'translate(-50%,-16px)'
-    }), '&-right', {
-      transform: 'translate(-50%, 6px)'
-    }), '&::after', {
-      left: 0,
-      top: 0,
-      bottom: 4,
-      right: 0
-    })
-  }, "&[data-resize-handle-state='hover']", _defineProperty(_defineProperty({}, '.vtx-split-pane-outer-resizer-left,.vtx-split-pane-outer-resizer-right', {
-    opacity: 1
-  }), '.vtx-split-pane-outer-resizer::after', {
-    background: "linear-gradient(to right , rgba(0,0,0,0), ".concat(token.colorSplit, ", rgba(0,0,0,0)) !important")
-  })), "&[data-resize-handle-state='active']", _defineProperty(_defineProperty({}, '.vtx-split-pane-outer-resizer-left,.vtx-split-pane-outer-resizer-right', {
-    opacity: 1
-  }), '.vtx-split-pane-outer-resizer::after', {
-    background: "linear-gradient(to right , rgba(0,0,0,0), ".concat(token.colorSplit, ", rgba(0,0,0,0)) !important")
-  })), "&[data-resize-handle-state='drag']", _defineProperty(_defineProperty({}, '.vtx-split-pane-outer-resizer-left,.vtx-split-pane-outer-resizer-right', {
-    opacity: 1
-  }), '.vtx-split-pane-outer-resizer::after', {
-    background: "linear-gradient(to right , rgba(0,0,0,0), ".concat(token.colorSplit, ", rgba(0,0,0,0)) !important")
-  })), "&[data-resize-handle-state='inactive']", {
-    backgroundColor: 'transparent'
-  })));
+  });
 };
 export function useStyle(prefixCls) {
   return useAntdStyle(prefixCls, function (token) {