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

package/dist/nutui.react.umd.js

@@ -8,7 +8,7 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 /*!
-* @nutui/nutui-react-taro v2.0.17 Wed Sep 13 2023 17:17:51 GMT+0800 (中国标准时间)
+* @nutui/nutui-react-taro v2.0.18-beta.1 Wed Sep 20 2023 14:53:57 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */
@@ -5552,7 +5552,7 @@ var __publicField = (obj, key, value) => {
   const defaultProps$1j = {
     ...ComponentDefaults,
     position: "top",
-    zIndex: 2e3
+    zIndex: 900
   };
   const classPrefix$k = "nut-sticky";
   const Sticky = (props) => {
@@ -5677,7 +5677,7 @@ var __publicField = (obj, key, value) => {
   const defaultProps$1i = {
     ...ComponentDefaults,
     threshold: 200,
-    zIndex: 10,
+    zIndex: 900,
     duration: 1e3
   };
   const BackTop = (props) => {
@@ -6130,7 +6130,7 @@ var __publicField = (obj, key, value) => {
     onCloseIconClick: (e) => true,
     ...defaultOverlayProps
   };
-  let _zIndex = 2e3;
+  let _zIndex = 1100;
   const Popup = (props) => {
     const {
       children,
@@ -6490,8 +6490,8 @@ var __publicField = (obj, key, value) => {
     }
     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;
     };
@@ -7649,7 +7649,7 @@ var __publicField = (obj, key, value) => {
      * @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;
     },
     /**
      * 返回星期数
@@ -7752,9 +7752,9 @@ var __publicField = (obj, key, value) => {
      * 时间是否相等
      * @return {Boolean}
      */
-    isEqual(date1 = "", date2) {
-      const startTime = new Date(date1.replace("-", "/")).getTime();
-      const endTime = new Date(date2.replace("-", "/")).getTime();
+    isEqual(date1, date2) {
+      const startTime = new Date((date1 || "").replace(/-/g, "/")).getTime();
+      const endTime = new Date(date2.replace(/-/g, "/")).getTime();
       if (startTime === endTime) {
         return true;
       }
@@ -10876,6 +10876,7 @@ var __publicField = (obj, key, value) => {
   Schema.warning = warning;
   Schema.messages = messages;
   Schema.validators = validators;
+  const SECRET$1 = "NUT_FORM_INTERNAL";
   class FormStore {
     constructor() {
       // 初始化数据
@@ -10911,12 +10912,12 @@ var __publicField = (obj, key, value) => {
       /**
        * 获取全部字段
        */
-      __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;
@@ -11036,20 +11037,27 @@ var __publicField = (obj, key, value) => {
       __publicField(this, "dispatch", ({ name }) => {
         this.validateFields([name]);
       });
+      __publicField(this, "getInternal", (key) => {
+        if (key === SECRET$1) {
+          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 = {
@@ -11112,8 +11120,10 @@ var __publicField = (obj, key, value) => {
       } else {
         [formInstance] = useForm();
       }
+      React.useImperativeHandle(ref, () => formInstance);
       formInstance.starPosition = starPosition;
-      const { setCallback, submit, resetFields, setInitialValues } = formInstance;
+      const { submit, resetFields } = formInstance;
+      const { setCallback, setInitialValues } = formInstance.getInternal(SECRET$1);
       setCallback({
         onFinish,
         onFinishFailed
@@ -11158,6 +11168,7 @@ var __publicField = (obj, key, value) => {
       }
     ).$$typeof === component.type.$$typeof;
   }
+  const SECRET = "NUT_FORM_INTERNAL";
   const defaultProps$X = {
     ...ComponentDefaults,
     required: false,
@@ -11175,7 +11186,8 @@ var __publicField = (obj, key, value) => {
       // children添加value属性和onChange事件
       __publicField(this, "getControlled", (children) => {
         var _a;
-        const { setFieldsValue, getFieldValue, dispatch } = this.context;
+        const { setFieldsValue, getFieldValue } = this.context;
+        const { dispatch } = this.context.getInternal(SECRET);
         const { name = "" } = this.props;
         if ((_a = children == null ? void 0 : children.props) == null ? void 0 : _a.defaultValue) {
           console.warn("通过 initialValue 设置初始值");
@@ -11284,7 +11296,8 @@ var __publicField = (obj, key, value) => {
       };
     }
     componentDidMount() {
-      this.cancelRegister = this.context.registerField(this);
+      const { registerField } = this.context.getInternal(SECRET);
+      this.cancelRegister = registerField(this);
     }
     componentWillUnmount() {
       if (this.cancelRegister) {
@@ -11750,7 +11763,7 @@ var __publicField = (obj, key, value) => {
     columns: 1,
     direction: "down",
     icon: null,
-    closeOnClickAway: false,
+    closeOnClickAway: true,
     activeTitleClass: "",
     inactiveTitleClass: "",
     onChange: (value) => void 0
@@ -11761,6 +11774,7 @@ var __publicField = (obj, key, value) => {
       style,
       options,
       value,
+      defaultValue,
       columns,
       title,
       icon,
@@ -11779,7 +11793,15 @@ var __publicField = (obj, key, value) => {
       ...props
     };
     const [showPopup, setShowPopup] = React.useState(show2);
-    const [innerValue, setValue] = React.useState(value);
+    const [innerValue, setValue] = usePropsValue({
+      defaultValue,
+      value,
+      finalValue: void 0,
+      onChange: (v) => {
+        const [option] = options.filter((o) => o.value === v);
+        onChange == null ? void 0 : onChange(option);
+      }
+    });
     React.useEffect(() => {
       setShowPopup(show2);
     }, [show2]);
@@ -11800,7 +11822,9 @@ var __publicField = (obj, key, value) => {
     }, [direction, windowHeight]);
     Taro.usePageScroll(updateItemOffset);
     React.useImperativeHandle(ref, () => ({
-      toggle: parent.toggleMenuItem
+      toggle: (s) => {
+        s ? parent.toggleMenuItem(index) : parent.hideMenuItem(index);
+      }
     }));
     const getIconCName = (optionVal, value2) => {
       return classNames({
@@ -11817,7 +11841,6 @@ var __publicField = (obj, key, value) => {
       parent.toggleMenuItem(index);
       setTitle(item.text);
       setValue(item.value);
-      onChange && onChange(item);
     };
     const [position, setPosition] = React.useState({
       top: 0,
@@ -11871,7 +11894,7 @@ var __publicField = (obj, key, value) => {
         style: placeholderStyle(),
         onClick: () => parent.toggleMenuItem(index)
       }
-    ) : null, /* @__PURE__ */ React.createElement(
+    ) : null, parent.overlay ? /* @__PURE__ */ React.createElement(
       Overlay,
       {
         className: "nut-menu__overlay",
@@ -11883,7 +11906,7 @@ var __publicField = (obj, key, value) => {
           parent.closeOnOverlayClick && parent.toggleMenuItem(index);
         }
       }
-    ), /* @__PURE__ */ React.createElement(
+    ) : null, /* @__PURE__ */ React.createElement(
       components.View,
       {
         className: classNames(className, {
@@ -11948,10 +11971,11 @@ var __publicField = (obj, key, value) => {
     closeOnOverlayClick: true,
     scrollFixed: false,
     lockScroll: true,
+    overlay: true,
     icon: null,
-    onOpen: () => {
+    onOpen: (index) => {
     },
-    onClose: () => {
+    onClose: (index) => {
     }
   };
   const Menu = (props) => {
@@ -11960,6 +11984,7 @@ var __publicField = (obj, key, value) => {
       icon,
       scrollFixed,
       lockScroll,
+      overlay,
       closeOnOverlayClick,
       children,
       activeColor,
@@ -11992,9 +12017,9 @@ var __publicField = (obj, key, value) => {
     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
@@ -12004,7 +12029,7 @@ var __publicField = (obj, key, value) => {
     const hideMenuItem = (index) => {
       showMenuItem[index] = false;
       setShowMenuItem([...showMenuItem]);
-      onClose && onClose();
+      onClose && onClose(index);
     };
     const updateTitle = (text, index) => {
       menuItemTitle[index] = text;
@@ -12019,6 +12044,7 @@ var __publicField = (obj, key, value) => {
           activeColor,
           parent: {
             closeOnOverlayClick,
+            overlay,
             lockScroll,
             toggleMenuItem,
             updateTitle,
@@ -12031,9 +12057,9 @@ var __publicField = (obj, key, value) => {
     const menuTitle = () => {
       return React.Children.map(children, (child, index) => {
         if (React.isValidElement(child)) {
-          const { title, options, value, disabled, direction } = child.props;
+          const { title, options, value, defaultValue, disabled, direction } = child.props;
           const selected = options == null ? void 0 : options.filter(
-            (option) => option.value === value
+            (option) => option.value === (value !== void 0 ? value : defaultValue)
           );
           const finallyTitle = () => {
             if (title)
@@ -12054,6 +12080,8 @@ var __publicField = (obj, key, value) => {
               style: { color: showMenuItem[index] ? activeColor : "" },
               key: index,
               onClick: () => {
+                if ((!options || !options.length) && !child.props.children)
+                  return;
                 !disabled && toggleMenuItem(index);
               }
             },
@@ -13991,21 +14019,22 @@ var __publicField = (obj, key, value) => {
     const handleItemClick = (file) => {
       onFileItemClick && onFileItemClick(file);
     };
-    return /* @__PURE__ */ React.createElement("div", { className: classes, ...restProps }, children && /* @__PURE__ */ React.createElement("div", { className: "nut-uploader__slot" }, /* @__PURE__ */ React.createElement(React.Fragment, null, children, maxCount > fileList.length && /* @__PURE__ */ React.createElement(Button, { className: "nut-uploader__input", onClick: _chooseImage }))), fileList.length !== 0 && Array.isArray(fileList) && fileList.map((item, index) => {
+    return /* @__PURE__ */ React.createElement("div", { className: classes, ...restProps }, (children || previewType === "list") && /* @__PURE__ */ React.createElement("div", { className: "nut-uploader__slot" }, /* @__PURE__ */ React.createElement(React.Fragment, null, children || /* @__PURE__ */ React.createElement(Button, { size: "small", type: "primary" }, "上传文件"), maxCount > fileList.length && /* @__PURE__ */ React.createElement(Button, { className: "nut-uploader__input", onClick: _chooseImage }))), fileList.length !== 0 && Array.isArray(fileList) && fileList.map((item, index) => {
       return /* @__PURE__ */ React.createElement(
         "div",
         {
           className: `nut-uploader__preview ${previewType}`,
           key: item.uid
         },
-        previewType === "picture" && !children && /* @__PURE__ */ React.createElement("div", { className: "nut-uploader__preview-img" }, deletable && /* @__PURE__ */ React.createElement(
+        previewType === "picture" && deletable && /* @__PURE__ */ React.createElement(
           a$n,
           {
             color: "rgba(0,0,0,0.6)",
             className: "close",
             onClick: () => onDeleteItem(item, index)
           }
-        ), item.status === "ready" ? /* @__PURE__ */ React.createElement("div", { className: "nut-uploader__preview__progress" }, /* @__PURE__ */ React.createElement("div", { className: "nut-uploader__preview__progress__msg" }, item.message)) : item.status !== "success" && /* @__PURE__ */ React.createElement("div", { className: "nut-uploader__preview__progress" }, item.failIcon !== " " && item.loadingIcon !== " " && (item.status === "error" ? item.failIcon || /* @__PURE__ */ React.createElement(a$n, { color: "#fff" }) : item.loadingIcon || /* @__PURE__ */ React.createElement(r$h, { color: "#fff" })), /* @__PURE__ */ React.createElement("div", { className: "nut-uploader__preview__progress__msg" }, item.message)), item.type.includes("image") ? /* @__PURE__ */ React.createElement(React.Fragment, null, item.url && /* @__PURE__ */ React.createElement(
+        ),
+        previewType === "picture" && !children && /* @__PURE__ */ React.createElement("div", { className: "nut-uploader__preview-img" }, item.status === "ready" ? /* @__PURE__ */ React.createElement("div", { className: "nut-uploader__preview__progress" }, /* @__PURE__ */ React.createElement("div", { className: "nut-uploader__preview__progress__msg" }, item.message)) : item.status !== "success" && /* @__PURE__ */ React.createElement("div", { className: "nut-uploader__preview__progress" }, item.failIcon !== " " && item.loadingIcon !== " " && (item.status === "error" ? item.failIcon || /* @__PURE__ */ React.createElement(a$n, { color: "#fff" }) : item.loadingIcon || /* @__PURE__ */ React.createElement(r$h, { color: "#fff" })), /* @__PURE__ */ React.createElement("div", { className: "nut-uploader__preview__progress__msg" }, item.message)), item.type.includes("image") ? /* @__PURE__ */ React.createElement(React.Fragment, null, item.url && /* @__PURE__ */ React.createElement(
           components.Image,
           {
             className: "nut-uploader__preview-img__c",
@@ -14029,8 +14058,7 @@ var __publicField = (obj, key, value) => {
             className: "nut-uploader__preview-img__file__name"
           },
           /* @__PURE__ */ React.createElement(a$i, { color: "#808080" }),
-          " ",
-          item.name
+          /* @__PURE__ */ React.createElement("span", null, " ", item.name)
         ))), item.status === "success" ? /* @__PURE__ */ React.createElement("div", { className: "tips" }, item.name) : null),
         previewType === "list" && /* @__PURE__ */ React.createElement("div", { className: "nut-uploader__preview-list" }, /* @__PURE__ */ React.createElement(
           "div",
@@ -14039,8 +14067,7 @@ var __publicField = (obj, key, value) => {
             onClick: () => handleItemClick(item)
           },
           /* @__PURE__ */ React.createElement(a$i, null),
-          " ",
-          item.name
+          /* @__PURE__ */ React.createElement("span", null, " ", item.name)
         ), deletable && /* @__PURE__ */ React.createElement(
           a$p,
           {
@@ -14338,7 +14365,8 @@ var __publicField = (obj, key, value) => {
           visible: true,
           closeOnOverlayClick,
           lockScroll,
-          onClick: onHandleClickOverlay
+          onClick: onHandleClickOverlay,
+          className: classNames("nut-dialog-overlay")
         }
       ) : null, /* @__PURE__ */ React.createElement(
         CSSTransition$1,

package/dist/packages/badge/badge.scss

@@ -26,6 +26,7 @@
     line-height: 16px;
     border: $badge-border;
     border-radius: $badge-border-radius;
+    min-width: $badge-min-width;
   }
 
   &__content {

package/dist/packages/dialog/dialog.scss

@@ -9,12 +9,18 @@
   padding: $dialog-padding;
   box-sizing: border-box;
 
+  &-overlay {
+    --nutui-overlay-zIndex: 1200;
+  }
+
   &__outer {
     position: fixed;
     max-height: 100%;
     overflow-y: auto;
     background-color: $white;
-    transition: transform 0.2s, -webkit-transform 0.2s;
+    transition:
+      transform 0.2s,
+      -webkit-transform 0.2s;
     -webkit-overflow-scrolling: touch;
     top: 50%;
     left: 50%;

package/dist/packages/fixednav/fixednav.scss

@@ -1,11 +1,4 @@
-.nut-theme-dark {
-  .nut-fixednav {
-    &__list {
-      // background-color: $dark2;
-      // color: $white;
-    }
-  }
-}
+
 .nut-fixednav {
   position: fixed;
   z-index: $fixednav-index;

package/dist/packages/menuitem/menuitem.scss

@@ -38,7 +38,7 @@
 .nut-menu-item__wrap-up {
   position: absolute;
   width: 100%;
-  z-index: 2052;
+  z-index: $menu-item-z-index;
   overflow: hidden;
 }
 
@@ -48,7 +48,7 @@
 
 .overlay-fade-enter-active.nut-menu__overlay {
   top: auto;
-  z-index: 2052;
+  z-index: $menu-item-z-index;
 }
 
 .nut-menu__pop.nut-popup {

package/dist/packages/toast/toast.scss

@@ -15,9 +15,10 @@
   height: 100%;
   text-align: center;
   pointer-events: none;
-  z-index: 9999;
+  z-index: 1300;
   &__overlay-default {
     --nutui-overlay-bg-color: rgba(0, 0, 0, 0);
+    --nutui-overlay-zIndex: 1300;
   }
   &-small {
     .nut-toast__inner {

package/dist/packages/tour/tour.scss

@@ -1,3 +1,4 @@
+
 .nut-tour {
   &-mask {
     position: fixed;

package/dist/packages/uploader/uploader.scss

@@ -68,6 +68,7 @@
     position: relative;
     margin-right: $uploader-preview-margin-right;
     margin-bottom: $uploader-preview-margin-bottom;
+    border-radius: $uploader-picture-border-radius;
     box-shadow: 0 2px 10px 0 rgb(0 0 0 / 10%);
 
     &__progress {
@@ -103,23 +104,20 @@
     &-list {
       width: 100%;
       height: 32px;
+      box-sizing: border-box;
       display: flex;
-      flex-direction: column;
-      position: relative;
+      align-items: center;
+      justify-content: space-between;
+      padding: 0 10px;
       background-color: $gray5;
 
       .nut-uploader__preview-img__file__name {
+        display: flex;
         -webkit-line-clamp: 1;
         padding: 2px;
         height: 24px;
       }
 
-      .nut-uploader__preview-img__file__del {
-        position: absolute;
-        right: 4px;
-        top: 6px;
-      }
-
       .nut-progress {
         position: absolute;
         left: 0;
@@ -137,6 +135,7 @@
       right: $uploader-preview-close-right;
       top: $uploader-preview-close-top;
       transform: translate(50%, -50%);
+      z-index: 1;
     }
 
     &-img {
@@ -144,6 +143,7 @@
       width: $uploader-picture-width;
       height: $uploader-picture-height;
       border-radius: $uploader-picture-border-radius;
+      overflow: hidden;
 
       i {
         color: $gray1;
@@ -171,7 +171,7 @@
         width: 100%;
         height: 100%;
         position: initial;
-        border-radius: 6px;
+        border-radius: $uploader-picture-border-radius;
       }
 
       &__file {
@@ -184,7 +184,7 @@
 
         &__name {
           display: flex;
-          width: 100%;
+          width: 90%;
           font-size: 12px;
           color: $text-color;
 
@@ -198,8 +198,8 @@
 
           .nut-icon-link {
             &::before {
-              margin-left: -25%;
-              margin-top: -25%;
+              margin-left: -45%;
+              margin-top: -45%;
               transform: none;
             }
           }