@nutui/nutui 3.1.19-beta.0 → 3.1.19-beta.1

package/dist/packages/_es/List.js

@@ -18,19 +18,20 @@ var __spreadValues = (a, b) => {
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 /*!
-* @nutui/nutui v3.1.19-beta.0 Mon Mar 28 2022 17:50:21 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.19-beta.1 Sat Apr 02 2022 16:26:37 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */
-import { ref, reactive, computed, watch, toRefs, openBlock, createElementBlock, normalizeClass, createElementVNode, normalizeStyle, Fragment, renderList, renderSlot } from "vue";
+import { ref, reactive, computed, watch, toRefs, resolveComponent, openBlock, createBlock, normalizeClass, normalizeStyle, withCtx, createElementVNode, createElementBlock, Fragment, renderList, renderSlot } from "vue";
 import { c as createComponent } from "./component.js";
+import Taro from "@tarojs/taro";
 import { _ as _export_sfc } from "./plugin-vue_export-helper.js";
 const { componentName, create } = createComponent("list");
 const _sfc_main = create({
   props: {
     height: {
       type: [Number],
-      default: 50
+      default: 0
     },
     listData: {
       type: Array,
@@ -43,7 +44,7 @@ const _sfc_main = create({
   setup(props, { emit }) {
     const list = ref(null);
     const state = reactive({
-      screenHeight: document.documentElement.clientHeight || document.body.clientHeight || 667,
+      screenHeight: Taro.getSystemInfoSync().windowHeight,
       startOffset: 0,
       start: 0,
       list: props.listData.slice()
@@ -69,9 +70,8 @@ const _sfc_main = create({
     const visibleData = computed(() => {
       return state.list.slice(state.start, Math.min(end.value, state.list.length));
     });
-    const handleScrollEvent = () => {
-      var _a;
-      const scrollTop = (_a = list.value) == null ? void 0 : _a.scrollTop;
+    const handleScrollEvent = async (e) => {
+      const scrollTop = e.detail.scrollTop;
       state.start = Math.floor(scrollTop / props.height);
       if (end.value > state.list.length) {
         emit("scroll");
@@ -92,33 +92,40 @@ const _sfc_main = create({
   }
 });
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  return openBlock(), createElementBlock("view", {
+  const _component_scroll_view = resolveComponent("scroll-view");
+  return openBlock(), createBlock(_component_scroll_view, {
     class: normalizeClass(_ctx.classes),
-    onScrollPassive: _cache[0] || (_cache[0] = (...args) => _ctx.handleScrollEvent && _ctx.handleScrollEvent(...args)),
+    "scroll-y": true,
+    style: normalizeStyle({ height: _ctx.screenHeight + "px" }),
+    "scroll-top": "0",
+    onScroll: _ctx.handleScrollEvent,
     ref: "list"
-  }, [
-    createElementVNode("div", {
-      class: "nut-list-phantom",
-      style: normalizeStyle({ height: _ctx.listHeight + "px" })
-    }, null, 4),
-    createElementVNode("div", {
-      class: "nut-list-container",
-      style: normalizeStyle({ transform: _ctx.getTransform })
-    }, [
-      (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.visibleData, (item, index2) => {
-        return openBlock(), createElementBlock("div", {
-          class: "nut-list-item",
-          style: normalizeStyle({ height: _ctx.height + "px" }),
-          key: item
-        }, [
-          renderSlot(_ctx.$slots, "default", {
-            item,
-            index: index2
-          })
-        ], 4);
-      }), 128))
-    ], 4)
-  ], 34);
+  }, {
+    default: withCtx(() => [
+      createElementVNode("div", {
+        class: "nut-list-phantom",
+        style: normalizeStyle({ height: _ctx.listHeight + "px" })
+      }, null, 4),
+      createElementVNode("div", {
+        class: "nut-list-container",
+        style: normalizeStyle({ transform: _ctx.getTransform })
+      }, [
+        (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.visibleData, (item, index) => {
+          return openBlock(), createElementBlock("div", {
+            class: "nut-list-item",
+            style: normalizeStyle({ height: _ctx.height + "px" }),
+            key: item
+          }, [
+            renderSlot(_ctx.$slots, "default", {
+              item,
+              index
+            })
+          ], 4);
+        }), 128))
+      ], 4)
+    ]),
+    _: 3
+  }, 8, ["class", "style", "onScroll"]);
 }
-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/Menu.js

@@ -1,11 +1,11 @@
 /*!
-* @nutui/nutui v3.1.19-beta.0 Mon Mar 28 2022 17:50:21 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.19-beta.1 Sat Apr 02 2022 16:26:37 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */
 import { ref, computed, reactive, provide, resolveComponent, openBlock, createElementBlock, normalizeClass, createElementVNode, Fragment, renderList, normalizeStyle, toDisplayString, createVNode, renderSlot } from "vue";
 import { c as createComponent } from "./component.js";
-import { u as useRect } from "./index3.js";
+import Taro from "@tarojs/taro";
 import { _ as _export_sfc } from "./plugin-vue_export-helper.js";
 const { componentName, create } = createComponent("menu");
 const _sfc_main = create({
@@ -20,7 +20,7 @@ const _sfc_main = create({
     },
     duration: {
       type: [Number, String],
-      default: 0
+      default: 0.3
     }
   },
   setup(props, { emit, slots }) {
@@ -57,14 +57,17 @@ const _sfc_main = create({
     });
     const updateOffset = () => {
       if (barRef.value) {
-        const rect = useRect(barRef);
-        offset.value = rect.bottom;
+        setTimeout(() => {
+          Taro.createSelectorQuery().select(".nut-menu__bar.opened").boundingClientRect((rect) => {
+            offset.value = rect.bottom;
+          }).exec();
+        }, 100);
       }
     };
     linkChildren({ props, offset });
     const toggleItem = (active) => {
-      children.forEach((item, index2) => {
-        if (index2 === active) {
+      children.forEach((item, index) => {
+        if (index === active) {
           updateOffset();
           item.toggle();
         } else if (item.state.showPopup) {
@@ -92,11 +95,11 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       class: normalizeClass(["nut-menu__bar", { opened: _ctx.opened }]),
       ref: "barRef"
     }, [
-      (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.children, (item, index2) => {
+      (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.children, (item, index) => {
         return openBlock(), createElementBlock("view", {
-          key: index2,
+          key: index,
           class: normalizeClass(["nut-menu__item", { disabled: item.disabled, active: item.state.showPopup }]),
-          onClick: ($event) => !item.disabled && _ctx.toggleItem(index2),
+          onClick: ($event) => !item.disabled && _ctx.toggleItem(index),
           style: normalizeStyle({ color: item.state.showPopup ? _ctx.activeColor : "" })
         }, [
           createElementVNode("view", {
@@ -115,5 +118,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     renderSlot(_ctx.$slots, "default")
   ], 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 };

package/dist/packages/_es/MenuItem.js

@@ -1,14 +1,15 @@
 /*!
-* @nutui/nutui v3.1.19-beta.0 Mon Mar 28 2022 17:50:21 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.19-beta.1 Sat Apr 02 2022 16:26:37 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */
 import { reactive, computed, inject, getCurrentInstance, resolveComponent, withDirectives, openBlock, createElementBlock, normalizeClass, createElementVNode, normalizeStyle, vShow, createVNode, mergeProps, withCtx, Fragment, renderList, createBlock, createCommentVNode, toDisplayString, renderSlot } from "vue";
 import { c as createComponent } from "./component.js";
 import _sfc_main$1 from "./Icon.js";
-import popup from "./Popup.js";
+import Popup from "./Popup.js";
 import { _ as _export_sfc } from "./plugin-vue_export-helper.js";
 import "./pxCheck.js";
+import "./use-lock-scroll.js";
 import "./OverLay.js";
 const { componentName, create } = createComponent("menu-item");
 const _sfc_main = create({
@@ -34,7 +35,7 @@ const _sfc_main = create({
   },
   components: {
     [_sfc_main$1.name]: _sfc_main$1,
-    [popup.name]: popup
+    [Popup.name]: Popup
   },
   emits: ["update:modelValue", "change"],
   setup(props, { emit, slots }) {
@@ -133,14 +134,13 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       "pop-class": "nut-menu__pop",
       overlayClass: "nut-menu__overlay",
       overlay: _ctx.parent.props.overlay,
-      onClosed: _ctx.handleClose,
-      isWrapTeleport: false
+      onClosed: _ctx.handleClose
     }), {
       default: withCtx(() => [
         createElementVNode("view", _hoisted_1, [
-          (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.options, (option, index2) => {
+          (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.options, (option, index) => {
             return openBlock(), createElementBlock("view", {
-              key: index2,
+              key: index,
               class: normalizeClass(["nut-menu-item__option", { active: option.value === _ctx.modelValue }]),
               style: normalizeStyle({ "flex-basis": 100 / _ctx.cols + "%" }),
               onClick: ($event) => _ctx.onClick(option)
@@ -164,5 +164,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     [vShow, _ctx.state.showWrapper]
   ]);
 }
-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/Navbar.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui v3.1.19-beta.0 Mon Mar 28 2022 17:50:21 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.19-beta.1 Sat Apr 02 2022 16:26:37 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */
@@ -74,7 +74,6 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     createElementVNode("view", _hoisted_2, [
       _ctx.title ? (openBlock(), createElementBlock("view", {
         key: 0,
-        class: "title",
         onClick: _cache[0] || (_cache[0] = (...args) => _ctx.handleCenter && _ctx.handleCenter(...args))
       }, toDisplayString(_ctx.title), 1)) : createCommentVNode("", true),
       _ctx.titIcon ? (openBlock(), createBlock(_component_nut_icon, {
@@ -95,5 +94,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 };

package/dist/packages/_es/NoticeBar.js

@@ -18,12 +18,13 @@ var __spreadValues = (a, b) => {
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 /*!
-* @nutui/nutui v3.1.19-beta.0 Mon Mar 28 2022 17:50:21 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.19-beta.1 Sat Apr 02 2022 16:26:37 GMT+0800 (中国标准时间)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */
 import { h, ref, reactive, computed, watch, onMounted, onActivated, onDeactivated, onUnmounted, toRefs, resolveComponent, openBlock, createElementBlock, normalizeClass, withDirectives, normalizeStyle, renderSlot, createBlock, createCommentVNode, createElementVNode, createTextVNode, toDisplayString, withModifiers, createVNode, vShow, Fragment, renderList } from "vue";
 import { c as createComponent } from "./component.js";
+import Taro from "@tarojs/taro";
 import { _ as _export_sfc } from "./plugin-vue_export-helper.js";
 const { componentName, create } = createComponent("noticebar");
 const _sfc_main = create({
@@ -66,7 +67,7 @@ const _sfc_main = create({
     rightIcon: { type: String, default: "" },
     color: {
       type: String,
-      default: ""
+      default: "#F9911B"
     },
     background: {
       type: String,
@@ -88,7 +89,6 @@ const _sfc_main = create({
   components: {
     ScrollItem: function(props) {
       props.item.props.style = props.style;
-      props.item.key = props.key;
       return h(props.item);
     }
   },
@@ -108,7 +108,8 @@ const _sfc_main = create({
       distance: 0,
       timer: null,
       keepAlive: false,
-      isCanScroll: null
+      isCanScroll: null,
+      id: Math.round(Math.random() * 1e5)
     });
     const classes = computed(() => {
       const prefixCls = componentName;
@@ -118,7 +119,7 @@ const _sfc_main = create({
     });
     const isEllipsis = computed(() => {
       if (state.isCanScroll == null) {
-        return props.wrapable;
+        return false;
       } else {
         return !state.isCanScroll && !props.wrapable;
       }
@@ -131,9 +132,10 @@ const _sfc_main = create({
       }
     });
     const barStyle = computed(() => {
-      let style = {};
-      props.color && (style.color = props.color);
-      props.background && (style.background = props.background);
+      let style = {
+        color: props.color,
+        background: props.background
+      };
       if (props.direction == "vertical") {
         style.height = `${props.height}px`;
       }
@@ -161,9 +163,8 @@ const _sfc_main = create({
         };
       } else {
         if (state.animate) {
-          let a = ~~(props.height / props.speed / 4);
           styles = {
-            transition: `all ${a == 0 ? ~~(props.height / props.speed) : a}s`,
+            transition: `all ${~~(props.height / props.speed / 4)}s`,
             "margin-top": `-${props.height}px`
           };
         }
@@ -184,19 +185,26 @@ const _sfc_main = create({
         if (!wrap.value || !content.value) {
           return;
         }
-        const wrapWidth = wrap.value.getBoundingClientRect().width;
-        const offsetWidth = content.value.getBoundingClientRect().width;
-        state.isCanScroll = props.scrollable == null ? offsetWidth > wrapWidth : props.scrollable;
-        console.log(111, state.isCanScroll);
-        if (state.isCanScroll) {
-          state.wrapWidth = wrapWidth;
-          state.offsetWidth = offsetWidth;
-          state.duration = offsetWidth / props.speed;
-          state.animationClass = "play";
-        } else {
-          state.animationClass = "";
-        }
-      }, 0);
+        let wrapWidth = 0;
+        let offsetWidth = 0;
+        Taro.createSelectorQuery().select(`.wrap${state.id}`).boundingClientRect((rect) => {
+          if (rect.width > 0)
+            wrapWidth = rect.width;
+        }).exec();
+        Taro.createSelectorQuery().select(`.content${state.id}`).boundingClientRect((rect) => {
+          if (rect.width > 0)
+            offsetWidth = rect.width;
+          state.isCanScroll = props.scrollable == null ? offsetWidth > wrapWidth : props.scrollable;
+          if (state.isCanScroll) {
+            state.wrapWidth = wrapWidth;
+            state.offsetWidth = offsetWidth;
+            state.duration = offsetWidth / props.speed;
+            state.animationClass = "play";
+          } else {
+            state.animationClass = "";
+          }
+        }).exec();
+      }, 100);
     };
     const handleClick = (event) => {
       emit("click", event);
@@ -216,7 +224,7 @@ const _sfc_main = create({
     };
     const startRollEasy = () => {
       showhorseLamp();
-      state.timer = setInterval(showhorseLamp, ~~(props.height / props.speed / 4 * 1e3) + props.standTime);
+      state.timer = setInterval(showhorseLamp, ~~(props.height / props.speed / 4) * 1e3 + props.standTime);
     };
     const showhorseLamp = () => {
       state.animate = true;
@@ -224,7 +232,7 @@ const _sfc_main = create({
         state.scrollList.push(state.scrollList[0]);
         state.scrollList.shift();
         state.animate = false;
-      }, ~~(props.height / props.speed / 4 * 1e3));
+      }, ~~(props.height / props.speed / 4) * 1e3);
     };
     const startRoll = () => {
       state.timer = setInterval(() => {
@@ -295,11 +303,7 @@ const _sfc_main = create({
     });
   }
 });
-const _hoisted_1 = {
-  ref: "wrap",
-  class: "wrap"
-};
-const _hoisted_2 = ["onClick"];
+const _hoisted_1 = ["onClick"];
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_nut_icon = resolveComponent("nut-icon");
   const _component_ScrollItem = resolveComponent("ScrollItem");
@@ -326,10 +330,13 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           }, null, 8, ["color"])) : createCommentVNode("", true)
         ])
       ], 4)) : createCommentVNode("", true),
-      createElementVNode("view", _hoisted_1, [
+      createElementVNode("view", {
+        ref: "wrap",
+        class: normalizeClass(`wrap wrap${_ctx.id}`)
+      }, [
         createElementVNode("view", {
           ref: "content",
-          class: normalizeClass(["content", _ctx.animationClass, { "nut-ellipsis": _ctx.isEllipsis }]),
+          class: normalizeClass(["content", [_ctx.animationClass, { "nut-ellipsis": _ctx.isEllipsis }, `content${_ctx.id}`]]),
           style: normalizeStyle(_ctx.contentStyle),
           onAnimationend: _cache[0] || (_cache[0] = (...args) => _ctx.onAnimationEnd && _ctx.onAnimationEnd(...args)),
           onWebkitAnimationEnd: _cache[1] || (_cache[1] = (...args) => _ctx.onAnimationEnd && _ctx.onAnimationEnd(...args))
@@ -338,7 +345,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             createTextVNode(toDisplayString(_ctx.text), 1)
           ])
         ], 38)
-      ], 512),
+      ], 2),
       _ctx.closeMode || _ctx.rightIcon ? (openBlock(), createElementBlock("view", {
         key: 1,
         class: "right-icon",
@@ -364,9 +371,9 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         class: "horseLamp_list",
         style: normalizeStyle(_ctx.horseLampStyle)
       }, [
-        (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.scrollList, (item, index2) => {
+        (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.scrollList, (item, index) => {
           return openBlock(), createBlock(_component_ScrollItem, {
-            key: index2,
+            key: index,
             style: normalizeStyle({ height: _ctx.height + "px", "line-height": _ctx.height + "px" }),
             item
           }, null, 8, ["style", "item"]);
@@ -376,13 +383,13 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         class: "horseLamp_list",
         style: normalizeStyle(_ctx.horseLampStyle)
       }, [
-        (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.scrollList, (item, index2) => {
+        (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.scrollList, (item, index) => {
           return openBlock(), createElementBlock("li", {
             class: "horseLamp_list_item",
-            key: index2,
+            key: index,
             style: normalizeStyle({ height: _ctx.height }),
             onClick: ($event) => _ctx.go(item)
-          }, toDisplayString(item), 13, _hoisted_2);
+          }, toDisplayString(item), 13, _hoisted_1);
         }), 128))
       ], 4)),
       createElementVNode("view", {
@@ -399,5 +406,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     ], 4)) : createCommentVNode("", true)
   ], 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 };