@nutui/nutui 3.2.5-beta.1 → 3.2.6-beta.1

package/dist/packages/_es/OldPicker.js

@@ -1,16 +1,37 @@
 /*!
-* @nutui/nutui v3.2.5-beta.1 Tue Oct 25 2022 11:38:42 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.2.6-beta.1 Mon Oct 31 2022 19:38:22 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */
-import { ref, reactive, computed, watch, onMounted, toRefs, openBlock, createElementBlock, createElementVNode, normalizeStyle, Fragment, renderList, normalizeClass, toDisplayString, createCommentVNode, onBeforeUnmount, toRaw, resolveComponent, createVNode, withCtx } from "vue";
+import { ref, reactive, computed, watch, onMounted, toRefs, openBlock, createElementBlock, createElementVNode, normalizeStyle, Fragment, renderList, normalizeClass, toDisplayString, createTextVNode, createCommentVNode, toRaw, resolveComponent, createBlock, withCtx, createVNode } from "vue";
 import { c as createComponent } from "./component.js";
+import { u as useTaroRect } from "./index.js";
+import Taro from "@tarojs/taro";
 import { _ as _export_sfc } from "./plugin-vue_export-helper.js";
-import Popup, { popupProps } from "./Popup.js";
+import { p as popupProps } from "./index4.js";
 import "../locale/lang";
-import "./OverLay.js";
-import "./Icon.js";
+import "./use-lock-scroll.js";
 import "./pxCheck.js";
+const commonProps = {
+  listData: {
+    type: Array,
+    default: () => {
+      return [];
+    }
+  },
+  readonly: {
+    type: Boolean,
+    default: false
+  },
+  defaultIndex: {
+    type: [Number, String],
+    default: 0
+  },
+  itemHeight: {
+    type: [Number, String],
+    default: 35
+  }
+};
 const { create: create$1 } = createComponent("oldpicker-column");
 const _sfc_main$1 = create$1({
   props: {
@@ -19,20 +40,7 @@ const _sfc_main$1 = create$1({
       type: Boolean,
       default: false
     },
-    listData: {
-      type: Object,
-      default: () => {
-        return {};
-      }
-    },
-    readonly: {
-      type: Boolean,
-      default: false
-    },
-    defaultIndex: {
-      type: [Number, String],
-      default: 0
-    }
+    ...commonProps
   },
   emits: ["click", "change"],
   setup(props, { emit }) {
@@ -43,7 +51,8 @@ const _sfc_main$1 = create$1({
         endY: 0,
         startTime: 0,
         endTime: 0,
-        lastY: 0
+        lastY: 0,
+        lastTime: 0
       },
       currIndex: 1,
       transformY: 0,
@@ -71,6 +80,7 @@ const _sfc_main$1 = create$1({
       };
     });
     const onTouchStart = (event) => {
+      console.log(event);
       event.preventDefault();
       let changedTouches = event.changedTouches[0];
       state.touchParams.startY = changedTouches.pageY;
@@ -89,7 +99,7 @@ const _sfc_main$1 = create$1({
       event.preventDefault();
       let changedTouches = event.changedTouches[0];
       state.touchParams.lastY = changedTouches.pageY;
-      state.touchParams.lastTime = event.timestamp || Date.now();
+      state.touchParams.lastTime = event.timeStamp || Date.now();
       let move = state.touchParams.lastY - state.touchParams.startY;
       let moveTime = state.touchParams.lastTime - state.touchParams.startTime;
       if (moveTime <= 300) {
@@ -100,11 +110,11 @@ const _sfc_main$1 = create$1({
         setMove(move, "end");
       }
     };
-    const setRollerStyle = (index2) => {
-      return `transform: rotate3d(1, 0, 0, ${-state.rotation * index2}deg) translate3d(0px, 0px, 104px)`;
+    const setRollerStyle = (index) => {
+      return `transform: rotate3d(1, 0, 0, ${-state.rotation * index}deg) translate3d(0px, 0px, 104px)`;
     };
-    const isHidden = (index2) => {
-      if (index2 >= state.currIndex + 8 || index2 <= state.currIndex - 8) {
+    const isHidden = (index) => {
+      if (index >= state.currIndex + 8 || index <= state.currIndex - 8) {
         return true;
       } else {
         return false;
@@ -152,12 +162,17 @@ const _sfc_main$1 = create$1({
       emit("change", state.currIndex - 1);
     };
     const modifyStatus = (type) => {
-      let index2 = props.defaultIndex;
-      state.currIndex = index2 === -1 ? 1 : index2 + 1;
-      let move = index2 === -1 ? 0 : index2 * state.lineSpacing;
+      let index = props.defaultIndex;
+      state.currIndex = index === -1 ? 1 : index + 1;
+      let move = index === -1 ? 0 : index * state.lineSpacing;
       type && setChooseValue();
       setMove(-move);
     };
+    const getReference = async () => {
+      const refe = await useTaroRect(list, Taro);
+      state.lineSpacing = refe.height / props.listData.values.length;
+      modifyStatus(true);
+    };
     watch(
       () => props.listData,
       (val) => {
@@ -168,6 +183,19 @@ const _sfc_main$1 = create$1({
         deep: true
       }
     );
+    watch(
+      () => props.itemShow,
+      (val) => {
+        if (val) {
+          setTimeout(() => {
+            getReference();
+          }, 200);
+        }
+      },
+      {
+        deep: true
+      }
+    );
     watch(
       () => props.defaultIndex,
       (val) => {
@@ -176,8 +204,11 @@ const _sfc_main$1 = create$1({
       }
     );
     onMounted(() => {
-      modifyStatus(true);
+      setTimeout(() => {
+        getReference();
+      }, 200);
     });
+    const refRandomId = Math.random().toString(36).slice(-8);
     return {
       ...toRefs(state),
       ...toRefs(props),
@@ -192,17 +223,19 @@ const _sfc_main$1 = create$1({
       onTouchEnd,
       touchRollerStyle,
       touchListStyle,
-      setMove
+      refRandomId
     };
   }
 });
 const _hoisted_1$1 = { class: "nut-oldpicker-content" };
-const _hoisted_2$1 = {
+const _hoisted_2$1 = ["id"];
+const _hoisted_3$1 = {
   key: 0,
   class: "nut-oldpicker-placeholder"
 };
 function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
-  return openBlock(), createElementBlock("view", {
+  return _ctx.itemShow ? (openBlock(), createElementBlock("view", {
+    key: 0,
     class: "nut-oldpicker__list",
     onTouchstart: _cache[0] || (_cache[0] = (...args) => _ctx.onTouchStart && _ctx.onTouchStart(...args)),
     onTouchmove: _cache[1] || (_cache[1] = (...args) => _ctx.onTouchMove && _ctx.onTouchMove(...args)),
@@ -213,37 +246,39 @@ function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
       ref: "roller",
       style: normalizeStyle(_ctx.touchRollerStyle)
     }, [
-      (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.listData.values, (item, index2) => {
+      (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.listData.values, (item, index) => {
         return openBlock(), createElementBlock("view", {
-          class: normalizeClass(["nut-oldpicker-roller-item", { "nut-oldpicker-roller-item-hidden": _ctx.isHidden(index2 + 1) }]),
-          style: normalizeStyle(_ctx.setRollerStyle(index2 + 1)),
-          key: item.label ? item.label : index2
+          class: normalizeClass(["nut-oldpicker-roller-item", { "nut-oldpicker-roller-item-hidden": _ctx.isHidden(index + 1) }]),
+          style: normalizeStyle(_ctx.setRollerStyle(index + 1)),
+          key: item.label ? item.label : index
         }, toDisplayString(_ctx.dataType === "cascade" ? item.text : item), 7);
       }), 128))
     ], 4),
+    createTextVNode(),
     createElementVNode("view", _hoisted_1$1, [
       createElementVNode("view", {
         class: "nut-oldpicker-list-panel",
         ref: "list",
+        id: "list" + _ctx.refRandomId,
         style: normalizeStyle(_ctx.touchListStyle)
       }, [
-        (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.listData.values, (item, index2) => {
+        (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.listData.values, (item, index) => {
           return openBlock(), createElementBlock("view", {
             class: "nut-oldpicker-item nut-oldpicker-item-ref",
-            key: item.label ? item.label : index2
+            key: item.label ? item.label : index
           }, toDisplayString(_ctx.dataType === "cascade" ? item.text : item), 1);
         }), 128)),
-        _ctx.listData && _ctx.listData.length === 1 ? (openBlock(), createElementBlock("view", _hoisted_2$1)) : createCommentVNode("", true)
-      ], 4)
+        createTextVNode(),
+        _ctx.listData && _ctx.listData.length === 1 ? (openBlock(), createElementBlock("view", _hoisted_3$1)) : createCommentVNode("", true)
+      ], 12, _hoisted_2$1)
     ])
-  ], 32);
+  ], 32)) : createCommentVNode("", true);
 }
 var column = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["render", _sfc_render$1]]);
 const { create, componentName } = createComponent("oldpicker");
 const _sfc_main = create({
   components: {
-    [column.name]: column,
-    [Popup.name]: Popup
+    [column.name]: column
   },
   props: {
     ...popupProps,
@@ -259,20 +294,7 @@ const _sfc_main = create({
       type: String,
       default: "\u786E\u5B9A"
     },
-    listData: {
-      type: Array,
-      default: () => {
-        return [];
-      }
-    },
-    readonly: {
-      type: Boolean,
-      default: false
-    },
-    defaultIndex: {
-      type: [Number, String],
-      default: 0
-    }
+    ...commonProps
   },
   emits: ["close", "change", "confirm", "update:visible"],
   setup(props, { emit }) {
@@ -392,14 +414,6 @@ const _sfc_main = create({
       }
       emit("update:visible", false);
     };
-    onMounted(() => {
-      if (props.visible)
-        state.show = props.visible;
-    });
-    onBeforeUnmount(() => {
-      if (props.visible)
-        state.show = false;
-    });
     watch(
       () => props.visible,
       (val) => {
@@ -431,56 +445,56 @@ const _hoisted_4 = /* @__PURE__ */ createElementVNode("view", { class: "nut-oldp
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_nut_oldpicker_column = resolveComponent("nut-oldpicker-column");
   const _component_nut_popup = resolveComponent("nut-popup");
-  return openBlock(), createElementBlock("view", {
-    class: normalizeClass(_ctx.classes)
-  }, [
-    createVNode(_component_nut_popup, {
-      position: "bottom",
-      visible: _ctx.show,
-      "onUpdate:visible": _cache[2] || (_cache[2] = ($event) => _ctx.show = $event),
-      teleport: _ctx.teleport,
-      "lock-scroll": _ctx.lockScroll,
-      "close-on-click-overlay": _ctx.closeOnClickOverlay,
-      onClose: _ctx.close,
-      round: true,
-      isWrapTeleport: _ctx.isWrapTeleport
-    }, {
-      default: withCtx(() => [
-        createElementVNode("view", _hoisted_1, [
-          createElementVNode("view", {
-            class: "nut-oldpicker__cancel nut-oldpicker__left nut-oldpicker__button",
-            onClick: _cache[0] || (_cache[0] = (...args) => _ctx.close && _ctx.close(...args))
-          }, toDisplayString(_ctx.cancelText), 1),
-          createElementVNode("view", _hoisted_2, toDisplayString(_ctx.title), 1),
-          createElementVNode("view", {
-            class: "nut-oldpicker__confirm nut-oldpicker__button nut-oldpicker__right",
-            onClick: _cache[1] || (_cache[1] = ($event) => _ctx.confirm())
-          }, toDisplayString(_ctx.okText), 1)
-        ]),
-        createElementVNode("view", _hoisted_3, [
-          _hoisted_4,
-          (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.columnList, (item, columnIndex) => {
-            return openBlock(), createElementBlock("view", {
-              class: "nut-oldpicker__columnitem",
-              key: columnIndex
-            }, [
-              createVNode(_component_nut_oldpicker_column, {
-                itemShow: _ctx.show,
-                "list-data": item,
-                readonly: _ctx.readonly,
-                "default-index": item.defaultIndex,
-                "data-type": _ctx.dataType,
-                onChange: (dataIndex) => {
-                  _ctx.changeHandler(columnIndex, dataIndex);
-                }
-              }, null, 8, ["itemShow", "list-data", "readonly", "default-index", "data-type", "onChange"])
-            ]);
-          }), 128))
-        ])
+  return openBlock(), createBlock(_component_nut_popup, {
+    position: "bottom",
+    visible: _ctx.show,
+    "onUpdate:visible": _cache[2] || (_cache[2] = ($event) => _ctx.show = $event),
+    teleport: _ctx.teleport,
+    "lock-scroll": _ctx.lockScroll,
+    "close-on-click-overlay": _ctx.closeOnClickOverlay,
+    onClose: _ctx.close,
+    round: true
+  }, {
+    default: withCtx(() => [
+      createElementVNode("view", _hoisted_1, [
+        createElementVNode("view", {
+          class: "nut-oldpicker__button nut-oldpicker__left",
+          onClick: _cache[0] || (_cache[0] = (...args) => _ctx.close && _ctx.close(...args))
+        }, toDisplayString(_ctx.cancelText), 1),
+        createTextVNode(),
+        createElementVNode("view", _hoisted_2, toDisplayString(_ctx.title), 1),
+        createTextVNode(),
+        createElementVNode("view", {
+          class: "nut-oldpicker__button nut-oldpicker__right",
+          onClick: _cache[1] || (_cache[1] = ($event) => _ctx.confirm())
+        }, toDisplayString(_ctx.okText), 1)
       ]),
-      _: 1
-    }, 8, ["visible", "teleport", "lock-scroll", "close-on-click-overlay", "onClose", "isWrapTeleport"])
-  ], 2);
+      createTextVNode(),
+      createElementVNode("view", _hoisted_3, [
+        _hoisted_4,
+        createTextVNode(),
+        (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.columnList, (item, columnIndex) => {
+          return openBlock(), createElementBlock("view", {
+            class: "nut-oldpicker__columnitem",
+            key: columnIndex
+          }, [
+            createVNode(_component_nut_oldpicker_column, {
+              itemShow: _ctx.show,
+              "list-data": item,
+              readonly: _ctx.readonly,
+              "default-index": item.defaultIndex,
+              "visible-item-count": _ctx.visibleItemCount,
+              "data-type": _ctx.dataType,
+              onChange: (dataIndex) => {
+                _ctx.changeHandler(columnIndex, dataIndex);
+              }
+            }, null, 8, ["itemShow", "list-data", "readonly", "default-index", "visible-item-count", "data-type", "onChange"])
+          ]);
+        }), 128))
+      ])
+    ]),
+    _: 1
+  }, 8, ["visible", "teleport", "lock-scroll", "close-on-click-overlay", "onClose"]);
 }
-var index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
-export { index as default };
+var index_taro = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
+export { index_taro as default };

package/dist/packages/_es/OverLay.js

@@ -1,9 +1,9 @@
 /*!
-* @nutui/nutui v3.2.5-beta.1 Tue Oct 25 2022 11:38:42 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.2.6-beta.1 Mon Oct 31 2022 19:38:22 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */
-import { computed, watch, onDeactivated, onBeforeUnmount, onMounted, onActivated, openBlock, createBlock, Transition, withCtx, withDirectives, createElementVNode, normalizeClass, withModifiers, normalizeStyle, renderSlot, vShow } from "vue";
+import { computed, openBlock, createBlock, Transition, withCtx, withDirectives, createElementVNode, normalizeClass, normalizeStyle, renderSlot, vShow } from "vue";
 import { c as createComponent } from "./component.js";
 import { _ as _export_sfc } from "./plugin-vue_export-helper.js";
 import "../locale/lang";
@@ -48,24 +48,6 @@ const _sfc_main = create({
         [props.overlayClass]: true
       };
     });
-    watch(
-      () => props.visible,
-      (value) => {
-        value ? lock() : unlock();
-      }
-    );
-    const lock = () => {
-      if (props.lockScroll && props.visible) {
-        document.body.classList.add("nut-overflow-hidden");
-      }
-    };
-    const unlock = () => {
-      document.body.classList.remove("nut-overflow-hidden");
-    };
-    onDeactivated(unlock);
-    onBeforeUnmount(unlock);
-    onMounted(lock);
-    onActivated(lock);
     const style = computed(() => {
       return {
         animationDuration: `${props.duration}s`,
@@ -73,17 +55,13 @@ const _sfc_main = create({
         ...props.overlayStyle
       };
     });
-    const touchmove = (e) => {
-      if (props.lockScroll)
-        e.preventDefault();
-    };
     const onClick = (e) => {
       emit("click", e);
       if (props.closeOnClickOverlay) {
         emit("update:visible", false);
       }
     };
-    return { classes, style, touchmove, onClick };
+    return { classes, style, onClick };
   }
 });
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
@@ -91,12 +69,11 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     default: withCtx(() => [
       withDirectives(createElementVNode("view", {
         class: normalizeClass(_ctx.classes),
-        onTouchmove: _cache[0] || (_cache[0] = withModifiers((...args) => _ctx.touchmove && _ctx.touchmove(...args), ["stop"])),
-        onClick: _cache[1] || (_cache[1] = (...args) => _ctx.onClick && _ctx.onClick(...args)),
+        onClick: _cache[0] || (_cache[0] = (...args) => _ctx.onClick && _ctx.onClick(...args)),
         style: normalizeStyle(_ctx.style)
       }, [
         renderSlot(_ctx.$slots, "default")
-      ], 38), [
+      ], 6), [
         [vShow, _ctx.visible]
       ])
     ]),

package/dist/packages/_es/Pagination.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui v3.2.5-beta.1 Tue Oct 25 2022 11:38:42 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.2.6-beta.1 Mon Oct 31 2022 19:38:22 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */
@@ -135,10 +135,11 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         createTextVNode(toDisplayString(_ctx.prevText || _ctx.translate("prev")), 1)
       ])
     ], 2),
+    createTextVNode(),
     _ctx.mode == "multi" ? (openBlock(), createElementBlock("view", _hoisted_2, [
-      (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.pages, (item, index2) => {
+      (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.pages, (item, index) => {
         return openBlock(), createElementBlock("view", {
-          key: index2 + "pagination",
+          key: index + "pagination",
           class: normalizeClass(["nut-pagination-item", item.active ? "active" : ""]),
           onClick: ($event) => _ctx.select(item.number, true)
         }, [
@@ -148,9 +149,11 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         ], 10, _hoisted_3);
       }), 128))
     ])) : createCommentVNode("", true),
+    createTextVNode(),
     _ctx.mode == "simple" ? (openBlock(), createElementBlock("view", _hoisted_4, [
       createElementVNode("view", _hoisted_5, toDisplayString(_ctx.modelValue) + "/" + toDisplayString(_ctx.countRef), 1)
     ])) : createCommentVNode("", true),
+    createTextVNode(),
     createElementVNode("view", {
       class: normalizeClass(["nut-pagination-next", _ctx.modelValue >= _ctx.countRef ? "disabled" : ""]),
       onClick: _cache[1] || (_cache[1] = ($event) => _ctx.select(_ctx.modelValue + 1, true))
@@ -161,5 +164,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     ], 2)
   ]);
 }
-var index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
-export { index as default };
+var index_taro = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
+export { index_taro as default };