@nutui/nutui-react-taro 2.0.21-beta.0 → 2.0.21

package/dist/nutui.react.es.js

@@ -5,7 +5,7 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 /*!
-* @nutui/nutui-react-taro v2.0.21-beta.0 Fri Oct 13 2023 18:55:02 GMT+0800 (China Standard Time)
+* @nutui/nutui-react-taro v2.0.21 Wed Oct 18 2023 17:56:58 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */
@@ -9472,6 +9472,7 @@ const InternalPicker = (props, ref) => {
         onPickStart: pickerStart,
         onChange: pickerChange,
         onPickEnd: pickerEnd,
+        indicatorClass: Taro.getEnv() === "JD" ? "nut-picker-indicator-jdapp" : "",
         className: "nut-picker-view-panel"
       },
       columnsList == null ? void 0 : columnsList.map((columnOptions, index) => {
@@ -10944,17 +10945,17 @@ class FormStore {
     });
     __publicField(this, "validateFields", async (nameList) => {
       var _a;
-      let filterEntitys = [];
+      let filterEntities = [];
       const errs = [];
       this.errors.length = 0;
       if (!nameList || nameList.length === 0) {
-        filterEntitys = this.fieldEntities;
+        filterEntities = this.fieldEntities;
       } else {
-        filterEntitys = this.fieldEntities.filter(
+        filterEntities = this.fieldEntities.filter(
           ({ props: { name } }) => nameList.includes(name)
         );
       }
-      for (const entity of filterEntitys) {
+      for (const entity of filterEntities) {
         const { name, rules: rules2 = [] } = entity.props;
         const descriptor = {};
         if (rules2.length) {
@@ -10969,13 +10970,16 @@ class FormStore {
         }
         const validator = new Schema(descriptor);
         try {
-          this.errors[name] = [];
           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");
       }
@@ -11218,6 +11222,7 @@ class FormItem extends React__default.Component {
       }
     });
     __publicField(this, "renderLayout", (childNode) => {
+      var _a;
       const {
         label,
         name,
@@ -11243,13 +11248,16 @@ class FormItem extends React__default.Component {
           onClick: (e) => this.props.onClick && this.props.onClick(e, this.componentRef)
         },
         label ? /* @__PURE__ */ React__default.createElement("div", { className: "nut-cell__title nut-form-item__label" }, renderLabel) : null,
-        /* @__PURE__ */ React__default.createElement("div", { className: "nut-cell__value nut-form-item__body" }, /* @__PURE__ */ React__default.createElement("div", { className: "nut-form-item__body__slots" }, childNode), item && item.length > 0 && /* @__PURE__ */ React__default.createElement(
+        /* @__PURE__ */ React__default.createElement("div", { className: "nut-cell__value nut-form-item__body" }, /* @__PURE__ */ React__default.createElement("div", { className: "nut-form-item__body__slots" }, childNode), /* @__PURE__ */ React__default.createElement(
           "div",
           {
             className: "nut-form-item__body__tips",
-            style: { textAlign: errorMessageAlign }
+            style: {
+              textAlign: errorMessageAlign,
+              display: (item == null ? void 0 : item.length) ? "inherit" : "none"
+            }
           },
-          item[0].message
+          (_a = item == null ? void 0 : item[0]) == null ? void 0 : _a.message
         ))
       );
     });
@@ -11776,7 +11784,7 @@ const MenuItem = forwardRef((props, ref) => {
     if (!parent.lockScroll)
       return;
     const p = parent.menuRef.current;
-    p.getBoundingClientRect().then((rect) => {
+    getRectByTaro(p).then((rect) => {
       if (rect) {
         setPosition({
           height: rect.height,
@@ -13694,7 +13702,7 @@ const Preview = ({
           style: { objectFit: "fill" },
           mode: "aspectFit",
           src: item.url,
-          onClick: () => handleItemClick(item)
+          onClick: () => handleItemClick(item, index)
         }
       )) : /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, previewUrl ? /* @__PURE__ */ React__default.createElement(
         Image$2,
@@ -13702,12 +13710,12 @@ const Preview = ({
           className: "nut-uploader__preview-img__c",
           mode: "aspectFit",
           src: previewUrl,
-          onClick: () => handleItemClick(item)
+          onClick: () => handleItemClick(item, index)
         }
       ) : /* @__PURE__ */ React__default.createElement("div", { className: "nut-uploader__preview-img__file" }, /* @__PURE__ */ React__default.createElement(
         "div",
         {
-          onClick: () => handleItemClick(item),
+          onClick: () => handleItemClick(item, index),
           className: "nut-uploader__preview-img__file__name"
         },
         /* @__PURE__ */ React__default.createElement(a$i, { color: "#808080" }),
@@ -13717,7 +13725,7 @@ const Preview = ({
         "div",
         {
           className: `nut-uploader__preview-img__file__name ${item.status}`,
-          onClick: () => handleItemClick(item)
+          onClick: () => handleItemClick(item, index)
         },
         /* @__PURE__ */ React__default.createElement(a$i, null),
         /* @__PURE__ */ React__default.createElement("span", null, " ", item.name)
@@ -13951,7 +13959,7 @@ const InternalUploader = (props, ref) => {
       onSuccess == null ? void 0 : onSuccess({
         responseText,
         option,
-        fileList: list
+        files: list
       });
     };
     uploadOption.onFailure = (responseText, option) => {
@@ -13967,7 +13975,7 @@ const InternalUploader = (props, ref) => {
       onFailure == null ? void 0 : onFailure({
         responseText,
         option,
-        fileList: list
+        files: list
       });
     };
     const task = new UploaderTaro(uploadOption);
@@ -14064,8 +14072,8 @@ const InternalUploader = (props, ref) => {
     const _files = filterFiles(tempFiles);
     readFile(_files);
   };
-  const handleItemClick = (file) => {
-    onFileItemClick == null ? void 0 : onFileItemClick(file);
+  const handleItemClick = (file, index) => {
+    onFileItemClick == null ? void 0 : onFileItemClick(file, index);
   };
   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(Button, { className: "nut-uploader__input", onClick: _chooseImage }))), /* @__PURE__ */ React__default.createElement(
     Preview,

package/dist/nutui.react.umd.js

@@ -8,7 +8,7 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 /*!
-* @nutui/nutui-react-taro v2.0.21-beta.0 Fri Oct 13 2023 18:55:02 GMT+0800 (China Standard Time)
+* @nutui/nutui-react-taro v2.0.21 Wed Oct 18 2023 17:56:58 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */
@@ -9488,6 +9488,7 @@ var __publicField = (obj, key, value) => {
           onPickStart: pickerStart,
           onChange: pickerChange,
           onPickEnd: pickerEnd,
+          indicatorClass: Taro.getEnv() === "JD" ? "nut-picker-indicator-jdapp" : "",
           className: "nut-picker-view-panel"
         },
         columnsList == null ? void 0 : columnsList.map((columnOptions, index) => {
@@ -10960,17 +10961,17 @@ var __publicField = (obj, key, value) => {
       });
       __publicField(this, "validateFields", async (nameList) => {
         var _a;
-        let filterEntitys = [];
+        let filterEntities = [];
         const errs = [];
         this.errors.length = 0;
         if (!nameList || nameList.length === 0) {
-          filterEntitys = this.fieldEntities;
+          filterEntities = this.fieldEntities;
         } else {
-          filterEntitys = this.fieldEntities.filter(
+          filterEntities = this.fieldEntities.filter(
             ({ props: { name } }) => nameList.includes(name)
           );
         }
-        for (const entity of filterEntitys) {
+        for (const entity of filterEntities) {
           const { name, rules: rules2 = [] } = entity.props;
           const descriptor = {};
           if (rules2.length) {
@@ -10985,13 +10986,16 @@ var __publicField = (obj, key, value) => {
           }
           const validator = new Schema(descriptor);
           try {
-            this.errors[name] = [];
             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");
         }
@@ -11234,6 +11238,7 @@ var __publicField = (obj, key, value) => {
         }
       });
       __publicField(this, "renderLayout", (childNode) => {
+        var _a;
         const {
           label,
           name,
@@ -11259,13 +11264,16 @@ var __publicField = (obj, key, value) => {
             onClick: (e) => this.props.onClick && this.props.onClick(e, this.componentRef)
           },
           label ? /* @__PURE__ */ React.createElement("div", { className: "nut-cell__title nut-form-item__label" }, renderLabel) : null,
-          /* @__PURE__ */ React.createElement("div", { className: "nut-cell__value nut-form-item__body" }, /* @__PURE__ */ React.createElement("div", { className: "nut-form-item__body__slots" }, childNode), item && item.length > 0 && /* @__PURE__ */ React.createElement(
+          /* @__PURE__ */ React.createElement("div", { className: "nut-cell__value nut-form-item__body" }, /* @__PURE__ */ React.createElement("div", { className: "nut-form-item__body__slots" }, childNode), /* @__PURE__ */ React.createElement(
             "div",
             {
               className: "nut-form-item__body__tips",
-              style: { textAlign: errorMessageAlign }
+              style: {
+                textAlign: errorMessageAlign,
+                display: (item == null ? void 0 : item.length) ? "inherit" : "none"
+              }
             },
-            item[0].message
+            (_a = item == null ? void 0 : item[0]) == null ? void 0 : _a.message
           ))
         );
       });
@@ -11792,7 +11800,7 @@ var __publicField = (obj, key, value) => {
       if (!parent.lockScroll)
         return;
       const p = parent.menuRef.current;
-      p.getBoundingClientRect().then((rect) => {
+      getRectByTaro(p).then((rect) => {
         if (rect) {
           setPosition({
             height: rect.height,
@@ -13710,7 +13718,7 @@ var __publicField = (obj, key, value) => {
             style: { objectFit: "fill" },
             mode: "aspectFit",
             src: item.url,
-            onClick: () => handleItemClick(item)
+            onClick: () => handleItemClick(item, index)
           }
         )) : /* @__PURE__ */ React.createElement(React.Fragment, null, previewUrl ? /* @__PURE__ */ React.createElement(
           components.Image,
@@ -13718,12 +13726,12 @@ var __publicField = (obj, key, value) => {
             className: "nut-uploader__preview-img__c",
             mode: "aspectFit",
             src: previewUrl,
-            onClick: () => handleItemClick(item)
+            onClick: () => handleItemClick(item, index)
           }
         ) : /* @__PURE__ */ React.createElement("div", { className: "nut-uploader__preview-img__file" }, /* @__PURE__ */ React.createElement(
           "div",
           {
-            onClick: () => handleItemClick(item),
+            onClick: () => handleItemClick(item, index),
             className: "nut-uploader__preview-img__file__name"
           },
           /* @__PURE__ */ React.createElement(a$i, { color: "#808080" }),
@@ -13733,7 +13741,7 @@ var __publicField = (obj, key, value) => {
           "div",
           {
             className: `nut-uploader__preview-img__file__name ${item.status}`,
-            onClick: () => handleItemClick(item)
+            onClick: () => handleItemClick(item, index)
           },
           /* @__PURE__ */ React.createElement(a$i, null),
           /* @__PURE__ */ React.createElement("span", null, " ", item.name)
@@ -13967,7 +13975,7 @@ var __publicField = (obj, key, value) => {
         onSuccess == null ? void 0 : onSuccess({
           responseText,
           option,
-          fileList: list
+          files: list
         });
       };
       uploadOption.onFailure = (responseText, option) => {
@@ -13983,7 +13991,7 @@ var __publicField = (obj, key, value) => {
         onFailure == null ? void 0 : onFailure({
           responseText,
           option,
-          fileList: list
+          files: list
         });
       };
       const task = new UploaderTaro(uploadOption);
@@ -14080,8 +14088,8 @@ var __publicField = (obj, key, value) => {
       const _files = filterFiles(tempFiles);
       readFile(_files);
     };
-    const handleItemClick = (file) => {
-      onFileItemClick == null ? void 0 : onFileItemClick(file);
+    const handleItemClick = (file, index) => {
+      onFileItemClick == null ? void 0 : onFileItemClick(file, 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 }))), /* @__PURE__ */ React.createElement(
       Preview,

package/dist/packages/picker/picker.scss

@@ -49,6 +49,18 @@
     color: $picker-item-text-color;
     font-size: $picker-item-text-font-size;
     z-index: 3;
+
+    &-jdapp {
+      height: $picker-item-height;
+      border: 0;
+
+      &::before,
+      &::after {
+        border: $picker-item-active-line-border;
+        border-left: 0;
+        border-right: 0;
+      }
+    }
   }
 
   &-list {

package/dist/packages/popover/popover.scss

@@ -210,7 +210,7 @@
   top: 0;
   left: 0;
   background: transparent;
-  z-index: 1999;
+  z-index: 999;
 }
 
 .nut-popover-wrapper {