@hlw-uni/mp-vue 1.1.1 → 1.1.2

package/dist/index.js

@@ -709,11 +709,14 @@
     },
     emits: ["update:show", "confirm", "cancel"],
     setup(__props, { emit: __emit }) {
+      const props = __props;
       const emit = __emit;
       function close() {
         emit("update:show", false);
       }
       function onMask() {
+        if (!props.closeOnMask)
+          return;
         close();
       }
       function onConfirm() {
@@ -731,7 +734,9 @@
           onTap: vue.withModifiers(onMask, ["self"])
         }, [
           vue.createElementVNode("view", {
-            class: vue.normalizeClass(["hlw-modal", { "hlw-modal--show": __props.show }])
+            class: vue.normalizeClass(["hlw-modal", { "hlw-modal--show": __props.show }]),
+            onTap: _cache[0] || (_cache[0] = vue.withModifiers(() => {
+            }, ["stop"]))
           }, [
             __props.title ? (vue.openBlock(), vue.createElementBlock("view", _hoisted_1$6, vue.toDisplayString(__props.title), 1)) : vue.createCommentVNode("", true),
             vue.createElementVNode("view", _hoisted_2$5, [
@@ -742,20 +747,20 @@
                 __props.showCancel ? (vue.openBlock(), vue.createElementBlock("view", {
                   key: 0,
                   class: "hlw-modal-btn hlw-modal-btn--cancel",
-                  onTap: onCancel
+                  onTap: vue.withModifiers(onCancel, ["stop"])
                 }, vue.toDisplayString(__props.cancelText), 33)) : vue.createCommentVNode("", true),
                 vue.createElementVNode("view", {
                   class: "hlw-modal-btn hlw-modal-btn--confirm",
-                  onTap: onConfirm
+                  onTap: vue.withModifiers(onConfirm, ["stop"])
                 }, vue.toDisplayString(__props.confirmText), 33)
               ])
             ], true)
-          ], 2)
+          ], 34)
         ], 32)) : vue.createCommentVNode("", true);
       };
     }
   });
-  const index$7 = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["__scopeId", "data-v-397b9549"]]);
+  const index$7 = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["__scopeId", "data-v-91d9e108"]]);
   const _hoisted_1$5 = {
     key: 1,
     class: "hlw-notice-left-icon i-fa6-solid-bullhorn"

package/dist/index.mjs

@@ -708,11 +708,14 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
   },
   emits: ["update:show", "confirm", "cancel"],
   setup(__props, { emit: __emit }) {
+    const props = __props;
     const emit = __emit;
     function close() {
       emit("update:show", false);
     }
     function onMask() {
+      if (!props.closeOnMask)
+        return;
       close();
     }
     function onConfirm() {
@@ -730,7 +733,9 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
         onTap: withModifiers(onMask, ["self"])
       }, [
         createElementVNode("view", {
-          class: normalizeClass(["hlw-modal", { "hlw-modal--show": __props.show }])
+          class: normalizeClass(["hlw-modal", { "hlw-modal--show": __props.show }]),
+          onTap: _cache[0] || (_cache[0] = withModifiers(() => {
+          }, ["stop"]))
         }, [
           __props.title ? (openBlock(), createElementBlock("view", _hoisted_1$6, toDisplayString(__props.title), 1)) : createCommentVNode("", true),
           createElementVNode("view", _hoisted_2$5, [
@@ -741,20 +746,20 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
               __props.showCancel ? (openBlock(), createElementBlock("view", {
                 key: 0,
                 class: "hlw-modal-btn hlw-modal-btn--cancel",
-                onTap: onCancel
+                onTap: withModifiers(onCancel, ["stop"])
               }, toDisplayString(__props.cancelText), 33)) : createCommentVNode("", true),
               createElementVNode("view", {
                 class: "hlw-modal-btn hlw-modal-btn--confirm",
-                onTap: onConfirm
+                onTap: withModifiers(onConfirm, ["stop"])
               }, toDisplayString(__props.confirmText), 33)
             ])
           ], true)
-        ], 2)
+        ], 34)
       ], 32)) : createCommentVNode("", true);
     };
   }
 });
-const index$7 = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["__scopeId", "data-v-397b9549"]]);
+const index$7 = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["__scopeId", "data-v-91d9e108"]]);
 const _hoisted_1$5 = {
   key: 1,
   class: "hlw-notice-left-icon i-fa6-solid-bullhorn"

package/dist/style.css

@@ -594,7 +594,7 @@ from {
 to {
     transform: rotate(360deg);
 }
-}.hlw-modal-mask[data-v-397b9549] {
+}.hlw-modal-mask[data-v-91d9e108] {
   position: fixed;
   inset: 0;
   display: flex;
@@ -602,52 +602,52 @@ to {
   justify-content: center;
   background: rgba(0, 0, 0, 0.5);
   z-index: 1000;
-  animation: hlw-fade-in-397b9549 0.2s;
+  animation: hlw-fade-in-91d9e108 0.2s;
 }
-.hlw-modal[data-v-397b9549] {
+.hlw-modal[data-v-91d9e108] {
   width: 80%;
   max-width: 600rpx;
   background: #fff;
   border-radius: var(--radius-xl, 32rpx);
   overflow: hidden;
-  animation: hlw-scale-in-397b9549 0.25s ease;
+  animation: hlw-scale-in-91d9e108 0.25s ease;
 }
-.hlw-modal-title[data-v-397b9549] {
+.hlw-modal-title[data-v-91d9e108] {
   padding: 40rpx 32rpx 0;
   text-align: center;
   font-size: var(--font-md, 32rpx);
   font-weight: 600;
   color: #1e293b;
 }
-.hlw-modal-body[data-v-397b9549] {
+.hlw-modal-body[data-v-91d9e108] {
   padding: 32rpx;
   font-size: var(--font-base, 28rpx);
   color: #475569;
   text-align: center;
   line-height: 1.6;
 }
-.hlw-modal-footer[data-v-397b9549] {
+.hlw-modal-footer[data-v-91d9e108] {
   display: flex;
   border-top: 1rpx solid var(--border-color-light, #f1f5f9);
 }
-.hlw-modal-btn[data-v-397b9549] {
+.hlw-modal-btn[data-v-91d9e108] {
   flex: 1;
   padding: 24rpx 0;
   text-align: center;
   font-size: var(--font-base, 28rpx);
   font-weight: 500;
 }
-.hlw-modal-btn[data-v-397b9549]:active {
+.hlw-modal-btn[data-v-91d9e108]:active {
   background: #f8fafc;
 }
-.hlw-modal-btn--cancel[data-v-397b9549] {
+.hlw-modal-btn--cancel[data-v-91d9e108] {
   color: #64748b;
   border-right: 1rpx solid var(--border-color-light, #f1f5f9);
 }
-.hlw-modal-btn--confirm[data-v-397b9549] {
+.hlw-modal-btn--confirm[data-v-91d9e108] {
   color: var(--primary-color, #3b82f6);
 }
-@keyframes hlw-fade-in-397b9549 {
+@keyframes hlw-fade-in-91d9e108 {
 from {
     opacity: 0;
 }
@@ -655,7 +655,7 @@ to {
     opacity: 1;
 }
 }
-@keyframes hlw-scale-in-397b9549 {
+@keyframes hlw-scale-in-91d9e108 {
 from {
     transform: scale(0.9);
     opacity: 0;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hlw-uni/mp-vue",
-    "version": "1.1.1",
+    "version": "1.1.2",
     "description": "hlw-uni Vue 组件库 — 供小程序业务方使用的 UI 组件集合",
     "main": "src/index.ts",
     "module": "src/index.ts",

package/src/components/hlw-modal/index.vue

@@ -1,14 +1,22 @@
 <template>
     <view v-if="show" class="hlw-modal-mask" @tap.self="onMask">
-        <view class="hlw-modal" :class="{ 'hlw-modal--show': show }">
+        <view class="hlw-modal" :class="{ 'hlw-modal--show': show }" @tap.stop>
             <view v-if="title" class="hlw-modal-title">{{ title }}</view>
             <view class="hlw-modal-body">
                 <slot />
             </view>
             <slot name="footer">
                 <view class="hlw-modal-footer">
-                    <view v-if="showCancel" class="hlw-modal-btn hlw-modal-btn--cancel" @tap="onCancel">{{ cancelText }}</view>
-                    <view class="hlw-modal-btn hlw-modal-btn--confirm" @tap="onConfirm">{{ confirmText }}</view>
+                    <view
+                        v-if="showCancel"
+                        class="hlw-modal-btn hlw-modal-btn--cancel"
+                        @tap.stop="onCancel"
+                    >
+                        {{ cancelText }}
+                    </view>
+                    <view class="hlw-modal-btn hlw-modal-btn--confirm" @tap.stop="onConfirm">
+                        {{ confirmText }}
+                    </view>
                 </view>
             </slot>
         </view>
@@ -16,36 +24,6 @@
 </template>
 
 <script setup lang="ts">
-/**
- * HlwModal — 模态弹窗
- *
- * 比 uni.showModal 更灵活：支持插槽自定义内容和底部按钮。
- * 使用 v-model:show 控制显隐。
- *
- * @props
- *   show        - 是否显示，支持 v-model:show
- *   title       - 标题文字
- *   showCancel  - 是否显示取消按钮，默认 true
- *   confirmText - 确认按钮文字，默认 "确定"
- *   cancelText  - 取消按钮文字，默认 "取消"
- *   closeOnMask - 点击蒙层是否关闭，默认 true
- *
- * @events
- *   update:show - 显隐状态变更
- *   confirm     - 点击确认
- *   cancel      - 点击取消
- *
- * @slots
- *   default - 弹窗内容
- *   footer  - 自定义底部按钮区域（覆盖默认确认/取消）
- *
- * @example
- * ```vue
- * <HlwModal v-model:show="visible" title="提示" @confirm="onOk">
- *   <text>确定要删除吗？</text>
- * </HlwModal>
- * ```
- */
 interface Props {
     show?: boolean;
     title?: string;
@@ -55,7 +33,7 @@ interface Props {
     closeOnMask?: boolean;
 }
 
-withDefaults(defineProps<Props>(), {
+const props = withDefaults(defineProps<Props>(), {
     show: false,
     title: "",
     showCancel: true,
@@ -71,6 +49,7 @@ function close() {
 }
 
 function onMask() {
+    if (!props.closeOnMask) return;
     close();
 }
 
@@ -140,6 +119,7 @@ function onCancel() {
         color: #64748b;
         border-right: 1rpx solid var(--border-color-light, #f1f5f9);
     }
+
     &--confirm {
         color: var(--primary-color, #3b82f6);
     }