fix(badge): optimize code and hide icon when dot prop is true

varletjs · May 1, 2021 · 7246fd3 · 7246fd3
1 parent e2687f8
commit 7246fd3
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/packages/varlet-ui/src/badge/Badge.vue b/packages/varlet-ui/src/badge/Badge.vue
@@ -8,7 +8,7 @@
         :class="contentClass"
         :style="{ background: color }"
       >
-        <var-icon v-if="icon" :name="icon" size="10px" />
+        <var-icon v-if="icon && !dot" :name="icon" size="10px" />
         <span v-else>{{ values }}</span>
       </span>
     </transition>
@@ -51,16 +51,12 @@ export default defineComponent({
       return value
     })
 
-    const getPositionClass = (): string => {
+    const getPositionClass = (): string | undefined => {
       const { position, dot } = props
 
-      if (!position || !dot) return ''
+      if (dot && position.includes('right')) return 'var-badge__dot--right'
 
-      if (position.includes('right')) return 'var-badge__dot--right'
-
-      if (position.includes('left')) return 'var-badge__dot--left'
-
-      return ''
+      if (dot && position.includes('left')) return 'var-badge__dot--left'
     }
 
     return {