瀏覽代碼

fix: 修复富文本背景图、标签样式启用问题

jiaxing.liao 1 月之前
父節點
當前提交
dae407eca9

+ 4 - 0
src/renderer/src/lvgl-widgets/label/Label.vue

@@ -29,6 +29,10 @@ import ImageBg from '../ImageBg.vue'
 import { useLongMode } from '../hooks/useLongMode'
 import { useLanguage } from '../hooks/useLanguage'
 
+defineOptions({
+  inheritAttrs: false
+})
+
 const props = defineProps<{
   width: number
   height: number

+ 1 - 1
src/renderer/src/lvgl-widgets/label/style.json

@@ -56,7 +56,7 @@
           "originX": 0,
           "originY": 0,
           "rotate": 0,
-          "scale": 1
+          "scale": 256
         }
       },
       "state": []

+ 13 - 6
src/renderer/src/lvgl-widgets/span-group/SpanGroup.vue

@@ -1,12 +1,18 @@
 <template>
   <div :style="{ ...(styleMap?.mainStyle || {}), ...otherStyles }" class="w-full h-full">
-    <span
-      class="shrink-0 whitespace-pre!"
-      v-for="(item, index) in resolvedItems"
-      :key="index"
-      :style="getSpanStyle(item)"
-      >{{ item.resolvedText.text }}</span
+    <ImageBg :src="styleMap?.mainStyle?.imageSrc" :image-style="styleMap?.mainStyle?.imageStyle" />
+    <div
+      class="absolute w-full h-full z-2 break-all"
+      :style="{ ...(styleMap?.mainStyle || {}), ...otherStyles }"
     >
+      <span
+        class="shrink-0 whitespace-pre!"
+        v-for="(item, index) in resolvedItems"
+        :key="index"
+        :style="getSpanStyle(item)"
+        >{{ item.resolvedText.text }}</span
+      >
+    </div>
   </div>
 </template>
 
@@ -15,6 +21,7 @@ import { computed, CSSProperties } from 'vue'
 import { LineEnum } from './data'
 import { useWidgetStyle } from '../hooks/useWidgetStyle'
 import { useLanguage } from '../hooks/useLanguage'
+import ImageBg from '../ImageBg.vue'
 
 import type { SpanItem } from './data'