@nutui/nutui 3.1.12-beta.1 → 3.1.14

package/dist/packages/_es/ImagePreview.js

@@ -17,23 +17,28 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __require = typeof require !== "undefined" ? require : (x) => {
-  throw new Error('Dynamic require of "' + x + '" is not supported');
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
 };
 /*!
-* @nutui/nutui v3.1.11 Wed Nov 24 2021 14:54:38 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.14 Wed Dec 22 2021 20:49:10 GMT+0800 (中国标准时间)
 * (c) 2021 @jdf2e.
 * Released under the MIT License.
 */
-import { toRefs, reactive, watch, resolveComponent, openBlock, createElementBlock, createVNode, withCtx, createBlock, Fragment, renderList, createElementVNode, createCommentVNode, toDisplayString } from "vue";
+import { toRefs, reactive, watch, onMounted, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, withModifiers, createElementBlock, Fragment, renderList, createVNode, createCommentVNode, toDisplayString, render, h } from "vue";
 import { c as createComponent } from "./component.js";
-import _sfc_main$1 from "./Popup.js";
-import "./use-lock-scroll.js";
+import Popup from "./Popup.js";
+import Video from "./Video.js";
+import Swiper from "./Swiper.js";
+import SwiperItem from "./SwiperItem.js";
+import { _ as _export_sfc } from "./plugin-vue_export-helper.js";
 import "./OverLay.js";
-import "./index.taro.vue_vue&type=script&lang.js";
+import "./Icon.js";
 import "./pxCheck.js";
+import "./index.js";
 const { componentName, create } = createComponent("imagepreview");
-var _sfc_main = create({
+const _sfc_main = create({
   props: {
     show: {
       type: Boolean,
@@ -42,21 +47,59 @@ var _sfc_main = create({
     images: {
       type: Array,
       default: () => []
+    },
+    videos: {
+      type: Array,
+      default: () => []
+    },
+    contentClose: {
+      type: Boolean,
+      default: false
+    },
+    initNo: {
+      type: Number,
+      default: 1
+    },
+    paginationVisible: {
+      type: Boolean,
+      default: false
+    },
+    paginationColor: {
+      type: String,
+      default: "#fff"
     }
   },
+  emits: ["close"],
   components: {
-    [_sfc_main$1.name]: _sfc_main$1
+    [Popup.name]: Popup,
+    [Video.name]: Video,
+    [Swiper.name]: Swiper,
+    [SwiperItem.name]: SwiperItem
   },
   setup(props, { emit }) {
-    const { value, images } = toRefs(props);
+    toRefs(props);
     const state = reactive({
-      showPop: value,
-      active: 1
+      showPop: false,
+      active: 1,
+      maxNo: 1,
+      source: {
+        src: "https://storage.jd.com/about/big-final.mp4?Expires=3730193075&AccessKey=3LoYX1dQWa6ZXzQl&Signature=ViMFjz%2BOkBxS%2FY1rjtUVqbopbJI%3D",
+        type: "video/mp4"
+      },
+      options: {
+        muted: true,
+        controls: true
+      }
     });
     const slideChangeEnd = function(page) {
-      state.active = page.detail.current + 1;
+      state.active = page + 1;
+    };
+    const closeOnImg = () => {
+      if (props.contentClose) {
+        onClose();
+      }
     };
-    const closePop = function() {
+    const onClose = () => {
       state.showPop = false;
       state.active = 1;
       emit("close");
@@ -64,55 +107,126 @@ var _sfc_main = create({
     watch(() => props.show, (val) => {
       state.showPop = val;
     });
+    onMounted(() => {
+      state.active = props.initNo;
+      state.showPop = props.show;
+      state.maxNo = props.images.length + props.videos.length;
+    });
     return __spreadProps(__spreadValues({}, toRefs(state)), {
       slideChangeEnd,
-      closePop
+      onClose,
+      closeOnImg
     });
   }
 });
-const _hoisted_1 = { class: "nut-imagepreview" };
-const _hoisted_2 = ["src"];
-const _hoisted_3 = { class: "nut-imagepreview-index" };
+const _hoisted_1 = ["src"];
+const _hoisted_2 = { class: "nut-imagepreview-index" };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  const _component_swiper_item = resolveComponent("swiper-item");
-  const _component_swiper = resolveComponent("swiper");
+  const _component_nut_video = resolveComponent("nut-video");
+  const _component_nut_swiper_item = resolveComponent("nut-swiper-item");
+  const _component_nut_swiper = resolveComponent("nut-swiper");
   const _component_nut_popup = resolveComponent("nut-popup");
-  return openBlock(), createElementBlock("view", _hoisted_1, [
-    createVNode(_component_nut_popup, {
-      "pop-class": "custom-pop",
-      visible: _ctx.showPop,
-      "onUpdate:visible": _cache[0] || (_cache[0] = ($event) => _ctx.showPop = $event),
-      onClick: _ctx.closePop
-    }, {
-      default: withCtx(() => [
-        _ctx.showPop ? (openBlock(), createBlock(_component_swiper, {
+  return openBlock(), createBlock(_component_nut_popup, {
+    "pop-class": "custom-pop",
+    visible: _ctx.showPop,
+    "onUpdate:visible": _cache[1] || (_cache[1] = ($event) => _ctx.showPop = $event),
+    onClick: _ctx.onClose
+  }, {
+    default: withCtx(() => [
+      createElementVNode("view", {
+        class: "nut-imagepreview",
+        onClick: _cache[0] || (_cache[0] = withModifiers((...args) => _ctx.closeOnImg && _ctx.closeOnImg(...args), ["stop"]))
+      }, [
+        _ctx.showPop ? (openBlock(), createBlock(_component_nut_swiper, {
           key: 0,
-          autoplay: true,
-          interval: 3e3,
+          "auto-play": 3e3,
           class: "nut-imagepreview-swiper",
-          circular: true,
-          onChange: _ctx.slideChangeEnd
+          loop: true,
+          "is-preventDefault": false,
+          direction: "horizontal",
+          onChange: _ctx.slideChangeEnd,
+          "init-page": _ctx.initNo > _ctx.maxNo ? _ctx.maxNo - 1 : _ctx.initNo - 1,
+          "pagination-visible": _ctx.paginationVisible,
+          "pagination-color": _ctx.paginationColor
         }, {
           default: withCtx(() => [
+            (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.videos, (item, index) => {
+              return openBlock(), createBlock(_component_nut_swiper_item, { key: index }, {
+                default: withCtx(() => [
+                  createVNode(_component_nut_video, {
+                    source: item.source,
+                    options: item.options
+                  }, null, 8, ["source", "options"])
+                ]),
+                _: 2
+              }, 1024);
+            }), 128)),
             (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.images, (item, index) => {
-              return openBlock(), createBlock(_component_swiper_item, { key: index }, {
+              return openBlock(), createBlock(_component_nut_swiper_item, { key: index }, {
                 default: withCtx(() => [
                   createElementVNode("img", {
-                    src: item.imgSrc,
+                    src: item.src,
                     class: "nut-imagepreview-img"
-                  }, null, 8, _hoisted_2)
+                  }, null, 8, _hoisted_1)
                 ]),
                 _: 2
               }, 1024);
             }), 128))
           ]),
           _: 1
-        }, 8, ["onChange"])) : createCommentVNode("", true),
-        createElementVNode("view", _hoisted_3, toDisplayString(_ctx.active) + " / " + toDisplayString(_ctx.images.length), 1)
-      ]),
-      _: 1
-    }, 8, ["visible", "onClick"])
-  ]);
+        }, 8, ["onChange", "init-page", "pagination-visible", "pagination-color"])) : createCommentVNode("", true),
+        createElementVNode("view", _hoisted_2, toDisplayString(_ctx.active) + " / " + toDisplayString(_ctx.images.length + _ctx.videos.length), 1)
+      ])
+    ]),
+    _: 1
+  }, 8, ["visible", "onClick"]);
+}
+var ImagePreview = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
+class ImagePreviewOptions {
+  constructor() {
+    __publicField(this, "show", false);
+    __publicField(this, "images", []);
+    __publicField(this, "initNo", 1);
+    __publicField(this, "paginationVisible", false);
+    __publicField(this, "paginationColor", "");
+    __publicField(this, "teleport", "body");
+    __publicField(this, "onClose", () => {
+    });
+  }
 }
-_sfc_main.render = _sfc_render;
-export { _sfc_main as default };
+class ImagePreviewFunction {
+  constructor(_options) {
+    __publicField(this, "options", new ImagePreviewOptions());
+    let options = Object.assign(this.options, _options);
+    let elWarp = document.body;
+    let teleport = options.teleport;
+    if (teleport != "body") {
+      if (typeof teleport == "string") {
+        elWarp = document.querySelector(teleport);
+      } else {
+        elWarp = options.teleport;
+      }
+    }
+    const root = document.createElement("view");
+    root.id = "imagepreview-" + new Date().getTime();
+    const Wrapper = {
+      setup() {
+        options.teleport = `#${root.id}`;
+        return () => {
+          return h(ImagePreview, options);
+        };
+      }
+    };
+    const instance = createVNode(Wrapper);
+    elWarp.appendChild(root);
+    render(instance, root);
+  }
+}
+const _ImagePreview = function(options) {
+  return new ImagePreviewFunction(options);
+};
+_ImagePreview.install = (app) => {
+  app.use(ImagePreview);
+  app.config.globalProperties.$imagepreview = _ImagePreview;
+};
+export { ImagePreview, ImagePreviewOptions, _ImagePreview as default };

package/dist/packages/_es/Indicator.js

@@ -0,0 +1,66 @@
+/*!
+* @nutui/nutui v3.1.14 Wed Dec 22 2021 20:49:10 GMT+0800 (中国标准时间)
+* (c) 2021 @jdf2e.
+* Released under the MIT License.
+*/
+import { toRefs, computed, openBlock, createElementBlock, normalizeClass, Fragment, renderList, toDisplayString } from "vue";
+import { c as createComponent } from "./component.js";
+import { _ as _export_sfc } from "./plugin-vue_export-helper.js";
+const { componentName, create } = createComponent("indicator");
+const _sfc_main = create({
+  props: {
+    size: {
+      type: Number,
+      default: 3,
+      required: true
+    },
+    current: {
+      type: Number,
+      default: 1,
+      required: true
+    },
+    block: {
+      type: Boolean,
+      default: false
+    },
+    align: {
+      type: String,
+      default: "center"
+    },
+    fillZero: {
+      type: Boolean,
+      default: true
+    }
+  },
+  setup(props) {
+    const { block, align } = toRefs(props);
+    const classes = computed(() => {
+      const prefixCls = componentName;
+      return {
+        [prefixCls]: true,
+        [`${prefixCls}--block`]: block.value,
+        [`${prefixCls}--align__${align.value}`]: block.value && align.value
+      };
+    });
+    return { classes, componentName };
+  }
+});
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return openBlock(), createElementBlock("view", {
+    class: normalizeClass(_ctx.classes)
+  }, [
+    (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.size, (item) => {
+      return openBlock(), createElementBlock(Fragment, { key: item }, [
+        item === _ctx.current ? (openBlock(), createElementBlock("view", {
+          key: 0,
+          class: normalizeClass(`${_ctx.componentName}--number`)
+        }, toDisplayString(_ctx.fillZero && item < 10 ? `0${item}` : item), 3)) : (openBlock(), createElementBlock("view", {
+          key: 1,
+          class: normalizeClass(`${_ctx.componentName}--dot`)
+        }, null, 2))
+      ], 64);
+    }), 128))
+  ], 2);
+}
+var index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
+export { index as default };

package/dist/packages/_es/InfiniteLoading.js

@@ -17,21 +17,16 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __require = typeof require !== "undefined" ? require : (x) => {
-  throw new Error('Dynamic require of "' + x + '" is not supported');
-};
 /*!
-* @nutui/nutui v3.1.11 Wed Nov 24 2021 14:54:38 GMT+0800 (中国标准时间)
+* @nutui/nutui v3.1.14 Wed Dec 22 2021 20:49:10 GMT+0800 (中国标准时间)
 * (c) 2021 @jdf2e.
 * Released under the MIT License.
 */
-import { reactive, computed, onMounted, toRefs, resolveComponent, openBlock, createBlock, normalizeClass, withCtx, createElementVNode, normalizeStyle, createVNode, toDisplayString, renderSlot, createElementBlock, createCommentVNode } from "vue";
+import { reactive, computed, onMounted, onUnmounted, ref, onActivated, onDeactivated, toRefs, resolveComponent, openBlock, createElementBlock, normalizeClass, createElementVNode, normalizeStyle, createVNode, toDisplayString, renderSlot, createCommentVNode } from "vue";
 import { c as createComponent } from "./component.js";
-import { _ as _sfc_main$1 } from "./index.taro.vue_vue&type=script&lang.js";
-import Taro from "@tarojs/taro";
-import "./pxCheck.js";
+import { _ as _export_sfc } from "./plugin-vue_export-helper.js";
 const { componentName, create } = createComponent("infiniteloading");
-var _sfc_main = create({
+const _sfc_main = create({
   props: {
     hasMore: {
       type: Boolean,
@@ -79,16 +74,14 @@ var _sfc_main = create({
     }
   },
   emits: ["scroll-change", "load-more", "refresh"],
-  components: {
-    "nut-icon": _sfc_main$1
-  },
   setup(props, { emit, slots }) {
     const state = reactive({
-      scrollHeight: 0,
-      scrollTop: 0,
-      isInfiniting: false,
-      direction: "down",
+      scrollEl: window,
+      scroller: null,
+      refreshTop: null,
+      beforeScrollTop: 0,
       isTouching: false,
+      isInfiniting: false,
       refreshMaxH: 0,
       y: 0,
       x: 0,
@@ -107,46 +100,69 @@ var _sfc_main = create({
       };
     });
     const getParentElement = (el) => {
-      return Taro.createSelectorQuery().select(!!props.containerId ? `#${props.containerId} #${el}` : `#${el}`);
+      return !!props.containerId ? document.querySelector(`#${props.containerId}`) : el && el.parentNode;
     };
-    const getScrollHeight = () => {
-      const parentElement = getParentElement("scroller");
-      parentElement.boundingClientRect((rect) => {
-        state.scrollHeight = rect.height;
-      }).exec();
+    const requestAniFrame = () => {
+      return window.requestAnimationFrame || window.webkitRequestAnimationFrame || function(callback) {
+        window.setTimeout(callback, 1e3 / 60);
+      };
     };
-    const lower = () => {
-      if (state.direction == "up" || !props.hasMore || state.isInfiniting) {
-        return false;
-      } else {
-        state.isInfiniting = true;
-        emit("load-more", infiniteDone);
-      }
+    const getWindowScrollTop = () => {
+      return window.pageYOffset !== void 0 ? window.pageYOffset : (document.documentElement || document.body.parentNode || document.body).scrollTop;
+    };
+    const calculateTopPosition = (el) => {
+      return !el ? 0 : el.offsetTop + calculateTopPosition(el.offsetParent);
     };
-    const scroll = (e) => {
-      if (e.detail.scrollTop <= 0) {
-        e.detail.scrollTop = 0;
-      } else if (e.detail.scrollTop >= state.scrollHeight) {
-        e.detail.scrollTop = state.scrollHeight;
+    const isScrollAtBottom = () => {
+      let offsetDistance = 0;
+      let resScrollTop = 0;
+      let direction = "down";
+      const windowScrollTop = getWindowScrollTop();
+      if (props.useWindow) {
+        if (state.scroller) {
+          offsetDistance = calculateTopPosition(state.scroller) + state.scroller.offsetHeight - windowScrollTop - window.innerHeight;
+        }
+        resScrollTop = windowScrollTop;
+      } else {
+        const { scrollHeight, clientHeight, scrollTop } = state.scrollEl;
+        offsetDistance = scrollHeight - clientHeight - scrollTop;
+        resScrollTop = scrollTop;
       }
-      if (e.detail.scrollTop > state.scrollTop || e.detail.scrollTop >= state.scrollHeight) {
-        state.direction = "down";
+      if (state.beforeScrollTop > resScrollTop) {
+        direction = "up";
       } else {
-        state.direction = "up";
+        direction = "down";
       }
-      state.scrollTop = e.detail.scrollTop;
-      emit("scroll-change", e.detail.scrollTop);
+      state.beforeScrollTop = resScrollTop;
+      emit("scroll-change", resScrollTop);
+      return offsetDistance <= props.threshold && direction == "down";
     };
     const infiniteDone = () => {
       state.isInfiniting = false;
     };
+    const handleScroll = () => {
+      requestAniFrame()(() => {
+        if (!isScrollAtBottom() || !props.hasMore || state.isInfiniting) {
+          return false;
+        } else {
+          state.isInfiniting = true;
+          emit("load-more", infiniteDone);
+        }
+      });
+    };
+    const scrollListener = () => {
+      state.scrollEl.addEventListener("scroll", handleScroll, props.useCapture);
+    };
+    const refreshDone = () => {
+      state.distance = 0;
+      state.isTouching = false;
+    };
     const touchStart = (event) => {
-      if (state.scrollTop == 0 && !state.isTouching && props.isOpenRefresh) {
+      if (state.beforeScrollTop == 0 && !state.isTouching && props.isOpenRefresh) {
         state.y = event.touches[0].pageY;
         state.isTouching = true;
-        getParentElement("refreshTop").boundingClientRect((rect) => {
-          state.refreshMaxH = Math.floor(rect.height * 1 + 10);
-        }).exec();
+        const childHeight = state.refreshTop.firstElementChild.offsetHeight;
+        state.refreshMaxH = Math.floor(childHeight * 1 + 10);
       }
     };
     const touchMove = (event) => {
@@ -167,20 +183,28 @@ var _sfc_main = create({
         emit("refresh", refreshDone);
       }
     };
-    const refreshDone = () => {
-      state.distance = 0;
-      state.isTouching = false;
-    };
     onMounted(() => {
-      setTimeout(() => {
-        getScrollHeight();
-      }, 200);
+      const parentElement = getParentElement(state.scroller);
+      state.scrollEl = props.useWindow ? window : parentElement;
+      scrollListener();
+    });
+    onUnmounted(() => {
+      state.scrollEl.removeEventListener("scroll", handleScroll, props.useCapture);
+    });
+    const isKeepAlive = ref(false);
+    onActivated(() => {
+      if (isKeepAlive.value) {
+        isKeepAlive.value = false;
+        scrollListener();
+      }
+    });
+    onDeactivated(() => {
+      isKeepAlive.value = true;
+      state.scrollEl.removeEventListener("scroll", handleScroll, props.useCapture);
     });
     return __spreadProps(__spreadValues({
       classes
     }, toRefs(state)), {
-      lower,
-      scroll,
       touchStart,
       touchMove,
       touchEnd,
@@ -188,10 +212,7 @@ var _sfc_main = create({
     });
   }
 });
-const _hoisted_1 = {
-  class: "top-box",
-  id: "refreshTop"
-};
+const _hoisted_1 = { class: "top-box" };
 const _hoisted_2 = { class: "top-text" };
 const _hoisted_3 = { class: "nut-infinite-container" };
 const _hoisted_4 = { class: "nut-infinite-bottom" };
@@ -206,46 +227,39 @@ const _hoisted_7 = {
 };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_nut_icon = resolveComponent("nut-icon");
-  const _component_scroll_view = resolveComponent("scroll-view");
-  return openBlock(), createBlock(_component_scroll_view, {
+  return openBlock(), createElementBlock("view", {
     class: normalizeClass(_ctx.classes),
-    scrollY: "true",
-    style: { "height": "100%" },
-    id: "scroller",
-    onScrolltolower: _ctx.lower,
-    onScroll: _ctx.scroll,
-    onTouchstart: _ctx.touchStart,
-    onTouchmove: _ctx.touchMove,
-    onTouchend: _ctx.touchEnd
-  }, {
-    default: withCtx(() => [
-      createElementVNode("view", {
-        class: "nut-infinite-top",
-        style: normalizeStyle(_ctx.getStyle)
-      }, [
-        createElementVNode("view", _hoisted_1, [
-          createVNode(_component_nut_icon, {
-            class: "top-img",
-            name: _ctx.pullIcon
-          }, null, 8, ["name"]),
-          createElementVNode("view", _hoisted_2, toDisplayString(_ctx.pullTxt), 1)
-        ])
-      ], 4),
-      createElementVNode("view", _hoisted_3, [
-        renderSlot(_ctx.$slots, "default")
-      ]),
-      createElementVNode("view", _hoisted_4, [
-        _ctx.isInfiniting ? (openBlock(), createElementBlock("view", _hoisted_5, [
-          createVNode(_component_nut_icon, {
-            class: "bottom-img",
-            name: _ctx.loadIcon
-          }, null, 8, ["name"]),
-          createElementVNode("view", _hoisted_6, toDisplayString(_ctx.loadTxt), 1)
-        ])) : !_ctx.hasMore ? (openBlock(), createElementBlock("view", _hoisted_7, toDisplayString(_ctx.loadMoreTxt), 1)) : createCommentVNode("", true)
+    ref: "scroller",
+    onTouchstart: _cache[0] || (_cache[0] = (...args) => _ctx.touchStart && _ctx.touchStart(...args)),
+    onTouchmove: _cache[1] || (_cache[1] = (...args) => _ctx.touchMove && _ctx.touchMove(...args)),
+    onTouchend: _cache[2] || (_cache[2] = (...args) => _ctx.touchEnd && _ctx.touchEnd(...args))
+  }, [
+    createElementVNode("view", {
+      class: "nut-infinite-top",
+      ref: "refreshTop",
+      style: normalizeStyle(_ctx.getStyle)
+    }, [
+      createElementVNode("view", _hoisted_1, [
+        createVNode(_component_nut_icon, {
+          class: "top-img",
+          name: _ctx.pullIcon
+        }, null, 8, ["name"]),
+        createElementVNode("view", _hoisted_2, toDisplayString(_ctx.pullTxt), 1)
       ])
+    ], 4),
+    createElementVNode("view", _hoisted_3, [
+      renderSlot(_ctx.$slots, "default")
     ]),
-    _: 3
-  }, 8, ["class", "onScrolltolower", "onScroll", "onTouchstart", "onTouchmove", "onTouchend"]);
+    createElementVNode("view", _hoisted_4, [
+      _ctx.isInfiniting ? (openBlock(), createElementBlock("view", _hoisted_5, [
+        createVNode(_component_nut_icon, {
+          class: "bottom-img",
+          name: _ctx.loadIcon
+        }, null, 8, ["name"]),
+        createElementVNode("view", _hoisted_6, toDisplayString(_ctx.loadTxt), 1)
+      ])) : !_ctx.hasMore ? (openBlock(), createElementBlock("view", _hoisted_7, toDisplayString(_ctx.loadMoreTxt), 1)) : createCommentVNode("", true)
+    ])
+  ], 34);
 }
-_sfc_main.render = _sfc_render;
-export { _sfc_main as default };
+var index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
+export { index as default };