@nutui/nutui-react-taro 1.3.7 → 1.3.9-beta.0

package/dist/nutui.react.es.js

@@ -1,11 +1,11 @@
 /*!
-* @nutui/nutui-react-taro v1.3.7 Wed Oct 19 2022 16:59:16 GMT+0800 (中国标准时间)
+* @nutui/nutui-react-taro v1.3.9-beta.0 Wed Nov 02 2022 15:21:20 GMT+0800 (China Standard Time)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */
 import * as React from "react";
 import React__default, { useCallback, useState, useEffect, useRef, createContext as createContext$1, useContext as useContext$1, useImperativeHandle, useLayoutEffect, forwardRef, useMemo, memo, Component } from "react";
-import Taro, { eventCenter, getCurrentInstance, nextTick, useReady, createSelectorQuery } from "@tarojs/taro";
+import Taro, { usePageScroll, eventCenter, getCurrentInstance, nextTick, useReady, createSelectorQuery } from "@tarojs/taro";
 import ReactDOM, { createPortal, unstable_batchedUpdates } from "react-dom";
 function getAugmentedNamespace(n2) {
   if (n2.__esModule)
@@ -1484,12 +1484,15 @@ const defaultProps$1m = {
   iconSlot: null,
   linkSlot: null,
   click: (event) => {
+  },
+  onClick: (event) => {
   }
 };
 const Cell = (props) => {
   const {
     children,
     click,
+    onClick,
     title,
     subTitle,
     desc,
@@ -1516,6 +1519,7 @@ const Cell = (props) => {
   const history = useHistory();
   const handleClick2 = (event) => {
     click(event);
+    onClick(event);
     if (to2 && history) {
       history[replace ? "replace" : "push"](to2);
     } else if (url) {
@@ -1571,21 +1575,21 @@ Cell.displayName = "NutCell";
 const defaultProps$1l = {
   title: "",
   desc: "",
+  className: "",
   titleSlot: null,
-  descSlot: null,
-  classPrefix: "nutui-cell-group"
+  descSlot: null
 };
 const CellGroup = (props) => {
-  const { children, classPrefix, title, desc, titleSlot, descSlot } = {
+  const { children, className, title, desc, titleSlot, descSlot } = {
     ...defaultProps$1l,
     ...props
   };
   const b2 = cn("cell-group");
   return /* @__PURE__ */ React__default.createElement("div", {
-    className: b2(null, [classPrefix])
+    className: b2(null, [className])
   }, titleSlot || /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, title ? /* @__PURE__ */ React__default.createElement("div", {
     className: b2("title")
-  }, title) : null), descSlot || /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, title ? /* @__PURE__ */ React__default.createElement("div", {
+  }, title) : null), descSlot || /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, desc ? /* @__PURE__ */ React__default.createElement("div", {
     className: b2("desc")
   }, desc) : null), /* @__PURE__ */ React__default.createElement("div", {
     className: b2("wrap")
@@ -2718,6 +2722,7 @@ const GridItem = (props) => {
     direction,
     iconClassPrefix,
     iconFontClassName,
+    onClick,
     ...rest
   } = {
     ...defaultProps$1d,
@@ -2748,10 +2753,14 @@ const GridItem = (props) => {
   const isIconName = () => {
     return typeof icon === "string";
   };
+  const handleClick2 = (e2) => {
+    onClick && onClick(e2);
+  };
   return /* @__PURE__ */ React__default.createElement("div", {
     className: b2(),
     style: rootStyle(),
-    ...rest
+    ...rest,
+    onClick: handleClick2
   }, /* @__PURE__ */ React__default.createElement("div", {
     className: contentClass()
   }, icon && isIconName() ? /* @__PURE__ */ React__default.createElement(Icon$1, {
@@ -2993,6 +3002,8 @@ const defaultProps$19 = {
   className: "",
   style: {},
   tabSwitch: () => {
+  },
+  onSwitch: () => {
   }
 };
 const Tabbar = (props) => {
@@ -3006,7 +3017,8 @@ const Tabbar = (props) => {
     safeAreaInsetBottom,
     className,
     style,
-    tabSwitch
+    tabSwitch,
+    onSwitch
   } = {
     ...defaultProps$19,
     ...props
@@ -3038,6 +3050,7 @@ const Tabbar = (props) => {
       handleClick: () => {
         handleClick2(idx);
         tabSwitch(child, idx);
+        onSwitch(child, idx);
       }
     };
     return React__default.cloneElement(child, childProps);
@@ -3122,6 +3135,11 @@ const TabbarItem = (props) => {
     ])
   }, tabTitle)));
 };
+var index_cjs$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+  __proto__: null
+}, Symbol.toStringTag, { value: "Module" }));
+var require$$0 = /* @__PURE__ */ getAugmentedNamespace(index_cjs$1);
+var index_cjs = require$$0;
 const elevatorContext = createContext$1({});
 const defaultProps$17 = {
   height: "200px",
@@ -3192,7 +3210,7 @@ const Elevator = (props) => {
       const query = Taro.createSelectorQuery();
       query.selectAll(`.${className} .elevator__item__${i}`).boundingClientRect();
       query.exec((res) => {
-        height2 += res[0].height;
+        height2 += res[0][0].height;
         state.current.listHeight.push(height2);
       });
     }
@@ -3245,10 +3263,8 @@ const Elevator = (props) => {
     onClickIndex && onClickIndex(key);
   };
   const setListGroup = () => {
-    console.log(Taro.createSelectorQuery().selectAll(`.${className}`));
     if (listview.current) {
       Taro.createSelectorQuery().selectAll(`.${className} .nut-elevator__list__item`).node((el) => {
-        console.log(el, "el");
         state.current.listGroup = [...Object.keys(el)];
         calculateHeight();
       }).exec();
@@ -3276,7 +3292,9 @@ const Elevator = (props) => {
   };
   useEffect(() => {
     if (listview.current) {
-      setListGroup();
+      Taro.nextTick(() => {
+        setListGroup();
+      });
     }
   }, [listview]);
   useEffect(() => {
@@ -3291,7 +3309,6 @@ const Elevator = (props) => {
       return;
     state.current.fixedTop = fixedTop;
   }, [state.current.diff, titleHeight]);
-  console.log(currentIndex, "currentIndex");
   return /* @__PURE__ */ React__default.createElement("div", {
     className: `${b2()} ${className} `,
     ...rest
@@ -3302,12 +3319,15 @@ const Elevator = (props) => {
   }, indexList[currentIndex][acceptKey])) : null, /* @__PURE__ */ React__default.createElement("div", {
     className: b2("list"),
     style: { height: Number.isNaN(+height) ? height : `${height}px` }
-  }, /* @__PURE__ */ React__default.createElement("div", {
+  }, /* @__PURE__ */ React__default.createElement(index_cjs.ScrollView, {
+    scrollTop,
+    scrollY: true,
     className: b2("list__inner"),
-    ref: listview
+    ref: listview,
+    onScroll: listViewScroll
   }, indexList.map((item, idx) => {
     return /* @__PURE__ */ React__default.createElement("div", {
-      className: b2("list__item"),
+      className: `${b2("list__item")} elevator__item__${idx}`,
       key: idx
     }, /* @__PURE__ */ React__default.createElement("div", {
       className: b2("list__item__code")
@@ -3331,13 +3351,12 @@ const Elevator = (props) => {
     onTouchStart: (event) => touchStart(event),
     onTouchMove: (event) => touchMove(event),
     onTouchEnd: touchEnd,
-    style: { touchAction: "pan-y" },
-    onScroll: listViewScroll
+    style: { touchAction: "pan-y" }
   }, indexList.map((item, index) => {
     return /* @__PURE__ */ React__default.createElement("div", {
       className: `${b2("bars__inner__item", {
         active: item[acceptKey] === indexList[currentIndex][acceptKey]
-      })} elevator__item__${index}`,
+      })} `,
       "data-index": index,
       key: index,
       onClick: () => handleClickIndex(item[acceptKey])
@@ -3492,6 +3511,7 @@ class Title {
 }
 const defaultProps$15 = {
   ...ComponentDefaults,
+  tabStyle: {},
   value: 0,
   color: "",
   background: "",
@@ -3511,6 +3531,7 @@ const Tabs = (props) => {
   const {
     value,
     color,
+    tabStyle,
     background,
     direction,
     type,
@@ -3592,7 +3613,7 @@ const Tabs = (props) => {
     ...rest
   }, /* @__PURE__ */ React__default.createElement("div", {
     className: classesTitle,
-    style: { background }
+    style: { ...tabStyle, background }
   }, !!titleNode && typeof titleNode === "function" ? titleNode() : titles.current.map((item, index2) => {
     return /* @__PURE__ */ React__default.createElement("div", {
       style: titleStyle,
@@ -3625,6 +3646,8 @@ const Tabs = (props) => {
       )
     }, item.title));
   })), /* @__PURE__ */ React__default.createElement("div", {
+    className: `${b2("")}__content__wrap`
+  }, /* @__PURE__ */ React__default.createElement("div", {
     className: `${b2("")}__content`,
     style: contentStyle
   }, React__default.Children.map(children, (child, idx) => {
@@ -3643,7 +3666,7 @@ const Tabs = (props) => {
       };
     }
     return React__default.cloneElement(child, childProps);
-  })));
+  }))));
 };
 Tabs.defaultProps = defaultProps$15;
 Tabs.displayName = "NutTabs";
@@ -3654,7 +3677,7 @@ const defaultProps$14 = {
   disabled: false
 };
 const TabPane = (props) => {
-  const { children, paneKey, activeKey, autoHeightClassName } = {
+  const { children, paneKey, activeKey, autoHeightClassName, className } = {
     ...defaultProps$14,
     ...props
   };
@@ -3664,7 +3687,8 @@ const TabPane = (props) => {
       active: paneKey === activeKey
     },
     b2(""),
-    autoHeightClassName
+    autoHeightClassName,
+    className
   );
   return /* @__PURE__ */ React__default.createElement("div", {
     className: classes
@@ -3755,7 +3779,7 @@ const SideNavBar = (props) => {
     children,
     className,
     showhead,
-    handleClose,
+    onClose,
     ...rest
   } = {
     ...defaultProps$12,
@@ -3766,7 +3790,7 @@ const SideNavBar = (props) => {
     visible,
     style: { width, height: "100%" },
     position,
-    onClose: handleClose
+    onClose
   }, /* @__PURE__ */ React__default.createElement("div", {
     className: className ? `${className} nut-sidenavbar` : "nut-sidenavbar",
     ...rest
@@ -3792,7 +3816,7 @@ const defaultProps$11 = {
   open: true
 };
 const SubSideNavBar = (props) => {
-  const { title, ikey, children, titleClick, open, ...rest } = {
+  const { title, ikey, children, onClick, open, ...rest } = {
     ...defaultProps$11,
     ...props
   };
@@ -3829,7 +3853,7 @@ const SubSideNavBar = (props) => {
     handleClick(e2);
     const currentClass = e2.currentTarget.className;
     const isShow = currentClass.includes("nutShow");
-    titleClick && titleClick({ title, ikey, isShow });
+    onClick && onClick({ title, ikey, isShow });
   };
   useEffect(() => {
     var _a, _b;
@@ -3853,10 +3877,10 @@ const SubSideNavBar = (props) => {
   }, children));
 };
 const SideNavBarItem = (props) => {
-  const { title, ikey, children, click, ...rest } = props;
+  const { title, ikey, children, onClick, ...rest } = props;
   const clickFn = (e2) => {
     e2.stopPropagation();
-    click && click({ title, ikey });
+    onClick && onClick({ title, ikey });
   };
   return /* @__PURE__ */ React__default.createElement("div", {
     className: "nut-subsidenavbar__item border-bt",
@@ -4437,7 +4461,10 @@ const Range = (props) => {
     marks,
     change,
     dragStart,
-    dragEnd
+    dragEnd,
+    onChange,
+    onDragStart,
+    onDragEnd
   } = { ...defaultProps$Y, ...props };
   let { min, max, step } = { ...defaultProps$Y, ...props };
   min = Number(min);
@@ -4607,6 +4634,7 @@ const Range = (props) => {
     }
     if ((marks || end) && !isSameValue(value, startValue)) {
       change && change(value);
+      onChange && onChange(value);
     }
   };
   const click = async (event) => {
@@ -4654,6 +4682,7 @@ const Range = (props) => {
     }
     if (dragStatus === "start") {
       dragStart && dragStart();
+      onDragStart && onDragStart();
     }
     touch.move(event);
     SetDragStatus("draging");
@@ -4680,6 +4709,7 @@ const Range = (props) => {
     if (dragStatus === "draging") {
       updateValue(currentValue, true);
       dragEnd && dragEnd();
+      onDragEnd && onDragEnd();
     }
     SetDragStatus("");
   };
@@ -6069,6 +6099,7 @@ const DatePicker = (props) => {
     onCloseDatePicker,
     onConfirmDatePicker,
     filter,
+    onChange,
     threeDimensional,
     className,
     style,
@@ -6234,7 +6265,7 @@ const DatePicker = (props) => {
       const isEqual2 = (currentDate == null ? void 0 : currentDate.getTime()) === (date == null ? void 0 : date.getTime());
       date && isDate(date) && !isEqual2 && setCurrentDate(formatValue(date));
     }
-    props.onChangeDatePicker && props.onChangeDatePicker(index, selectedValue, cacheValueData);
+    props.onChange && props.onChange(index, selectedValue, cacheValueData);
   };
   const padZero = (num, targetLength = 2) => {
     let str = `${num}`;
@@ -6378,6 +6409,12 @@ const InputNumber = (props) => {
     overlimit,
     blur,
     focus,
+    onAdd,
+    onReduce,
+    onOverlimit,
+    onBlurFuc,
+    onFocus,
+    onChangeFuc,
     iconClassPrefix,
     iconFontClassName,
     ...restProps
@@ -6418,6 +6455,7 @@ const InputNumber = (props) => {
   };
   const emitChange = (value, e2) => {
     const outputValue = fixedDecimalPlaces(value);
+    onChangeFuc && onChangeFuc(outputValue, e2);
     change && change(outputValue, e2);
     if (!isAsync) {
       if (Number(outputValue) < Number(min)) {
@@ -6430,26 +6468,31 @@ const InputNumber = (props) => {
     }
   };
   const reduceNumber = (e2) => {
+    onReduce && onReduce(e2);
     reduce && reduce(e2);
     if (reduceAllow()) {
       const outputValue = Number(inputValue) - Number(step);
       emitChange(outputValue, e2);
     } else {
+      onOverlimit && onOverlimit(e2);
       overlimit && overlimit(e2);
     }
   };
   const addNumber = (e2) => {
+    onAdd && onAdd(e2);
     add && add(e2);
     if (addAllow()) {
       const outputValue = Number(inputValue) + Number(step);
       emitChange(outputValue, e2);
     } else {
+      onOverlimit && onOverlimit(e2);
       overlimit && overlimit(e2);
     }
   };
   const changeValue = (e2) => {
     const value = Number(e2.detail.value);
     change && change(value, e2);
+    onChangeFuc && onChangeFuc(value, e2);
     if (!isAsync) {
       if (Number.isNaN(value)) {
         setInputValue(inputValue);
@@ -6463,6 +6506,7 @@ const InputNumber = (props) => {
       return;
     if (readonly)
       return;
+    onFocus && onFocus(e2);
     focus && focus(e2);
   };
   const burValue = (e2) => {
@@ -6477,6 +6521,7 @@ const InputNumber = (props) => {
       value = Number(max);
     }
     emitChange(value, e2);
+    onBlurFuc && onBlurFuc(e2);
     blur && blur(e2);
   };
   return /* @__PURE__ */ React__default.createElement("div", {
@@ -6609,12 +6654,20 @@ const Input = (props) => {
     rows,
     slotButton,
     slotInput,
+    onChange,
+    onBlur,
+    onFocus,
+    onClear,
+    formatter,
+    keypress,
+    onClickInput,
+    onClickLeftIcon,
+    onClickRightIcon,
+    onClick,
     change,
     blur,
     focus,
     clear,
-    formatter,
-    keypress,
     clickInput,
     clickLeftIcon,
     clickRightIcon,
@@ -6680,20 +6733,22 @@ const Input = (props) => {
     }
     SetInputValue(val);
   };
-  const onFocus = (event) => {
+  const handleFocus = (event) => {
     const val = event.target.value;
     SetActive(true);
+    onFocus && onFocus(val, event);
     focus && focus(val, event);
   };
-  const onInput = (event) => {
+  const handleInput = (event) => {
     let val = event.target.value;
     if (maxlength && val.length > Number(maxlength)) {
       val = val.slice(0, Number(maxlength));
     }
     updateValue(val);
+    onChange && onChange(val, event);
     change && change(val, event);
   };
-  const onBlur = (event) => {
+  const handleBlur = (event) => {
     setTimeout(() => {
       SetActive(false);
     }, 200);
@@ -6702,15 +6757,19 @@ const Input = (props) => {
       val = val.slice(0, Number(maxlength));
     }
     updateValue(getModelValue(), "onBlur");
+    onBlur && onBlur(val, event);
     blur && blur(val, event);
   };
-  const onClickInput = (event) => {
+  const handleClickInput = (event) => {
+    onClickInput && onClickInput(event);
     clickInput && clickInput(event);
   };
-  const onClickLeftIcon = (event) => {
+  const handleClickLeftIcon = (event) => {
+    onClickLeftIcon && onClickLeftIcon(event);
     clickLeftIcon && clickLeftIcon(event);
   };
-  const onClickRightIcon = (event) => {
+  const handleClickRightIcon = (event) => {
+    onClickRightIcon && onClickRightIcon(event);
     clickRightIcon && clickRightIcon(event);
   };
   const resetValidation = () => {
@@ -6726,6 +6785,7 @@ const Input = (props) => {
   };
   const handleClear = (event) => {
     updateValue("");
+    onClear && onClear("", event);
     clear && clear("", event);
   };
   return /* @__PURE__ */ React__default.createElement("div", {
@@ -6733,41 +6793,42 @@ const Input = (props) => {
     style,
     ...rest,
     onClick: (e2) => {
+      onClick && onClick(e2);
       click && click(e2);
     }
-  }, slotInput ? /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, /* @__PURE__ */ React__default.createElement("div", {
+  }, slotInput ? /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, label ? /* @__PURE__ */ React__default.createElement("div", {
     className: `nut-input-label ${labelClass}`,
     style: { width: `${labelWidth}px`, textAlign: labelAlign }
   }, /* @__PURE__ */ React__default.createElement("div", {
     className: "label-string"
-  }, label, colon ? ":" : "")), /* @__PURE__ */ React__default.createElement("div", {
+  }, label, colon ? ":" : "")) : null, /* @__PURE__ */ React__default.createElement("div", {
     className: "nut-input-value"
   }, /* @__PURE__ */ React__default.createElement("div", {
     className: "nut-input-inner",
     onClick: (e2) => {
-      onClickInput(e2);
+      handleClickInput(e2);
     }
   }, slotInput))) : /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, leftIcon && leftIcon.length > 0 ? /* @__PURE__ */ React__default.createElement("div", {
     className: "nut-input-left-icon",
     onClick: (e2) => {
-      onClickLeftIcon(e2);
+      handleClickLeftIcon(e2);
     }
   }, /* @__PURE__ */ React__default.createElement(Icon$1, {
     classPrefix: iconClassPrefix,
     fontClassName: iconFontClassName,
     name: leftIcon,
     size: leftIconSize
-  })) : null, /* @__PURE__ */ React__default.createElement("div", {
+  })) : null, label ? /* @__PURE__ */ React__default.createElement("div", {
     className: `nut-input-label ${labelClass}`,
     style: { width: `${labelWidth}px`, textAlign: labelAlign }
   }, /* @__PURE__ */ React__default.createElement("div", {
     className: "label-string"
-  }, label, colon ? ":" : "")), /* @__PURE__ */ React__default.createElement("div", {
+  }, label, colon ? ":" : "")) : null, /* @__PURE__ */ React__default.createElement("div", {
     className: "nut-input-value"
   }, /* @__PURE__ */ React__default.createElement("div", {
     className: "nut-input-inner",
     onClick: (e2) => {
-      onClickInput(e2);
+      handleClickInput(e2);
     }
   }, type === "textarea" ? /* @__PURE__ */ React__default.createElement("textarea", {
     className: "input-text",
@@ -6783,13 +6844,13 @@ const Input = (props) => {
     value: inputValue,
     autoFocus: autofocus,
     onBlur: (e2) => {
-      onBlur(e2);
+      handleBlur(e2);
     },
     onFocus: (e2) => {
-      onFocus(e2);
+      handleFocus(e2);
     },
     onInput: (e2) => {
-      onInput(e2);
+      handleInput(e2);
     }
   }) : /* @__PURE__ */ React__default.createElement("input", {
     className: "input-text",
@@ -6803,13 +6864,13 @@ const Input = (props) => {
     value: inputValue,
     autoFocus: autofocus,
     onBlur: (e2) => {
-      onBlur(e2);
+      handleBlur(e2);
     },
     onFocus: (e2) => {
-      onFocus(e2);
+      handleFocus(e2);
     },
     onInput: (e2) => {
-      onInput(e2);
+      handleInput(e2);
     }
   }), clearable && !readonly && active && inputValue.length > 0 ? /* @__PURE__ */ React__default.createElement(Icon$1, {
     classPrefix: iconClassPrefix,
@@ -6823,7 +6884,7 @@ const Input = (props) => {
   }) : null, rightIcon && rightIcon.length > 0 ? /* @__PURE__ */ React__default.createElement("div", {
     className: "nut-input-right-icon",
     onClick: (e2) => {
-      onClickRightIcon(e2);
+      handleClickRightIcon(e2);
     }
   }, /* @__PURE__ */ React__default.createElement(Icon$1, {
     classPrefix: iconClassPrefix,
@@ -7921,7 +7982,7 @@ const InternalUploader = (props, ref) => {
       classPrefix: props.iconClassPrefix,
       fontClassName: props.iconFontClassName,
       name: "link"
-    }), "\xA0", item.name), /* @__PURE__ */ React__default.createElement(Icon$1, {
+    }), "\xA0", item.name), isDeletable && /* @__PURE__ */ React__default.createElement(Icon$1, {
       classPrefix: props.iconClassPrefix,
       fontClassName: props.iconFontClassName,
       color: "#808080",
@@ -8960,80 +9021,23 @@ const BackTop = (props) => {
     ...props
   };
   const [backTop, SetBackTop] = useState(false);
-  const [scrollTop, SetScrollTop] = useState(0);
-  let startTime = 0;
-  const scrollEl = useRef(null);
-  useEffect(() => {
-    init();
-    return () => removeEventListener();
-  }, []);
-  const init = () => {
-    if (elId && document.getElementById(elId)) {
-      scrollEl.current = document.getElementById(elId);
-    }
-    addEventListener();
-    initCancelAniFrame();
-  };
-  const scrollListener = () => {
-    let top = null;
-    if (scrollEl.current instanceof Window) {
-      top = scrollEl.current.pageYOffset;
-      SetScrollTop(top);
-    } else {
-      top = scrollEl.current.scrollTop;
-      SetScrollTop(top);
-    }
-    const showBtn = top >= distance;
-    SetBackTop(showBtn);
-  };
-  const scroll = (y2 = 0) => {
-    if (scrollEl.current instanceof Window) {
-      window.scrollTo(0, y2);
-    } else {
-      scrollEl.current.scrollTop = y2;
-    }
-  };
-  const scrollAnimation = () => {
-    let cid = requestAniFrame2()(function fn() {
-      const t2 = duration - Math.max(0, startTime - +new Date() + duration / 2);
-      const y2 = t2 * -scrollTop / duration + scrollTop;
-      scroll(y2);
-      cid = requestAniFrame2()(fn);
-      if (t2 === duration || y2 === 0) {
-        window.cancelAnimationFrame(cid);
-      }
-    });
-  };
-  const initCancelAniFrame = () => {
-    window.cancelAnimationFrame = window.webkitCancelAnimationFrame;
-  };
-  const requestAniFrame2 = () => {
-    return window.requestAnimationFrame || window.webkitRequestAnimationFrame || window.mozRequestAnimationFrame || function(callback) {
-      window.setTimeout(callback, 1e3 / 60);
-    };
-  };
-  function addEventListener() {
-    var _a, _b;
-    (_a = scrollEl.current) == null ? void 0 : _a.addEventListener("scroll", scrollListener, false);
-    (_b = scrollEl.current) == null ? void 0 : _b.addEventListener("resize", scrollListener, false);
-  }
-  function removeEventListener() {
-    var _a, _b;
-    (_a = scrollEl.current) == null ? void 0 : _a.removeEventListener("scroll", scrollListener, false);
-    (_b = scrollEl.current) == null ? void 0 : _b.removeEventListener("resize", scrollListener, false);
-  }
+  usePageScroll((res) => {
+    const { scrollTop } = res;
+    scrollTop >= distance ? SetBackTop(true) : SetBackTop(false);
+  });
   const goTop = (e2) => {
     onClick && onClick(e2);
-    const otime = +new Date();
-    startTime = otime;
-    isAnimation && duration > 0 ? scrollAnimation() : scroll();
+    Taro.pageScrollTo({
+      scrollTop: 0,
+      duration: isAnimation && duration > 0 ? duration : 0
+    });
   };
   const backTopClass = {
     right: `${right}px`,
     bottom: `${bottom}px`,
     zIndex
   };
-  return /* @__PURE__ */ React__default.createElement("div", {
+  return /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, /* @__PURE__ */ React__default.createElement("div", {
     className: `nut-backtop ${backTop ? "show" : ""} ${className || ""}`,
     style: { ...backTopClass, ...style },
     onClick: (e2) => {
@@ -9045,7 +9049,7 @@ const BackTop = (props) => {
     size: "19px",
     className: "nut-backtop-main",
     name: "top"
-  }));
+  })));
 };
 BackTop.defaultProps = defaultProps$E;
 BackTop.displayName = "NutBackTop";
@@ -9334,11 +9338,6 @@ const BaseDialog = (props, ref) => {
 const Dialog = forwardRef(BaseDialog);
 Dialog.defaultProps = defaultProps$C;
 Dialog.displayName = "NutDialog";
-var index_cjs$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
-  __proto__: null
-}, Symbol.toStringTag, { value: "Module" }));
-var require$$0 = /* @__PURE__ */ getAugmentedNamespace(index_cjs$1);
-var index_cjs = require$$0;
 const defaultProps$B = {
   ...ComponentDefaults,
   hasMore: true,
@@ -9623,7 +9622,7 @@ const Switch = (props) => {
     inactiveColor,
     activeText,
     inactiveText,
-    change,
+    onChange,
     className,
     style
   } = {
@@ -9651,7 +9650,7 @@ const Switch = (props) => {
     if (!isAsync) {
       setValue(!value);
     }
-    change && change(!value, event);
+    onChange && onChange(!value, event);
   };
   return /* @__PURE__ */ React__default.createElement("div", {
     className: classes(),
@@ -14687,6 +14686,8 @@ const NoticeBar = (props) => {
     rightIcon,
     close,
     click,
+    onClose,
+    onClick,
     iconClassPrefix,
     iconFontClassName
   } = {
@@ -14774,11 +14775,13 @@ const NoticeBar = (props) => {
   };
   const handleClick2 = (event) => {
     click && click(event);
+    onClick && onClick(event);
   };
   const onClickIcon = (event) => {
     event.stopPropagation();
     SetShowNoticeBar(!closeMode);
     close && close(event);
+    onClose && onClose(event);
   };
   const onAnimationEnd = () => {
     SetFirstRound(false);
@@ -14828,9 +14831,11 @@ const NoticeBar = (props) => {
   };
   const go = (item) => {
     click && click(item);
+    onClick && onClick(item);
   };
   const handleClickIcon = () => {
     close && close(scrollList[0]);
+    onClose && onClose(scrollList[0]);
   };
   const iconShow = () => {
     if (leftIcon === "close") {
@@ -14956,6 +14961,7 @@ const Steps = (props) => {
     className,
     progressDot,
     clickStep,
+    onClickStep,
     ...restProps
   } = propSteps;
   const parentSteps = {
@@ -15019,10 +15025,9 @@ const Step = (props) => {
     return index === +parent.propSteps.current ? "process" : "wait";
   };
   const handleClickStep = () => {
-    var _a, _b;
-    if ((_a = parent.propSteps) == null ? void 0 : _a.clickStep) {
-      (_b = parent.propSteps) == null ? void 0 : _b.clickStep(activeIndex);
-    }
+    var _a, _b, _c, _d;
+    ((_a = parent.propSteps) == null ? void 0 : _a.onClickStep) && ((_b = parent.propSteps) == null ? void 0 : _b.onClickStep(activeIndex));
+    ((_c = parent.propSteps) == null ? void 0 : _c.clickStep) && ((_d = parent.propSteps) == null ? void 0 : _d.clickStep(activeIndex));
   };
   const b2 = cn("step");
   const classes = classNames(
@@ -15565,6 +15570,7 @@ const Avatar = (props) => {
     className,
     style,
     activeAvatar,
+    onActiveAvatar,
     onError,
     iconClassPrefix,
     iconFontClassName,
@@ -15627,9 +15633,8 @@ const Avatar = (props) => {
     }
   };
   const clickAvatar = (e2) => {
-    if (props.activeAvatar) {
-      props.activeAvatar(e2);
-    }
+    activeAvatar && activeAvatar(e2);
+    onActiveAvatar && onActiveAvatar(e2);
   };
   console.log(
     "!parent?.propAvatarGroup?.maxCount",
@@ -16434,6 +16439,8 @@ function areEqual(prevProps, nextProps) {
 const Collapse = memo(
   (props) => {
     const {
+      className,
+      style,
       children,
       activeName,
       accordion,
@@ -16441,7 +16448,7 @@ const Collapse = memo(
       rotate,
       iconSize,
       iconColor,
-      change
+      onChange
     } = {
       ...defaultProps$i,
       ...props
@@ -16483,10 +16490,11 @@ const Collapse = memo(
         }
       }
       setDefaultOpenIndex(newOpenIndex);
-      change && change(!isOpen, name);
+      onChange && onChange(!isOpen, name);
     };
     return /* @__PURE__ */ React__default.createElement("div", {
-      className: colBem()
+      className: `${colBem()} ${className}`,
+      style
     }, childrenDom.map((item) => {
       return React__default.cloneElement(item, {
         isOpen: defaultOpenIndex.includes(item.props.name),
@@ -16916,6 +16924,7 @@ const VirtualList = (props) => {
     overscan = 2,
     key,
     handleScroll,
+    onScroll,
     className,
     containerSize,
     ...rest
@@ -16982,7 +16991,7 @@ const VirtualList = (props) => {
     const totalSize = getListTotalSize(positions, horizontal);
     setListTotalSize(totalSize);
   }, [positions, sizeKey, horizontal]);
-  const onScroll = useCallback(() => {
+  const scroll = useCallback(() => {
     requestAnimationFrame((e2) => {
       const scrollSize = getElement()[scrollKey];
       const startIndex = binarySearch(positions, scrollSize, horizontal);
@@ -17003,7 +17012,11 @@ const VirtualList = (props) => {
       const startOffset = positions[startIndex][offsetKey];
       setOptions({ startOffset, startIndex, overStart, endIndex });
       if (endIndex > sourceData.length - 1) {
-        handleScroll && handleScroll();
+        if (onScroll) {
+          onScroll();
+        } else if (handleScroll) {
+          handleScroll();
+        }
       }
     });
   }, [
@@ -17023,11 +17036,11 @@ const VirtualList = (props) => {
   ]);
   useEffect(() => {
     const element = getElement();
-    element.addEventListener("scroll", onScroll, false);
+    element.addEventListener("scroll", scroll, false);
     return () => {
-      element.removeEventListener("scroll", onScroll, false);
+      element.removeEventListener("scroll", scroll, false);
     };
-  }, [getElement, onScroll]);
+  }, [getElement, scroll]);
   return /* @__PURE__ */ React__default.createElement("div", {
     className: className ? `${className} nut-virtualList-box` : "nut-virtualList-box",
     ...rest,
@@ -17217,6 +17230,9 @@ const Video = (props) => {
     play,
     pause,
     playend,
+    onPlayFuc,
+    onPauseFuc,
+    onPlayend,
     ...restProps
   } = {
     ...defaultProps$b,
@@ -17243,13 +17259,16 @@ const Video = (props) => {
         videoRef.setAttribute("x5-video-player-fullscreen", "false");
       }
       videoRef.addEventListener("play", () => {
+        onPlayFuc && onPlayFuc(videoRef);
         play && play(videoRef);
       });
       videoRef.addEventListener("pause", () => {
+        onPauseFuc && onPauseFuc(videoRef);
         pause && pause(videoRef);
       });
       videoRef.addEventListener("ended", () => {
         videoRef.currentTime = 0;
+        onPlayend && onPlayend(videoRef);
         playend && playend(videoRef);
       });
     }
@@ -18318,6 +18337,10 @@ const Signature = (props) => {
     strokeStyle,
     unSupportTpl,
     className,
+    confirm,
+    clear,
+    onConfirm,
+    onClear,
     ...rest
   } = {
     ...defaultProps$4,
@@ -18347,14 +18370,15 @@ const Signature = (props) => {
   const endEventHandler = (event) => {
     event.preventDefault();
   };
-  const clear = () => {
+  const handleClearBtn = () => {
     if (ctx2.current) {
       ctx2.current.clearRect(0, 0, canvasWidth, canvasHeight);
       ctx2.current.closePath();
     }
-    props.clear && props.clear();
+    clear && clear();
+    onClear && onClear();
   };
-  const confirm = () => {
+  const handleConfirmBtn = () => {
     onSave();
   };
   const onSave = () => {
@@ -18366,8 +18390,9 @@ const Signature = (props) => {
         canvas: res[0].node,
         fileType: props.type,
         success: (res2) => {
-          clear();
-          props.confirm && props.confirm(res2.tempFilePath);
+          handleClearBtn();
+          confirm && confirm(res2.tempFilePath);
+          onConfirm && onConfirm(res2.tempFilePath);
         },
         fail: (res2) => {
           console.log("\u4FDD\u5B58\u5931\u8D25");
@@ -18416,11 +18441,11 @@ const Signature = (props) => {
   })), /* @__PURE__ */ React__default.createElement(Button, {
     className: `${b2("btn")}`,
     type: "default",
-    onClick: () => clear()
+    onClick: () => handleClearBtn()
   }, locale.signature.reSign), /* @__PURE__ */ React__default.createElement(Button, {
     className: `${b2("btn")}`,
     type: "primary",
-    onClick: () => confirm()
+    onClick: () => handleConfirmBtn()
   }, locale.confirm));
 };
 Signature.defaultProps = defaultProps$4;
@@ -18547,6 +18572,7 @@ TimeDetail.defaultProps = defaultProps$1;
 TimeDetail.displayName = "NutTimeDetail";
 const defaultProps = {
   className: "",
+  style: {},
   visible: false,
   height: "20%",
   multiple: false,
@@ -18559,7 +18585,6 @@ const defaultProps = {
 const TimeSelect = (props) => {
   useConfig$1();
   const {
-    children,
     visible,
     className,
     height,
@@ -18571,7 +18596,10 @@ const TimeSelect = (props) => {
     multiple,
     select,
     pannelChange,
-    timeChange
+    timeChange,
+    onSelect,
+    onPannelChange,
+    onTimeChange
   } = {
     ...defaultProps,
     ...props
@@ -18592,7 +18620,11 @@ const TimeSelect = (props) => {
   };
   const b2 = cn("timeselect");
   const closeFun = () => {
-    select && select(activeTime);
+    if (onSelect) {
+      onSelect(activeTime);
+    } else if (select) {
+      select(activeTime);
+    }
   };
   const handleSelectTime = (time) => {
     let curTimeData = {};
@@ -18615,7 +18647,11 @@ const TimeSelect = (props) => {
     const resultTimeData = [...activeTime];
     resultTimeData.splice(curIndex, 1, curTimeData);
     setActiveTime(resultTimeData);
-    timeChange && timeChange(time, resultTimeData);
+    if (onTimeChange) {
+      onTimeChange(time, resultTimeData);
+    } else if (timeChange) {
+      timeChange(time, resultTimeData);
+    }
   };
   const handleChange = (pannelKey) => {
     const resultTimeData = [...activeTime];
@@ -18641,7 +18677,11 @@ const TimeSelect = (props) => {
         ]);
       }
     }
-    pannelChange && pannelChange(pannelKey, resultTimeData);
+    if (onPannelChange) {
+      onPannelChange(pannelKey, resultTimeData);
+    } else if (pannelChange) {
+      pannelChange(pannelKey, resultTimeData);
+    }
   };
   const getTimePannelClass = (dataItem) => {
     if (String(dataItem["pannel-key"]) === String(activeKey)) {