@nutui/nutui-react 2.0.17 → 2.0.18-beta.1

package/dist/nutui.react.es.js

@@ -6,7 +6,7 @@ var __publicField = (obj, key, value) => {
 };
 var _a;
 /*!
-* @nutui/nutui-react v2.0.17 Wed Sep 13 2023 17:08:08 GMT+0800 (中国标准时间)
+* @nutui/nutui-react v2.0.18 Wed Sep 20 2023 14:59:05 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */
@@ -6111,7 +6111,7 @@ const defaultProps$1h = {
   ...ComponentDefaults,
   position: "top",
   threshold: 0,
-  zIndex: 2e3
+  zIndex: 900
 };
 const classPrefix$j = "nut-sticky";
 const Sticky = (props) => {
@@ -6247,7 +6247,7 @@ const defaultProps$1g = {
   ...ComponentDefaults,
   target: "",
   threshold: 200,
-  zIndex: 10,
+  zIndex: 900,
   duration: 1e3
 };
 const BackTop = (props) => {
@@ -11846,7 +11846,7 @@ const defaultProps$1c = {
   onCloseIconClick: (e) => true,
   ...defaultOverlayProps
 };
-let _zIndex = 1e3;
+let _zIndex = 1100;
 const Popup = (props) => {
   const {
     children,
@@ -12214,8 +12214,8 @@ const Badge = (props) => {
   }
   const getStyle = () => {
     const style2 = {};
-    style2.top = `${Number(top) || parseFloat(top) || 0}px`;
-    style2.right = `${Number(right) || parseFloat(right) || 0}px`;
+    style2.top = `${Number(top) || parseFloat(String(top)) || 0}px`;
+    style2.right = `${Number(right) || parseFloat(String(right)) || 0}px`;
     style2.background = color;
     return style2;
   };
@@ -13293,7 +13293,7 @@ const Utils = {
    * @return {Boolse} true|false
    */
   isLeapYear(y2) {
-    return y2 % 4 == 0 && y2 % 100 != 0 || y2 % 400 == 0;
+    return y2 % 4 === 0 && y2 % 100 !== 0 || y2 % 400 === 0;
   },
   /**
    * 返回星期数
@@ -13396,9 +13396,9 @@ const Utils = {
    * 时间是否相等
    * @return {Boolean}
    */
-  isEqual(date1 = "", date22) {
-    const startTime = new Date(date1.replace("-", "/")).getTime();
-    const endTime = new Date(date22.replace("-", "/")).getTime();
+  isEqual(date1, date22) {
+    const startTime = new Date((date1 || "").replace(/-/g, "/")).getTime();
+    const endTime = new Date(date22.replace(/-/g, "/")).getTime();
     if (startTime === endTime) {
       return true;
     }
@@ -16395,6 +16395,7 @@ Schema.register = function register(type4, validator) {
 Schema.warning = warning;
 Schema.messages = messages;
 Schema.validators = validators;
+const SECRET = "NUT_FORM_INTERNAL";
 class FormStore {
   constructor() {
     // 初始化数据
@@ -16430,12 +16431,12 @@ class FormStore {
     /**
      * 获取全部字段
      */
-    __publicField(this, "getFieldsValue", (name) => {
-      if (typeof name === "boolean") {
+    __publicField(this, "getFieldsValue", (nameList) => {
+      if (typeof nameList === "boolean") {
         return JSON.parse(JSON.stringify(this.store));
       }
       const fieldsValue = {};
-      name.forEach((field) => {
+      nameList.forEach((field) => {
         fieldsValue[field] = this.getFieldValue(field);
       });
       return fieldsValue;
@@ -16555,20 +16556,27 @@ class FormStore {
     __publicField(this, "dispatch", ({ name }) => {
       this.validateFields([name]);
     });
+    __publicField(this, "getInternal", (key) => {
+      if (key === SECRET) {
+        return {
+          registerField: this.registerField,
+          setCallback: this.setCallback,
+          setInitialValues: this.setInitialValues,
+          dispatch: this.dispatch,
+          store: this.store,
+          fieldEntities: this.fieldEntities
+        };
+      }
+    });
     __publicField(this, "getForm", () => {
       return {
-        dispatch: this.dispatch,
-        setInitialValues: this.setInitialValues,
-        setCallback: this.setCallback,
-        registerField: this.registerField,
         getFieldValue: this.getFieldValue,
         getFieldsValue: this.getFieldsValue,
         setFieldsValue: this.setFieldsValue,
         resetFields: this.resetFields,
         submit: this.submit,
-        store: this.store,
         errors: this.errors,
-        fieldEntities: this.fieldEntities
+        getInternal: this.getInternal
       };
     });
     this.callbacks = {
@@ -16633,7 +16641,8 @@ const Form = React__default.forwardRef(
     }
     React__default.useImperativeHandle(ref, () => formInstance);
     formInstance.starPosition = starPosition;
-    const { setCallback, submit, resetFields, setInitialValues } = formInstance;
+    const { submit, resetFields } = formInstance;
+    const { setCallback, setInitialValues } = formInstance.getInternal(SECRET);
     setCallback({
       onFinish,
       onFinishFailed
@@ -16695,7 +16704,8 @@ class FormItem extends React__default.Component {
     // children添加value属性和onChange事件
     __publicField(this, "getControlled", (children) => {
       var _a2;
-      const { setFieldsValue, getFieldValue, dispatch } = this.context;
+      const { setFieldsValue, getFieldValue } = this.context;
+      const { dispatch } = this.context.getInternal(SECRET);
       const { name = "" } = this.props;
       if ((_a2 = children == null ? void 0 : children.props) == null ? void 0 : _a2.defaultValue) {
         console.warn("通过 initialValue 设置初始值");
@@ -16804,7 +16814,8 @@ class FormItem extends React__default.Component {
     };
   }
   componentDidMount() {
-    this.cancelRegister = this.context.registerField(this);
+    const { registerField } = this.context.getInternal(SECRET);
+    this.cancelRegister = registerField(this);
   }
   componentWillUnmount() {
     if (this.cancelRegister) {
@@ -17313,6 +17324,7 @@ const defaultProps$S = {
   columns: 1,
   direction: "down",
   icon: null,
+  closeOnClickAway: true,
   activeTitleClass: "",
   inactiveTitleClass: "",
   onChange: (value) => void 0
@@ -17323,6 +17335,7 @@ const MenuItem = forwardRef((props, ref) => {
     style,
     options: options2,
     value,
+    defaultValue,
     columns,
     title,
     icon,
@@ -17341,7 +17354,15 @@ const MenuItem = forwardRef((props, ref) => {
     ...props
   };
   const [showPopup, setShowPopup] = useState(show2);
-  const [innerValue, setValue] = useState(value);
+  const [innerValue, setValue] = usePropsValue({
+    defaultValue,
+    value,
+    finalValue: void 0,
+    onChange: (v) => {
+      const [option] = options2.filter((o) => o.value === v);
+      onChange == null ? void 0 : onChange(option);
+    }
+  });
   useEffect(() => {
     setShowPopup(show2);
   }, [show2]);
@@ -17349,7 +17370,9 @@ const MenuItem = forwardRef((props, ref) => {
     getParentOffset();
   }, [showPopup]);
   useImperativeHandle(ref, () => ({
-    toggle: parent.toggleMenuItem
+    toggle: (s) => {
+      s ? parent.toggleMenuItem(index) : parent.hideMenuItem(index);
+    }
   }));
   const getIconCName = (optionVal, value2) => {
     return classNames({
@@ -17366,7 +17389,6 @@ const MenuItem = forwardRef((props, ref) => {
     parent.toggleMenuItem(index);
     setTitle(item.text);
     setValue(item.value);
-    onChange && onChange(item);
   };
   const isShow = () => {
     if (showPopup)
@@ -17377,6 +17399,9 @@ const MenuItem = forwardRef((props, ref) => {
     top: 0,
     height: 0
   });
+  const scrollParent = useMemo$1(() => {
+    return getScrollParent(parent.menuRef, window);
+  }, [parent.menuRef]);
   const getParentOffset = () => {
     setTimeout(() => {
       const p = parent.menuRef.current;
@@ -17387,6 +17412,12 @@ const MenuItem = forwardRef((props, ref) => {
       });
     });
   };
+  useEffect(() => {
+    scrollParent == null ? void 0 : scrollParent.addEventListener("scroll", getParentOffset, false);
+    return () => {
+      scrollParent == null ? void 0 : scrollParent.removeEventListener("scroll", getParentOffset, false);
+    };
+  }, []);
   const getPosition = () => {
     return direction === "down" ? {
       top: `${position.top + position.height}px`,
@@ -17418,7 +17449,7 @@ const MenuItem = forwardRef((props, ref) => {
       className: "nut-menu-item-container",
       ref: micRef
     },
-    /* @__PURE__ */ React__default.createElement(
+    parent.overlay ? /* @__PURE__ */ React__default.createElement(
       Overlay,
       {
         className: "nut-menu__overlay",
@@ -17430,7 +17461,7 @@ const MenuItem = forwardRef((props, ref) => {
           parent.closeOnOverlayClick && parent.toggleMenuItem(index);
         }
       }
-    ),
+    ) : null,
     /* @__PURE__ */ React__default.createElement(
       "div",
       {
@@ -17496,10 +17527,11 @@ const defaultProps$R = {
   closeOnOverlayClick: true,
   scrollFixed: false,
   lockScroll: true,
+  overlay: true,
   icon: null,
-  onOpen: () => {
+  onOpen: (index) => {
   },
-  onClose: () => {
+  onClose: (index) => {
   }
 };
 const Menu = (props) => {
@@ -17508,6 +17540,7 @@ const Menu = (props) => {
     icon,
     scrollFixed,
     lockScroll,
+    overlay,
     closeOnOverlayClick,
     children,
     activeColor,
@@ -17540,9 +17573,9 @@ const Menu = (props) => {
   const toggleMenuItem = (index) => {
     showMenuItem[index] = !showMenuItem[index];
     if (showMenuItem[index]) {
-      onOpen && onOpen();
+      onOpen && onOpen(index);
     } else {
-      onClose && onClose();
+      onClose && onClose(index);
     }
     const temp = showMenuItem.map(
       (i, idx) => idx === index ? i : false
@@ -17552,7 +17585,7 @@ const Menu = (props) => {
   const hideMenuItem = (index) => {
     showMenuItem[index] = false;
     setShowMenuItem([...showMenuItem]);
-    onClose && onClose();
+    onClose && onClose(index);
   };
   const updateTitle = (text, index) => {
     menuItemTitle[index] = text;
@@ -17567,6 +17600,7 @@ const Menu = (props) => {
         activeColor,
         parent: {
           closeOnOverlayClick,
+          overlay,
           lockScroll,
           toggleMenuItem,
           updateTitle,
@@ -17579,9 +17613,9 @@ const Menu = (props) => {
   const menuTitle = () => {
     return React__default.Children.map(children, (child, index) => {
       if (React__default.isValidElement(child)) {
-        const { title, options: options2, value, disabled, direction } = child.props;
+        const { title, options: options2, value, defaultValue, disabled, direction } = child.props;
         const selected = options2 == null ? void 0 : options2.filter(
-          (option) => option.value === value
+          (option) => option.value === (value !== void 0 ? value : defaultValue)
         );
         const finallyTitle = () => {
           if (title)
@@ -17603,6 +17637,8 @@ const Menu = (props) => {
             key: index,
             onClick: (e) => {
               e.stopPropagation();
+              if ((!options2 || !options2.length) && !child.props.children)
+                return;
               !disabled && toggleMenuItem(index);
             }
           },
@@ -19456,7 +19492,7 @@ const InternalUploader = (props, ref) => {
   const handleItemClick = (file) => {
     onFileItemClick && onFileItemClick(file);
   };
-  return /* @__PURE__ */ React__default.createElement("div", { className: classes, ...restProps }, children && /* @__PURE__ */ React__default.createElement("div", { className: "nut-uploader__slot" }, /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, children, maxCount > fileList.length && /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, capture ? /* @__PURE__ */ React__default.createElement(
+  return /* @__PURE__ */ React__default.createElement("div", { className: classes, ...restProps }, (children || previewType === "list") && /* @__PURE__ */ React__default.createElement("div", { className: "nut-uploader__slot" }, /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, children || /* @__PURE__ */ React__default.createElement(Button, { size: "small", type: "primary" }, "上传文件"), maxCount > fileList.length && /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, capture ? /* @__PURE__ */ React__default.createElement(
     "input",
     {
       className: "nut-uploader__input",
@@ -19486,14 +19522,15 @@ const InternalUploader = (props, ref) => {
         className: `nut-uploader__preview ${previewType}`,
         key: item.uid
       },
-      previewType === "picture" && !children && /* @__PURE__ */ React__default.createElement("div", { className: "nut-uploader__preview-img" }, deletable && /* @__PURE__ */ React__default.createElement(
+      previewType === "picture" && deletable && /* @__PURE__ */ React__default.createElement(
         x$9,
         {
           color: "rgba(0,0,0,0.6)",
           className: "close",
           onClick: () => onDeleteItem(item, index)
         }
-      ), item.status === "ready" ? /* @__PURE__ */ React__default.createElement("div", { className: "nut-uploader__preview__progress" }, /* @__PURE__ */ React__default.createElement("div", { className: "nut-uploader__preview__progress__msg" }, item.message)) : item.status !== "success" && /* @__PURE__ */ React__default.createElement("div", { className: "nut-uploader__preview__progress" }, item.failIcon !== " " && item.loadingIcon !== " " && (item.status === "error" ? item.failIcon || /* @__PURE__ */ React__default.createElement(x$9, { color: "#fff" }) : item.loadingIcon || /* @__PURE__ */ React__default.createElement(
+      ),
+      previewType === "picture" && !children && /* @__PURE__ */ React__default.createElement("div", { className: "nut-uploader__preview-img" }, item.status === "ready" ? /* @__PURE__ */ React__default.createElement("div", { className: "nut-uploader__preview__progress" }, /* @__PURE__ */ React__default.createElement("div", { className: "nut-uploader__preview__progress__msg" }, item.message)) : item.status !== "success" && /* @__PURE__ */ React__default.createElement("div", { className: "nut-uploader__preview__progress" }, item.failIcon !== " " && item.loadingIcon !== " " && (item.status === "error" ? item.failIcon || /* @__PURE__ */ React__default.createElement(x$9, { color: "#fff" }) : item.loadingIcon || /* @__PURE__ */ React__default.createElement(
         k$3,
         {
           className: "nut-icon-loading",
@@ -19523,8 +19560,7 @@ const InternalUploader = (props, ref) => {
           className: "nut-uploader__preview-img__file__name"
         },
         /* @__PURE__ */ React__default.createElement(x$6, { color: "#808080" }),
-        " ",
-        item.name
+        /* @__PURE__ */ React__default.createElement("span", null, " ", item.name)
       ))), item.status === "success" ? /* @__PURE__ */ React__default.createElement("div", { className: "tips" }, item.name) : null),
       previewType === "list" && /* @__PURE__ */ React__default.createElement("div", { className: "nut-uploader__preview-list" }, /* @__PURE__ */ React__default.createElement(
         "div",
@@ -19533,8 +19569,7 @@ const InternalUploader = (props, ref) => {
           onClick: () => handleItemClick(item)
         },
         /* @__PURE__ */ React__default.createElement(x$6, null),
-        " ",
-        item.name
+        /* @__PURE__ */ React__default.createElement("span", null, " ", item.name)
       ), deletable && /* @__PURE__ */ React__default.createElement(
         y$8,
         {
@@ -19876,7 +19911,7 @@ const DialogWrap = (props) => {
     Overlay,
     {
       style: overlayStyle,
-      className: overlayClassName,
+      className: classNames("nut-dialog-overlay", overlayClassName),
       visible,
       closeOnOverlayClick,
       lockScroll,
@@ -23410,10 +23445,6 @@ const Swiper = React__default.forwardRef((props, ref) => {
     target.style.transform = `translate3D${!isVertical ? `(${_offset}px,0,0)` : `(0,${_offset}px,0)`}`;
   };
   const onTouchStart = (e) => {
-    if (props.preventDefault)
-      e.preventDefault();
-    if (props.stopPropagation)
-      e.stopPropagation();
     if (!props.touchable)
       return;
     touchStart(e);
@@ -23422,6 +23453,10 @@ const Swiper = React__default.forwardRef((props, ref) => {
     resetPosition();
   };
   const onTouchMove = (e) => {
+    if (props.preventDefault)
+      e.preventDefault();
+    if (props.stopPropagation)
+      e.stopPropagation();
     if (props.touchable && swiperRef.current.moving) {
       handleTouchMove(e);
       if (touch.stateDirection === props.direction) {