Browse Source

fix: 组件Tour引入icon错误

yangxiaolu3 3 years ago
parent
commit
d1867e9f6e

+ 4 - 4
src/packages/__VUE/popover/index.vue

@@ -22,9 +22,9 @@
           :class="[item.className, item.disabled && 'nut-popover-menu-disabled', 'nut-popover-menu-item']"
           @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
-          ></slot>
+          ></slot> -->
           <view class="nut-popover-menu-item-name">{{ item.name }}</view>
         </view>
       </view>
@@ -36,12 +36,12 @@ import { computed, watch, ref, PropType, CSSProperties, reactive } from 'vue';
 import { createComponent } from '@/packages/utils/create';
 import { isArray } from '@/packages/utils/util';
 import { useRect, rect } from '@/packages/utils/useRect';
-import { Icon } from '@nutui/icons-vue';
+// import { Icon } from '@nutui/icons-vue';
 import Popup from '../popup/index.vue';
 const { create } = createComponent('popover');
 export default create({
   components: {
-    Icon
+    // Icon
   },
   props: {
     visible: { type: Boolean, default: false },

+ 5 - 5
src/packages/__VUE/tour/demo.vue

@@ -155,9 +155,9 @@ export default createDemo({
       type: 'normal'
     });
 
-    // setTimeout(() => {
-    //   state.showTour = true;
-    // }, 1000);
+    setTimeout(() => {
+      state.showTour = true;
+    }, 1000);
 
     const showTourHandle = () => {
       state.showTour1 = true;
@@ -180,9 +180,9 @@ export default createDemo({
   .nut-popover-content {
     width: auto !important;
   }
-  .nut-tour-content-inner {
+  /* .nut-tour-content-inner {
     width: max-content;
-  }
+  } */
 }
 
 .index-header {

+ 3 - 3
src/packages/__VUE/tour/index.vue

@@ -22,7 +22,7 @@
             <div class="nut-tour-content" v-if="type == 'step'">
               <div class="nut-tour-content-top">
                 <div class="nut-tour-content-top-close" @click="close">
-                  <Icon size="10" name="close"> </Icon>
+                  <Close size="10" name="close" />
                 </div>
               </div>
               <div class="nut-tour-content-inner">
@@ -63,7 +63,7 @@ import { computed, watch, ref, reactive, toRefs, PropType, nextTick } from 'vue'
 import { PopoverLocation } from '../popover/type';
 import { createComponent } from '@/packages/utils/create';
 import { useRect } from '@/packages/utils/useRect';
-import { Icon } from '@nutui/icons-vue';
+import { Close } from '@nutui/icons-vue';
 
 interface StepOptions {
   target: Element;
@@ -73,7 +73,7 @@ interface StepOptions {
 const { create } = createComponent('tour');
 export default create({
   components: {
-    Icon
+    Close
   },
   props: {
     visible: { type: Boolean, default: false },