浏览代码

fix(icon): taro icon bug

richard1015 3 年之前
父节点
当前提交
a91f1ff34e

+ 3 - 3
src/packages/__VUE/actionsheet/index.taro.vue

@@ -17,7 +17,7 @@
             :key="index"
             :key="index"
             @click="chooseItem(item, index)"
             @click="chooseItem(item, index)"
           >
           >
-            <IconFont v-if="item.loading" name="loading"></IconFont>
+            <Loading v-if="item.loading"></Loading>
             <view v-else> {{ item[optionTag] }}</view>
             <view v-else> {{ item[optionTag] }}</view>
             <view class="nut-action-sheet__subdesc">{{ item[optionSubTag] }}</view>
             <view class="nut-action-sheet__subdesc">{{ item[optionSubTag] }}</view>
           </view>
           </view>
@@ -36,7 +36,7 @@ import type { PropType } from 'vue';
 const { componentName, create } = createComponent('action-sheet');
 const { componentName, create } = createComponent('action-sheet');
 import Popup from '../popup/index.taro.vue';
 import Popup from '../popup/index.taro.vue';
 import { popupProps } from '../popup/props';
 import { popupProps } from '../popup/props';
-import { IconFont } from '@nutui/icons-vue';
+import { Loading } from '@nutui/icons-vue-taro';
 export interface menuItems {
 export interface menuItems {
   disable: boolean;
   disable: boolean;
   loading: boolean;
   loading: boolean;
@@ -48,7 +48,7 @@ export interface menuItems {
 export default create({
 export default create({
   components: {
   components: {
     [Popup.name]: Popup,
     [Popup.name]: Popup,
-    IconFont
+    Loading
   },
   },
   props: {
   props: {
     ...popupProps,
     ...popupProps,

+ 1 - 1
src/packages/__VUE/backtop/index.taro.vue

@@ -22,7 +22,7 @@ import { reactive, computed, toRefs } from 'vue';
 import { createComponent } from '@/packages/utils/create';
 import { createComponent } from '@/packages/utils/create';
 import NutScrollView from '../scrollView/index.taro.vue';
 import NutScrollView from '../scrollView/index.taro.vue';
 const { componentName, create } = createComponent('backtop');
 const { componentName, create } = createComponent('backtop');
-import { Top } from '@nutui/icons-vue';
+import { Top } from '@nutui/icons-vue-taro';
 export default create({
 export default create({
   components: {
   components: {
     NutScrollView,
     NutScrollView,

+ 1 - 1
src/packages/__VUE/cell/demo.vue

@@ -55,7 +55,7 @@
     </nut-cell-group>
     </nut-cell-group>
 
 
     <h2>{{ translate('displayIcon') }}</h2>
     <h2>{{ translate('displayIcon') }}</h2>
-    <nut-cell :title="translate('name')" icon="my" :desc="translate('desc')" isLink> </nut-cell>
+    <nut-cell :title="translate('name')" :desc="translate('desc')" isLink> </nut-cell>
     <h2>{{ translate('title6') }}</h2>
     <h2>{{ translate('title6') }}</h2>
     <nut-cell desc-text-align="left" :desc="translate('desc')"></nut-cell>
     <nut-cell desc-text-align="left" :desc="translate('desc')"></nut-cell>
 
 

+ 1 - 1
src/packages/__VUE/cell/doc.md

@@ -163,7 +163,7 @@ app.use(CellGroup);
 
 
 ```html
 ```html
 <template>
 <template>
-  <nut-cell title="姓名" icon="my" desc="张三"></nut-cell>
+  <nut-cell title="姓名" desc="张三"></nut-cell>
 </template>
 </template>
 ```
 ```
 
 

+ 1 - 1
src/packages/__VUE/cell/index.taro.vue

@@ -5,7 +5,7 @@ import { computed } from 'vue';
 import { createComponent } from '@/packages/utils/create';
 import { createComponent } from '@/packages/utils/create';
 import { pxCheck } from '@/packages/utils/pxCheck';
 import { pxCheck } from '@/packages/utils/pxCheck';
 const { componentName, create } = createComponent('cell');
 const { componentName, create } = createComponent('cell');
-import { Right } from '@nutui/icons-vue';
+import { Right } from '@nutui/icons-vue-taro';
 export default create({
 export default create({
   components: { Right },
   components: { Right },
   props: {
   props: {

+ 1 - 1
src/packages/__VUE/fixednav/index.taro.vue

@@ -4,7 +4,7 @@ import { createComponent } from '@/packages/utils/create';
 import { component } from './common';
 import { component } from './common';
 import OverLay from '../overlay/index.taro.vue';
 import OverLay from '../overlay/index.taro.vue';
 const { create } = createComponent('fixed-nav');
 const { create } = createComponent('fixed-nav');
-import { Left } from '@nutui/icons-vue';
+import { Left } from '@nutui/icons-vue-taro';
 export default create(
 export default create(
   component({
   component({
     [OverLay.name]: OverLay,
     [OverLay.name]: OverLay,

+ 7 - 7
src/packages/__VUE/icon/doc.taro.md

@@ -2,27 +2,27 @@
 
 
 ### 介绍
 ### 介绍
 
 
-独立安装 @nutui/icons-vue 图标组件包。
+独立安装 @nutui/icons-vue-taro 图标组件包。
 
 
 ### 安装
 ### 安装
 
 
 ```bash
 ```bash
-npm i --save @nutui/icons-vue
+npm i --save @nutui/icons-vue-taro
 ```
 ```
 
 
 ``` javascript
 ``` javascript
 import { createApp } from 'vue';
 import { createApp } from 'vue';
-import { IconFont } from '@nutui/icons-vue';
+import { IconFont } from '@nutui/icons-vue-taro';
 
 
 const app = createApp();
 const app = createApp();
 app.use(IconFont);
 app.use(IconFont);
 ```
 ```
-### Svg 按需加载使用
+### 按需加载使用
 
 
-按需加载组件使用方式,可选项见 @nutui/icons-vue/dist/types/index.d.ts
+按需加载组件使用方式,可选项见 @nutui/icons-vue-taro/dist/types/index.d.ts
 
 
 ```js
 ```js
-import { Add } from '@nutui/icons-vue';
+import { Add } from '@nutui/icons-vue-taro';
 // template
 // template
 <Add color='red'>
 <Add color='red'>
 ```
 ```
@@ -30,7 +30,7 @@ import { Add } from '@nutui/icons-vue';
 ### IconFont 全量使用
 ### IconFont 全量使用
 
 
 ```js
 ```js
-import { IconFont } from '@nutui/icons-vue';
+import { IconFont } from '@nutui/icons-vue-taro';
 ```
 ```
 
 
 `Icon` 的 `name` 属性支持传入图标名称或图片链接。
 `Icon` 的 `name` 属性支持传入图标名称或图片链接。

+ 1 - 1
src/packages/__VUE/inputnumber/index.taro.vue

@@ -41,7 +41,7 @@
 import { computed } from 'vue';
 import { computed } from 'vue';
 import { createComponent } from '@/packages/utils/create';
 import { createComponent } from '@/packages/utils/create';
 import { pxCheck } from '@/packages/utils/pxCheck';
 import { pxCheck } from '@/packages/utils/pxCheck';
-import { Minus, Plus } from '@nutui/icons-vue';
+import { Minus, Plus } from '@nutui/icons-vue-taro';
 const { componentName, create } = createComponent('input-number');
 const { componentName, create } = createComponent('input-number');
 export default create({
 export default create({
   components: { Minus, Plus },
   components: { Minus, Plus },

+ 2 - 2
src/packages/__VUE/shortpassword/index.taro.vue

@@ -43,7 +43,7 @@
       <view class="nut-shortpsd-message">
       <view class="nut-shortpsd-message">
         <view class="nut-shortpsd-error">{{ errorMsg }}</view>
         <view class="nut-shortpsd-error">{{ errorMsg }}</view>
         <view class="nut-shortpsd-forget" @click="onTips" v-if="tips || translate('tips')">
         <view class="nut-shortpsd-forget" @click="onTips" v-if="tips || translate('tips')">
-          <tips class="icon" height="11px" width="11px"></tips>
+          <tips class="icon" size="11px"></tips>
           <view>{{ tips || translate('tips') }}</view>
           <view>{{ tips || translate('tips') }}</view>
         </view>
         </view>
       </view>
       </view>
@@ -58,7 +58,7 @@
 import { ref, computed, watch, onMounted } from 'vue';
 import { ref, computed, watch, onMounted } from 'vue';
 import { createComponent } from '@/packages/utils/create';
 import { createComponent } from '@/packages/utils/create';
 import Popup from '../popup/index.taro.vue';
 import Popup from '../popup/index.taro.vue';
-import { Tips } from '@nutui/icons-vue';
+import { Tips } from '@nutui/icons-vue-taro';
 const { create, translate } = createComponent('short-password');
 const { create, translate } = createComponent('short-password');
 import Taro, { eventCenter, getCurrentInstance } from '@tarojs/taro';
 import Taro, { eventCenter, getCurrentInstance } from '@tarojs/taro';
 export default create({
 export default create({

+ 3 - 3
src/packages/__VUE/tabs/index.taro.vue

@@ -17,7 +17,7 @@
         >
         >
           <view class="nut-tabs__titles-item__line" :style="tabsActiveStyle" v-if="type == 'line'"></view>
           <view class="nut-tabs__titles-item__line" :style="tabsActiveStyle" v-if="type == 'line'"></view>
           <view class="nut-tabs__titles-item__smile" :style="tabsActiveStyle" v-if="type == 'smile'">
           <view class="nut-tabs__titles-item__smile" :style="tabsActiveStyle" v-if="type == 'smile'">
-            <IconFont name="joy-smile" :color="color" />
+            <JoySmile :color="color" />
           </view>
           </view>
           <view class="nut-tabs__titles-item__text" :class="{ ellipsis: ellipsis }">{{ item.title }} </view>
           <view class="nut-tabs__titles-item__text" :class="{ ellipsis: ellipsis }">{{ item.title }} </view>
         </view>
         </view>
@@ -30,7 +30,7 @@
 </template>
 </template>
 <script lang="ts">
 <script lang="ts">
 import { createComponent } from '@/packages/utils/create';
 import { createComponent } from '@/packages/utils/create';
-import { IconFont } from '@nutui/icons-vue';
+import { JoySmile } from '@nutui/icons-vue-taro';
 import { pxCheck } from '@/packages/utils/pxCheck';
 import { pxCheck } from '@/packages/utils/pxCheck';
 import { TypeOfFun } from '@/packages/utils/util';
 import { TypeOfFun } from '@/packages/utils/util';
 import { useRect } from '@/packages/utils/useRect';
 import { useRect } from '@/packages/utils/useRect';
@@ -46,7 +46,7 @@ export type TabsSize = 'large' | 'normal' | 'small';
 const { create } = createComponent('tabs');
 const { create } = createComponent('tabs');
 export default create({
 export default create({
   components: {
   components: {
-    IconFont
+    JoySmile
   },
   },
   props: {
   props: {
     modelValue: {
     modelValue: {

+ 3 - 11
src/packages/__VUE/tag/index.taro.vue

@@ -1,21 +1,13 @@
 <template>
 <template>
   <view :class="classes" :style="getStyle()" @click="onClick">
   <view :class="classes" :style="getStyle()" @click="onClick">
     <slot></slot>
     <slot></slot>
-    <IconFont
-      name="close"
-      class="nut-tag--close"
-      v-if="closeable"
-      font-size="12px"
-      width="11px"
-      height="11px"
-      @click="onClose"
-    ></IconFont>
+    <Close class="nut-tag--close" v-if="closeable" size="11" @click="onClose"></Close>
   </view>
   </view>
 </template>
 </template>
 
 
 <script lang="ts">
 <script lang="ts">
 import { PropType, CSSProperties, computed, toRefs } from 'vue';
 import { PropType, CSSProperties, computed, toRefs } from 'vue';
-import { IconFont } from '@nutui/icons-vue';
+import { Close } from '@nutui/icons-vue-taro';
 import { createComponent } from '@/packages/utils/create';
 import { createComponent } from '@/packages/utils/create';
 const { componentName, create } = createComponent('tag');
 const { componentName, create } = createComponent('tag');
 export type TagType = 'primary' | 'success' | 'danger' | 'warning';
 export type TagType = 'primary' | 'success' | 'danger' | 'warning';
@@ -46,7 +38,7 @@ export default create({
     }
     }
   },
   },
   components: {
   components: {
-    IconFont
+    Close
   },
   },
   emits: ['close', 'click'],
   emits: ['close', 'click'],
   setup(props, { emit }) {
   setup(props, { emit }) {

+ 1 - 1
src/packages/__VUE/tour/index.taro.vue

@@ -68,7 +68,7 @@ import { computed, watch, ref, reactive, toRefs, PropType, nextTick, onMounted }
 import { PopoverLocation } from '../popover/type';
 import { PopoverLocation } from '../popover/type';
 import { createComponent } from '@/packages/utils/create';
 import { createComponent } from '@/packages/utils/create';
 import { useTaroRect } from '@/packages/utils/useTaroRect';
 import { useTaroRect } from '@/packages/utils/useTaroRect';
-import { Close } from '@nutui/icons-vue';
+import { Close } from '@nutui/icons-vue-taro';
 import Taro from '@tarojs/taro';
 import Taro from '@tarojs/taro';
 
 
 interface StepOptions {
 interface StepOptions {

+ 1 - 1
src/packages/__VUE/uploader/index.taro.vue

@@ -82,7 +82,7 @@ import Button from '../button/index.taro.vue';
 const { componentName, create, translate } = createComponent('uploader');
 const { componentName, create, translate } = createComponent('uploader');
 import Taro from '@tarojs/taro';
 import Taro from '@tarojs/taro';
 import { isPromise } from '@/packages/utils/util';
 import { isPromise } from '@/packages/utils/util';
-import { Photograph } from '@nutui/icons-vue';
+import { Photograph } from '@nutui/icons-vue-taro';
 export default create({
 export default create({
   components: {
   components: {
     [Progress.name]: Progress,
     [Progress.name]: Progress,

+ 2 - 2
src/sites/mobile-taro/vue/src/basic/pages/icon/index.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
   <div class="demo">
   <div class="demo">
-    <h2>Svg 按需使用</h2>
+    <h2>按需使用</h2>
     <nut-cell>
     <nut-cell>
       <Add color="red" />
       <Add color="red" />
     </nut-cell>
     </nut-cell>
@@ -59,7 +59,7 @@
 </template>
 </template>
 
 
 <script lang="ts">
 <script lang="ts">
-import { Add, IconFontConfig, IconFont } from '@nutui/icons-vue';
+import { Add, IconFontConfig, IconFont } from '@nutui/icons-vue-taro';
 export default {
 export default {
   props: {},
   props: {},
   components: { IconFont, Add },
   components: { IconFont, Add },

+ 1 - 1
src/sites/mobile-taro/vue/src/exhibition/pages/swiper/index.vue

@@ -114,7 +114,7 @@
 
 
 <script lang="ts">
 <script lang="ts">
 import { reactive, toRefs, onMounted, ref, Ref } from 'vue';
 import { reactive, toRefs, onMounted, ref, Ref } from 'vue';
-import { Left, Right } from '@nutui/icons-vue';
+import { Left, Right } from '@nutui/icons-vue-taro';
 
 
 export default {
 export default {
   props: {},
   props: {},

+ 1 - 1
src/sites/mobile-taro/vue/src/nav/pages/fixednav/index.vue

@@ -44,7 +44,7 @@
 
 
 <script lang="ts">
 <script lang="ts">
 import { onMounted, reactive, ref } from 'vue';
 import { onMounted, reactive, ref } from 'vue';
-import { Retweet } from '@nutui/icons-vue';
+import { Retweet } from '@nutui/icons-vue-taro';
 export default {
 export default {
   props: {},
   props: {},
   components: { Retweet },
   components: { Retweet },