合并分支 'main' 到 'examples'

Main

查看合并请求 !40

src/components/Icon/index.vue

@@ -13,8 +13,8 @@
         },
     })
 
-    const size = computed(() => `${props.size}rpx`)
-    const color = computed(() => props.color)
+    const isize = computed(() => `${props.size}rpx`)
+    const icolor = computed(() => props.color)
 </script>
 
 <template>
@@ -23,8 +23,8 @@
 
 <style lang="less" scoped>
     .icon {
-        width: v-bind(size);
-        height: v-bind(size);
-        color: v-bind(color);
+        width: v-bind(isize);
+        height: v-bind(isize);
+        color: v-bind(icolor);
     }
 </style>

src/components/ThumbnailPreview/index.vue

@@ -28,7 +28,7 @@
     })
 
     // 生成预览容器高度
-    const height = computed(() => `${props.height}rpx`)
+    const iheight = computed(() => `${props.height}rpx`)
     // 分离图片和视频资源地址
     const images = computed(() => props.assets.filter((item) => isImage(item.url)))
     const videos = computed(() => props.assets.filter((item) => isVideo(item.url)))
@@ -133,7 +133,7 @@
             position: relative;
 
             :deep(.fui-lazyload__img) {
-                height: v-bind(height) !important;
+                height: v-bind(iheight) !important;
             }
 
             .icon-wrap {