hy-app 0.4.6 → 0.4.8

package/components/hy-submit-bar/hy-submit-bar.vue

@@ -4,38 +4,39 @@
     :style="submitBarStyle"
   >
     <view class="hy-submit-bar__left">
-      <slot name="left">
-        <view
-          class="hy-submit-bar__left--item"
-          v-for="(item, i) in menus"
-          :key="i"
-          @tap="clickMenuFn(i)"
-        >
-          <HyIcon
-            :name="item.icon"
-            :label="item.text"
-            :color="iconColor"
-            :label-color="iconLabelColor"
-            labelPos="bottom"
-            space="7"
-            :size="20"
-          ></HyIcon>
-          <HyBadge
-            :value="item?.badge?.value"
-            :absolute="true"
-            :offset="item?.badge?.offset || [-5, 20]"
-            :isDot="item?.badge?.isDot"
-            :type="item?.badge?.type"
-            :color="item?.badge?.color"
-            :shape="item?.badge?.shape"
-            :numberType="item?.badge?.numberType"
-            :inverted="item?.badge?.inverted"
-          ></HyBadge>
-        </view>
-      </slot>
+      <slot v-if="$slots.left" name="left"></slot>
+      <view
+        v-else-if="menus.length"
+        class="hy-submit-bar__left--item"
+        v-for="(item, i) in menus"
+        :key="i"
+        @tap="clickMenuFn(i)"
+      >
+        <HyIcon
+          :name="item.icon"
+          :label="item.text"
+          :color="iconColor"
+          :label-color="iconLabelColor"
+          labelPos="bottom"
+          space="7"
+          :size="20"
+        ></HyIcon>
+        <HyBadge
+          :value="item?.badge?.value"
+          :absolute="true"
+          :offset="item?.badge?.offset || [-5, 20]"
+          :isDot="item?.badge?.isDot"
+          :type="item?.badge?.type"
+          :color="item?.badge?.color"
+          :shape="item?.badge?.shape"
+          :numberType="item?.badge?.numberType"
+          :inverted="item?.badge?.inverted"
+        ></HyBadge>
+      </view>
     </view>
     <view class="hy-submit-bar__right">
-      <slot name="right">
+      <slot v-if="$slots.right" name="right"></slot>
+      <template v-else>
         <view
           class="hy-submit-bar__right--button"
           v-if="showLeftBtn"
@@ -64,7 +65,7 @@
           ></HyLoading>
           {{ rightBtnText }}
         </view>
-      </slot>
+      </template>
     </view>
   </view>
 </template>
@@ -169,6 +170,11 @@ const props = defineProps({
     type: String,
     default: "circle",
   },
+  /** 层级 */
+  zIndex: {
+    type: [Number, String],
+    default: 999,
+  },
   /** 定义需要用到的外部样式 */
   customStyle: {
     type: Object as PropType<CSSProperties>,
@@ -186,6 +192,7 @@ const submitBarStyle = computed(() => {
   const style: CSSProperties = {
     bottom: 0,
     left: 0,
+    zIndex: props.zIndex,
   };
   if (props.fixed) style.position = "fixed";
   return Object.assign(style, props.customStyle);

package/components/hy-tooltip/hy-tooltip.vue

@@ -1,9 +1,5 @@
 <template>
-  <view
-    :class="['hy-tooltip', customClass]"
-    :style="customStyle"
-    @click.stop="closeHandler"
-  >
+  <view class="hy-tooltip">
     <HyOverlay
       :show="showTooltip && tooltipTop !== -10000 && overlay"
       :customStyle="{ backgroundColor: 'rgba(0, 0, 0, 0)' }"
@@ -11,17 +7,22 @@
     ></HyOverlay>
     <!-- 文本内容区域 -->
     <view
-      class="hy-tooltip__content"
+      :class="`hy-tooltip__content ${customClass}`"
       id="target"
       @longpress.stop="longPressHandler"
       @tap.stop="clickHandler"
-      :style="{
-        color: color,
-        backgroundColor:
-          bgColor && showTooltip && tooltipTop !== -10000
-            ? bgColor
-            : 'transparent',
-      }"
+      :style="[
+        {
+          color: color,
+          fontSize: addUnit(size),
+          fontWeight: bold ? 'bold' : '',
+          backgroundColor:
+            bgColor && showTooltip && tooltipTop !== -10000
+              ? bgColor
+              : 'transparent',
+        },
+        customStyle,
+      ]"
     >
       <slot v-if="$slots.default"></slot>
       <text class="hy-tooltip__content--text" v-else>{{ text }}</text>
@@ -35,7 +36,7 @@
             v-if="showCopy"
             class="hy-tooltip__container--list__btn"
             hover-class="hy-tooltip__container--list__btn--hover"
-            @tap="setClipboardData"
+            @tap.stop="setClipboardData"
           >
             <text class="hy-tooltip__container--list__btn--text">复制</text>
           </view>
@@ -73,12 +74,14 @@
       :show="showTooltip"
       :duration="300"
       custom-class="hy-tooltip__popup"
-      :custom-style="popover.popStyle.value"
+      :custom-style="{
+        ...popover.popStyle.value,
+        zIndex: zIndex,
+      }"
     >
       <view class="hy-tooltip__container">
         <!-- 三角形 -->
         <view
-          v-if="showCopy"
           :class="`hy-tooltip__arrow ${popover.arrowClass.value}`"
           :style="popover.arrowStyle.value"
         ></view>
@@ -154,6 +157,7 @@ import {
   closeOther,
   removeFromQueue,
   pushToQueue,
+  addUnit,
 } from "../../libs";
 
 // 组件
@@ -179,11 +183,6 @@ const props = defineProps({
     type: String,
     default: "",
   },
-  /** 文本大小 */
-  size: {
-    type: [String, Number],
-    default: 14,
-  },
   /**
    * 触发模式
    * @values longpress,click
@@ -200,21 +199,23 @@ const props = defineProps({
     type: String as PropType<IPlacementVo>,
     default: "bottom",
   },
+  /** 文本大小 */
+  size: {
+    type: [String, Number],
+    default: 14,
+  },
   /** 字体颜色 */
   color: String,
+  /** 字体粗细 */
+  bold: {
+    type: Boolean,
+    default: false,
+  },
   /** 弹出提示框时，文本的背景色 */
   bgColor: {
     type: String,
     default: "transparent",
   },
-  /**
-   * 弹出提示的方向
-   * @values top,bottom
-   * */
-  direction: {
-    type: String,
-    default: "top",
-  },
   /** 弹出提示的z-index，nvue无效 */
   zIndex: {
     type: Number,
@@ -237,7 +238,7 @@ const props = defineProps({
     type: Boolean,
     default: true,
   },
-  /** 是否显示遮罩 */
+  /** 是否显示提示 */
   showToast: {
     type: Boolean,
     default: true,

package/components/hy-tooltip/index.scss

@@ -16,7 +16,6 @@ $hy-tooltip--background-color: rgb(50, 50, 51);
     background-clip: padding-box;
     text-align: center;
     min-height: 36px;
-    z-index: $hy-tooltip--z-index;
     transition: opacity 0.2s;
     box-shadow: $hy-box-shadow;
     border-radius: $hy-border-radius-sm;
@@ -49,10 +48,6 @@ $hy-tooltip--background-color: rgb(50, 50, 51);
     /* #ifndef APP-NVUE */
     white-space: nowrap;
     /* #endif */
-
-    @include m(text) {
-      font-size: 28rpx;
-    }
   }
 
   @include e(container) {
@@ -67,7 +62,6 @@ $hy-tooltip--background-color: rgb(50, 50, 51);
       padding: 0;
       @include flex(row);
       align-items: center;
-      z-index: 999;
 
       @include e(btn) {
         padding: $hy-border-margin-padding-base;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hy-app",
-  "version": "0.4.6",
-  "description": "fix: 修复toast的缓存问题",
+  "version": "0.4.8",
+  "description": "fix: 修复tooltip字体样式未修改问题",
   "main": "./index.ts",
   "private": false,
   "scripts": {},