Browse Source

Merge branch 'next' of https://github.com/jdf2e/nutui into next

Drjnigfubo 3 years ago
parent
commit
2afdcb24b4
2 changed files with 8 additions and 2 deletions
  1. 6 1
      src/packages/__VUE/popover/index.vue
  2. 2 1
      src/packages/__VUE/progress/index.vue

+ 6 - 1
src/packages/__VUE/popover/index.vue

@@ -25,7 +25,12 @@
           @click.stop="chooseItem(item, index)"
           @click.stop="chooseItem(item, index)"
         >
         >
           <slot v-if="item.icon">
           <slot v-if="item.icon">
-            <Icon v-bind="$attrs" class="nut-popover-item-img" :classPrefix="iconPrefix" :name="item.icon"></Icon
+            <nut-icon
+              v-bind="$attrs"
+              class="nut-popover-item-img"
+              :classPrefix="iconPrefix"
+              :name="item.icon"
+            ></nut-icon
           ></slot>
           ></slot>
           <view class="nut-popover-menu-item-name">{{ item.name }}</view>
           <view class="nut-popover-menu-item-name">{{ item.name }}</view>
         </view>
         </view>

+ 2 - 1
src/packages/__VUE/progress/index.vue

@@ -26,7 +26,8 @@
             position: `absolute`,
             position: `absolute`,
             top: `50%`,
             top: `50%`,
             left: `${percentage}%`,
             left: `${percentage}%`,
-            transform: `translate(-${+percentage}%,-50%)`
+            transform: `translate(-${+percentage}%,-50%)`,
+            transition: 'all 0.4s'
           }"
           }"
           v-if="showText && textInside && slotDefault"
           v-if="showText && textInside && slotDefault"
         >
         >