@nutui/nutui 4.0.0-beta.14 → 4.0.0-beta.16

package/dist/packages/_es/AddressList.js

@@ -1,4 +1,4 @@
-import { resolveComponent, openBlock, createElementBlock, createElementVNode, renderSlot, toDisplayString, createCommentVNode, createVNode, createTextVNode, ref, createBlock, withCtx, reactive, computed, watch, onMounted, normalizeClass, Fragment, renderList, createSlots } from "vue";
+import { resolveComponent, openBlock, createElementBlock, createElementVNode, renderSlot, toDisplayString, createCommentVNode, createVNode, createTextVNode, ref, h, createBlock, resolveDynamicComponent, withCtx, reactive, computed, watch, onMounted, normalizeClass, Fragment, renderList, createSlots } from "vue";
 import { c as createComponent, n as floatData } from "./component-81a4c1d0.js";
 import { Del, Edit } from "@nutui/icons-vue";
 import { _ as _export_sfc } from "./_plugin-vue_export-helper-cc2b3d55.js";
@@ -6,9 +6,9 @@ import Button from "./Button.js";
 import Swipe from "./Swipe.js";
 import "../locale/lang";
 import "./index-7a7385e4.js";
-const { create: create$3 } = createComponent("addresslist-item");
+const { create: create$2 } = createComponent("addresslist-item");
 const { translate: translate$1 } = createComponent("addresslist");
-const _sfc_main$3 = create$3({
+const _sfc_main$2 = create$2({
   components: { Del, Edit },
   props: {
     item: {
@@ -38,7 +38,7 @@ const _sfc_main$3 = create$3({
     };
   }
 });
-const _hoisted_1$2 = { class: "nut-address-list-item__info" };
+const _hoisted_1$1 = { class: "nut-address-list-item__info" };
 const _hoisted_2$1 = { class: "nut-address-list-item__info-contact" };
 const _hoisted_3$1 = { class: "nut-address-list-item__info-contact-name" };
 const _hoisted_4$1 = { class: "nut-address-list-item__info-contact-tel" };
@@ -48,14 +48,14 @@ const _hoisted_5$1 = {
 };
 const _hoisted_6$1 = { class: "nut-address-list-item__info-handle" };
 const _hoisted_7$1 = { class: "nut-address-list-item__addr" };
-function _sfc_render$3(_ctx, _cache, $props, $setup, $data, $options) {
+function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_Del = resolveComponent("Del");
   const _component_Edit = resolveComponent("Edit");
   return openBlock(), createElementBlock("div", {
     class: "nut-address-list-item",
     onClick: _cache[0] || (_cache[0] = (...args) => _ctx.contentsClick && _ctx.contentsClick(...args))
   }, [
-    createElementVNode("div", _hoisted_1$2, [
+    createElementVNode("div", _hoisted_1$1, [
       createElementVNode("div", _hoisted_2$1, [
         renderSlot(_ctx.$slots, "contentTop", {}, () => [
           createElementVNode("div", _hoisted_3$1, toDisplayString(_ctx.item.addressName), 1),
@@ -85,103 +85,7 @@ function _sfc_render$3(_ctx, _cache, $props, $setup, $data, $options) {
     ])
   ]);
 }
-const ItemContents = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["render", _sfc_render$3]]);
-const { create: create$2 } = createComponent("addresslist-swipe");
-const _sfc_main$2 = create$2({
-  props: {
-    item: {
-      type: Object,
-      default: {}
-    }
-  },
-  emits: ["delIcon", "editIcon", "itemClick", "swipeDel"],
-  components: {
-    ItemContents
-  },
-  setup(props, { emit }) {
-    const moveRef = ref(false);
-    const delClick = (event) => {
-      emit("delIcon", event, props.item);
-      event.stopPropagation();
-    };
-    const editClick = (event) => {
-      emit("editIcon", event, props.item);
-      event.stopPropagation();
-    };
-    const itemClick = (event) => {
-      if (moveRef.value)
-        return;
-      emit("itemClick", event, props.item);
-      event.stopPropagation();
-    };
-    const swipeDelClick = (event) => {
-      emit("swipeDel", event, props.item);
-      event.stopPropagation();
-    };
-    const swipestart = () => {
-      moveRef.value = false;
-    };
-    const swipemove = () => {
-      moveRef.value = true;
-    };
-    return {
-      delClick,
-      editClick,
-      itemClick,
-      swipeDelClick,
-      swipestart,
-      swipemove
-    };
-  }
-});
-const _hoisted_1$1 = { class: "nut-address-list-swipe" };
-function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) {
-  const _component_item_contents = resolveComponent("item-contents");
-  const _component_nut_button = resolveComponent("nut-button");
-  const _component_nut_swipe = resolveComponent("nut-swipe");
-  return openBlock(), createBlock(_component_nut_swipe, null, {
-    right: withCtx(() => [
-      renderSlot(_ctx.$slots, "swiperightbtn", {}, () => [
-        createVNode(_component_nut_button, {
-          shape: "square",
-          style: { "height": "100%" },
-          type: "danger",
-          onClick: _ctx.swipeDelClick
-        }, {
-          default: withCtx(() => [
-            createTextVNode("删除")
-          ]),
-          _: 1
-        }, 8, ["onClick"])
-      ])
-    ]),
-    default: withCtx(() => [
-      createElementVNode("div", _hoisted_1$1, [
-        createVNode(_component_item_contents, {
-          item: _ctx.item,
-          onDelIcon: _ctx.delClick,
-          onEditIcon: _ctx.editClick,
-          onItemClick: _ctx.itemClick,
-          onTouchmove: _ctx.swipemove,
-          onTouchstart: _ctx.swipestart
-        }, {
-          contentTop: withCtx(() => [
-            renderSlot(_ctx.$slots, "contentInfo")
-          ]),
-          contentIcon: withCtx(() => [
-            renderSlot(_ctx.$slots, "contentIcons")
-          ]),
-          contentAddr: withCtx(() => [
-            renderSlot(_ctx.$slots, "contentAddrs")
-          ]),
-          _: 3
-        }, 8, ["item", "onDelIcon", "onEditIcon", "onItemClick", "onTouchmove", "onTouchstart"])
-      ])
-    ]),
-    _: 3
-  });
-}
-const SwipeShell = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["render", _sfc_render$2]]);
+const ItemContents = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["render", _sfc_render$2]]);
 const { create: create$1 } = createComponent("addresslist-general");
 const _sfc_main$1 = create$1({
   props: {
@@ -192,27 +96,52 @@ const _sfc_main$1 = create$1({
     longPress: {
       type: Boolean,
       default: false
+    },
+    swipeEdition: {
+      type: Boolean,
+      default: false
     }
   },
-  emits: ["delIcon", "editIcon", "itemClick", "longDown", "longCopy", "longSet", "longDel"],
+  emits: ["delIcon", "editIcon", "itemClick", "longDown", "longCopy", "longSet", "longDel", "swipeDel"],
   components: {
     ItemContents
   },
   setup(props, { emit }) {
+    const renderCompontent = () => {
+      return h(ItemContents, {
+        item: props.item,
+        onDelIcon(event) {
+          delClick(event);
+        },
+        onEditIcon(event) {
+          editClick(event);
+        },
+        onItemClick(event) {
+          itemClick(event);
+        }
+      });
+    };
     let loop = null;
+    const moveRef = ref(false);
     const showMaskRef = ref(false);
-    const delShellClick = (event) => {
+    const delClick = (event) => {
       emit("delIcon", event, props.item);
       event.stopPropagation();
     };
-    const editShellClick = (event) => {
+    const editClick = (event) => {
       emit("editIcon", event, props.item);
       event.stopPropagation();
     };
-    const itemShellClick = (event) => {
+    const itemClick = (event) => {
+      if (moveRef.value)
+        return;
       emit("itemClick", event, props.item);
       event.stopPropagation();
     };
+    const delLongClick = (event) => {
+      emit("longDel", event, props.item);
+      event.stopPropagation();
+    };
     const holdingFunc = (event) => {
       loop = 0;
       showMaskRef.value = true;
@@ -240,10 +169,6 @@ const _sfc_main$1 = create$1({
       emit("longSet", event, props.item);
       event.stopPropagation();
     };
-    const delClick = (event) => {
-      emit("longDel", event, props.item);
-      event.stopPropagation();
-    };
     const maskClick = (event) => {
       if (loop != 0) {
         showMaskRef.value = false;
@@ -251,23 +176,40 @@ const _sfc_main$1 = create$1({
       event.stopPropagation();
       event.preventDefault();
     };
+    const swipeDelClick = (event) => {
+      emit("swipeDel", event, props.item);
+      event.stopPropagation();
+    };
+    const swipestart = () => {
+      moveRef.value = false;
+    };
+    const swipemove = () => {
+      moveRef.value = true;
+    };
     return {
-      delShellClick,
-      editShellClick,
-      itemShellClick,
+      renderCompontent,
+      showMaskRef,
+      itemClick,
+      editClick,
+      delClick,
+      delLongClick,
       holddownstart,
       holddownmove,
       holddownend,
-      showMaskRef,
-      delClick,
       copyCLick,
       hideMaskClick,
       setDefault,
-      maskClick
+      maskClick,
+      swipeDelClick,
+      swipestart,
+      swipemove
     };
   }
 });
-const _hoisted_1 = { class: "nut-address-list-general" };
+const _hoisted_1 = {
+  key: 0,
+  class: "nut-address-list-general"
+};
 const _hoisted_2 = /* @__PURE__ */ createElementVNode("div", { class: "nut-address-list-mask-contain" }, [
   /* @__PURE__ */ createTextVNode(" 复制"),
   /* @__PURE__ */ createElementVNode("br"),
@@ -292,14 +234,12 @@ const _hoisted_6 = /* @__PURE__ */ createElementVNode("div", { class: "nut-addre
 const _hoisted_7 = [
   _hoisted_6
 ];
+const _hoisted_8 = { class: "nut-address-list-swipe" };
 function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
-  const _component_item_contents = resolveComponent("item-contents");
-  return openBlock(), createElementBlock("div", _hoisted_1, [
-    createVNode(_component_item_contents, {
-      item: _ctx.item,
-      onDelIcon: _ctx.delShellClick,
-      onEditIcon: _ctx.editShellClick,
-      onItemClick: _ctx.itemShellClick,
+  const _component_nut_button = resolveComponent("nut-button");
+  const _component_nut_swipe = resolveComponent("nut-swipe");
+  return !_ctx.swipeEdition ? (openBlock(), createElementBlock("div", _hoisted_1, [
+    (openBlock(), createBlock(resolveDynamicComponent(_ctx.renderCompontent()), {
       onTouchstart: _ctx.holddownstart,
       onTouchend: _ctx.holddownend,
       onTouchmove: _ctx.holddownmove
@@ -314,7 +254,7 @@ function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
         renderSlot(_ctx.$slots, "contentAddrs")
       ]),
       _: 3
-    }, 8, ["item", "onDelIcon", "onEditIcon", "onItemClick", "onTouchstart", "onTouchend", "onTouchmove"]),
+    }, 40, ["onTouchstart", "onTouchend", "onTouchmove"])),
     _ctx.longPress && _ctx.showMaskRef ? (openBlock(), createElementBlock("div", {
       key: 0,
       class: "nut-address-list-general__mask",
@@ -331,7 +271,7 @@ function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
         }, _hoisted_5),
         createElementVNode("div", {
           class: "nut-address-list-general__mask-del",
-          onClick: _cache[2] || (_cache[2] = (...args) => _ctx.delClick && _ctx.delClick(...args))
+          onClick: _cache[2] || (_cache[2] = (...args) => _ctx.delLongClick && _ctx.delLongClick(...args))
         }, _hoisted_7)
       ])
     ])) : createCommentVNode("", true),
@@ -340,7 +280,43 @@ function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
       class: "nut-address-list__mask-bottom",
       onClick: _cache[4] || (_cache[4] = (...args) => _ctx.hideMaskClick && _ctx.hideMaskClick(...args))
     })) : createCommentVNode("", true)
-  ]);
+  ])) : (openBlock(), createBlock(_component_nut_swipe, { key: 1 }, {
+    right: withCtx(() => [
+      renderSlot(_ctx.$slots, "swiperightbtn", {}, () => [
+        createVNode(_component_nut_button, {
+          shape: "square",
+          style: { "height": "100%" },
+          type: "danger",
+          onClick: _ctx.swipeDelClick
+        }, {
+          default: withCtx(() => [
+            createTextVNode("删除")
+          ]),
+          _: 1
+        }, 8, ["onClick"])
+      ])
+    ]),
+    default: withCtx(() => [
+      createElementVNode("div", _hoisted_8, [
+        (openBlock(), createBlock(resolveDynamicComponent(_ctx.renderCompontent()), {
+          onTouchmove: _ctx.swipemove,
+          onTouchstart: _ctx.swipestart
+        }, {
+          contentTop: withCtx(() => [
+            renderSlot(_ctx.$slots, "contentInfo")
+          ]),
+          contentIcon: withCtx(() => [
+            renderSlot(_ctx.$slots, "contentIcons")
+          ]),
+          contentAddr: withCtx(() => [
+            renderSlot(_ctx.$slots, "contentAddrs")
+          ]),
+          _: 3
+        }, 40, ["onTouchmove", "onTouchstart"]))
+      ])
+    ]),
+    _: 3
+  }));
 }
 const GeneralShell = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["render", _sfc_render$1]]);
 const { componentName, create, translate } = createComponent("address-list");
@@ -368,7 +344,6 @@ const _sfc_main = create({
     }
   },
   components: {
-    SwipeShell,
     GeneralShell,
     [Button.name]: Button,
     [Swipe.name]: Swipe
@@ -453,16 +428,16 @@ const _sfc_main = create({
 });
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_general_shell = resolveComponent("general-shell");
-  const _component_swipe_shell = resolveComponent("swipe-shell");
   const _component_nut_button = resolveComponent("nut-button");
   return openBlock(), createElementBlock("div", {
     class: normalizeClass(_ctx.classes)
   }, [
-    !_ctx.swipeEdition ? (openBlock(true), createElementBlock(Fragment, { key: 0 }, renderList(_ctx.dataArray, (item, index2) => {
+    (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.dataArray, (item, index2) => {
       return openBlock(), createBlock(_component_general_shell, {
         key: index2,
         item,
         longPress: _ctx.longPress,
+        swipeEdition: _ctx.swipeEdition,
         onDelIcon: _ctx.clickDelIcon,
         onEditIcon: _ctx.clickEditIcon,
         onItemClick: _ctx.clickContentItem,
@@ -470,46 +445,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         onLongCopy: _ctx.clickLongCopy,
         onLongSet: _ctx.clickLongSet,
         onLongDel: _ctx.clickLongDel
-      }, createSlots({ _: 2 }, [
-        _ctx.longPress ? {
-          name: "contentInfo",
-          fn: withCtx(() => [
-            renderSlot(_ctx.$slots, "iteminfos")
-          ]),
-          key: "0"
-        } : void 0,
-        _ctx.longPress ? {
-          name: "contentIcons",
-          fn: withCtx(() => [
-            renderSlot(_ctx.$slots, "itemicon")
-          ]),
-          key: "1"
-        } : void 0,
-        _ctx.longPress ? {
-          name: "contentAddrs",
-          fn: withCtx(() => [
-            renderSlot(_ctx.$slots, "itemaddr")
-          ]),
-          key: "2"
-        } : void 0,
-        _ctx.longPress ? {
-          name: "longpressAll",
-          fn: withCtx(() => [
-            renderSlot(_ctx.$slots, "longpressbtns")
-          ]),
-          key: "3"
-        } : void 0
-      ]), 1032, ["item", "longPress", "onDelIcon", "onEditIcon", "onItemClick", "onSwipeDel", "onLongCopy", "onLongSet", "onLongDel"]);
-    }), 128)) : createCommentVNode("", true),
-    _ctx.swipeEdition ? (openBlock(true), createElementBlock(Fragment, { key: 1 }, renderList(_ctx.dataArray, (item, index2) => {
-      return openBlock(), createBlock(_component_swipe_shell, {
-        key: index2,
-        item,
-        onDelIcon: _ctx.clickDelIcon,
-        onEditIcon: _ctx.clickEditIcon,
-        onItemClick: _ctx.clickContentItem,
-        onSwipeDel: _ctx.clickSwipeDel
-      }, {
+      }, createSlots({
         contentInfo: withCtx(() => [
           renderSlot(_ctx.$slots, "iteminfos")
         ]),
@@ -519,14 +455,26 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         contentAddrs: withCtx(() => [
           renderSlot(_ctx.$slots, "itemaddr")
         ]),
-        swiperightbtn: withCtx(() => [
-          renderSlot(_ctx.$slots, "swiperight")
-        ]),
         _: 2
-      }, 1032, ["item", "onDelIcon", "onEditIcon", "onItemClick", "onSwipeDel"]);
-    }), 128)) : createCommentVNode("", true),
+      }, [
+        _ctx.longPress ? {
+          name: "longpressAll",
+          fn: withCtx(() => [
+            renderSlot(_ctx.$slots, "longpressbtns")
+          ]),
+          key: "0"
+        } : void 0,
+        _ctx.swipeEdition ? {
+          name: "swiperightbtn",
+          fn: withCtx(() => [
+            renderSlot(_ctx.$slots, "swiperight")
+          ]),
+          key: "1"
+        } : void 0
+      ]), 1032, ["item", "longPress", "swipeEdition", "onDelIcon", "onEditIcon", "onItemClick", "onSwipeDel", "onLongCopy", "onLongSet", "onLongDel"]);
+    }), 128)),
     _ctx.showBottomButton ? (openBlock(), createElementBlock("div", {
-      key: 2,
+      key: 0,
       class: "nut-address-list__bottom",
       onClick: _cache[0] || (_cache[0] = (...args) => _ctx.addAddress && _ctx.addAddress(...args))
     }, [

package/dist/packages/avatar/index.scss

@@ -7,6 +7,7 @@
   flex: 0 0 auto; // 防止被压缩
   text-align: center;
   img {
+    display: block;
     width: 100%;
     height: 100%;
   }
@@ -35,7 +36,7 @@
 }
 .nut-avatar-round {
   border-radius: 50%;
-  overflow: hidden;
+  // overflow: hidden;
 }
 .nut-avatar-square {
   border-radius: $avatar-square;

package/dist/packages/avatargroup/index.scss

@@ -2,7 +2,7 @@
   background-size: 100% 100%;
   background-repeat: no-repeat;
   background-position: center center;
-  display: inline-block;
+  display: flex;
   position: relative;
   flex: 0 0 auto; // 防止被压缩
   .nut-avatar {

package/dist/packages/button/index.scss

@@ -16,7 +16,6 @@
   user-select: none;
   touch-action: manipulation;
   vertical-align: bottom;
-
   -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
   -webkit-tap-highlight-color: transparent;
 
@@ -174,3 +173,66 @@
     border-radius: 0;
   }
 }
+.nut-button--default:not([disabled]):active {
+  color: $button-default-color;
+  background: $button-default-bg-color;
+  border: $button-border-width solid $button-default-border-color;
+}
+.nut-button--primary:not([disabled]):active {
+  color: $button-primary-color;
+  background: $button-primary-background-color;
+  border: $button-border-width solid transparent;
+}
+
+.nut-button--info:not([disabled]):active {
+  color: $button-info-color;
+  background: $button-info-background-color;
+  border: $button-border-width solid transparent;
+}
+
+.nut-button--success:not([disabled]):active {
+  color: $button-success-color;
+  background: $button-success-background-color;
+  border: $button-border-width solid transparent;
+}
+
+.nut-button--danger:not([disabled]):active {
+  color: $button-danger-color;
+  background: $button-danger-background-color;
+  border: $button-border-width solid transparent;
+}
+
+.nut-button--warning:not([disabled]):active {
+  color: $button-warning-color;
+  background: $button-warning-background-color;
+  border: $button-border-width solid transparent;
+}
+.nut-button--plain:not([disabled]):active {
+  background: $button-plain-background-color;
+}
+.nut-button--plain {
+  &.nut-button--primary:not([disabled]):active {
+    color: $button-primary-border-color;
+    border-color: $button-primary-border-color;
+  }
+
+  &.nut-button--info:not([disabled]):active {
+    color: $button-info-border-color;
+    border-color: $button-info-border-color;
+  }
+
+  &.nut-button--success:not([disabled]):active {
+    color: $button-success-border-color;
+    border-color: $button-success-border-color;
+  }
+
+  &.nut-button--danger:not([disabled]):active {
+    color: $button-danger-border-color;
+    border-color: $button-danger-border-color;
+  }
+
+  &.nut-button--warning:not([disabled]):active {
+    color: $button-warning-border-color;
+    border-color: $button-warning-border-color;
+  }
+}

package/dist/smartips/web-types.json

@@ -2,7 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/JetBrains/web-types/master/schema/web-types.json",
   "framework": "vue",
   "name": "NutUI",
-  "version": "4.0.0-beta.14",
+  "version": "4.0.0-beta.16",
   "contributions": {
     "html": {
       "tags": [
@@ -1500,7 +1500,7 @@
             {
               "name": "speed",
               "default": "`1`",
-              "description": "间隔数字，目前仅支持基本用法",
+              "description": "间隔数字，目前仅支持基础用法",
               "value": {
                 "type": "number",
                 "kind": "expression"
@@ -6543,7 +6543,7 @@
             {
               "name": "list-type",
               "default": "`\"picture\"`",
-              "description": "上传列表的内建样式，支持两种基本样式 picture、list",
+              "description": "上传列表的内建样式，支持两种基础样式 picture、list",
               "value": {
                 "type": "string",
                 "kind": "expression"