Browse Source

chore(tag): use icons-vue component (#1929)

kikachen 3 years ago
parent
commit
8a1c9d9f50

+ 2 - 3
src/packages/__VUE/tag/__test__/tag.spec.ts

@@ -1,11 +1,10 @@
 import Tag from '../index.vue';
 import { mount, config } from '@vue/test-utils';
-
-import NutIcon from '../../icon/index.vue';
+import { Close } from '@nutui/icons-vue';
 
 beforeAll(() => {
   config.global.components = {
-    NutIcon
+    Close
   };
 });
 

+ 5 - 2
src/packages/__VUE/tag/index.taro.vue

@@ -1,15 +1,15 @@
 <template>
   <view :class="classes" :style="getStyle()" @click="onClick">
     <slot></slot>
-    <nut-icon class="nut-tag--close" v-if="closeable" name="close" size="11" @click="onClose"></nut-icon>
+    <Close class="nut-tag--close" v-if="closeable" width="11px" height="11px" @click="onClose"></Close>
   </view>
 </template>
 
 <script lang="ts">
 import { PropType, CSSProperties, computed, toRefs } from 'vue';
+import { Close } from '@nutui/icons-vue';
 import { createComponent } from '@/packages/utils/create';
 const { componentName, create } = createComponent('tag');
-
 export type TagType = 'primary' | 'success' | 'danger' | 'warning';
 
 export default create({
@@ -37,6 +37,9 @@ export default create({
       default: false
     }
   },
+  components: {
+    Close
+  },
   emits: ['close', 'click'],
   setup(props, { emit }) {
     const { type, color, plain, round, mark, textColor } = toRefs(props);

+ 5 - 1
src/packages/__VUE/tag/index.vue

@@ -1,13 +1,14 @@
 <template>
   <view :class="classes" :style="getStyle()" @click="onClick">
     <slot></slot>
-    <nut-icon class="nut-tag--close" v-if="closeable" name="close" size="12" @click="onClose"></nut-icon>
+    <Close class="nut-tag--close" v-if="closeable" width="12px" height="12px" @click="onClose"></Close>
   </view>
 </template>
 
 <script lang="ts">
 import { PropType, CSSProperties, computed, toRefs } from 'vue';
 import { createComponent } from '@/packages/utils/create';
+import { Close } from '@nutui/icons-vue';
 const { componentName, create } = createComponent('tag');
 
 export default create({
@@ -35,6 +36,9 @@ export default create({
       default: false
     }
   },
+  components: {
+    Close
+  },
   emits: ['close', 'click'],
   setup(props, { emit }) {
     const { type, color, plain, round, mark, textColor } = toRefs(props);