@nutui/nutui-react-taro 2.0.19 → 2.0.20

package/dist/nutui.react.umd.js

@@ -8,7 +8,7 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 /*!
-* @nutui/nutui-react-taro v2.0.19 Wed Sep 27 2023 18:15:02 GMT+0800 (China Standard Time)
+* @nutui/nutui-react-taro v2.0.20 Fri Oct 13 2023 13:54:07 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */
@@ -3238,6 +3238,9 @@ var __publicField = (obj, key, value) => {
     ));
   };
   ConfigProvider.displayName = "NutConfigProvider";
+  const pxCheck = (value) => {
+    return Number.isNaN(Number(value)) ? String(value) : `${value}px`;
+  };
   const defaultProps$1r = {
     src: "",
     error: true,
@@ -3272,14 +3275,13 @@ var __publicField = (obj, key, value) => {
         onError && onError(e);
       }
     };
-    const pxCheck2 = (value) => {
-      return Number.isNaN(Number(value)) ? String(value) : `${value}px`;
-    };
     const containerStyle = {
-      height: height ? pxCheck2(height) : "",
-      width: width ? pxCheck2(width) : "",
+      // eslint-disable-next-line no-nested-ternary
+      height: height ? pxCheck(height) : Taro.getEnv() === "WEB" ? "" : "100px",
+      // eslint-disable-next-line no-nested-ternary
+      width: width ? pxCheck(width) : Taro.getEnv() === "WEB" ? "" : "100%",
       overflow: radius !== void 0 && radius !== null ? "hidden" : "",
-      borderRadius: radius !== void 0 && radius !== null ? pxCheck2(radius) : ""
+      borderRadius: radius !== void 0 && radius !== null ? pxCheck(radius) : ""
     };
     const imgStyle = {
       ...style
@@ -5224,9 +5226,6 @@ var __publicField = (obj, key, value) => {
     }
   };
   const GridContext = React.createContext(gridContext);
-  const pxCheck = (value) => {
-    return Number.isNaN(Number(value)) ? String(value) : `${value}px`;
-  };
   const defaultProps$1o = {
     text: "",
     columns: 4,
@@ -6191,7 +6190,9 @@ var __publicField = (obj, key, value) => {
     const open2 = () => {
       if (!innerVisible) {
         setInnerVisible(true);
-        setIndex(++_zIndex);
+        if (props.zIndex === void 0) {
+          setIndex(++_zIndex);
+        }
       }
       if (destroyOnClose) {
         setShowChildren(true);
@@ -10942,11 +10943,11 @@ var __publicField = (obj, key, value) => {
           ...this.store,
           ...newStore
         };
-        this.fieldEntities.forEach((enetity) => {
-          const { name } = enetity.props;
+        this.fieldEntities.forEach((entity) => {
+          const { name } = entity.props;
           Object.keys(newStore).forEach((key) => {
             if (key === name) {
-              enetity.onStoreChange("update");
+              entity.onStoreChange("update");
             }
           });
         });
@@ -10957,44 +10958,19 @@ var __publicField = (obj, key, value) => {
           ...callback
         };
       });
-      __publicField(this, "validate", () => {
-        const err = [];
+      __publicField(this, "validateFields", async (nameList) => {
+        var _a;
+        let filterEntitys = [];
+        const errs = [];
         this.errors.length = 0;
-        this.fieldEntities.forEach((entity) => {
-          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);
-          validator.messages();
-          validator.validate({ [name]: (_a = this.store) == null ? void 0 : _a[name] }, (errors) => {
-            if (errors) {
-              err.push(...errors);
-              this.errors[name] = errors;
-            }
-            entity.onStoreChange("validate");
-          });
-        });
-        return err;
-      });
-      __publicField(this, "validateFields", (nameList) => {
         if (!nameList || nameList.length === 0) {
-          this.validate();
-          return;
+          filterEntitys = this.fieldEntities;
+        } else {
+          filterEntitys = this.fieldEntities.filter(
+            ({ props: { name } }) => nameList.includes(name)
+          );
         }
-        this.fieldEntities.filter(({ props: { name } }) => {
-          return nameList.includes(name);
-        }).forEach((entity) => {
-          var _a;
+        for (const entity of filterEntitys) {
           const { name, rules: rules2 = [] } = entity.props;
           const descriptor = {};
           if (rules2.length) {
@@ -11008,19 +10984,22 @@ var __publicField = (obj, key, value) => {
             }
           }
           const validator = new Schema(descriptor);
-          validator.messages();
-          validator.validate({ [name]: (_a = this.store) == null ? void 0 : _a[name] }, (errors) => {
+          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;
             }
-            entity.onStoreChange("validate");
-          });
-        });
+          }
+          entity.onStoreChange("validate");
+        }
+        return errs;
       });
-      __publicField(this, "submit", () => {
+      __publicField(this, "submit", async () => {
         var _a, _b, _c, _d;
-        const errors = this.validate();
+        const errors = await this.validateFields();
         if (errors.length === 0) {
           (_b = (_a = this.callbacks).onFinish) == null ? void 0 : _b.call(_a, this.store);
         } else if (errors.length > 0) {
@@ -17601,8 +17580,8 @@ var __publicField = (obj, key, value) => {
       {
         className: classNames(classPrefix$3, className),
         style: {
-          width: !width ? "100%" : `${width}px`,
-          height: !height ? "150px" : `${height}px`
+          width: !width ? "100%" : pxCheck(width),
+          height: !height ? "150px" : pxCheck(height)
         }
       },
       /* @__PURE__ */ React.createElement(
@@ -17610,8 +17589,8 @@ var __publicField = (obj, key, value) => {
         {
           className: "nut-swiper__inner",
           style: {
-            width: !width ? "100%" : `${width}px`,
-            height: !height ? "150px" : `${height}px`
+            width: !width ? "100%" : pxCheck(width),
+            height: !height ? "150px" : pxCheck(height)
           }
         },
         /* @__PURE__ */ React.createElement(
@@ -17628,8 +17607,8 @@ var __publicField = (obj, key, value) => {
               (_a = props.onChange) == null ? void 0 : _a.call(props, e);
             },
             style: {
-              width: !width ? "100%" : `${width}px`,
-              height: !height ? "150px" : `${height}px`
+              width: !width ? "100%" : pxCheck(width),
+              height: !height ? "150px" : pxCheck(height)
             },
             ...rest
           },
@@ -17869,13 +17848,14 @@ var __publicField = (obj, key, value) => {
             ));
           }) : []).concat(
             images && images.length > 0 ? images.map((item, index) => {
-              return /* @__PURE__ */ React.createElement(SwiperItem, { key: index }, Taro.getEnv() === "WEB" ? /* @__PURE__ */ React.createElement("img", { src: item.src, alt: "" }) : /* @__PURE__ */ React.createElement(
-                components.Image,
+              return /* @__PURE__ */ React.createElement(SwiperItem, { key: index }, Taro.getEnv() === "WEB" ? /* @__PURE__ */ React.createElement(Image$1, { src: item.src, mode: "aspectFit" }) : /* @__PURE__ */ React.createElement(
+                Image$1,
                 {
                   src: item.src,
                   mode: "aspectFit",
                   showMenuByLongpress: true,
-                  style: { width: "100%", height: "100%" }
+                  width: "100%",
+                  height: "100%"
                 }
               ));
             }) : []

package/dist/style.mjs

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react-taro v2.0.19 Wed Sep 27 2023 18:15:34 GMT+0800 (China Standard Time)
+* @nutui/nutui-react-taro v2.0.20 Fri Oct 13 2023 13:54:40 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */

package/dist/types/packages/calendar/calendar.taro.d.ts

@@ -111,22 +111,22 @@ export interface CalendarProps {
     renderDayBottom?: (date: Day) => string | JSX.Element
     /**
     * 关闭时触发
-    * @default 
+    * @default -
     */
     onClose?: () => void
     /**
     * 选择之后或是点击确认按钮触发
-    * @default 
+    * @default -
     */
     onConfirm?: (param: string) => void
     /**
     * 点击/选择后触发
-    * @default 
+    * @default -
     */
     onDayClick?: (data: string) => void
     /**
     * 年月子标题到达顶部时触发
-    * @default 
+    * @default -
     */
     onPageChange?: (param: string) => void
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nutui/nutui-react-taro",
-  "version": "2.0.19",
+  "version": "2.0.20",
   "style": "dist/style.css",
   "main": "dist/nutui.react.umd.js",
   "module": "dist/esm/nutui-react.es.js",