@nutui/nutui 3.2.7 → 3.2.8-beta.1

package/dist/packages/_es/OverLay.js

@@ -1,46 +1,63 @@
 /*!
-* @nutui/nutui v3.2.7 Fri Nov 18 2022 19:57:44 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.2.8-beta.1 Fri Dec 02 2022 14:18:21 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 { c as createComponent } from "./component.js";
+import { computed, watchEffect, openBlock, createBlock, Transition, withCtx, withDirectives, createElementVNode, normalizeClass, withModifiers, normalizeStyle, renderSlot, vShow } from "vue";
+import { b as body, c as createComponent } from "./component.js";
 import { _ as _export_sfc } from "./plugin-vue_export-helper.js";
 import "../locale/lang";
-const { componentName, create } = createComponent("overlay");
-const overlayProps = {
-  visible: {
-    type: Boolean,
-    default: false
-  },
-  zIndex: {
-    type: [Number, String],
-    default: 2e3
-  },
-  duration: {
-    type: [Number, String],
-    default: 0.3
-  },
-  overlayClass: {
-    type: String,
-    default: ""
-  },
-  lockScroll: {
-    type: Boolean,
-    default: false
-  },
-  overlayStyle: {
-    type: Object
-  },
-  closeOnClickOverlay: {
-    type: Boolean,
-    default: true
-  }
+let count = 0;
+const CLSNAME = "nut-overflow-hidden";
+const useLockScroll = (isLock) => {
+  const lock = () => {
+    if (isLock()) {
+      !count && body.classList.add(CLSNAME);
+      count++;
+    }
+  };
+  const unlock = () => {
+    if (isLock() && count) {
+      count--;
+      !count && body.classList.remove(CLSNAME);
+    }
+  };
+  return [lock, unlock];
 };
+const { componentName, create } = createComponent("overlay");
 const _sfc_main = create({
-  props: overlayProps,
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    zIndex: {
+      type: [Number, String],
+      default: 2e3
+    },
+    duration: {
+      type: [Number, String],
+      default: 0.3
+    },
+    lockScroll: {
+      type: Boolean,
+      default: false
+    },
+    overlayClass: {
+      type: String,
+      default: ""
+    },
+    overlayStyle: {
+      type: Object
+    },
+    closeOnClickOverlay: {
+      type: Boolean,
+      default: true
+    }
+  },
   emits: ["click", "update:visible"],
   setup(props, { emit }) {
+    const [lock, unlock] = useLockScroll(() => props.lockScroll);
     const classes = computed(() => {
       const prefixCls = componentName;
       return {
@@ -48,42 +65,23 @@ 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`,
+        transitionDuration: `${props.duration}s`,
         zIndex: props.zIndex,
         ...props.overlayStyle
       };
     });
-    const touchmove = (e) => {
-      if (props.lockScroll)
-        e.preventDefault();
-    };
+    watchEffect(() => {
+      props.visible ? lock() : unlock();
+    });
     const onClick = (e) => {
-      emit("click", e);
       if (props.closeOnClickOverlay) {
         emit("update:visible", false);
+        emit("click", e);
       }
     };
-    return { classes, style, touchmove, onClick };
+    return { classes, style, onClick };
   }
 });
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
@@ -91,17 +89,16 @@ 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] = withModifiers((...args) => _ctx.onClick && _ctx.onClick(...args), ["stop"])),
         style: normalizeStyle(_ctx.style)
       }, [
         renderSlot(_ctx.$slots, "default")
-      ], 38), [
+      ], 6), [
         [vShow, _ctx.visible]
       ])
     ]),
     _: 3
   });
 }
-var overlay = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
-export { overlay as default, overlayProps };
+var OverLay = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
+export { OverLay as default };

package/dist/packages/_es/Pagination.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui v3.2.7 Fri Nov 18 2022 19:57:44 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.2.8-beta.1 Fri Dec 02 2022 14:18:21 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */

package/dist/packages/_es/Picker.js

@@ -1,17 +1,15 @@
 /*!
-* @nutui/nutui v3.2.7 Fri Nov 18 2022 19:57:44 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.2.8-beta.1 Fri Dec 02 2022 14:18:21 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, resolveComponent, createVNode, withCtx, renderSlot } from "vue";
-import { c as createComponent } from "./component.js";
-import Popup, { popupProps } from "./Popup.js";
+import { c as createComponent, a as preventDefault } from "./component.js";
+import Popup from "./Popup.js";
+import { p as popupProps } from "./props.js";
 import { u as useTouch } from "./index4.js";
 import { _ as _export_sfc } from "./plugin-vue_export-helper.js";
 import "../locale/lang";
-import "./OverLay.js";
-import "./Icon.js";
-import "./pxCheck.js";
 const { create: create$1 } = createComponent("picker-column");
 const _sfc_main$1 = create$1({
   props: {
@@ -55,11 +53,9 @@ const _sfc_main$1 = create$1({
       transformY: 0,
       scrollDistance: 0,
       lineSpacing: 36,
-      rotation: 20,
-      timer: null
+      rotation: 20
     });
     const roller = ref(null);
-    const list = ref(null);
     const moving = ref(false);
     const touchDeg = ref(0);
     const touchTime = ref(0);
@@ -84,12 +80,17 @@ const _sfc_main$1 = create$1({
     const onTouchStart = (event) => {
       touch.start(event);
       if (moving.value) {
-        let dom = list.value;
-        if (!props.threeDimensional) {
-          dom = roller.value;
-        }
+        let dom = roller.value;
         const { transform } = window.getComputedStyle(dom);
-        state.scrollDistance = +transform.slice(7, transform.length - 1).split(", ")[5];
+        if (props.threeDimensional) {
+          const circle = Math.floor(parseFloat(touchDeg.value) / 360);
+          const cos = +transform.split(", ")[5];
+          const sin = +transform.split(", ")[6] < 0 ? 180 : 0;
+          const endDeg = circle * 360 + Math.acos(cos) / Math.PI * 180 + sin;
+          state.scrollDistance = -Math.abs((endDeg / state.rotation - 1) * state.lineSpacing);
+        } else {
+          state.scrollDistance = +transform.slice(7, transform.length - 1).split(", ")[5];
+        }
       }
       state.touchParams.startY = touch.deltaY.value;
       state.touchParams.startTime = Date.now();
@@ -179,14 +180,6 @@ const _sfc_main$1 = create$1({
       type && setChooseValue();
       setMove(-move);
     };
-    const preventDefault = (event, isStopPropagation) => {
-      if (typeof event.cancelable !== "boolean" || event.cancelable) {
-        event.preventDefault();
-      }
-      if (isStopPropagation) {
-        event.stopPropagation();
-      }
-    };
     const stopMomentum = () => {
       moving.value = false;
       touchTime.value = 0;
@@ -224,7 +217,6 @@ const _sfc_main$1 = create$1({
       setRollerStyle,
       isHidden,
       roller,
-      list,
       onTouchStart,
       onTouchMove,
       onTouchEnd,
@@ -240,10 +232,6 @@ const _hoisted_1$1 = {
   class: "nut-picker-roller-item-tile"
 };
 const _hoisted_2$1 = /* @__PURE__ */ createElementVNode("view", { class: "nut-picker-roller-mask" }, null, -1);
-const _hoisted_3$1 = {
-  key: 0,
-  class: "nut-picker-content"
-};
 function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createElementBlock("view", {
     class: "nut-picker__list",
@@ -270,14 +258,7 @@ function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
         ], 64);
       }), 128))
     ], 36),
-    _hoisted_2$1,
-    _ctx.threeDimensional ? (openBlock(), createElementBlock("view", _hoisted_3$1, [
-      createElementVNode("view", {
-        class: "nut-picker-list-panel",
-        ref: "list",
-        style: normalizeStyle(_ctx.touchTileStyle)
-      }, null, 4)
-    ])) : createCommentVNode("", true)
+    _hoisted_2$1
   ], 32);
 }
 var column = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["render", _sfc_render$1]]);
@@ -447,6 +428,7 @@ const _sfc_main = create({
       });
       emit("update:visible", false);
     };
+    const isSameValue = (valA, valB) => JSON.stringify(valA) === JSON.stringify(valB);
     onMounted(() => {
       if (props.visible)
         state.show = props.visible;
@@ -458,8 +440,7 @@ const _sfc_main = create({
     watch(
       () => props.modelValue,
       (newValues) => {
-        const isSameValue = JSON.stringify(newValues) === JSON.stringify(defaultValues.value);
-        if (!isSameValue) {
+        if (!isSameValue(newValues, defaultValues.value)) {
           defaultValues.value = newValues;
         }
       },
@@ -468,8 +449,7 @@ const _sfc_main = create({
     watch(
       defaultValues,
       (newValues) => {
-        const isSameValue = JSON.stringify(newValues) === JSON.stringify(props.modelValue);
-        if (!isSameValue) {
+        if (!isSameValue(newValues, props.modelValue)) {
           emit("update:modelValue", newValues);
         }
       },
@@ -509,11 +489,7 @@ const _sfc_main = create({
 });
 const _hoisted_1 = { class: "nut-picker__bar" };
 const _hoisted_2 = { class: "nut-picker__title" };
-const _hoisted_3 = {
-  class: "nut-picker__column",
-  ref: "wrapHeight"
-};
-const _hoisted_4 = /* @__PURE__ */ createElementVNode("view", { class: "nut-picker__hairline" }, null, -1);
+const _hoisted_3 = { class: "nut-picker__column" };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_nut_picker_column = resolveComponent("nut-picker-column");
   const _component_nut_popup = resolveComponent("nut-popup");
@@ -529,25 +505,24 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       "close-on-click-overlay": _ctx.closeOnClickOverlay,
       onClose: _ctx.close,
       round: true,
-      isWrapTeleport: _ctx.isWrapTeleport,
+      teleportDisable: _ctx.teleportDisable,
       safeAreaInsetBottom: _ctx.safeAreaInsetBottom,
       destroyOnClose: _ctx.destroyOnClose
     }, {
       default: withCtx(() => [
         createElementVNode("view", _hoisted_1, [
           createElementVNode("view", {
-            class: "nut-picker__cancel nut-picker__left nut-picker__button",
+            class: "nut-picker__left",
             onClick: _cache[0] || (_cache[0] = (...args) => _ctx.close && _ctx.close(...args))
           }, toDisplayString(_ctx.cancelText || _ctx.translate("cancel")), 1),
           createElementVNode("view", _hoisted_2, toDisplayString(_ctx.title), 1),
           createElementVNode("view", {
-            class: "nut-picker__confirm nut-picker__right nut-picker__button",
+            class: "nut-picker__right",
             onClick: _cache[1] || (_cache[1] = ($event) => _ctx.confirmHandler())
           }, toDisplayString(_ctx.okText || _ctx.translate("confirm")), 1)
         ]),
         renderSlot(_ctx.$slots, "top"),
         createElementVNode("view", _hoisted_3, [
-          _hoisted_4,
           (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.columnsList, (column2, columnIndex) => {
             return openBlock(), createElementBlock("view", {
               class: "nut-picker__columnitem",
@@ -569,11 +544,11 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               }, null, 8, ["itemShow", "column", "readonly", "columnsType", "value", "threeDimensional", "swipeDuration", "onChange"])
             ]);
           }), 128))
-        ], 512),
+        ]),
         renderSlot(_ctx.$slots, "default")
       ]),
       _: 3
-    }, 8, ["visible", "teleport", "lock-scroll", "close-on-click-overlay", "onClose", "isWrapTeleport", "safeAreaInsetBottom", "destroyOnClose"])
+    }, 8, ["visible", "teleport", "lock-scroll", "close-on-click-overlay", "onClose", "teleportDisable", "safeAreaInsetBottom", "destroyOnClose"])
   ], 2);
 }
 var Picker = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);