@nutui/nutui-react-taro 2.0.0-alpha.12 → 2.0.0-alpha.14

package/dist/nutui.react.umd.js

@@ -8,7 +8,7 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 /*!
-* @nutui/nutui-react-taro v2.0.0-alpha.12 Fri May 26 2023 15:28:47 GMT+0800 (China Standard Time)
+* @nutui/nutui-react-taro v2.0.0-alpha.14 Fri Jun 02 2023 17:13:52 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */
@@ -1958,7 +1958,7 @@ var __publicField = (obj, key, value) => {
     onClick: (event) => {
     }
   };
-  const classPrefix$j = "nut-cell";
+  const classPrefix$m = "nut-cell";
   const Cell = (props) => {
     const {
       children,
@@ -1989,19 +1989,19 @@ var __publicField = (obj, key, value) => {
     return /* @__PURE__ */ React.createElement(
       "div",
       {
-        className: classNames(classPrefix$j, className),
+        className: classNames(classPrefix$m, className),
         onClick: (event) => handleClick(event),
         style: baseStyle,
         ...rest
       },
-      children || /* @__PURE__ */ React.createElement(React.Fragment, null, title || description ? /* @__PURE__ */ React.createElement("div", { className: `${classPrefix$j}__left` }, title ? /* @__PURE__ */ React.createElement("div", { className: `${classPrefix$j}__title` }, title) : null, description ? /* @__PURE__ */ React.createElement("div", { className: `${classPrefix$j}__description` }, description) : null) : null, extra ? /* @__PURE__ */ React.createElement(
+      children || /* @__PURE__ */ React.createElement(React.Fragment, null, title || description ? /* @__PURE__ */ React.createElement("div", { className: `${classPrefix$m}__left` }, title ? /* @__PURE__ */ React.createElement("div", { className: `${classPrefix$m}__title` }, title) : null, description ? /* @__PURE__ */ React.createElement("div", { className: `${classPrefix$m}__description` }, description) : null) : null, extra ? /* @__PURE__ */ React.createElement(
         "div",
         {
-          className: `${classPrefix$j}__extra`,
+          className: `${classPrefix$m}__extra`,
           style: styles
         },
         extra
-      ) : null, /* @__PURE__ */ React.createElement("div", { className: `${classPrefix$j}__divider` }))
+      ) : null, /* @__PURE__ */ React.createElement("div", { className: `${classPrefix$m}__divider` }))
     );
   };
   Cell.defaultProps = defaultProps$1t;
@@ -2012,16 +2012,16 @@ var __publicField = (obj, key, value) => {
     description: "",
     divider: true
   };
-  const classPrefix$i = "nut-cell-group";
+  const classPrefix$l = "nut-cell-group";
   const CellGroup = (props) => {
     const { children, className, style, title, description, divider, ...rest } = {
       ...defaultProps$1s,
       ...props
     };
-    return /* @__PURE__ */ React.createElement("div", { className: classNames(classPrefix$i, className), ...rest }, title ? /* @__PURE__ */ React.createElement("div", { className: `${classPrefix$i}__title` }, title) : null, description ? /* @__PURE__ */ React.createElement("div", { className: `${classPrefix$i}__description` }, description) : null, /* @__PURE__ */ React.createElement(
+    return /* @__PURE__ */ React.createElement("div", { className: classNames(classPrefix$l, className), ...rest }, title ? /* @__PURE__ */ React.createElement("div", { className: `${classPrefix$l}__title` }, title) : null, description ? /* @__PURE__ */ React.createElement("div", { className: `${classPrefix$l}__description` }, description) : null, /* @__PURE__ */ React.createElement(
       "div",
       {
-        className: `${classPrefix$i}__wrap ${divider ? `${classPrefix$i}__wrap--divider` : ""}`
+        className: `${classPrefix$l}__wrap ${divider ? `${classPrefix$l}__wrap--divider` : ""}`
       },
       children
     ));
@@ -2716,21 +2716,21 @@ var __publicField = (obj, key, value) => {
     contentPosition: "center",
     direction: "horizontal"
   };
-  const classPrefix$h = `nut-divider`;
+  const classPrefix$k = `nut-divider`;
   const Divider = (props) => {
     const { children, contentPosition, style, className, direction, ...rest } = {
       ...defaultProps$1o,
       ...props
     };
     const classes = direction === "horizontal" ? classNames({
-      [`${classPrefix$h}`]: true,
-      [`${classPrefix$h}__center`]: children,
-      [`${classPrefix$h}__left`]: contentPosition === "left",
-      [`${classPrefix$h}__right`]: contentPosition === "right",
-      [`${classPrefix$h}__hairline`]: true
+      [`${classPrefix$k}`]: true,
+      [`${classPrefix$k}__center`]: children,
+      [`${classPrefix$k}__left`]: contentPosition === "left",
+      [`${classPrefix$k}__right`]: contentPosition === "right",
+      [`${classPrefix$k}__hairline`]: true
     }) : classNames({
-      [`${classPrefix$h}`]: true,
-      [`${classPrefix$h}__vertical`]: direction === "vertical"
+      [`${classPrefix$k}`]: true,
+      [`${classPrefix$k}__vertical`]: direction === "vertical"
     });
     return /* @__PURE__ */ React.createElement("div", { className: `${classes} ${className || ""}`, style, ...rest }, children);
   };
@@ -2891,7 +2891,7 @@ var __publicField = (obj, key, value) => {
   };
   Layout.defaultProps = defaultProps$1l;
   Layout.displayName = "NutLayout";
-  const classPrefix$g = "nut-row";
+  const classPrefix$j = "nut-row";
   const defaultProps$1k = {
     ...ComponentDefaults,
     type: "",
@@ -2926,7 +2926,7 @@ var __publicField = (obj, key, value) => {
     ${getClass("justify", justify)}
     ${getClass("align", align)}
     ${getClass("flex", wrap)}
-    ${classPrefix$g}
+    ${classPrefix$j}
    `;
     };
     const parentRow = {
@@ -2969,6 +2969,35 @@ var __publicField = (obj, key, value) => {
       stop.current = true;
     };
   }
+  function isWindow(val) {
+    return val === window;
+  }
+  const getRect = (elementRef) => {
+    const element = elementRef;
+    if (isWindow(element)) {
+      const width = element.innerWidth;
+      const height = element.innerHeight;
+      return {
+        top: 0,
+        left: 0,
+        right: width,
+        bottom: height,
+        width,
+        height
+      };
+    }
+    if (element && element.getBoundingClientRect) {
+      return element.getBoundingClientRect();
+    }
+    return {
+      top: 0,
+      left: 0,
+      right: 0,
+      bottom: 0,
+      width: 0,
+      height: 0
+    };
+  };
   const getRectByTaro = async (element) => {
     if (element) {
       const res = await element.getBoundingClientRect();
@@ -3002,7 +3031,7 @@ var __publicField = (obj, key, value) => {
     position: "top",
     zIndex: 2e3
   };
-  const classPrefix$f = "nut-sticky";
+  const classPrefix$i = "nut-sticky";
   const Sticky = (props) => {
     const {
       position,
@@ -3078,7 +3107,7 @@ var __publicField = (obj, key, value) => {
           setFixed(windowHeight - threshold < curRootRect.bottom);
         }
       } else {
-        console.log("getRectByTaro获取失败", { stickyRect, curRootRect });
+        console.warn("getRectByTaro获取失败", { stickyRect, curRootRect });
       }
     };
     const getElement = React.useCallback(() => {
@@ -3104,7 +3133,7 @@ var __publicField = (obj, key, value) => {
       {
         ref: rootRef,
         style: rootStyle,
-        className: classNames(classPrefix$f, className),
+        className: classNames(classPrefix$i, className),
         ...rest
       },
       /* @__PURE__ */ React.createElement(
@@ -5484,11 +5513,12 @@ var __publicField = (obj, key, value) => {
   Popup.displayName = "NutPopup";
   const OffsetContext = React.createContext(20);
   const defaultProps$1d = {
-    showhead: false,
+    ...ComponentDefaults,
     position: "left",
     width: "80%"
   };
   const SideNavBar = (props) => {
+    const classPrefix2 = "nut-sidenavbar";
     const {
       title,
       visible,
@@ -5496,14 +5526,13 @@ var __publicField = (obj, key, value) => {
       position,
       children,
       className,
-      showhead,
       onClose,
       ...rest
     } = {
       ...defaultProps$1d,
       ...props
     };
-    const offset = props.offset ? Number(props.offset) : 20;
+    const indent = props.indent ? Number(props.indent) : 20;
     const [sidenavbarShow, setSidenavbarShow] = React.useState(true);
     const handleClick = () => {
       setSidenavbarShow(!sidenavbarShow);
@@ -5516,49 +5545,43 @@ var __publicField = (obj, key, value) => {
         position,
         onClose
       },
-      /* @__PURE__ */ React.createElement(
+      /* @__PURE__ */ React.createElement("div", { className: classNames(className, classPrefix2), ...rest }, /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}__content` }, /* @__PURE__ */ React.createElement(
         "div",
         {
-          className: className ? `${className} nut-sidenavbar` : "nut-sidenavbar",
-          ...rest
+          className: `${classPrefix2}__list ${sidenavbarShow ? "sidenavbar-show" : "sidenavbar-hide"}`,
+          onClick: handleClick
         },
-        /* @__PURE__ */ React.createElement("div", { className: "nut-sidenavbar__content" }, /* @__PURE__ */ React.createElement(
+        /* @__PURE__ */ React.createElement(
           "div",
           {
-            className: `nut-sidenavbar__list ${sidenavbarShow ? "nutShow" : "nutHide"}`,
-            onClick: handleClick
+            className: `${classPrefix2}__title ${classPrefix2}-border-bt`,
+            style: { paddingLeft: `${indent}px` }
           },
+          title,
           /* @__PURE__ */ React.createElement(
-            "div",
+            "i",
             {
-              className: "nut-sidenavbar__title border-bt ",
-              style: { paddingLeft: `${offset}px` }
-            },
-            title,
-            /* @__PURE__ */ React.createElement(
-              "i",
-              {
-                className: `arrow-icon ${sidenavbarShow ? "arrow-up" : "arrow-down"}`
-              }
-            )
-          ),
-          /* @__PURE__ */ React.createElement(OffsetContext.Provider, { value: offset }, /* @__PURE__ */ React.createElement("div", { className: "nut-sidenavbar__content" }, children))
-        ))
-      )
+              className: `arrow-icon ${sidenavbarShow ? "arrow-up" : "arrow-down"}`
+            }
+          )
+        ),
+        /* @__PURE__ */ React.createElement(OffsetContext.Provider, { value: indent }, /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}__content` }, children))
+      )))
     );
   };
   SideNavBar.defaultProps = defaultProps$1d;
   SideNavBar.displayName = "NutSideNavBar";
   const SideNavBarItem = (props) => {
-    const { title, key, children, onClick, ...rest } = props;
+    const classPrefix2 = "nut-subsidenavbar";
+    const { title, value, children, onClick, ...rest } = props;
     const clickFn = (e) => {
       e.stopPropagation();
-      onClick && onClick({ title, key });
+      onClick && onClick({ title, value });
     };
     return /* @__PURE__ */ React.createElement(
       "div",
       {
-        className: "nut-subsidenavbar__item border-bt",
+        className: `${classPrefix2}__item ${classPrefix2}-border-bt`,
         onClick: clickFn,
         ...rest
       },
@@ -5569,7 +5592,8 @@ var __publicField = (obj, key, value) => {
     open: true
   };
   const SubSideNavBar = (props) => {
-    const { title, key, children, onClick, open, ...rest } = {
+    const classPrefix2 = "nut-subsidenavbar";
+    const { title, value, children, onClick, open, ...rest } = {
       ...defaultProps$1c,
       ...props
     };
@@ -5579,7 +5603,7 @@ var __publicField = (obj, key, value) => {
     const setListLevel = React.useCallback(
       (nodeList, level = 1) => {
         const titleClass = nodeList[0].className;
-        if (titleClass.includes("nut-subsidenavbar__title")) {
+        if (titleClass.includes(`${classPrefix2}__title`)) {
           const left = offset * (level + 1);
           nodeList[0].style.paddingLeft = `${left}px`;
         }
@@ -5588,11 +5612,11 @@ var __publicField = (obj, key, value) => {
         );
         childNodes.forEach((item) => {
           const itemClass = item.className;
-          if (itemClass.includes("nut-subsidenavbar__item")) {
+          if (itemClass.includes(`${classPrefix2}__item`)) {
             const left = offset * (level + 2);
             item.style.paddingLeft = `${left}px`;
           }
-          if (itemClass.includes("nut-subsidenavbar__list")) {
+          if (itemClass.includes(`${classPrefix2}__list`)) {
             let level2 = item.getAttribute("level") ? Number(item.getAttribute("level")) : 1;
             level2 += 1;
             item.setAttribute("level", level2.toString());
@@ -5606,7 +5630,7 @@ var __publicField = (obj, key, value) => {
       e.stopPropagation();
       setSubShow(!subShow);
       const isShow = !subShow;
-      onClick && onClick({ title, key, isShow });
+      onClick && onClick({ title, value, isShow });
     };
     React.useEffect(() => {
       var _a, _b;
@@ -5614,9 +5638,9 @@ var __publicField = (obj, key, value) => {
       (_b = listRef.current) == null ? void 0 : _b.setAttribute("level", "1");
       childNodes && setListLevel(childNodes);
     }, [setListLevel]);
-    const divClass = subShow ? "nut-subsidenavbar__list  nutShow" : "nut-subsidenavbar__list  nutHide";
+    const divClass = subShow ? `${classPrefix2}__list sidenavbar-show` : `${classPrefix2}__list sidenavbar-hide`;
     const iconClass = subShow ? "arrow-icon arrow-down" : "arrow-icon arrow-up";
-    return /* @__PURE__ */ React.createElement("div", { className: divClass, ref: listRef, onClick: clickFn, ...rest }, /* @__PURE__ */ React.createElement("div", { className: "nut-subsidenavbar__title border-bt" }, title, " ", /* @__PURE__ */ React.createElement("i", { className: iconClass })), /* @__PURE__ */ React.createElement("div", { className: "nut-subsidenavbar__content" }, children));
+    return /* @__PURE__ */ React.createElement("div", { className: divClass, ref: listRef, onClick: clickFn, ...rest }, /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}__title ${classPrefix2}-border-bt` }, title, " ", /* @__PURE__ */ React.createElement("i", { className: iconClass })), /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}__content` }, children));
   };
   function usePropsValue({
     value,
@@ -5818,7 +5842,7 @@ var __publicField = (obj, key, value) => {
     duration: 300,
     autoHeight: false
   };
-  const classPrefix$e = "nut-tabs";
+  const classPrefix$h = "nut-tabs";
   const Tabs = (props) => {
     const {
       activeColor,
@@ -5880,14 +5904,14 @@ var __publicField = (obj, key, value) => {
       }
     }, [children]);
     const classes = classNames(
-      classPrefix$e,
-      `${classPrefix$e}--${direction}`,
+      classPrefix$h,
+      `${classPrefix$h}--${direction}`,
       className
     );
-    const classesTitle = classNames(`${classPrefix$e}__titles`, {
-      [`${classPrefix$e}__titles--${activeType}`]: activeType,
-      [`${classPrefix$e}__titles--scrollable`]: true,
-      [`${classPrefix$e}__titles--${align}`]: align
+    const classesTitle = classNames(`${classPrefix$h}__titles`, {
+      [`${classPrefix$h}__titles--${activeType}`]: activeType,
+      [`${classPrefix$h}__titles--scrollable`]: true,
+      [`${classPrefix$h}__titles--${align}`]: align
     });
     const tabsActiveStyle = {
       color: activeType === "smile" ? activeColor : "",
@@ -5933,7 +5957,7 @@ var __publicField = (obj, key, value) => {
             onClick: (e) => {
               tabChange(item);
             },
-            className: classNames(`${classPrefix$e}__titles-item`, {
+            className: classNames(`${classPrefix$h}__titles-item`, {
               [`nut-tabs__titles-item--active`]: !item.disabled && String(item.value) === String(value),
               [`nut-tabs__titles-item--disabled`]: item.disabled,
               [`nut-tabs__titles-item--${align}`]: align
@@ -5943,14 +5967,14 @@ var __publicField = (obj, key, value) => {
           activeType === "line" && /* @__PURE__ */ React.createElement(
             components.View,
             {
-              className: `${classPrefix$e}__titles-item__line`,
+              className: `${classPrefix$h}__titles-item__line`,
               style: tabsActiveStyle
             }
           ),
           activeType === "smile" && /* @__PURE__ */ React.createElement(
             components.View,
             {
-              className: `${classPrefix$e}__titles-item__smile`,
+              className: `${classPrefix$h}__titles-item__smile`,
               style: tabsActiveStyle
             },
             /* @__PURE__ */ React.createElement(a$j, { color: activeColor, width: 40, height: 20 })
@@ -5962,14 +5986,14 @@ var __publicField = (obj, key, value) => {
                 {
                   ellipsis: true
                 },
-                `${classPrefix$e}__titles-item__text`
+                `${classPrefix$h}__titles-item__text`
               )
             },
             item.title
           )
         );
       })
-    ), /* @__PURE__ */ React.createElement(components.View, { className: `${classPrefix$e}__content__wrap` }, /* @__PURE__ */ React.createElement(components.View, { className: `${classPrefix$e}__content`, style: contentStyle }, React.Children.map(children, (child, idx) => {
+    ), /* @__PURE__ */ React.createElement(components.View, { className: `${classPrefix$h}__content__wrap` }, /* @__PURE__ */ React.createElement(components.View, { className: `${classPrefix$h}__content`, style: contentStyle }, React.Children.map(children, (child, idx) => {
       if (!React.isValidElement(child)) {
         return null;
       }
@@ -8070,7 +8094,7 @@ var __publicField = (obj, key, value) => {
     },
     options: []
   };
-  const classPrefix$d = "nut-checkboxgroup";
+  const classPrefix$g = "nut-checkboxgroup";
   const CheckboxGroup = React.forwardRef(
     (props, ref) => {
       const { children } = { ...defaultProps$$, ...props };
@@ -8152,7 +8176,7 @@ var __publicField = (obj, key, value) => {
         /* @__PURE__ */ React.createElement(
           "div",
           {
-            className: classNames(classPrefix$d, className, {
+            className: classNames(classPrefix$g, className, {
               [`nut-checkboxgroup--${props.direction}`]: props.direction
             }),
             ...rest
@@ -8174,7 +8198,7 @@ var __publicField = (obj, key, value) => {
     onChange: (value) => {
     }
   };
-  const classPrefix$c = "nut-checkbox";
+  const classPrefix$f = "nut-checkbox";
   const Checkbox = (props) => {
     const { children } = {
       ...defaultProps$_,
@@ -8236,22 +8260,22 @@ var __publicField = (obj, key, value) => {
     };
     const color = () => {
       if (innerDisabled) {
-        return `${classPrefix$c}__icon--disable`;
+        return `${classPrefix$f}__icon--disable`;
       }
       if (innerChecked) {
         if (innerIndeterminate) {
-          return `${classPrefix$c}__icon--indeterminate`;
+          return `${classPrefix$f}__icon--indeterminate`;
         }
-        return `${classPrefix$c}__icon`;
+        return `${classPrefix$f}__icon`;
       }
-      return `${classPrefix$c}__icon--unchecked`;
+      return `${classPrefix$f}__icon--unchecked`;
     };
     const renderLabel = () => {
       return /* @__PURE__ */ React.createElement(
         "span",
         {
-          className: classNames(`${classPrefix$c}__label `, {
-            [`${classPrefix$c}__label--disabled`]: innerDisabled
+          className: classNames(`${classPrefix$f}__label `, {
+            [`${classPrefix$f}__label--disabled`]: innerDisabled
           })
         },
         children || label
@@ -8270,8 +8294,8 @@ var __publicField = (obj, key, value) => {
     return /* @__PURE__ */ React.createElement(
       "div",
       {
-        className: classNames(classPrefix$c, className, {
-          [`${classPrefix$c}--reverse`]: labelPosition === "left"
+        className: classNames(classPrefix$f, className, {
+          [`${classPrefix$f}--reverse`]: labelPosition === "left"
         }),
         ...rest,
         onClick: handleClick
@@ -8620,6 +8644,7 @@ var __publicField = (obj, key, value) => {
   const InternalPicker = (props, ref) => {
     const { locale } = useConfig$1();
     const {
+      children,
       visible,
       title,
       options = [],
@@ -8645,6 +8670,7 @@ var __publicField = (obj, key, value) => {
         (_a = props.onConfirm) == null ? void 0 : _a.call(props, setSelectedOptions(), val);
       }
     });
+    const [innerValue, setInnerValue] = React.useState(selectedValue);
     const [currentValue, setCurrentValue] = React.useState([]);
     const [columnIndex, setColumnIndex] = React.useState(0);
     const pickerRef = React.useRef(null);
@@ -8685,41 +8711,52 @@ var __publicField = (obj, key, value) => {
       }
       return "single";
     };
-    const normalListData = () => {
+    const normalListData = (innerValue2) => {
       const type = columnsType();
       switch (type) {
         case "multiple":
           return options;
         case "cascade":
-          return formatCascade(options, selectedValue);
+          return formatCascade(options, innerValue2);
         default:
           return [options];
       }
     };
     const init = () => {
-      const normalData = normalListData();
+      const normalData = normalListData(
+        innerValue
+      );
       setColumnsList(normalData);
       const data = [];
       normalData.length > 0 && normalData.map((item) => {
         item[0] && data.push(item[0].value);
         return item;
       });
-      if (!defaultValue.length && selectedValue.length === 0) {
-        setSelectedValue([...data]);
+      if (!innerValue.length && innerValue.length === 0) {
+        setInnerValue([...data]);
       }
     };
+    React.useEffect(() => {
+      setInnerValue(innerValue !== selectedValue ? selectedValue : innerValue);
+    }, [visible]);
+    React.useEffect(() => {
+      if (visible) {
+        init();
+      }
+    }, [options, visible]);
     React.useEffect(() => {
       if (!visible) {
         return;
       }
-      init();
-    }, [options, visible]);
+      Taro.getEnv() !== "WEB" && setCurrentValue(defaultValuesConvert());
+      onChange && onChange(setSelectedOptions(), innerValue, columnIndex);
+    }, [innerValue, columnsList, visible]);
     const setSelectedOptions = () => {
       const options2 = [];
       let currOptions = [];
       columnsList.forEach((columnOptions, index) => {
         currOptions = columnOptions.filter(
-          (item) => item.value === selectedValue[index]
+          (item) => item.value === innerValue[index]
         );
         if (currOptions[0]) {
           options2.push(currOptions[0]);
@@ -8731,8 +8768,8 @@ var __publicField = (obj, key, value) => {
     };
     const defaultValuesConvert = () => {
       const defaultIndexs = [];
-      if (selectedValue.length > 0) {
-        selectedValue.forEach((value, index) => {
+      if (innerValue.length > 0) {
+        innerValue.forEach((value, index) => {
           var _a;
           for (let i = 0; i < ((_a = columnsList == null ? void 0 : columnsList[index]) == null ? void 0 : _a.length); i++) {
             if (columnsList[index][i].value === value) {
@@ -8749,37 +8786,30 @@ var __publicField = (obj, key, value) => {
       }
       return defaultIndexs;
     };
-    React.useEffect(() => {
-      if (!visible) {
-        return;
-      }
-      Taro.getEnv() !== "WEB" && setCurrentValue(defaultValuesConvert());
-      onChange && onChange(setSelectedOptions(), selectedValue, columnIndex);
-      if (isConfirmEvent.current) {
-        isConfirmEvent.current = false;
-        onConfirm && onConfirm(setSelectedOptions(), selectedValue);
-      }
-    }, [selectedValue, columnsList, visible]);
     const chooseItem = (columnOptions, columnIndex2) => {
       var _a, _b;
+      const values = [];
+      const start = columnIndex2;
       if (columnOptions && Object.keys(columnOptions).length) {
-        if (selectedValue[columnIndex2] !== columnOptions.value) {
+        if (values[columnIndex2] !== columnOptions.value) {
           if (columnsType() === "cascade") {
-            selectedValue[columnIndex2] = columnOptions.value || "";
-            setSelectedValue([...selectedValue]);
+            values[columnIndex2] = columnOptions.value || "";
             while ((_a = columnOptions == null ? void 0 : columnOptions.children) == null ? void 0 : _a[0]) {
-              selectedValue[columnIndex2 + 1] = columnOptions.children[0].value;
-              setSelectedValue([...selectedValue]);
+              values[columnIndex2 + 1] = columnOptions.children[0].value;
               columnIndex2++;
               columnOptions = columnOptions.children[0];
             }
             if ((_b = columnOptions == null ? void 0 : columnOptions.children) == null ? void 0 : _b.length) {
-              selectedValue[columnIndex2 + 1] = "";
-              setSelectedValue([...selectedValue]);
+              values[columnIndex2 + 1] = "";
             }
-            setColumnsList(normalListData());
+            const combineResult = [
+              ...innerValue.slice(0, start),
+              ...values.splice(start)
+            ];
+            setInnerValue(combineResult);
+            setColumnsList(normalListData(combineResult));
           } else {
-            setSelectedValue((data) => {
+            setInnerValue((data) => {
               const cdata = [...data];
               cdata[columnIndex2] = Object.prototype.hasOwnProperty.call(
                 columnOptions,
@@ -8793,16 +8823,16 @@ var __publicField = (obj, key, value) => {
       }
     };
     const confirm = () => {
-      let movings = false;
+      let moving = false;
       refs.forEach((ref2) => {
         if (ref2.moving)
-          movings = true;
+          moving = true;
         ref2.stopMomentum();
       });
-      if (movings) {
+      if (moving) {
         isConfirmEvent.current = true;
       } else {
-        onConfirm && onConfirm(setSelectedOptions(), selectedValue);
+        setSelectedValue(innerValue);
         closePicker();
       }
       setTimeout(() => {
@@ -8810,8 +8840,8 @@ var __publicField = (obj, key, value) => {
       }, 0);
     };
     const closePicker = () => {
-      onClose && onClose(setSelectedOptions(), selectedValue);
-      afterClose && afterClose(setSelectedOptions(), selectedValue, pickerRef);
+      onClose && onClose(setSelectedOptions(), innerValue);
+      afterClose && afterClose(setSelectedOptions(), innerValue, pickerRef);
     };
     const renderTitleBar = () => {
       return /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}__control` }, /* @__PURE__ */ React.createElement(
@@ -8823,7 +8853,7 @@ var __publicField = (obj, key, value) => {
         locale.cancel
       ), /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}__title` }, title || ""), /* @__PURE__ */ React.createElement("span", { className: `${classPrefix2}__confirm-btn`, onClick: confirm }, locale.confirm));
     };
-    const [pickingStatus, setPickingStatus] = React.useState(false);
+    const [, setPickingStatus] = React.useState(false);
     const pickerStart = () => {
       setPickingStatus(true);
     };
@@ -8854,12 +8884,12 @@ var __publicField = (obj, key, value) => {
           closePicker();
         }
       },
-      /* @__PURE__ */ React.createElement(components.View, { className: classes, style, ...rest, catchMove: true }, renderTitleBar(), /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}__panel`, ref: pickerRef }, Taro.getEnv() === "WEB" ? columnsList == null ? void 0 : columnsList.map((item, index) => {
+      /* @__PURE__ */ React.createElement(components.View, { className: classes, style, ...rest, catchMove: true }, renderTitleBar(), children, /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}__panel`, ref: pickerRef }, Taro.getEnv() === "WEB" ? columnsList == null ? void 0 : columnsList.map((item, index) => {
         return /* @__PURE__ */ React.createElement(
           PickerPanel$1,
           {
             ref: setRefs(index),
-            defaultValue: selectedValue == null ? void 0 : selectedValue[index],
+            defaultValue: innerValue == null ? void 0 : innerValue[index],
             options: item,
             threeDimensional,
             chooseItem: (value, index2) => chooseItem(value, index2),
@@ -9709,7 +9739,7 @@ var __publicField = (obj, key, value) => {
     digits: 0,
     async: false
   };
-  const classPrefix$b = `nut-inputnumber`;
+  const classPrefix$e = `nut-inputnumber`;
   const InputNumber = (props) => {
     const {
       children,
@@ -9752,8 +9782,8 @@ var __publicField = (obj, key, value) => {
     }, []);
     const classes = classNames(
       {
-        [`${classPrefix$b}`]: true,
-        [`${classPrefix$b}--disabled`]: disabled
+        [`${classPrefix$e}`]: true,
+        [`${classPrefix$e}--disabled`]: disabled
       },
       className
     );
@@ -9926,7 +9956,7 @@ var __publicField = (obj, key, value) => {
   const defaultProps$T = {
     ...ComponentDefaults,
     activeColor: "",
-    closeOnClickOverlay: true,
+    closeOnOverlayClick: true,
     scrollFixed: false,
     lockScroll: true,
     icon: null
@@ -9937,7 +9967,7 @@ var __publicField = (obj, key, value) => {
       icon,
       scrollFixed,
       lockScroll,
-      closeOnClickOverlay,
+      closeOnOverlayClick,
       children,
       activeColor,
       ...rest
@@ -9986,7 +10016,7 @@ var __publicField = (obj, key, value) => {
           index,
           activeColor,
           parent: {
-            closeOnClickOverlay,
+            closeOnOverlayClick,
             lockScroll,
             toggleMenuItem,
             updateTitle,
@@ -10399,7 +10429,7 @@ var __publicField = (obj, key, value) => {
     direction: "vertical",
     options: []
   };
-  const classPrefix$a = "nut-radiogroup";
+  const classPrefix$d = "nut-radiogroup";
   const RadioGroup = React.forwardRef(
     (props, ref) => {
       const {
@@ -10455,8 +10485,8 @@ var __publicField = (obj, key, value) => {
         /* @__PURE__ */ React.createElement(
           "div",
           {
-            className: classNames(classPrefix$a, className, {
-              [`${classPrefix$a}--${props.direction}`]: props.direction
+            className: classNames(classPrefix$d, className, {
+              [`${classPrefix$d}--${props.direction}`]: props.direction
             }),
             ...rest
           },
@@ -11326,7 +11356,7 @@ var __publicField = (obj, key, value) => {
             onConfirm && onConfirm(res2.tempFilePath);
           },
           fail: (res2) => {
-            console.log("保存失败");
+            console.warn("保存失败");
           }
         });
       });
@@ -11762,6 +11792,14 @@ var __publicField = (obj, key, value) => {
   const isPromise = (val) => {
     return isObject(val) && isFunction(val.then) && isFunction(val.catch);
   };
+  const upperCaseFirst = (str) => {
+    var str = str.toLowerCase();
+    str = str.replace(
+      /\b\w+\b/g,
+      (word) => word.substring(0, 1).toUpperCase() + word.substring(1)
+    );
+    return str;
+  };
   const funcInterceptor = (interceptor, {
     args = [],
     done,
@@ -12589,7 +12627,7 @@ var __publicField = (obj, key, value) => {
     imageSize: "",
     status: "empty"
   };
-  const classPrefix$9 = `nut-empty`;
+  const classPrefix$c = `nut-empty`;
   const Empty = (props) => {
     const { locale } = useConfig$1();
     defaultProps$C.description = locale.noData || defaultProps$C.description;
@@ -12625,7 +12663,7 @@ var __publicField = (obj, key, value) => {
         };
       });
     }, [imageSize]);
-    return /* @__PURE__ */ React.createElement("div", { className: `${classPrefix$9} ${className}`, ...rest }, /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement("div", { className: `${classPrefix$9}__image`, style: imgStyle }, imageNode), typeof description === "string" ? /* @__PURE__ */ React.createElement("div", { className: `${classPrefix$9}__description` }, description) : description, children));
+    return /* @__PURE__ */ React.createElement("div", { className: `${classPrefix$c} ${className}`, ...rest }, /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement("div", { className: `${classPrefix$c}__image`, style: imgStyle }, imageNode), typeof description === "string" ? /* @__PURE__ */ React.createElement("div", { className: `${classPrefix$c}__description` }, description) : description, children));
   };
   Empty.defaultProps = defaultProps$C;
   Empty.displayName = "NutEmpty";
@@ -13191,7 +13229,7 @@ var __publicField = (obj, key, value) => {
     onClick: () => {
     }
   };
-  const classPrefix$8 = "nut-notify";
+  const classPrefix$b = "nut-notify";
   const Notify = (props) => {
     const {
       id,
@@ -13242,10 +13280,10 @@ var __publicField = (obj, key, value) => {
       onClose();
     };
     const classes = classNames({
-      [`${classPrefix$8}--popup-top`]: position === "top",
-      [`${classPrefix$8}--popup-bottom`]: position === "bottom",
-      [`${classPrefix$8}`]: true,
-      [`${classPrefix$8}--${type}`]: true
+      [`${classPrefix$b}--popup-top`]: position === "top",
+      [`${classPrefix$b}--popup-bottom`]: position === "bottom",
+      [`${classPrefix$b}`]: true,
+      [`${classPrefix$b}--${type}`]: true
     });
     return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(
       CSSTransition$1,
@@ -13271,165 +13309,264 @@ var __publicField = (obj, key, value) => {
   };
   Notify.defaultProps = defaultProps$z;
   Notify.displayName = "NutNotify";
-  function fillRef(ref, node) {
-    if (typeof ref === "function") {
-      ref(node);
-    } else if (typeof ref === "object" && ref && "current" in ref) {
-      ref.current = node;
-    }
-  }
-  function composeRef(...refs) {
-    return (node) => {
-      refs.forEach((ref) => {
-        fillRef(ref, node);
-      });
-    };
-  }
-  class Trigger extends React.Component {
-    fireEvents(type, e) {
-      const childCallback = this.props.children.props[type];
-      if (childCallback) {
-        childCallback(e);
-      }
-      const callback = this.props[type];
-      if (callback) {
-        callback(e);
-      }
-    }
-    render() {
-      const { children, className = "" } = this.props;
-      const child = React.Children.only(children);
-      const newChildProps = {
-        key: "trigger"
-      };
-      if (child && child.props && child.props.className) {
-        newChildProps.className = className;
-      }
-      const cloneProps = {
-        ...newChildProps
-      };
-      cloneProps.ref = composeRef(this.props.forwardedRef, child.ref);
-      const trigger = React.cloneElement(child, cloneProps);
-      return trigger;
-    }
-  }
   const defaultProps$y = {
     ...ComponentDefaults,
     list: [],
-    theme: "light",
     location: "bottom",
     visible: false,
-    offset: 20,
+    offset: [0, 12],
+    targetId: "",
     className: "",
-    onClick: (e) => {
+    background: "",
+    color: "",
+    showArrow: true,
+    duration: 0.3,
+    overlay: false,
+    overlayClassName: "",
+    overlayStyle: {},
+    closeOnClickOutside: true,
+    closeOnClickAction: true,
+    closeOnOverlayClick: true,
+    onClick: () => {
+    },
+    onOpen: () => {
+    },
+    onClose: () => {
     },
-    onChoose: (item, index) => {
+    onSelect: (item, index) => {
     }
   };
+  const classPrefix$a = `nut-popover`;
   const Popover = (props) => {
     const {
       children,
       list,
-      theme,
       location,
       visible,
       offset,
+      targetId,
+      overlay,
+      overlayStyle,
+      overlayClassName,
+      closeOnClickOutside,
+      closeOnClickAction,
+      closeOnOverlayClick,
       className,
+      showArrow,
       style,
+      background,
+      color,
       onClick,
-      onChoose,
+      onOpen,
+      onClose,
+      onSelect,
       ...reset
     } = {
       ...defaultProps$y,
       ...props
     };
-    const goodItem = React.useRef(null);
-    setTimeout(async () => {
-      if (goodItem.current) {
-        const res = await getRectByTaro(goodItem.current);
-        setElWidth(res == null ? void 0 : res.width);
-        setElHeight(res == null ? void 0 : res.height);
-      }
-    });
-    const [classes, setClasses] = React.useState("");
+    const popoverRef = React.useRef(null);
+    const popoverContentRef = React.useRef(null);
+    const [showPopup, setShowPopup] = React.useState(false);
     const [elWidth, setElWidth] = React.useState(0);
     const [elHeight, setElHeight] = React.useState(0);
-    const [popoverContent, setPopoverContent] = React.useState("");
-    const [popoverArrow, setPopoverArrow] = React.useState("");
+    const [rootPosition, setRootPosition] = React.useState();
     React.useEffect(() => {
-      setClasses(classesSelf());
-      setPopoverContent(popoverContentSelf());
-      setPopoverArrow(popoverArrowSelf());
-    }, [list, theme]);
-    const getStyle = () => {
-      const offNumer = Number(offset) ? Number(offset) : 0;
-      const style2 = {};
-      if (location.includes("top")) {
-        style2.bottom = `${elHeight + offNumer}px`;
-      } else if (location.includes("right")) {
-        style2.left = `${elWidth + offNumer}px`;
-      } else if (location.includes("left")) {
-        style2.right = `${elWidth + offNumer}px`;
-      } else {
-        style2.top = `${elHeight + offNumer}px`;
+      setShowPopup(visible);
+      if (visible) {
+        setTimeout(() => {
+          getContentWidth();
+        }, 0);
       }
-      return style2;
+    }, [visible]);
+    const getContentWidth = async () => {
+      let rect;
+      if (targetId) {
+        if (Taro.getEnv() == Taro.ENV_TYPE.WEB) {
+          rect = getRect(document.querySelector(`#${targetId}`));
+        } else {
+          rect = await getRectTaro(targetId);
+        }
+      } else {
+        rect = await getRectByTaro(popoverRef.current);
+      }
+      setRootPosition({
+        width: rect.width,
+        height: rect.height,
+        left: rect.left,
+        top: rect.top,
+        right: rect.right
+      });
+      setTimeout(() => {
+        getPopoverContentW();
+      }, 300);
+    };
+    const getRectTaro = async (targetId2) => {
+      return new Promise((resolve) => {
+        const query = Taro.createSelectorQuery();
+        query.select(`#${targetId2}`) && query.select(`#${targetId2}`).boundingClientRect();
+        query.exec(function(res) {
+          resolve(res[0]);
+        });
+      });
+    };
+    const getPopoverContentW = async () => {
+      let rectContent = await getRectByTaro(popoverContentRef.current);
+      setElWidth(rectContent.width);
+      setElHeight(rectContent.height);
     };
-    const classesSelf = () => {
-      const prefixCls2 = "nut-popover";
-      return `${prefixCls2} ${theme ? `${prefixCls2}--${theme}` : ""}`;
+    const clickAway = () => {
+      if (closeOnClickOutside) {
+        props.onClick && props.onClick();
+        onClose && onClose();
+      }
     };
-    const popoverContentSelf = () => {
-      const prefixCls2 = "popover-content";
-      return `${prefixCls2}-show ${prefixCls2} ${location ? `${prefixCls2}--${location}` : ""}`;
+    const classes = classNames(
+      {
+        [`${classPrefix$a}`]: true
+      },
+      className
+    );
+    const customStyle = () => {
+      const styles = {};
+      if (background) {
+        styles.background = background;
+      }
+      if (color) {
+        styles.color = color;
+      }
+      return styles;
     };
-    const filter = () => {
-      const ms = ["top", "bottom", "left", "right"];
-      return ms.filter((m) => location.includes(m))[0];
+    const popoverArrow = () => {
+      const prefixCls2 = "nut-popover-arrow";
+      const loca = location;
+      const direction = loca.split("-")[0];
+      return `${prefixCls2} ${prefixCls2}-${direction} ${prefixCls2}--${loca}`;
     };
-    const popoverArrowSelf = () => {
-      const prefixCls2 = "popover-arrow";
-      return `${prefixCls2} ${prefixCls2}-${filter()} ${location ? `${prefixCls2}--${location}` : ""}`;
+    const popoverArrowStyle = () => {
+      const styles = {};
+      const { background: background2 } = props;
+      const direction = location.split("-")[0];
+      if (background2) {
+        styles[`border${upperCaseFirst(direction)}Color`] = background2;
+      }
+      return styles;
     };
-    const handleClick = (e) => {
-      if (props.onClick) {
-        props.onClick(e);
+    const getRootPosition = () => {
+      let styles = {};
+      if (!rootPosition) {
+        styles.visibility = "hidden";
+        return styles;
+      }
+      const contentWidth = elWidth;
+      const contentHeight = elHeight;
+      const { width, height, left, top, right } = rootPosition;
+      const direction = location.split("-")[0];
+      const skew = location.split("-")[1];
+      let cross = 0;
+      let parallel = 0;
+      if (Array.isArray(offset) && offset.length == 2) {
+        cross += +offset[1];
+        parallel += +offset[0];
+      }
+      if (width) {
+        if (["bottom", "top"].includes(direction)) {
+          const h = direction == "bottom" ? height + cross : -(contentHeight + cross);
+          styles.top = `${top + h}px`;
+          if (!skew) {
+            styles.left = `${-(contentWidth - width) / 2 + left + parallel}px`;
+          }
+          if (skew == "start") {
+            styles.left = `${left + parallel}px`;
+          }
+          if (skew == "end") {
+            styles.left = `${right + parallel}px`;
+          }
+        }
+        if (["left", "right"].includes(direction)) {
+          const contentW = direction == "left" ? -(contentWidth + cross) : width + cross;
+          styles.left = `${left + contentW}px`;
+          if (!skew) {
+            styles.top = `${top - contentHeight / 2 + height / 2 - 4 + parallel}px`;
+          }
+          if (skew == "start") {
+            styles.top = `${top + parallel}px`;
+          }
+          if (skew == "end") {
+            styles.top = `${top + height + parallel}px`;
+          }
+        }
+      }
+      if (elWidth === 0) {
+        styles.visibility = "hidden";
+      } else {
+        styles.visibility = "initial";
       }
+      return styles;
     };
-    const handleChoose = (item, index) => {
+    const handleSelect = (item, index) => {
       if (!item.disabled) {
-        onChoose(item, index);
+        onSelect(item, index);
+      }
+      if (closeOnClickAction) {
+        props.onClick && props.onClick();
+        onClose && onClose();
       }
     };
-    return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(
+    return /* @__PURE__ */ React.createElement(React.Fragment, null, !targetId && /* @__PURE__ */ React.createElement(
       "div",
       {
-        className: `${classes} ${className}`,
-        style: { ...style },
-        ...reset
+        className: "nut-popover-wrapper",
+        ref: popoverRef,
+        onClick: () => {
+          props.onClick && props.onClick();
+          if (!visible) {
+            onOpen && onOpen();
+          } else {
+            onClose && onClose();
+          }
+        },
+        style
+      },
+      Array.isArray(children) ? children[0] : children
+    ), /* @__PURE__ */ React.createElement("div", { className: classes, style: getRootPosition(), ...reset }, /* @__PURE__ */ React.createElement(
+      Popup,
+      {
+        className: `nut-popover-content nut-popover-content--${location}`,
+        style: customStyle(),
+        position: "default",
+        overlay,
+        overlayStyle,
+        overlayClassName,
+        closeOnOverlayClick,
+        visible: showPopup
       },
-      /* @__PURE__ */ React.createElement(Trigger, { forwardedRef: goodItem }, /* @__PURE__ */ React.createElement("div", { onClick: (e) => handleClick(e) }, Array.isArray(children) ? children[0] : children, visible ? /* @__PURE__ */ React.createElement("div", { className: `${popoverContent}`, style: getStyle() }, /* @__PURE__ */ React.createElement("div", { className: `${popoverArrow}` }), Array.isArray(children) ? children[1] : "", /* @__PURE__ */ React.createElement("div", null, list.map((item, i) => {
+      /* @__PURE__ */ React.createElement("div", { className: "nut-popover-content-group", ref: popoverContentRef }, showArrow && /* @__PURE__ */ React.createElement("div", { className: popoverArrow(), style: popoverArrowStyle() }), Array.isArray(children) ? children[1] : "", list.map((item, index) => {
         return /* @__PURE__ */ React.createElement(
           "div",
           {
-            key: item.name,
-            className: `popover-menu-item ${item.disabled ? "disabled" : ""}`,
-            onClick: () => {
-              handleChoose(item, i);
-            }
+            className: classNames(
+              {
+                "nut-popover-menu-item": true,
+                "nut-popover-menu-disabled": item.disabled
+              },
+              item.className
+            ),
+            key: item.key,
+            onClick: () => handleSelect(item, index)
           },
           item.icon ? item.icon : null,
-          /* @__PURE__ */ React.createElement("div", { className: "popover-menu-item-name" }, item.name)
+          /* @__PURE__ */ React.createElement("div", { className: "nut-popover-menu-item-name" }, item.name)
         );
-      }))) : null))
-    ), visible ? /* @__PURE__ */ React.createElement(
-      Overlay$1,
+      }))
+    ), showPopup && /* @__PURE__ */ React.createElement(
+      "div",
       {
-        visible,
-        onClick: (e) => handleClick(e),
-        style: { background: "transparent" }
+        className: "nut-popover-content-bg",
+        onClick: clickAway,
+        onTouchMove: clickAway
       }
-    ) : null);
+    )));
   };
   Popover.defaultProps = defaultProps$y;
   Popover.displayName = "NutPopover";
@@ -13589,7 +13726,7 @@ var __publicField = (obj, key, value) => {
     src: "",
     alt: ""
   };
-  const classPrefix$7 = `nut-avatar`;
+  const classPrefix$9 = `nut-avatar`;
   const Avatar = (props) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
     const {
@@ -13621,7 +13758,7 @@ var __publicField = (obj, key, value) => {
       [`nut-avatar-${((_a = parent == null ? void 0 : parent.propAvatarGroup) == null ? void 0 : _a.size) || size || "normal"}`]: true,
       [`nut-avatar-${((_b = parent == null ? void 0 : parent.propAvatarGroup) == null ? void 0 : _b.shape) || shape}`]: true
     });
-    const cls = classNames(classPrefix$7, classes, className);
+    const cls = classNames(classPrefix$9, classes, className);
     const styles = {
       width: sizeValue.indexOf(size) > -1 ? "" : `${size}px`,
       height: sizeValue.indexOf(size) > -1 ? "" : `${size}px`,
@@ -14042,7 +14179,7 @@ var __publicField = (obj, key, value) => {
     }
     // 未实现
   };
-  const classPrefix$6 = "nut-toast";
+  const classPrefix$8 = "nut-toast";
   const Toast = (props) => {
     const {
       children,
@@ -14123,21 +14260,21 @@ var __publicField = (obj, key, value) => {
       {
         visible: openState,
         style,
-        className: `${classPrefix$6}__overlay-default ${className}`,
+        className: `${classPrefix$8}__overlay-default ${className}`,
         closeOnOverlayClick,
         onClick: () => {
           clickCover();
         }
       },
-      /* @__PURE__ */ React.createElement("div", { className: `${classPrefix$6} ${classes}`, id }, /* @__PURE__ */ React.createElement(
+      /* @__PURE__ */ React.createElement("div", { className: `${classPrefix$8} ${classes}`, id }, /* @__PURE__ */ React.createElement(
         "div",
         {
-          className: `${classPrefix$6}__inner ${classPrefix$6}-${position} ${contentClassName}`,
+          className: `${classPrefix$8}__inner ${classPrefix$8}-${position} ${contentClassName}`,
           style: contentStyle
         },
-        hasIcon() ? /* @__PURE__ */ React.createElement("p", { className: `${classPrefix$6}__icon-wrapper` }, iconName()) : null,
-        title ? /* @__PURE__ */ React.createElement("div", { className: `${classPrefix$6}-title` }, title) : null,
-        /* @__PURE__ */ React.createElement("span", { className: `${classPrefix$6}-text` }, msg)
+        hasIcon() ? /* @__PURE__ */ React.createElement("p", { className: `${classPrefix$8}__icon-wrapper` }, iconName()) : null,
+        title ? /* @__PURE__ */ React.createElement("div", { className: `${classPrefix$8}-title` }, title) : null,
+        /* @__PURE__ */ React.createElement("span", { className: `${classPrefix$8}-text` }, msg)
       ))
     ) : null);
   };
@@ -14151,7 +14288,7 @@ var __publicField = (obj, key, value) => {
     onClick: (event) => {
     }
   };
-  const classPrefix$5 = `nut-animate`;
+  const classPrefix$7 = `nut-animate`;
   const Animate = (props) => {
     const { className, type, action, loop, onClick, children, ...rest } = {
       ...defaultProps$s,
@@ -14160,7 +14297,7 @@ var __publicField = (obj, key, value) => {
     const [clicked, setClicked] = React.useState(false);
     const classes = classNames({
       "nut-ani-container": true,
-      [`${classPrefix$5}-${type}`]: action === "initial" || clicked ? type : false,
+      [`${classPrefix$7}-${type}`]: action === "initial" || clicked ? type : false,
       loop
     });
     const cls = classNames(classes, className);
@@ -14178,33 +14315,34 @@ var __publicField = (obj, key, value) => {
   Animate.defaultProps = defaultProps$s;
   Animate.displayName = "NutAnimate";
   const defaultProps$r = {
-    maxLen: 0,
-    endNumber: "",
-    delaySpeed: 300,
-    easeSpeed: 1,
-    thousands: false,
-    className: ""
+    ...ComponentDefaults,
+    length: 0,
+    value: "",
+    delay: 300,
+    duration: 1,
+    thousands: false
   };
   const CountUp = (props) => {
     const {
-      maxLen,
-      endNumber,
-      delaySpeed,
-      easeSpeed,
+      length,
+      value,
+      delay,
+      duration,
       className,
       thousands,
+      style,
       ...reset
     } = {
       ...defaultProps$r,
       ...props
     };
-    const b2 = cn("countup");
+    const classPrefix2 = "nut-countup";
     const countupRef = React.useRef(null);
     const timerRef = React.useRef(0);
     const numbers = Array.from({ length: 10 }, (v, i) => i);
     const getShowNumber = () => {
-      const splitArr = endNumber.split(".");
-      const intNumber = maxLen && splitArr[0].length < maxLen ? (Array(maxLen).join("0") + splitArr[0]).slice(-maxLen) : splitArr[0];
+      const splitArr = value.split(".");
+      const intNumber = length && splitArr[0].length < length ? (Array(length).join("0") + splitArr[0]).slice(-length) : splitArr[0];
       const currNumber = `${thousands ? intNumber.replace(/(\d)(?=(?:\d{3})+$)/g, "$1,") : intNumber}${splitArr[1] ? "." : ""}${splitArr[1] || ""}`;
       return currNumber.split("");
     };
@@ -14229,7 +14367,7 @@ var __publicField = (obj, key, value) => {
     };
     const numberEaseStyle = (idx) => {
       return {
-        transition: `transform ${easeSpeed}s ease-in-out`,
+        transition: `transform ${duration}s ease-in-out`,
         transform: transformArr[idx] ? transformArr[idx] : null
       };
     };
@@ -14241,26 +14379,31 @@ var __publicField = (obj, key, value) => {
         isLoaded.current = true;
         timerRef.current = window.setTimeout(() => {
           setNumerArr(getShowNumber());
-        }, delaySpeed);
+        }, delay);
       } else {
         setNumerArr(getShowNumber());
       }
       return () => {
         window.clearTimeout(timerRef.current);
       };
-    }, [endNumber]);
-    return /* @__PURE__ */ React.createElement("div", { className: `${b2()} ${className}`, ref: countupRef }, /* @__PURE__ */ React.createElement("ul", { className: b2("list") }, numerArr.map((item, idx) => {
+    }, [value]);
+    return /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2} ${className}`, ref: countupRef }, /* @__PURE__ */ React.createElement("ul", { className: `${classPrefix2}__list` }, numerArr.map((item, idx) => {
       return /* @__PURE__ */ React.createElement(
         "li",
         {
-          className: `${b2("listitem", {
-            number: !Number.isNaN(Number(item))
-          })}`,
+          className: `${classPrefix2}__listitem ${!Number.isNaN(Number(item)) ? `${classPrefix2}__listitem--number` : ""}`,
           key: idx
         },
-        !Number.isNaN(Number(item)) ? /* @__PURE__ */ React.createElement("span", { className: b2("number"), style: numberEaseStyle(idx) }, [...numbers, ...numbers].map((number, subidx) => {
-          return /* @__PURE__ */ React.createElement("span", { key: subidx }, number);
-        })) : /* @__PURE__ */ React.createElement("span", { className: b2("separator") }, item)
+        !Number.isNaN(Number(item)) ? /* @__PURE__ */ React.createElement(
+          "span",
+          {
+            className: `${classPrefix2}__number`,
+            style: numberEaseStyle(idx)
+          },
+          [...numbers, ...numbers].map((number, subidx) => {
+            return /* @__PURE__ */ React.createElement("span", { key: subidx }, number);
+          })
+        ) : /* @__PURE__ */ React.createElement("span", { className: `${classPrefix2}__separator` }, item)
       );
     })));
   };
@@ -14279,6 +14422,7 @@ var __publicField = (obj, key, value) => {
   __publicField(AnimatingNumbers, "defaultProps", defaultProps$q);
   __publicField(AnimatingNumbers, "displayName", "NutAnimatingNumbers");
   __publicField(AnimatingNumbers, "CountUp", CountUp);
+  AnimatingNumbers.CountUp = CountUp;
   const b = cn("audio");
   const warn = console.warn;
   const defaultProps$p = {
@@ -14375,8 +14519,8 @@ var __publicField = (obj, key, value) => {
       setCurrentDuration(formatSeconds(audioCtx.currentTime.toString()));
     });
     audioCtx.onError((res) => {
-      console.log("code", res.errCode);
-      console.log("message", res.errMsg);
+      console.warn("code", res.errCode);
+      console.warn("message", res.errMsg);
     });
     function formatSeconds(value) {
       if (!value) {
@@ -14492,12 +14636,12 @@ var __publicField = (obj, key, value) => {
     gap: "-8",
     level: "left"
   };
-  const classPrefix$4 = `nut-avatar-group`;
+  const classPrefix$6 = `nut-avatar-group`;
   const AvatarGroup = (props) => {
     const propAvatarGroup = { ...defaultProps$o, ...props };
     const { className, style, children } = propAvatarGroup;
     const avatarGroupRef = React.useRef(null);
-    const cls = classNames(classPrefix$4, className);
+    const cls = classNames(classPrefix$6, className);
     const parentAvatar = {
       propAvatarGroup,
       avatarGroupRef
@@ -14515,7 +14659,7 @@ var __publicField = (obj, key, value) => {
     background: "#e5e9f2",
     clockwise: true
   };
-  const classPrefix$3 = `nut-circleprogress`;
+  const classPrefix$5 = `nut-circleprogress`;
   const CircleProgress = (props) => {
     const {
       children,
@@ -14534,7 +14678,7 @@ var __publicField = (obj, key, value) => {
       ...props
     };
     const [oldValue, setOldValue] = React.useState(percent);
-    const classes = classNames(className, classPrefix$3);
+    const classes = classNames(className, classPrefix$5);
     const refRandomId = Math.random().toString(36).slice(-8);
     const animateIdRef = React.useRef(0);
     const styles = {
@@ -14677,7 +14821,7 @@ var __publicField = (obj, key, value) => {
     const [wrapperHeight, setWrapperHeight] = React.useState(
       () => expanded ? "auto" : "0px"
     );
-    const getRect = (selector) => {
+    const getRect2 = (selector) => {
       return new Promise((resolve) => {
         Taro.createSelectorQuery().select(selector).boundingClientRect().exec((rect = []) => {
           resolve(rect[0]);
@@ -14686,7 +14830,7 @@ var __publicField = (obj, key, value) => {
     };
     React.useEffect(() => {
       setTimeout(() => {
-        getRect(target).then((res) => {
+        getRect2(target).then((res) => {
           if (res == null ? void 0 : res.height) {
             setCurrentHeight(`${res.height}px`);
           }
@@ -14695,7 +14839,7 @@ var __publicField = (obj, key, value) => {
     }, [children]);
     React.useEffect(() => {
       setTimeout(() => {
-        getRect(target).then((res) => {
+        getRect2(target).then((res) => {
           if (res == null ? void 0 : res.height) {
             setCurrentHeight(`${res.height}px`);
           }
@@ -15092,7 +15236,7 @@ var __publicField = (obj, key, value) => {
     lineHeight: "20",
     width: "auto"
   };
-  const classPrefix$2 = `nut-ellipsis`;
+  const classPrefix$4 = `nut-ellipsis`;
   const Ellipsis = (props) => {
     var _a, _b, _c, _d;
     const {
@@ -15110,7 +15254,7 @@ var __publicField = (obj, key, value) => {
       onChange,
       ...rest
     } = { ...defaultProps$j, ...props };
-    let maxHeight = 0;
+    const maxHeight = React.useRef(0);
     const [exceeded, setExceeded] = React.useState(false);
     const [expanded, setExpanded] = React.useState(false);
     const ellipsis = React.useRef({
@@ -15121,8 +15265,8 @@ var __publicField = (obj, key, value) => {
     const rootContain = React.useRef(null);
     const symbolContain = React.useRef(null);
     const [contentCopy, setContentCopy] = React.useState(content);
-    let lineH = 0;
-    let originHeight = 0;
+    const lineH = React.useRef(0);
+    const originHeight = React.useRef(0);
     const refRandomId = Math.random().toString(36).slice(-8);
     const widthRef = React.useRef("auto");
     let widthBase = [14, 10, 7, 8.4, 10];
@@ -15132,9 +15276,9 @@ var __publicField = (obj, key, value) => {
     const letterUpperReg = /^[A-Z]+$/;
     const letterLowerReg = /^[a-z]+$/;
     const classes = classNames(
-      classPrefix$2,
+      classPrefix$4,
       className,
-      width ? `${classPrefix$2}-width` : ""
+      width ? `${classPrefix$4}-width` : ""
     );
     const init = () => {
       setExceeded(false);
@@ -15146,7 +15290,10 @@ var __publicField = (obj, key, value) => {
       });
     };
     Taro.useReady(() => init());
-    React.useEffect(() => init(), [content]);
+    React.useEffect(
+      () => init(),
+      [content, lineH.current, maxHeight.current, originHeight.current]
+    );
     const getSymbolInfo = async () => {
       const refe = await getRectByTaro(symbolContain == null ? void 0 : symbolContain.current);
       symbolTextWidth = refe.width ? Math.ceil(refe.width) : Math.ceil(widthBase[0] * 0.7921);
@@ -15174,13 +15321,13 @@ var __publicField = (obj, key, value) => {
         (res) => {
           if (!res)
             return;
-          lineH = pxToNumber(
+          lineH.current = pxToNumber(
             res.lineHeight === "normal" ? lineHeight : res.lineHeight
           );
-          maxHeight = Math.floor(
-            lineH * (Number(rows) + 0.5) + pxToNumber(res.paddingTop) + pxToNumber(res.paddingBottom)
+          maxHeight.current = Math.floor(
+            lineH.current * (Number(rows) + 0.5) + pxToNumber(res.paddingTop) + pxToNumber(res.paddingBottom)
           );
-          originHeight = pxToNumber(res.height);
+          originHeight.current = pxToNumber(res.height);
           widthRef.current = res.width;
           const bsize = pxToNumber(res.fontSize);
           widthBase = [
@@ -15196,10 +15343,12 @@ var __publicField = (obj, key, value) => {
     };
     const calcEllipse = async () => {
       const refe = await getRectByTaro(rootContain.current);
-      if (refe.height <= maxHeight) {
+      if (refe.height <= maxHeight.current) {
         setExceeded(false);
       } else {
-        const rowNum = Math.floor(content.length / (originHeight / lineH - 1));
+        const rowNum = Math.floor(
+          content.length / (originHeight.current / lineH.current - 1)
+        );
         if (direction === "middle") {
           const end = content.length;
           ellipsis.current.leading = tailorContent(
@@ -15228,7 +15377,7 @@ var __publicField = (obj, key, value) => {
     const verifyEllipsis = async () => {
       var _a2, _b2, _c2, _d2, _e, _f;
       const refe = await getRectByTaro(rootContain.current);
-      if (refe && refe.height && refe.height > maxHeight) {
+      if (refe && refe.height && refe.height > maxHeight.current) {
         if (direction === "end") {
           ellipsis.current.leading = (_c2 = (_a2 = ellipsis.current) == null ? void 0 : _a2.leading) == null ? void 0 : _c2.slice(
             0,
@@ -15395,14 +15544,14 @@ var __publicField = (obj, key, value) => {
     current: 0,
     direction: "horizontal"
   };
-  const classPrefix$1 = `nut-indicator`;
+  const classPrefix$3 = `nut-indicator`;
   const Indicator = (props) => {
     const { total, current, children, className, direction, ...rest } = {
       ...defaultProps$i,
       ...props
     };
     const classes = classNames({
-      [`${classPrefix$1}__vertical`]: direction === "vertical"
+      [`${classPrefix$3}__vertical`]: direction === "vertical"
     });
     const renderElement = () => {
       const childs = [];
@@ -15412,9 +15561,9 @@ var __publicField = (obj, key, value) => {
             "div",
             {
               key: item,
-              className: `${classPrefix$1}__dot ${classPrefix$1}__active`
+              className: `${classPrefix$3}__dot ${classPrefix$3}__active`
             }
-          ) : /* @__PURE__ */ React.createElement("div", { key: item, className: `${classPrefix$1}__dot` })
+          ) : /* @__PURE__ */ React.createElement("div", { key: item, className: `${classPrefix$3}__dot` })
         );
       }
       return childs;
@@ -15430,7 +15579,7 @@ var __publicField = (obj, key, value) => {
     loop: false,
     defaultValue: 0
   };
-  const classPrefix = "nut-swiper";
+  const classPrefix$2 = "nut-swiper";
   const Swiper = React.forwardRef((props, ref) => {
     const {
       width,
@@ -15461,8 +15610,8 @@ var __publicField = (obj, key, value) => {
           "div",
           {
             className: classNames({
-              [`${classPrefix}__indicator`]: true,
-              [`${classPrefix}__indicator-vertical`]: direction === "vertical"
+              [`${classPrefix$2}__indicator`]: true,
+              [`${classPrefix$2}__indicator-vertical`]: direction === "vertical"
             })
           },
           /* @__PURE__ */ React.createElement(
@@ -15504,7 +15653,7 @@ var __publicField = (obj, key, value) => {
     return /* @__PURE__ */ React.createElement(
       components.View,
       {
-        className: classNames(classPrefix, className),
+        className: classNames(classPrefix$2, className),
         style: {
           width: !width ? "100%" : `${width}px`,
           height: !height ? "150px" : `${height}px`
@@ -16556,6 +16705,7 @@ var __publicField = (obj, key, value) => {
   Tag.defaultProps = defaultProps$8;
   Tag.displayName = "NutTag";
   const defaultProps$7 = {
+    ...ComponentDefaults,
     source: {
       type: {},
       src: ""
@@ -16570,15 +16720,13 @@ var __publicField = (obj, key, value) => {
       loop: false
     }
   };
+  const classPrefix$1 = `nut-video`;
   const Video = (props) => {
     const {
       children,
       source,
       options,
       className,
-      play,
-      pause,
-      playend,
       onPlay,
       onPause,
       onPlayEnd,
@@ -16587,92 +16735,58 @@ var __publicField = (obj, key, value) => {
       ...defaultProps$7,
       ...props
     };
-    const rootRef = React.useRef(null);
-    const b2 = cn("video");
-    const classes = classNames(className, b2(""));
-    React.useEffect(() => {
-      init();
-    }, []);
-    const init = () => {
-      if (rootRef.current) {
-        const videoRef = rootRef.current;
-        if (options.autoplay) {
-          setTimeout(() => {
-            videoRef.play();
-          }, 200);
-        }
-        if (options.playsinline) {
-          videoRef.setAttribute("playsinline", String(options.playsinline));
-          videoRef.setAttribute("webkit-playsinline", String(options.playsinline));
-          videoRef.setAttribute("x5-video-player-type", "h5-page");
-          videoRef.setAttribute("x5-video-player-fullscreen", "false");
-        }
-        videoRef.addEventListener("play", () => {
-          onPlay && onPlay(videoRef);
-          play && play(videoRef);
-        });
-        videoRef.addEventListener("pause", () => {
-          onPause && onPause(videoRef);
-          pause && pause(videoRef);
-        });
-        videoRef.addEventListener("ended", () => {
-          videoRef.currentTime = 0;
-          onPlayEnd && onPlayEnd(videoRef);
-          playend && playend(videoRef);
-        });
-      }
-    };
+    const classes = classNames(className, classPrefix$1);
     return /* @__PURE__ */ React.createElement("div", { className: classes, ...restProps }, /* @__PURE__ */ React.createElement(
-      "video",
+      components.Video,
       {
         className: "nut-video-player",
         muted: options.muted,
-        autoPlay: options.autoplay,
+        autoplay: options.autoplay,
         loop: options.loop,
         poster: options.poster,
         controls: options.controls,
-        ref: rootRef,
-        src: source.src
-      },
-      /* @__PURE__ */ React.createElement("source", { src: source.src, type: source.type }),
-      /* @__PURE__ */ React.createElement("track", { kind: "captions" })
+        src: source.src,
+        onPlay,
+        onPause,
+        onEnded: onPlayEnd
+      }
     ));
   };
   Video.defaultProps = defaultProps$7;
   Video.displayName = "NutVideo";
   const defaultProps$6 = {
-    barrageList: [],
-    frequency: 500,
+    ...ComponentDefaults,
+    list: [],
+    interval: 500,
     loop: true,
-    speeds: 3e3,
+    duration: 3e3,
     rows: 3,
-    top: 10
+    gapY: 10
   };
+  const classPrefix = `nut-barrage`;
   const InternalBarrage = (props, ref) => {
     const {
       className,
-      frequency,
+      interval,
       loop,
-      barrageList,
-      speeds,
+      list,
+      duration,
       rows,
-      top,
+      gapY,
       ...restProps
     } = {
       ...defaultProps$6,
       ...props
     };
     const [styleList, setStyleList] = React.useState([]);
-    const [baItemList, setBaItemList] = React.useState(barrageList);
-    const barrageListSet = React.useRef(barrageList);
+    const [baItemList, setBaItemList] = React.useState(list);
+    const barrageListSet = React.useRef(list);
     const barrageBody = React.useRef(null);
     const barrageContainer = React.useRef(null);
     const timeId = React.useRef((/* @__PURE__ */ new Date()).getTime());
     const timer = React.useRef(0);
-    React.useRef(0);
-    const b2 = cn("barrage");
-    const classes = classNames(className, b2(""), {
-      [`nut-barrage__body${timeId.current}`]: true
+    const classes = classNames(className, classPrefix, {
+      [`${classPrefix}__body${timeId.current}`]: true
     });
     React.useImperativeHandle(ref, () => ({
       add: (word) => {
@@ -16681,53 +16795,53 @@ var __publicField = (obj, key, value) => {
       }
     }));
     React.useEffect(() => {
-      barrageListSet.current = [...barrageList];
+      barrageListSet.current = [...list];
       run();
       return () => {
         clearInterval(timer.current);
       };
-    }, [barrageList]);
+    }, [list]);
     const run = () => {
       setBaItemList(barrageListSet.current);
-      barrageListSet.current.forEach((item, index2) => {
-        getNode(index2);
+      barrageListSet.current.forEach((item, index) => {
+        getNode(index);
       });
     };
-    const getNode = (index2) => {
+    const getNode = (index) => {
       const query = Taro.createSelectorQuery();
       setTimeout(() => {
         let width = 100;
-        query.select(".nut-barrage__body" + timeId.current).boundingClientRect((rec) => {
+        query.select(`.${classPrefix}__body` + timeId.current).boundingClientRect((rec) => {
           width = rec.width || 300;
         });
-        query.select(".nut-barrage__item" + index2).boundingClientRect((recs) => {
+        query.select(`.${classPrefix}__item` + index).boundingClientRect((recs) => {
           let height = recs.height;
-          let nodeTop = index2 % rows * (height + top) + 20 + "px";
-          styleInfo(index2, nodeTop, width);
+          let nodeTop = index % rows * (height + gapY) + 20 + "px";
+          styleInfo(index, nodeTop, width);
         }).exec();
       }, 500);
     };
-    const styleInfo = (index2, nodeTop, width) => {
-      let timeIndex = index2 - rows > 0 ? index2 - rows : 0;
-      let list = styleList;
-      let time = list[timeIndex] ? Number(list[timeIndex]["--time"]) : 0;
+    const styleInfo = (index, nodeTop, width) => {
+      let timeIndex = index - rows > 0 ? index - rows : 0;
+      let list2 = styleList;
+      let time = list2[timeIndex] ? Number(list2[timeIndex]["--time"]) : 0;
       let obj = {
         top: nodeTop,
-        "--time": `${frequency * index2 + time}`,
-        animationDuration: `${speeds}ms`,
+        "--time": `${interval * index + time}`,
+        animationDuration: `${duration}ms`,
         animationIterationCount: `${loop ? "infinite" : 1}`,
-        animationDelay: `${frequency * index2 + time}ms`,
+        animationDelay: `${interval * index + time}ms`,
         "--move-distance": `-${width}px`
       };
-      list.push(obj);
-      setStyleList([...list]);
+      list2.push(obj);
+      setStyleList([...list2]);
     };
-    return /* @__PURE__ */ React.createElement("div", { className: classes, ref: barrageBody, ...restProps }, /* @__PURE__ */ React.createElement("div", { ref: barrageContainer, className: "bContainer" }, baItemList.map((item, index2) => {
+    return /* @__PURE__ */ React.createElement("div", { className: classes, ref: barrageBody, ...restProps }, /* @__PURE__ */ React.createElement("div", { ref: barrageContainer, className: "bContainer" }, baItemList.map((item, index) => {
       return /* @__PURE__ */ React.createElement(
         "div",
         {
-          className: `barrage-item nut-barrage__item${index2} move`,
-          style: styleList[index2]
+          className: `barrage-item ${classPrefix}__item${index} move`,
+          style: styleList[index]
         },
         item.length > 8 ? item.substr(0, 8) + "..." : item
       );
@@ -16982,43 +17096,42 @@ var __publicField = (obj, key, value) => {
   TimeSelect.defaultProps = defaultProps$2;
   TimeSelect.displayName = "NutTimeSelect";
   const defaultProps$1 = {
-    rate: 0,
+    ...ComponentDefaults,
+    value: 0,
     digits: 2,
-    showSign: false,
-    showZero: false,
+    symbol: false,
+    zero: false,
     arrowLeft: false,
-    syncTextColor: true,
-    textColor: "#333",
+    syncColor: true,
+    color: "#333",
     riseColor: "#fa2c19",
     dropColor: "#64b578",
-    upIcon: null,
-    downIcon: null,
-    className: ""
+    riseIcon: null,
+    downIcon: null
   };
   const TrendArrow = (props) => {
     const {
-      rate,
+      value,
       digits,
-      showSign,
-      showZero,
+      symbol,
+      zero,
       arrowLeft,
-      syncTextColor,
-      textColor,
+      syncColor,
+      color,
       riseColor,
       dropColor,
-      upIcon,
+      riseIcon,
       downIcon,
       className,
+      style,
       children,
       ...rest
     } = { ...defaultProps$1, ...props };
-    const b2 = cn("trendarrow");
-    const handleClick = () => {
-    };
-    const rateTrend = React.useRef(rate > 0);
+    const classPrefix2 = "nut-trendarrow";
+    const rateTrend = React.useRef(value > 0);
     const myFixed = (num, digit = 2) => {
       if (Object.is(parseFloat(num), NaN)) {
-        return console.log(`传入的值：${num}不是一个数字`);
+        return console.warn(`传入的值：${num}不是一个数字`);
       }
       num = parseFloat(num);
       const numPow = Math.pow(10, digit);
@@ -17026,20 +17139,20 @@ var __publicField = (obj, key, value) => {
     };
     const calcStyle = (() => {
       const arrowColor = rateTrend.current ? riseColor : dropColor;
-      const textEquArrowColor = syncTextColor ? arrowColor : textColor;
-      const style = {
-        color: rate === 0 ? textColor : textEquArrowColor
+      const textEquArrowColor = syncColor ? arrowColor : color;
+      const style2 = {
+        color: value === 0 ? color : textEquArrowColor
       };
-      return style;
+      return style2;
     })();
     const calcRate = (() => {
-      rateTrend.current = rate > 0;
-      const absRate = Math.abs(rate);
-      if (!showZero && rate === 0) {
+      rateTrend.current = value > 0;
+      const absRate = Math.abs(value);
+      if (!zero && value === 0) {
         return "--";
       }
       const resultRate = `${// eslint-disable-next-line no-nested-ternary
-      showSign && rate !== 0 ? rateTrend.current ? "+" : "-" : ""}${myFixed(Number(absRate), digits)}%`;
+      symbol && value !== 0 ? rateTrend.current ? "+" : "-" : ""}${myFixed(Number(absRate), digits)}%`;
       return resultRate;
     })();
     const calcIconProps = (() => {
@@ -17050,13 +17163,21 @@ var __publicField = (obj, key, value) => {
     })();
     const renderContent = (arrowLeft2) => {
       const classNameSuffix = !arrowLeft2 ? "icon-after" : "icon-before";
-      return /* @__PURE__ */ React.createElement("span", { className: `${b2(classNameSuffix)} ${b2("rate")}`, style: calcStyle }, calcRate);
+      return /* @__PURE__ */ React.createElement(
+        "span",
+        {
+          className: `${classPrefix2}__${classNameSuffix} ${classPrefix2}__value`,
+          style: calcStyle
+        },
+        calcRate
+      );
     };
-    return /* @__PURE__ */ React.createElement("div", { className: `${b2()} ${className}`, ...rest, onClick: handleClick }, !arrowLeft && renderContent(!arrowLeft), children || /* @__PURE__ */ React.createElement(React.Fragment, null, Number(rate) !== 0 && /* @__PURE__ */ React.createElement(React.Fragment, null, rateTrend ? /* @__PURE__ */ React.createElement(a, { color: calcIconProps.color }) : /* @__PURE__ */ React.createElement(a$1, { color: calcIconProps.color }))), arrowLeft && renderContent(!arrowLeft));
+    return /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2} ${className}`, style, ...rest }, !arrowLeft && renderContent(!arrowLeft), Number(value) !== 0 && /* @__PURE__ */ React.createElement(React.Fragment, null, rateTrend.current ? /* @__PURE__ */ React.createElement(React.Fragment, null, riseIcon || /* @__PURE__ */ React.createElement(a, { color: calcIconProps.color })) : /* @__PURE__ */ React.createElement(React.Fragment, null, downIcon || /* @__PURE__ */ React.createElement(a$1, { color: calcIconProps.color }))), arrowLeft && renderContent(!arrowLeft));
   };
   TrendArrow.defaultProps = defaultProps$1;
   TrendArrow.displayName = "NutTrendArrow";
   const defaultProps = {
+    ...ComponentDefaults,
     content: "",
     fullPage: true,
     zIndex: 2e3,
@@ -17068,9 +17189,8 @@ var __publicField = (obj, key, value) => {
     imageWidth: 120,
     imageHeight: 64,
     rotate: -22,
-    fontColor: "rgba(0,0,0,.15)",
+    color: "rgba(0,0,0,.15)",
     fontStyle: "normal",
-    fontFamily: "PingFang SC",
     fontWeight: "normal",
     fontSize: 14
   };
@@ -17089,22 +17209,20 @@ var __publicField = (obj, key, value) => {
       imageWidth,
       imageHeight,
       rotate,
-      fontColor,
+      color,
       fontStyle,
       fontFamily,
       fontWeight,
       fontSize,
-      style,
-      children
+      style
     } = {
       ...defaultProps,
       ...props
     };
     const [base64Url, setBase64Url] = React.useState("");
-    const b2 = cn("watermark");
-    const classes = classNames({
-      [`${b2("")}`]: true,
-      [`${b2("")}-full-page`]: fullPage
+    const classPrefix2 = "nut-watermark";
+    const classes = classNames(classPrefix2, {
+      [`${classPrefix2}-full-page`]: fullPage
     });
     const cls = classNames(classes, className);
     React.useEffect(() => {
@@ -17114,8 +17232,8 @@ var __publicField = (obj, key, value) => {
       let ratio = 1;
       Taro.getSystemInfo().then((res) => {
         ratio = res.pixelRatio;
-        const canvasWidth = `${(gapX + width) * ratio}px`;
-        const canvasHeight = `${(gapY + height) * ratio}px`;
+        const canvasWidth = `${(gapX + width) * ratio}`;
+        const canvasHeight = `${(gapY + height) * ratio}`;
         const markWidth = width * ratio;
         const markHeight = height * ratio;
         let ctx;
@@ -17123,8 +17241,8 @@ var __publicField = (obj, key, value) => {
         if (process.env.TARO_ENV === "h5") {
           canvas = document.createElement("canvas");
           ctx = canvas.getContext("2d");
-          canvas.setAttribute("width", canvasWidth);
-          canvas.setAttribute("height", canvasHeight);
+          canvas.setAttribute("width", `${canvasWidth}px`);
+          canvas.setAttribute("height", `${canvasHeight}px`);
         } else {
           canvas = Taro.createOffscreenCanvas({
             type: "2d",
@@ -17164,7 +17282,7 @@ var __publicField = (obj, key, value) => {
             ctx.rotate(Math.PI / 180 * Number(rotate));
             const markSize = Number(fontSize) * ratio;
             ctx.font = `${fontStyle} normal ${fontWeight} ${markSize}px/${markHeight}px ${fontFamily}`;
-            ctx.fillStyle = fontColor;
+            ctx.fillStyle = color;
             ctx.fillText(content, 0, 0);
             ctx.restore();
             setBase64Url(canvas.toDataURL());