@nutui/nutui-react-taro 2.3.6-beta.0 → 2.3.7

package/dist/nutui.react.umd.js

@@ -8,7 +8,7 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 /*!
-* @nutui/nutui-react-taro v2.3.6-beta.0 Wed Jan 10 2024 18:03:57 GMT+0800 (China Standard Time)
+* @nutui/nutui-react-taro v2.3.7 Fri Jan 19 2024 16:35:51 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */
@@ -5325,7 +5325,12 @@ var __publicField = (obj, key, value) => {
           activeType === "line" && /* @__PURE__ */ React.createElement(
             components.View,
             {
-              className: `${classPrefix$k}-titles-item-line`,
+              className: classNames(
+                `${classPrefix$k}-titles-item-line`,
+                {
+                  [`${classPrefix$k}-titles-item-line-${direction}`]: true
+                }
+              ),
               style: tabsActiveStyle
             }
           ),
@@ -5341,9 +5346,7 @@ var __publicField = (obj, key, value) => {
             components.View,
             {
               className: classNames(
-                {
-                  ellipsis: true
-                },
+                `${classPrefix$k}-ellipsis`,
                 `${classPrefix$k}-titles-item-text`
               )
             },
@@ -7300,8 +7303,8 @@ var __publicField = (obj, key, value) => {
     };
     const isActive = (day) => {
       if (type2 === "single" || type2 === "multiple") {
-        for (const val of innerValue) {
-          if (isSameDay(day, val)) {
+        for (const val in innerValue) {
+          if (isSameDay(day, innerValue[val])) {
             return true;
           }
         }
@@ -7507,28 +7510,33 @@ var __publicField = (obj, key, value) => {
   const Context$1 = CheckboxGroupContext;
   const defaultProps$11 = {
     max: void 0,
+    min: void 0,
     labelPosition: "right",
     direction: "vertical",
     onChange: (value) => {
     },
+    onLimit: (type2) => {
+    },
     options: []
   };
   const classPrefix$j = "nut-checkboxgroup";
   const CheckboxGroup = React.forwardRef(
     (props, ref) => {
-      const { children } = { ...defaultProps$11, ...props };
       const {
+        children,
         className,
         disabled,
         onChange,
         value,
         defaultValue,
         max,
+        min,
+        onLimit,
         labelPosition,
         direction,
         options,
         ...rest
-      } = props;
+      } = { ...defaultProps$11, ...props };
       React.useImperativeHandle(ref, () => ({
         toggle(state) {
           if (state === false) {
@@ -7573,7 +7581,7 @@ var __publicField = (obj, key, value) => {
             }
           );
         });
-      }, [options, max]);
+      }, [options, max, min]);
       return /* @__PURE__ */ React.createElement(
         Context$1.Provider,
         {
@@ -7581,13 +7589,22 @@ var __publicField = (obj, key, value) => {
             labelPosition: labelPosition || "right",
             disabled,
             max,
+            onLimit,
             value: _value,
             check: (value2) => {
               const combined = [..._value, value2];
+              if (max !== void 0) {
+                if (combined.length > max) {
+                  return onLimit == null ? void 0 : onLimit("max");
+                }
+              }
               setValue(combined);
             },
             uncheck: (value2) => {
               const reduced = _value.filter((item) => item !== value2);
+              if (min !== void 0 && reduced.length < min) {
+                return onLimit == null ? void 0 : onLimit("min");
+              }
               setValue(reduced);
             }
           }
@@ -7723,10 +7740,6 @@ var __publicField = (obj, key, value) => {
       if (disabled)
         return;
       const latestChecked = !innerChecked;
-      if (ctx && ctx.max !== void 0) {
-        if (latestChecked && ctx.value.length >= ctx.max)
-          return;
-      }
       setChecked(latestChecked);
     };
     const renderButton = () => {
@@ -9707,7 +9720,7 @@ var __publicField = (obj, key, value) => {
   Schema.warning = warning;
   Schema.messages = messages;
   Schema.validators = validators;
-  const SECRET$1 = "NUT_FORM_INTERNAL";
+  const SECRET = "NUT_FORM_INTERNAL";
   class FormStore {
     constructor() {
       // 初始化数据
@@ -9788,10 +9801,37 @@ var __publicField = (obj, key, value) => {
           ...callback
         };
       });
-      __publicField(this, "validateFields", async (nameList) => {
+      __publicField(this, "validateEntities", async (entity, errs) => {
         var _a;
+        const { name, rules: rules2 = [] } = entity.props;
+        const descriptor = {};
+        if (rules2.length) {
+          if (rules2.length > 1) {
+            descriptor[name] = [];
+            rules2.forEach((v) => {
+              descriptor[name].push(v);
+            });
+          } else {
+            descriptor[name] = rules2[0];
+          }
+        }
+        const validator = new Schema(descriptor);
+        try {
+          await validator.validate({ [name]: (_a = this.store) == null ? void 0 : _a[name] });
+        } catch ({ errors }) {
+          if (errors) {
+            errs.push(...errors);
+            this.errors[name] = errors;
+          }
+        } finally {
+          if (!errs || errs.length === 0) {
+            this.errors[name] = [];
+          }
+        }
+        entity.onStoreChange("validate");
+      });
+      __publicField(this, "validateFields", async (nameList) => {
         let filterEntities = [];
-        const errs = [];
         this.errors.length = 0;
         if (!nameList || nameList.length === 0) {
           filterEntities = this.fieldEntities;
@@ -9800,34 +9840,10 @@ var __publicField = (obj, key, value) => {
             ({ props: { name } }) => nameList.includes(name)
           );
         }
-        for (const entity of filterEntities) {
-          const { name, rules: rules2 = [] } = entity.props;
-          const descriptor = {};
-          if (rules2.length) {
-            if (rules2.length > 1) {
-              descriptor[name] = [];
-              rules2.forEach((v) => {
-                descriptor[name].push(v);
-              });
-            } else {
-              descriptor[name] = rules2[0];
-            }
-          }
-          const validator = new Schema(descriptor);
-          try {
-            await validator.validate({ [name]: (_a = this.store) == null ? void 0 : _a[name] });
-          } catch ({ errors }) {
-            if (errors) {
-              errs.push(...errors);
-              this.errors[name] = errors;
-            }
-          } finally {
-            if (!errs || errs.length === 0) {
-              this.errors[name] = [];
-            }
-          }
-          entity.onStoreChange("validate");
-        }
+        const errs = [];
+        filterEntities.forEach((entity) => {
+          this.validateEntities(entity, errs);
+        });
         return errs;
       });
       __publicField(this, "submit", async () => {
@@ -9850,7 +9866,7 @@ var __publicField = (obj, key, value) => {
         this.validateFields([name]);
       });
       __publicField(this, "getInternal", (key) => {
-        if (key === SECRET$1) {
+        if (key === SECRET) {
           return {
             registerField: this.registerField,
             setCallback: this.setCallback,
@@ -9936,7 +9952,7 @@ var __publicField = (obj, key, value) => {
       React.useImperativeHandle(ref, () => formInstance);
       formInstance.starPosition = starPosition;
       const { submit, resetFields } = formInstance;
-      const { setCallback, setInitialValues } = formInstance.getInternal(SECRET$1);
+      const { setCallback, setInitialValues } = formInstance.getInternal(SECRET);
       setCallback({
         onFinish,
         onFinishFailed
@@ -9981,7 +9997,6 @@ var __publicField = (obj, key, value) => {
       }
     ).$$typeof === component.type.$$typeof;
   }
-  const SECRET = "NUT_FORM_INTERNAL";
   const defaultProps$Y = {
     ...ComponentDefaults,
     required: false,
@@ -10953,6 +10968,7 @@ var __publicField = (obj, key, value) => {
   const defaultProps$T = {
     ...ComponentDefaults,
     visible: false,
+    rightActions: "",
     type: "default",
     custom: [],
     random: false,
@@ -10963,6 +10979,7 @@ var __publicField = (obj, key, value) => {
     const { locale } = useConfig$1();
     const {
       title,
+      rightActions,
       confirmText,
       visible,
       type: type2,
@@ -11072,7 +11089,7 @@ var __publicField = (obj, key, value) => {
           className: `${classPrefix2}-header-close`,
           onClick: onConfirm
         },
-        locale.done
+        rightActions || locale.done
       )), /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-body` }, /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-body-keys` }, keysList == null ? void 0 : keysList.map((item) => {
         return /* @__PURE__ */ React.createElement(NumberKeyboardKey, { key: item.id, item });
       })), type2 === "rightColumn" && /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-sidebar` }, /* @__PURE__ */ React.createElement(
@@ -12570,7 +12587,7 @@ var __publicField = (obj, key, value) => {
           className: `nut-uploader-preview ${previewType}`,
           key: item.uid
         },
-        previewType === "picture" && deletable && /* @__PURE__ */ React.createElement(
+        previewType === "picture" && !children && deletable && /* @__PURE__ */ React.createElement(
           j$3,
           {
             color: "rgba(0,0,0,0.6)",
@@ -13056,7 +13073,16 @@ var __publicField = (obj, key, value) => {
   ActionSheet.defaultProps = defaultProps$H;
   ActionSheet.displayName = "NutActionSheet";
   const Content = (props) => {
-    const { visible, title, header, footer, footerDirection, onClick, children } = props;
+    const {
+      visible,
+      title,
+      header,
+      footer,
+      close: close2,
+      footerDirection,
+      onClick,
+      children
+    } = props;
     const classPrefix2 = "nut-dialog";
     const renderHeader = () => {
       return title ? /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-header` }, title) : null;
@@ -13082,6 +13108,7 @@ var __publicField = (obj, key, value) => {
         style: props.style,
         onClick: (e2) => handleClick(e2)
       },
+      close2,
       header,
       /* @__PURE__ */ React.createElement(
         "div",
@@ -13150,6 +13177,8 @@ var __publicField = (obj, key, value) => {
     disableConfirmButton: false,
     footerDirection: "horizontal",
     lockScroll: true,
+    closeIconPosition: "top-right",
+    closeIcon: false,
     beforeCancel: () => true,
     beforeClose: () => true,
     onOverlayClick: () => true
@@ -13178,6 +13207,8 @@ var __publicField = (obj, key, value) => {
         confirmText,
         cancelText,
         overlay,
+        closeIconPosition,
+        closeIcon,
         onClose,
         onCancel,
         onConfirm,
@@ -13235,6 +13266,23 @@ var __publicField = (obj, key, value) => {
         confirmText || locale.confirm
       ));
     };
+    const renderCloseIcon = () => {
+      if (!closeIcon)
+        return null;
+      const handleCancel = () => {
+        if (!(beforeCancel == null ? void 0 : beforeCancel()))
+          return;
+        if (!(beforeClose == null ? void 0 : beforeClose()))
+          return;
+        onClose == null ? void 0 : onClose();
+        onCancel == null ? void 0 : onCancel();
+      };
+      const closeClasses = classNames({
+        [`${classPrefix2}-close`]: true,
+        [`${classPrefix2}-close-${closeIconPosition}`]: true
+      });
+      return /* @__PURE__ */ React.createElement(components.View, { className: closeClasses, onClick: handleCancel }, React.isValidElement(closeIcon) ? closeIcon : /* @__PURE__ */ React.createElement(A$1, null));
+    };
     const onHandleClickOverlay = (e2) => {
       if (closeOnOverlayClick && visible && e2.target === e2.currentTarget) {
         const closed = onOverlayClick && onOverlayClick();
@@ -13274,6 +13322,7 @@ var __publicField = (obj, key, value) => {
             style,
             title,
             header,
+            close: renderCloseIcon(),
             footer: renderFooter(),
             footerDirection,
             visible
@@ -16581,6 +16630,8 @@ var __publicField = (obj, key, value) => {
     closeOnContentClick: false,
     indicator: false,
     indicatorColor: "#fff",
+    closeIcon: false,
+    closeIconPosition: "top-right",
     showMenuByLongpress: false,
     onChange: (value) => {
     },
@@ -16599,6 +16650,8 @@ var __publicField = (obj, key, value) => {
       indicator,
       autoPlay,
       closeOnContentClick,
+      closeIcon,
+      closeIconPosition,
       showMenuByLongpress,
       onClose
     } = props;
@@ -16814,7 +16867,15 @@ var __publicField = (obj, key, value) => {
           )
         )
       ),
-      /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-index` }, active, "/", (images ? images.length : 0) + (videos ? videos.length : 0))
+      /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-index` }, active, "/", (images ? images.length : 0) + (videos ? videos.length : 0)),
+      closeIcon !== false ? /* @__PURE__ */ React.createElement(
+        "div",
+        {
+          className: `${classPrefix2}-close ${closeIconPosition}`,
+          onClick: onCloseInner
+        },
+        closeIcon === true ? /* @__PURE__ */ React.createElement(A$1, null) : closeIcon
+      ) : null
     );
   };
   ImagePreview.defaultProps = defaultProps$g;
@@ -17311,16 +17372,25 @@ var __publicField = (obj, key, value) => {
         return /* @__PURE__ */ React.createElement("div", { className: bodyClassPrefix, key: index }, renderBodyTds(item, index));
       });
     };
-    return /* @__PURE__ */ React.createElement("div", { className: cls, ...rest }, /* @__PURE__ */ React.createElement("div", { className: classNames(`${classPrefix2}-wrapper`), style }, /* @__PURE__ */ React.createElement(
+    return /* @__PURE__ */ React.createElement("div", { className: cls, ...rest }, /* @__PURE__ */ React.createElement(
       "div",
       {
-        className: classNames(`${classPrefix2}-main`, {
-          [`${classPrefix2}-main-striped`]: striped
-        })
+        className: classNames(
+          `${classPrefix2}-wrapper ${isSticky ? `${classPrefix2}-wrapper-sticky` : ""}`
+        ),
+        style
       },
-      showHeader && /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-main-head` }, /* @__PURE__ */ React.createElement("div", { className: headerClassPrefix }, renderHeadCells())),
-      /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-main-body` }, renderBodyTrs())
-    )), isSticky ? /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(
+      /* @__PURE__ */ React.createElement(
+        "div",
+        {
+          className: classNames(`${classPrefix2}-main`, {
+            [`${classPrefix2}-main-striped`]: striped
+          })
+        },
+        showHeader && /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-main-head` }, /* @__PURE__ */ React.createElement("div", { className: headerClassPrefix }, renderHeadCells())),
+        /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-main-body` }, renderBodyTrs())
+      )
+    ), isSticky ? /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(
       "div",
       {
         className: `${classPrefix2}-sticky-left`,

package/dist/packages/circleprogress/circleprogress.scss

@@ -3,7 +3,9 @@
 
   &-hover {
     stroke: $circleprogress-primary-color;
-    transition: stroke-dasharray 0.6s ease 0s, stroke 0.6s ease 0s;
+    transition:
+      stroke-dasharray 0.2s ease-in-out 0s,
+      stroke 0.2s ease 0s;
   }
 
   &-path {

package/dist/packages/dialog/dialog.scss

@@ -32,6 +32,31 @@
     animation-duration: 0.3s;
   }
 
+  &-close {
+    position: absolute !important;
+    z-index: 1;
+    cursor: pointer;
+    width: $dialog-close-width;
+    height: $dialog-close-height;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    top: $dialog-close-top;
+    color: $dialog-close-color;
+
+    &-top-right {
+      right: $dialog-close-right;
+    }
+
+    &-top-left {
+      left: $dialog-close-left;
+    }
+
+    &:active {
+      opacity: 0.7;
+    }
+  }
+
   &-header {
     display: block;
     text-align: center;

package/dist/packages/imagepreview/imagepreview.scss

@@ -26,6 +26,30 @@
     }
   }
 
+  &-close {
+    position: fixed;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 2002;
+    background: transparent;
+    color: $white;
+    &.top-right {
+      top: 50px;
+      right: 20px;
+    }
+    &.top-left {
+      top: 50px;
+      left: 20px;
+    }
+    &.bottom {
+      bottom: 50px;
+      left: 0;
+      right: 0;
+      text-align: center;
+    }
+  }
+
   &-pop {
     height: 100%;
     background: transparent !important;

package/dist/packages/popover/popover.scss

@@ -96,7 +96,7 @@
       border-bottom: 1px solid $popover-divider-color;
 
       &:last-child {
-        margin-bottom: 2px;
+        margin-bottom: 0px;
         border-bottom: none;
       }
 

package/dist/packages/table/table.scss

@@ -8,9 +8,14 @@
     flex-direction: column;
     font-size: $font-size-base;
     color: $color-title;
-    overflow: auto;
+    overflow-y: auto;
+    overflow-x: hidden;
     position: relative;
     border: 1px solid $table-border-color;
+
+    &-sticky {
+      overflow-x: auto;
+    }
   }
 
   &-main {
@@ -61,6 +66,7 @@
         &-th {
           display: table-cell;
           padding: $table-cols-padding;
+          table-layout: fixed;
           background: inherit;
           position: sticky;
           top: 0;
@@ -77,6 +83,7 @@
         &-td {
           display: table-cell;
           padding: $table-cols-padding;
+          table-layout: fixed;
           background: inherit;
 
           &:last-child {
@@ -149,6 +156,10 @@
   &-fixed-right {
     position: sticky;
     z-index: 2;
+    &.h5-div {
+      // 临时方案，小程序下，width包含了padding值。
+      padding: $table-cols-padding 0;
+    }
   }
   &-fixed-left-last {
     border-right: none;

package/dist/packages/tabs/tabs.scss

@@ -198,6 +198,12 @@
   flex-direction: row;
   width: 100%;
 
+  .nut-tabs-ellipsis {
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+  }
+
   .nut-tabs-titles {
     box-sizing: border-box;
     flex-direction: column;
@@ -212,6 +218,12 @@
       flex-direction: column;
       flex-shrink: 0;
     }
+
+    &-line {
+      .nut-tabs-titles-item {
+        padding-left: 14px;
+      }
+    }
   }
 
   .nut-tabs-titles-scrollable {
@@ -235,6 +247,9 @@
       height: 0;
       transform: translate(0, -50%);
       transition: height 0.3s ease;
+      &-vertical {
+        top: 50%;
+      }
     }
 
     &-active {
@@ -248,7 +263,7 @@
       }
 
       .nut-tabs-titles-item-smile {
-        right: -6px;
+        right: -12px;
         bottom: -2%;
         left: auto;
         width: 40px;

package/dist/packages/uploader/uploader.scss

@@ -117,9 +117,11 @@
 
       .nut-uploader-preview-img-file-name {
         display: flex;
+        align-items: center;
         -webkit-line-clamp: 1;
         padding: 2px;
         height: 24px;
+        @include text-ellipsis();
       }
 
       .nut-progress {
@@ -200,12 +202,8 @@
             color: #1890ff !important;
           }
 
-          .nut-icon-link {
-            &::before {
-              margin-left: -45%;
-              margin-top: -45%;
-              transform: none;
-            }
+          .nut-icon-Link {
+            flex-shrink: 0;
           }
 
           @include moreline-ellipsis();