@nutui/nutui 4.1.0-beta.6 → 4.1.1

package/dist/packages/_es/Progress.js

@@ -1,6 +1,6 @@
-import { useSlots, ref, computed, onMounted, resolveComponent, openBlock, createElementBlock, createElementVNode, normalizeClass, normalizeStyle, toDisplayString, createCommentVNode, renderSlot, createVNode } from "vue";
-import { c as createComponent } from "./component-0fbad28e.js";
+import { useSlots, computed, resolveComponent, openBlock, createElementBlock, createElementVNode, normalizeClass, normalizeStyle, toDisplayString, createCommentVNode, renderSlot, createVNode } from "vue";
 import { Checked } from "@nutui/icons-vue";
+import { c as createComponent } from "./component-0fbad28e.js";
 import { _ as _export_sfc } from "./_plugin-vue_export-helper-cc2b3d55.js";
 import "../locale/lang";
 const { create } = createComponent("progress");
@@ -18,7 +18,7 @@ const _sfc_main = create({
     },
     status: {
       type: String,
-      default: ""
+      default: "text"
     },
     strokeWidth: {
       type: [Number, String],
@@ -51,11 +51,14 @@ const _sfc_main = create({
   },
   setup(props) {
     const slotDefault = !!useSlots().default;
-    const height = ref(props.strokeWidth + "px");
-    const progressOuter = ref();
-    const insideText = ref();
+    const height = computed(() => {
+      if (props.strokeWidth) {
+        return props.strokeWidth + "px";
+      }
+      return void 0;
+    });
     const percentage = computed(() => {
-      return props.percentage >= 100 ? 100 : props.percentage;
+      return Number(props.percentage) >= 100 ? 100 : Number(props.percentage);
     });
     const bgStyle = computed(() => {
       return {
@@ -68,40 +71,30 @@ const _sfc_main = create({
         color: props.textColor || ""
       };
     });
-    onMounted(() => {
-    });
     return {
       height,
       percentage,
       bgStyle,
       textStyle,
-      progressOuter,
-      insideText,
       slotDefault
     };
   }
 });
 const _hoisted_1 = { class: "nut-progress" };
-const _hoisted_2 = {
-  key: 0,
-  class: "nut-progress-text"
-};
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_Checked = resolveComponent("Checked");
   return openBlock(), createElementBlock("div", _hoisted_1, [
     createElementVNode("div", {
       class: normalizeClass(["nut-progress-outer", [_ctx.showText && !_ctx.textInside ? "nut-progress-outer-part" : "", _ctx.size ? "nut-progress-" + _ctx.size : ""]]),
-      ref: "progressOuter",
       style: normalizeStyle({ height: _ctx.height })
     }, [
       createElementVNode("div", {
-        class: normalizeClass(["nut-progress-inner", _ctx.status == "active" ? "nut-active" : ""]),
+        class: normalizeClass(["nut-progress-inner", _ctx.status === "active" ? "nut-active" : ""]),
         style: normalizeStyle(_ctx.bgStyle)
       }, null, 6),
       _ctx.showText && _ctx.textInside && !_ctx.slotDefault ? (openBlock(), createElementBlock("div", {
         key: 0,
         class: "nut-progress-text nut-progress-insidetext",
-        ref: "insideText",
         style: normalizeStyle({
           lineHeight: _ctx.height,
           left: `${_ctx.percentage}%`,
@@ -115,7 +108,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       ], 4)) : createCommentVNode("", true),
       _ctx.showText && _ctx.textInside && _ctx.slotDefault ? (openBlock(), createElementBlock("div", {
         key: 1,
-        ref: "insideText",
+        class: "nut-progress-slot",
         style: normalizeStyle({
           position: `absolute`,
           top: `50%`,
@@ -126,18 +119,22 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         renderSlot(_ctx.$slots, "default")
       ], 4)) : createCommentVNode("", true)
     ], 6),
-    _ctx.showText && !_ctx.textInside ? (openBlock(), createElementBlock("div", _hoisted_2, [
-      _ctx.status == "active" || _ctx.status == "" ? (openBlock(), createElementBlock("span", {
+    _ctx.showText && !_ctx.textInside ? (openBlock(), createElementBlock("div", {
+      key: 0,
+      class: "nut-progress-text",
+      style: normalizeStyle({ lineHeight: _ctx.height })
+    }, [
+      _ctx.status === "text" || _ctx.status === "active" ? (openBlock(), createElementBlock("span", {
         key: 0,
         style: normalizeStyle(_ctx.textStyle)
-      }, toDisplayString(_ctx.percentage) + toDisplayString(_ctx.isShowPercentage ? "%" : ""), 5)) : _ctx.status == "icon" ? renderSlot(_ctx.$slots, "icon-name", { key: 1 }, () => [
+      }, toDisplayString(_ctx.percentage) + toDisplayString(_ctx.isShowPercentage ? "%" : ""), 5)) : _ctx.status === "icon" ? renderSlot(_ctx.$slots, "icon-name", { key: 1 }, () => [
         createVNode(_component_Checked, {
           width: "15px",
           height: "15px",
           color: "#439422"
         })
       ]) : createCommentVNode("", true)
-    ])) : createCommentVNode("", true)
+    ], 4)) : createCommentVNode("", true)
   ]);
 }
 const Progress = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);

package/dist/packages/_es/Sticky.js

@@ -34,6 +34,7 @@ const _sfc_main = create({
     const state = reactive({
       fixed: false,
       height: 0,
+      width: 0,
       transform: 0
     });
     const threshold = computed(() => {
@@ -49,6 +50,8 @@ const _sfc_main = create({
         return {};
       return {
         [props.position]: `${threshold.value}px`,
+        height: `${state.height}px`,
+        width: `${state.width}px`,
         transform: state.transform ? `translate3d(0, ${state.transform}px, 0)` : void 0,
         position: state.fixed ? "fixed" : void 0,
         zIndex: Number(props.zIndex)
@@ -63,6 +66,7 @@ const _sfc_main = create({
       const stickyRect = useRect(stCurrent);
       const containerRect = useRect(containerEle);
       state.height = rootRect.height;
+      state.width = rootRect.width;
       const getFixed = () => {
         let fixed = false;
         if (props.position === "top") {

package/dist/packages/_es/Swipe.js

@@ -18,11 +18,11 @@ var __spreadValues = (a, b) => {
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 import { u as useTouch } from "./index-7a7385e4.js";
-import { computed, ref, reactive, openBlock, createElementBlock, normalizeClass, normalizeStyle, createElementVNode, renderSlot } from "vue";
+import { ref, computed, inject, watch, reactive, openBlock, createElementBlock, normalizeStyle, createElementVNode, renderSlot } from "vue";
 import { c as createComponent } from "./component-0fbad28e.js";
 import { _ as _export_sfc } from "./_plugin-vue_export-helper-cc2b3d55.js";
 import "../locale/lang";
-const { componentName, create } = createComponent("swipe");
+const { create } = createComponent("swipe");
 const _sfc_main = create({
   props: {
     name: {
@@ -42,25 +42,32 @@ const _sfc_main = create({
       default: false
     }
   },
-  emits: ["open", "close"],
+  emits: ["open", "close", "click"],
   setup(props, { emit }) {
-    const classes = computed(() => {
-      const prefixCls = componentName;
-      return {
-        [prefixCls]: true
-      };
-    });
     const getRefWidth = (ref2) => {
       var _a;
-      return ((_a = ref2.value) == null ? void 0 : _a.clientWidth) || 0;
+      return ((_a = ref2.value) == null ? void 0 : _a.getBoundingClientRect().width) || 0;
     };
+    const lockClick = ref(false);
     const leftRef = ref(), leftRefWidth = computed(() => {
       return getRefWidth(leftRef);
     });
     const rightRef = ref(), rightRefWidth = computed(() => {
       return getRefWidth(rightRef);
     });
-    let opened = false;
+    const parent = inject("swipeGroup", null);
+    watch(
+      () => {
+        var _a;
+        return (_a = parent == null ? void 0 : parent.name) == null ? void 0 : _a.value;
+      },
+      (name) => {
+        if (props.name !== name && parent && parent.lock) {
+          close();
+        }
+      }
+    );
+    const opened = ref(false);
     let position = "";
     let oldPosition = "";
     const state = reactive({
@@ -68,7 +75,8 @@ const _sfc_main = create({
       moving: false
     });
     const open = (p = "") => {
-      opened = true;
+      parent && parent.update(props.name);
+      opened.value = true;
       if (p) {
         state.offset = p === "left" ? -rightRefWidth.value : leftRefWidth.value;
       }
@@ -79,11 +87,21 @@ const _sfc_main = create({
     };
     const close = () => {
       state.offset = 0;
-      opened = false;
-      emit("close", {
-        name: props.name,
-        position
-      });
+      if (opened.value) {
+        opened.value = false;
+        emit("close", {
+          name: props.name,
+          position
+        });
+      }
+    };
+    const onClick = (e, position2, lock) => {
+      if (lock) {
+        e.stopPropagation();
+      } else {
+        close();
+      }
+      emit("click", position2);
     };
     const touchStyle = computed(() => {
       return {
@@ -95,14 +113,14 @@ const _sfc_main = create({
       let offset = deltaX;
       switch (position) {
         case "left":
-          if (opened && oldPosition === position) {
+          if (opened.value && oldPosition === position) {
             offset = -rightRefWidth.value;
           } else {
             offset = Math.abs(deltaX) > rightRefWidth.value ? -rightRefWidth.value : deltaX;
           }
           break;
         case "right":
-          if (opened && oldPosition === position) {
+          if (opened.value && oldPosition === position) {
             offset = leftRefWidth.value;
           } else {
             offset = Math.abs(deltaX) > leftRefWidth.value ? leftRefWidth.value : deltaX;
@@ -123,6 +141,7 @@ const _sfc_main = create({
           return;
         touch.move(event);
         if (touch.isHorizontal()) {
+          lockClick.value = true;
           state.moving = true;
           setoffset(touch.deltaX.value);
           if (props.touchMovePreventDefault) {
@@ -155,48 +174,54 @@ const _sfc_main = create({
               }
               break;
           }
+          setTimeout(() => {
+            lockClick.value = false;
+          }, 0);
         }
       }
     };
     return __spreadProps(__spreadValues({
-      classes,
       touchStyle
     }, touchMethods), {
       leftRef,
       rightRef,
       open,
-      close
+      close,
+      onClick,
+      lockClick
     });
   }
 });
-const _hoisted_1 = {
-  class: "nut-swipe__left",
-  ref: "leftRef"
-};
-const _hoisted_2 = { class: "nut-swipe__content" };
-const _hoisted_3 = {
-  class: "nut-swipe__right",
-  ref: "rightRef"
-};
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createElementBlock("view", {
-    class: normalizeClass(_ctx.classes),
+    class: "nut-swipe",
     style: normalizeStyle(_ctx.touchStyle),
-    onTouchstart: _cache[0] || (_cache[0] = (...args) => _ctx.onTouchStart && _ctx.onTouchStart(...args)),
-    onTouchmove: _cache[1] || (_cache[1] = (...args) => _ctx.onTouchMove && _ctx.onTouchMove(...args)),
-    onTouchend: _cache[2] || (_cache[2] = (...args) => _ctx.onTouchEnd && _ctx.onTouchEnd(...args)),
-    onTouchcancel: _cache[3] || (_cache[3] = (...args) => _ctx.onTouchEnd && _ctx.onTouchEnd(...args))
+    onTouchstart: _cache[3] || (_cache[3] = (...args) => _ctx.onTouchStart && _ctx.onTouchStart(...args)),
+    onTouchmove: _cache[4] || (_cache[4] = (...args) => _ctx.onTouchMove && _ctx.onTouchMove(...args)),
+    onTouchend: _cache[5] || (_cache[5] = (...args) => _ctx.onTouchEnd && _ctx.onTouchEnd(...args)),
+    onTouchcancel: _cache[6] || (_cache[6] = (...args) => _ctx.onTouchEnd && _ctx.onTouchEnd(...args))
   }, [
-    createElementVNode("view", _hoisted_1, [
+    createElementVNode("view", {
+      class: "nut-swipe__left",
+      ref: "leftRef",
+      onClick: _cache[0] || (_cache[0] = ($event) => _ctx.onClick($event, "left", true))
+    }, [
       renderSlot(_ctx.$slots, "left")
     ], 512),
-    createElementVNode("view", _hoisted_2, [
+    createElementVNode("view", {
+      class: "nut-swipe__content",
+      onClick: _cache[1] || (_cache[1] = ($event) => _ctx.onClick($event, "content", _ctx.lockClick))
+    }, [
       renderSlot(_ctx.$slots, "default")
     ]),
-    createElementVNode("view", _hoisted_3, [
+    createElementVNode("view", {
+      class: "nut-swipe__right",
+      ref: "rightRef",
+      onClick: _cache[2] || (_cache[2] = ($event) => _ctx.onClick($event, "right", true))
+    }, [
       renderSlot(_ctx.$slots, "right")
     ], 512)
-  ], 38);
+  ], 36);
 }
 const Swipe = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
 export {

package/dist/packages/_es/SwipeGroup.js

@@ -0,0 +1,39 @@
+import { ref, provide, openBlock, createElementBlock, renderSlot } from "vue";
+import { c as createComponent } from "./component-0fbad28e.js";
+import { _ as _export_sfc } from "./_plugin-vue_export-helper-cc2b3d55.js";
+import "../locale/lang";
+const { create } = createComponent("swipe-group");
+const _sfc_main = create({
+  props: {
+    lock: {
+      type: Boolean,
+      default: false
+    }
+  },
+  setup(props) {
+    const swipeGroupRef = ref(null);
+    const name = ref("");
+    const update = (n) => {
+      name.value = n;
+    };
+    provide("swipeGroup", {
+      update,
+      lock: props.lock,
+      name
+    });
+    return { swipeGroupRef };
+  }
+});
+const _hoisted_1 = {
+  class: "nut-swipe-group",
+  ref: "swipeGroupRef"
+};
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return openBlock(), createElementBlock("div", _hoisted_1, [
+    renderSlot(_ctx.$slots, "default")
+  ], 512);
+}
+const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
+export {
+  index as default
+};

package/dist/packages/_es/Tabs.js

@@ -55,9 +55,14 @@ const useTabContentTouch = (props, tabMethods, taro, useTaroRect) => {
   const initTaroWidth = () => __async(void 0, null, function* () {
     var _a, _b;
     if (taro && taro.getEnv() !== taro.ENV_TYPE.WEB) {
-      let rect = yield useTaroRect(tabsContentRef);
-      tabsContentRefRect.value.width = rect.width || 0;
-      tabsContentRefRect.value.height = rect.height || 0;
+      useTaroRect(tabsContentRef).then(
+        (rect) => {
+          tabsContentRefRect.value.width = rect.width || 0;
+          tabsContentRefRect.value.height = rect.height || 0;
+        },
+        () => {
+        }
+      );
     } else {
       tabsContentRefRect.value.width = ((_a = tabsContentRef.value) == null ? void 0 : _a.clientWidth) || 0;
       tabsContentRefRect.value.height = ((_b = tabsContentRef.value) == null ? void 0 : _b.clientHeight) || 0;

package/dist/packages/_es/Tag.js

@@ -1,13 +1,19 @@
-import { toRefs, computed, resolveComponent, openBlock, createElementBlock, normalizeClass, normalizeStyle, renderSlot, createBlock, createCommentVNode } from "vue";
+import { computed, resolveComponent, openBlock, createElementBlock, normalizeClass, normalizeStyle, renderSlot, createBlock, createCommentVNode } from "vue";
 import { c as createComponent } from "./component-0fbad28e.js";
 import { Close } from "@nutui/icons-vue";
 import { _ as _export_sfc } from "./_plugin-vue_export-helper-cc2b3d55.js";
 import "../locale/lang";
-const { componentName, create } = createComponent("tag");
+const { create } = createComponent("tag");
 const _sfc_main = create({
   props: {
-    color: { type: String, default: "" },
-    textColor: { type: String, default: "" },
+    color: {
+      type: String,
+      default: ""
+    },
+    textColor: {
+      type: String,
+      default: ""
+    },
     type: {
       type: String,
       default: "default"
@@ -34,32 +40,31 @@ const _sfc_main = create({
   },
   emits: ["close", "click"],
   setup(props, { emit }) {
-    const { type, color, plain, round, mark, textColor } = toRefs(props);
     const classes = computed(() => {
-      const prefixCls = componentName;
+      const prefixCls = "nut-tag";
       return {
         [prefixCls]: true,
-        [`${prefixCls}--${type.value}`]: type.value,
-        [`${prefixCls}--plain`]: plain.value,
-        [`${prefixCls}--round`]: round.value,
-        [`${prefixCls}--mark`]: mark.value
+        [`${prefixCls}--${props.type}`]: props.type,
+        [`${prefixCls}--plain`]: props.plain,
+        [`${prefixCls}--round`]: props.round,
+        [`${prefixCls}--mark`]: props.mark
       };
     });
-    const getStyle = () => {
-      const style = {};
-      if (textColor.value) {
-        style.color = textColor.value;
-      } else if (color.value && plain.value) {
-        style.color = color.value;
+    const style = computed(() => {
+      const style2 = {};
+      if (props.textColor) {
+        style2.color = props.textColor;
+      } else if (props.color && props.plain) {
+        style2.color = props.color;
       }
-      if (plain.value) {
-        style.background = "#fff";
-        style["border-color"] = color.value;
-      } else if (color.value) {
-        style.background = color.value;
+      if (props.plain) {
+        style2.background = "#fff";
+        style2["border-color"] = props.color;
+      } else if (props.color) {
+        style2.background = props.color;
       }
-      return style;
-    };
+      return style2;
+    });
     const onClose = (event) => {
       event.stopPropagation();
       emit("close", event);
@@ -69,7 +74,7 @@ const _sfc_main = create({
     };
     return {
       classes,
-      getStyle,
+      style,
       onClose,
       onClick
     };
@@ -79,7 +84,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_Close = resolveComponent("Close");
   return openBlock(), createElementBlock("view", {
     class: normalizeClass(_ctx.classes),
-    style: normalizeStyle(_ctx.getStyle()),
+    style: normalizeStyle(_ctx.style),
     onClick: _cache[0] || (_cache[0] = (...args) => _ctx.onClick && _ctx.onClick(...args))
   }, [
     renderSlot(_ctx.$slots, "default"),