@nutui/nutui-react 1.3.1 → 1.3.2-beta.0

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+## v1.3.1
+`2022-08-31`
+* :sparkles: feat: calendar 组件功能补齐、单元测试 (#228) @love_forever
+* :bug: fix: audio组件内部css覆盖range组件样式问题修复 (#254) @libin0824
+* :sparkles: chore: audio 组件增加 taro 文件 (#253) @libin0824
+* :sparkles: feat: 新增 ImagePreview、Dialog国际化&单元测试 (#244) @yangjinjun3
+* :sparkles: feat: 增加backtop、input、notify组件的单元测试 (#252) @vickyYe
+* :sparkles: feat: textarea 组件增加单元测试、优化自动伸缩高度功能 (#248) @vickyYe
+* :sparkles: chore: taro 版本构建不压缩，解决 banner 插入导致打出的文件报错 oasis-cloud
+* :sparkles: feat: 新增组件 Grid (#237) @yangxiaolu1993
+* :sparkles: chore: 导出组件的 props 类型 oasis-cloud
+* :sparkles: feat: 新增 audio 组件 (#250) @libin0824
+* :sparkles: feat: 新增 menu 组件 (#251) @oasis-cloud
+* :bug: fix: elevator 电梯楼层组件索引滚动后白屏 (#238) @mike8625
+* :sparkles: feat: SearchBar、ShortPassword 适配 Taro (#247) @xiaoyatong
+* :sparkles: feat: Picker、DatePicker、Address 组件添加国际化 (#236) @yangxiaolu1993
+* :sparkles: feat: 新增 cascader 组件 (#202) @ailululu
+* :sparkles: feat: 新增 swipe 组件 (#226) @Ymm
+* :sparkles: feat: range适配taro (#243) @xiaoyatong
+
 ## v1.3.0
 `2022-08-24`
 

package/dist/esm/ActionSheet.js

@@ -1,6 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["cancelTxt", "optionTag", "optionSubTag", "chooseTagValue", "title", "color", "description", "menuItems", "cancel", "choose", "visible", "className", "style"];
+var _excluded = ["children", "cancelTxt", "optionTag", "optionSubTag", "chooseTagValue", "title", "color", "description", "menuItems", "onCancel", "onChoose", "visible", "className", "style"];
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
@@ -19,8 +19,8 @@ var defaultProps = {
   color: '#ee0a24',
   description: '',
   menuItems: [],
-  cancel: function cancel() {},
-  choose: function choose() {},
+  onCancel: function onCancel() {},
+  onChoose: function onChoose() {},
   visible: false,
   className: '',
   style: {}
@@ -28,6 +28,7 @@ var defaultProps = {
 
 var ActionSheet = function ActionSheet(props) {
   var _defaultProps$props = _objectSpread(_objectSpread({}, defaultProps), props),
+      children = _defaultProps$props.children,
       cancelTxt = _defaultProps$props.cancelTxt,
       optionTag = _defaultProps$props.optionTag,
       optionSubTag = _defaultProps$props.optionSubTag,
@@ -36,8 +37,8 @@ var ActionSheet = function ActionSheet(props) {
       color = _defaultProps$props.color,
       description = _defaultProps$props.description,
       menuItems = _defaultProps$props.menuItems,
-      cancel = _defaultProps$props.cancel,
-      choose = _defaultProps$props.choose,
+      onCancel = _defaultProps$props.onCancel,
+      onChoose = _defaultProps$props.onChoose,
       visible = _defaultProps$props.visible,
       className = _defaultProps$props.className,
       style = _defaultProps$props.style,
@@ -50,12 +51,12 @@ var ActionSheet = function ActionSheet(props) {
   };
 
   var cancelActionSheet = function cancelActionSheet() {
-    cancel && cancel();
+    onCancel && onCancel();
   };
 
   var chooseItem = function chooseItem(item, index) {
     if (!item.disable) {
-      choose && choose(item, index);
+      onChoose && onChoose(item, index);
     }
   };
 
@@ -64,7 +65,7 @@ var ActionSheet = function ActionSheet(props) {
     visible: visible,
     position: "bottom",
     onClose: function onClose() {
-      cancel && cancel();
+      onCancel && onCancel();
     }
   }, React__default.createElement("div", _objectSpread({
     className: "".concat(b(), " ").concat(className),
@@ -88,7 +89,7 @@ var ActionSheet = function ActionSheet(props) {
     }, item[optionTag], React__default.createElement("div", {
       className: "subdesc"
     }, item[optionSubTag]));
-  })) : null, cancelTxt && React__default.createElement("div", {
+  })) : children, cancelTxt && React__default.createElement("div", {
     className: b('cancel'),
     onClick: function onClick() {
       return cancelActionSheet();

package/dist/esm/Address.js

@@ -430,7 +430,7 @@ var CustomRender = function CustomRender(props) {
   }, React__default.createElement(Elevator, {
     height: height,
     indexList: regionList[tabName[tabIndex]],
-    clickItem: handleElevatorItem
+    onClickItem: handleElevatorItem
   })));
 };
 

package/dist/esm/Badge.js

@@ -41,10 +41,10 @@ var Badge = function Badge(props) {
 
   var getStyle = function getStyle() {
     var style = {};
-    style.top = "".concat(top, "px");
-    style.right = "".concat(right, "px");
+    style.top = "".concat(Number(top) || parseFloat(top) || 0, "px");
+    style.right = "".concat(Number(right) || parseFloat(right) || 0, "px");
     style.zIndex = zIndex;
-    style.background = color;
+    style.backgroundColor = color;
     return style;
   };
 

package/dist/esm/ConfigProvider.js

@@ -130,6 +130,12 @@ var zhCN = {
     hour: '时',
     min: '分',
     seconds: '秒'
+  },
+  pullToRefresh: {
+    pullingText: '下拉刷新',
+    canReleaseText: '松开刷新',
+    refreshingText: '加载中...',
+    completeText: '刷新成功'
   }
 };
 var defaultProps = {

package/dist/esm/Elevator.js

@@ -1,13 +1,15 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["height", "acceptKey", "indexList", "isSticky", "spaceHeight", "titleHeight", "className", "clickItem", "clickIndex", "children"];
+var _excluded = ["height", "acceptKey", "indexList", "isSticky", "spaceHeight", "titleHeight", "className", "onClickItem", "onClickIndex", "children"];
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 import React__default, { createContext, useRef, useState, useEffect } from 'react';
+import { useGesture } from '@use-gesture/react';
+import { animated } from '@react-spring/web';
 import { c as cn } from './bem-893ad28d.js';
 import '@bem-react/classname';
 var elevatorContext = createContext({});
@@ -30,8 +32,8 @@ var Elevator = function Elevator(props) {
       spaceHeight = _defaultProps$props.spaceHeight,
       titleHeight = _defaultProps$props.titleHeight,
       className = _defaultProps$props.className,
-      clickItem = _defaultProps$props.clickItem,
-      clickIndex = _defaultProps$props.clickIndex,
+      onClickItem = _defaultProps$props.onClickItem,
+      onClickIndex = _defaultProps$props.onClickIndex,
       children = _defaultProps$props.children,
       rest = _objectWithoutProperties(_defaultProps$props, _excluded);
 
@@ -132,44 +134,39 @@ var Elevator = function Elevator(props) {
     }
   };
 
-  var touchMove = function touchMove(e) {
-    var firstTouch = e.touches[0];
-    touchState.current.y2 = firstTouch.pageY;
-    var delta = (touchState.current.y2 - touchState.current.y1) / spaceHeight || 0; // delta 是一个浮点数, 需要四舍五入一下, 否则页面会找不到最终计算后的index
-
-    var cacheIndex = state.current.anchorIndex + Math.ceil(delta);
-    setCodeIndex(cacheIndex);
-    scrollTo(cacheIndex);
-    e.preventDefault();
-  };
-
-  var touchEnd = function touchEnd() {
-    resetScrollState();
-  };
-
-  var touchStart = function touchStart(e) {
-    setScrollStart(true);
-    var index = Number(getData(e.target, 'index'));
-    var firstTouch = e.touches[0];
-    touchState.current.y1 = firstTouch.pageY;
-    state.current.anchorIndex = +index;
-    setCodeIndex(function (codeIndex) {
-      return codeIndex + index;
-    });
-    scrollTo(index);
-    var target = e.currentTarget;
-    target.removeEventListener('touchend', touchEnd, false);
-    target.addEventListener('touchend', touchEnd, false);
-  };
+  var bind = useGesture({
+    onDragStart: function onDragStart(_ref) {
+      var target = _ref.target,
+          offset = _ref.offset;
+      setScrollStart(true);
+      var index = Number(getData(target, 'index'));
+      touchState.current.y1 = offset[1];
+      state.current.anchorIndex = +index;
+      setCodeIndex(function (codeIndex) {
+        return codeIndex + index;
+      });
+      scrollTo(index);
+    },
+    onDragEnd: function onDragEnd(_ref2) {
+      var offset = _ref2.offset;
+      touchState.current.y2 = offset[1];
+      var delta = (touchState.current.y2 - touchState.current.y1) / spaceHeight || 0; // delta 是一个浮点数, 需要四舍五入一下, 否则页面会找不到最终计算后的index
+
+      var cacheIndex = state.current.anchorIndex + Math.ceil(delta);
+      setCodeIndex(cacheIndex);
+      scrollTo(cacheIndex);
+      resetScrollState();
+    }
+  });
 
   var handleClickItem = function handleClickItem(key, item) {
-    clickItem && clickItem(key, item);
+    onClickItem && onClickItem(key, item);
     setCurrentData(item);
     setCurrentKey(key);
   };
 
   var handleClickIndex = function handleClickIndex(key) {
-    clickIndex && clickIndex(key);
+    onClickIndex && onClickIndex(key);
   };
 
   var setListGroup = function setListGroup() {
@@ -231,17 +228,6 @@ var Elevator = function Elevator(props) {
     if (state.current.fixedTop === fixedTop) return;
     state.current.fixedTop = fixedTop;
   }, [state.current.diff, titleHeight]);
-  var refIndexBar = useRef(null); // 之前的代码, 手指在index条上下移动的时候, 下面的列表也会跟随滚动, 需要阻止默认事件
-  // 如果使用react的touchmove, 没有找到可以设置passive的选项, 无法阻止默认事件, 所以使用了原生的方法进行添加
-
-  useEffect(function () {
-    refIndexBar.current && refIndexBar.current.addEventListener('touchmove', touchMove, {
-      passive: false
-    });
-    return function () {
-      refIndexBar.current && refIndexBar.current.removeEventListener('touchmove', touchMove);
-    };
-  }, []);
   return React__default.createElement("div", _objectSpread({
     className: "".concat(b(), " ").concat(className)
   }, rest), isSticky && scrollY > 0 ? React__default.createElement("div", {
@@ -280,14 +266,14 @@ var Elevator = function Elevator(props) {
       current: true
     })
   }, indexList[codeIndex][acceptKey]) : null, React__default.createElement("div", {
-    ref: refIndexBar,
-    className: b('bars'),
-    onTouchStart: function onTouchStart(event) {
-      return touchStart(event);
-    }
-  }, React__default.createElement("div", {
+    className: b('bars')
+  }, React__default.createElement(animated.div, _objectSpread(_objectSpread({
     className: b('bars__inner')
-  }, indexList.map(function (item, index) {
+  }, bind()), {}, {
+    style: {
+      touchAction: 'pan-y'
+    }
+  }), indexList.map(function (item, index) {
     return React__default.createElement("div", {
       className: b('bars__inner__item', {
         active: item[acceptKey] === indexList[currentIndex][acceptKey]

package/dist/esm/Menu.js

@@ -8,7 +8,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-import React__default, { useRef, useEffect, useState } from 'react';
+import React__default, { useRef, useState, useEffect } from 'react';
 import classNames from 'classnames';
 import Icon from './Icon.js';
 var defaultProps = {
@@ -34,7 +34,22 @@ var Menu = function Menu(props) {
 
   var parentRef = useRef(null);
 
-  var onScroll = function onScroll() {};
+  var _useState = useState(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      isScrollFixed = _useState2[0],
+      setIsScrollFixed = _useState2[1];
+
+  var getScrollTop = function getScrollTop(el) {
+    return Math.max(0, 'scrollTop' in el ? el.scrollTop : el.pageYOffset);
+  };
+
+  var onScroll = function onScroll() {
+    var scrollFixed = props.scrollFixed;
+    var scrollTop = getScrollTop(window);
+    console.log(scrollTop);
+    var isFixed = scrollTop > (typeof scrollFixed === 'boolean' ? 30 : Number(scrollFixed));
+    setIsScrollFixed(isFixed);
+  };
 
   useEffect(function () {
     if (scrollFixed) {
@@ -46,15 +61,15 @@ var Menu = function Menu(props) {
     };
   }, []);
 
-  var _useState = useState([]),
-      _useState2 = _slicedToArray(_useState, 2),
-      itemShow = _useState2[0],
-      setItemShow = _useState2[1];
-
   var _useState3 = useState([]),
       _useState4 = _slicedToArray(_useState3, 2),
-      itemTitle = _useState4[0],
-      setItemTitle = _useState4[1];
+      itemShow = _useState4[0],
+      setItemShow = _useState4[1];
+
+  var _useState5 = useState([]),
+      _useState6 = _slicedToArray(_useState5, 2),
+      itemTitle = _useState6[0],
+      setItemTitle = _useState6[1];
 
   var toggleItemShow = function toggleItemShow(index) {
     itemShow[index] = !itemShow[index];
@@ -96,8 +111,9 @@ var Menu = function Menu(props) {
     });
   };
 
+  console.log('isScrollFixed', isScrollFixed);
   return React__default.createElement("div", _objectSpread(_objectSpread({
-    className: "nut-menu ".concat(className)
+    className: "nut-menu ".concat(className, " ").concat(isScrollFixed ? 'scroll-fixed' : '')
   }, rest), {}, {
     ref: parentRef
   }), React__default.createElement("div", {

package/dist/esm/NoticeBar.js

@@ -330,7 +330,7 @@ var NoticeBar = function NoticeBar(props) {
     className: "wrap"
   }, React__default.createElement("div", {
     ref: content,
-    className: "content ".concat(animationClass, " ").concat(isEllipsis() && 'nut-ellipsis'),
+    className: "content ".concat(animationClass, " ").concat(isEllipsis() ? 'nut-ellipsis' : ''),
     style: contentStyle,
     onAnimationEnd: onAnimationEnd
   }, children, text)), closeMode || rightIcon ? React__default.createElement("div", {

package/dist/esm/Picker.js

@@ -8,7 +8,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-import React__default, { useState, useRef, useEffect } from 'react';
+import React__default, { useState, useRef, useEffect, useImperativeHandle } from 'react';
 import Popup from './Popup.js';
 import { u as useTouch } from './useTouch-a2ea68c6.js';
 import { useConfig } from './ConfigProvider.js';
@@ -40,28 +40,40 @@ var InternalPickerSlot = function InternalPickerSlot(props, ref) {
       setCurrIndex = _useState2[1];
 
   var lineSpacing = 36;
+
+  var _useState3 = useState(0),
+      _useState4 = _slicedToArray(_useState3, 2),
+      touchTime = _useState4[0],
+      setTouchTime = _useState4[1];
+
+  var _useState5 = useState('0deg'),
+      _useState6 = _slicedToArray(_useState5, 2),
+      touchDeg = _useState6[0],
+      setTouchDeg = _useState6[1];
+
   var rotation = 20;
+  var moving = useRef(false);
   var timer;
   useRef(null);
   var rollerRef = useRef(null);
   var pickerSlotRef = useRef(null);
 
-  var _useState3 = useState(0),
-      _useState4 = _slicedToArray(_useState3, 2),
-      startTime = _useState4[0],
-      setStartTime = _useState4[1];
+  var _useState7 = useState(0),
+      _useState8 = _slicedToArray(_useState7, 2),
+      startTime = _useState8[0],
+      setStartTime = _useState8[1];
 
-  var _useState5 = useState(0),
-      _useState6 = _slicedToArray(_useState5, 2),
-      startY = _useState6[0],
-      setStartY = _useState6[1];
+  var _useState9 = useState(0),
+      _useState10 = _slicedToArray(_useState9, 2),
+      startY = _useState10[0],
+      setStartY = _useState10[1];
 
   var transformY = useRef(0);
 
-  var _useState7 = useState(0),
-      _useState8 = _slicedToArray(_useState7, 2),
-      scrollDistance = _useState8[0],
-      setScrollDistance = _useState8[1];
+  var _useState11 = useState(0),
+      _useState12 = _slicedToArray(_useState11, 2),
+      scrollDistance = _useState12[0],
+      setScrollDistance = _useState12[1];
 
   var isHidden = function isHidden(index) {
     if (index >= currIndex + 8 || index <= currIndex - 8) {
@@ -82,13 +94,8 @@ var InternalPickerSlot = function InternalPickerSlot(props, ref) {
       nTime = 0;
     }
 
-    if (threeDimensional) {
-      rollerRef.current.style.webkitTransform = "rotate3d(1, 0, 0, ".concat(deg, ")");
-    } else {
-      rollerRef.current.style.webkitTransform = "translate3d(0, ".concat(translateY, "px, 0)");
-    }
-
-    rollerRef.current.style.webkitTransition = "transform ".concat(nTime, "ms cubic-bezier(0.17, 0.89, 0.45, 1)");
+    setTouchTime(nTime);
+    setTouchDeg(deg);
     setScrollDistance(translateY);
   };
 
@@ -141,6 +148,7 @@ var InternalPickerSlot = function InternalPickerSlot(props, ref) {
     touch.move(event);
 
     if (touch.isVertical) {
+      moving.current = true;
       preventDefault(event, true);
     }
 
@@ -149,6 +157,7 @@ var InternalPickerSlot = function InternalPickerSlot(props, ref) {
   };
 
   var touchEnd = function touchEnd(event) {
+    if (!moving.current) return;
     var move = touch.deltaY - startY;
     var moveTime = Date.now() - startTime; // 区分是否为惯性滚动
 
@@ -161,6 +170,7 @@ var InternalPickerSlot = function InternalPickerSlot(props, ref) {
     }
 
     setTimeout(function () {
+      // moving.current = false
       touch.reset();
     }, 0);
   }; // 惯性滚动 距离
@@ -204,6 +214,8 @@ var InternalPickerSlot = function InternalPickerSlot(props, ref) {
 
 
   var stopMomentum = function stopMomentum() {
+    moving.current = false;
+    setTouchTime(0);
     setChooseValue(scrollDistance);
   }; // 阻止默认事件
 
@@ -219,6 +231,20 @@ var InternalPickerSlot = function InternalPickerSlot(props, ref) {
     }
   };
 
+  var touchRollerStyle = function touchRollerStyle() {
+    return {
+      transition: "transform ".concat(touchTime, "ms cubic-bezier(0.17, 0.89, 0.45, 1)"),
+      transform: "rotate3d(1, 0, 0, ".concat(touchDeg, ")")
+    };
+  };
+
+  var touchTileStyle = function touchTileStyle() {
+    return {
+      transition: "transform ".concat(touchTime, "ms cubic-bezier(0.17, 0.89, 0.45, 1)"),
+      transform: "translate3d(0, ".concat(scrollDistance, "px, 0)")
+    };
+  };
+
   useEffect(function () {
     setScrollDistance(0);
     transformY.current = 0;
@@ -227,6 +253,12 @@ var InternalPickerSlot = function InternalPickerSlot(props, ref) {
       clearTimeout(timer);
     };
   }, [listData]);
+  useImperativeHandle(ref, function () {
+    return {
+      stopMomentum: stopMomentum,
+      moving: moving.current
+    };
+  });
   return React__default.createElement("div", {
     className: "nut-picker-list",
     ref: pickerSlotRef,
@@ -236,6 +268,7 @@ var InternalPickerSlot = function InternalPickerSlot(props, ref) {
   }, React__default.createElement("div", {
     className: "nut-picker-roller",
     ref: rollerRef,
+    style: threeDimensional ? touchRollerStyle() : touchTileStyle(),
     onTransitionEnd: stopMomentum
   }, threeDimensional && listData.map(function (item, index) {
     return React__default.createElement("div", {
@@ -259,6 +292,19 @@ var InternalPickerSlot = function InternalPickerSlot(props, ref) {
 
 var PickerSlot = React__default.forwardRef(InternalPickerSlot);
 
+function useRefs() {
+  var refs = React__default.useRef([]);
+  var setRefs = React__default.useCallback(function (index) {
+    return function (el) {
+      if (el) refs.current[index] = el;
+    };
+  }, []);
+  var reset = React__default.useCallback(function () {
+    refs.current = [];
+  }, []);
+  return [refs.current, setRefs, reset];
+}
+
 var InternalPicker = function InternalPicker(props, ref) {
   var _useConfig = useConfig(),
       locale = _useConfig.locale;
@@ -278,27 +324,33 @@ var InternalPicker = function InternalPicker(props, ref) {
       swipeDuration = props.swipeDuration,
       rest = _objectWithoutProperties(props, _excluded);
 
-  var _useState9 = useState([]),
-      _useState10 = _slicedToArray(_useState9, 2),
-      chooseValueData = _useState10[0],
-      setchooseValueData = _useState10[1]; // 选择的数据的 value 值, 每一条数据的 value 值
+  var _useState13 = useState([]),
+      _useState14 = _slicedToArray(_useState13, 2),
+      chooseValueData = _useState14[0],
+      setchooseValueData = _useState14[1]; // 选择的数据的 value 值, 每一条数据的 value 值
 
 
-  var _useState11 = useState(0),
-      _useState12 = _slicedToArray(_useState11, 2),
-      columnIndex = _useState12[0],
-      setcolumnIndex = _useState12[1]; // 选中列
+  var _useState15 = useState(0),
+      _useState16 = _slicedToArray(_useState15, 2),
+      columnIndex = _useState16[0],
+      setcolumnIndex = _useState16[1]; // 选中列
 
 
   var pickerRef = useRef(null);
 
-  var _useState13 = useState([]),
-      _useState14 = _slicedToArray(_useState13, 2),
-      columnsList = _useState14[0],
-      setColumnsList = _useState14[1]; // 格式化后每一列的数据
+  var _useRefs = useRefs(),
+      _useRefs2 = _slicedToArray(_useRefs, 2),
+      refs = _useRefs2[0],
+      setRefs = _useRefs2[1];
+
+  var _useState17 = useState([]),
+      _useState18 = _slicedToArray(_useState17, 2),
+      columnsList = _useState18[0],
+      setColumnsList = _useState18[1]; // 格式化后每一列的数据
 
 
-  var b = cn('picker'); // 默认值修改
+  var b = cn('picker');
+  var isConfirmEvent = useRef(false); // 默认值修改
 
   useEffect(function () {
     if (defaultValueData && defaultValueData.length !== 0 && defaultValueData.toString() !== chooseValueData.toString()) {
@@ -310,7 +362,13 @@ var InternalPicker = function InternalPicker(props, ref) {
   }, [defaultValueData]); // 选中值进行修改
 
   useEffect(function () {
+    console.log('修改');
     onChange && onChange(columnIndex, chooseValueData, selectedOptions());
+
+    if (isConfirmEvent.current) {
+      isConfirmEvent.current = false;
+      onConfirm && onConfirm(chooseValueData, selectedOptions());
+    }
   }, [chooseValueData]); // 列表格式修改
 
   useEffect(function () {
@@ -324,8 +382,23 @@ var InternalPicker = function InternalPicker(props, ref) {
 
 
   var confirm = function confirm() {
-    onConfirm && onConfirm(chooseValueData, selectedOptions());
+    var movings = false;
+    refs.forEach(function (_ref) {
+      if (_ref.moving) movings = true;
+
+      _ref.stopMomentum();
+    });
+
+    if (movings) {
+      isConfirmEvent.current = true;
+    } else {
+      onConfirm && onConfirm(chooseValueData, selectedOptions());
+    }
+
     onClose && onClose(chooseValueData, selectedOptions());
+    setTimeout(function () {
+      isConfirmEvent.current = false;
+    }, 0);
   };
 
   var selectedOptions = function selectedOptions() {
@@ -464,6 +537,22 @@ var InternalPicker = function InternalPicker(props, ref) {
     }
   };
 
+  var renderToolbar = function renderToolbar() {
+    return React__default.createElement("div", {
+      className: b('control')
+    }, React__default.createElement("span", {
+      className: b('cancel-btn'),
+      onClick: function onClick() {
+        return closeActionSheet();
+      }
+    }, locale.cancel), React__default.createElement("div", {
+      className: b('title')
+    }, title || ''), React__default.createElement("span", {
+      className: b('confirm-btn'),
+      onClick: confirm
+    }, locale.confirm));
+  };
+
   return React__default.createElement(Popup, {
     visible: isVisible,
     position: "bottom",
@@ -473,25 +562,12 @@ var InternalPicker = function InternalPicker(props, ref) {
   }, React__default.createElement("div", _objectSpread({
     className: "".concat(b(), " ").concat(className || ''),
     style: style
-  }, rest), React__default.createElement("div", {
-    className: b('control')
-  }, React__default.createElement("span", {
-    className: b('cancel-btn'),
-    onClick: function onClick() {
-      return closeActionSheet();
-    }
-  }, locale.cancel), React__default.createElement("div", {
-    className: b('title')
-  }, title || ''), React__default.createElement("span", {
-    className: b('confirm-btn'),
-    onClick: function onClick() {
-      return confirm();
-    }
-  }, locale.confirm)), React__default.createElement("div", {
+  }, rest), renderToolbar(), React__default.createElement("div", {
     className: b('panel'),
     ref: pickerRef
   }, columnsList === null || columnsList === void 0 ? void 0 : columnsList.map(function (item, index) {
     return React__default.createElement(PickerSlot, {
+      ref: setRefs(index),
       defaultValue: chooseValueData === null || chooseValueData === void 0 ? void 0 : chooseValueData[index],
       listData: item,
       threeDimensional: threeDimensional,

package/dist/esm/PullToRefresh/style/index.js

@@ -0,0 +1,2 @@
+
+require('../../../packages/pulltorefresh/pulltorefresh.scss')