Преглед на файлове

fix: 修改默认覆盖色

jiaxing.liao преди 1 месец
родител
ревизия
342d0e6348

+ 1 - 1
src/renderer/src/lvgl-widgets/bar/index.ts

@@ -64,7 +64,7 @@ export default {
           color: '#2092f53c',
           image: {
             imgId: '',
-            recolor: '',
+            recolor: '#ffffff00',
             alpha: 255
           }
         },

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

@@ -9,7 +9,7 @@
           "color": "#2092f53c",
           "image": {
             "imgId": "",
-            "recolor": "",
+            "recolor": "#ffffff00",
             "alpha": 255
           }
         },

+ 1 - 1
src/renderer/src/lvgl-widgets/button-matrix/style.json

@@ -9,7 +9,7 @@
           "color": "#ffffffff",
           "image": {
             "imgId": "",
-            "recolor": "",
+            "recolor": "#ffffff00",
             "alpha": 255
           }
         },

+ 1 - 1
src/renderer/src/lvgl-widgets/button/index.ts

@@ -56,7 +56,7 @@ export default {
           color: '#2195f6ff',
           image: {
             imgId: '',
-            recolor: '',
+            recolor: '#ffffff00',
             alpha: 255
           }
         },

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

@@ -9,7 +9,7 @@
           "color": "#2195f6ff",
           "image": {
             "imgId": "",
-            "recolor": "",
+            "recolor": "#ffffff00",
             "alpha": 255
           }
         },

+ 2 - 2
src/renderer/src/lvgl-widgets/image-button/index.ts

@@ -71,7 +71,7 @@ export default {
         },
         text: {
           color: '#000000ff',
-          family: '',
+          family: 'montserratMedium',
           size: 16,
           align: 'center',
           decoration: 'none'
@@ -129,7 +129,7 @@ export default {
         },
         text: {
           color: '#000000ff',
-          family: '',
+          family: 'montserratMedium',
           size: 16,
           align: 'center',
           decoration: 'none'

+ 1 - 1
src/renderer/src/lvgl-widgets/image-button/style.json

@@ -19,7 +19,7 @@
         },
         "text": {
           "color": "#000000ff",
-          "family": "",
+          "family": "montserratMedium",
           "size": 16,
           "align": "center",
           "decoration": "none"

+ 1 - 1
src/renderer/src/lvgl-widgets/label/index.ts

@@ -57,7 +57,7 @@ export default {
           color: '#2195f600',
           image: {
             imgId: '',
-            recolor: '',
+            recolor: '#ffffff00',
             alpha: 255
           }
         },

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

@@ -9,7 +9,7 @@
           "color": "#2195f600",
           "image": {
             "imgId": "",
-            "recolor": "",
+            "recolor": "#ffffff00",
             "alpha": 255
           }
         },

+ 1 - 1
src/renderer/src/lvgl-widgets/page/index.ts

@@ -51,7 +51,7 @@ export default {
           color: '#ffffffff',
           image: {
             imgId: '',
-            recolor: '',
+            recolor: '#ffffff00',
             alpha: 255
           }
         }

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

@@ -9,7 +9,7 @@
           "color": "#ffffffff",
           "image": {
             "imgId": "",
-            "recolor": "",
+            "recolor": "#ffffff00",
             "alpha": 255
           }
         }

+ 1 - 1
src/renderer/src/lvgl-widgets/slider/index.ts

@@ -66,7 +66,7 @@ export default {
           color: '#2092f53c',
           image: {
             imgId: '',
-            recolor: '',
+            recolor: '#ffffff00',
             alpha: 255
           }
         },

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

@@ -9,7 +9,7 @@
           "color": "#2092f53c",
           "image": {
             "imgId": "",
-            "recolor": "",
+            "recolor": "#ffffff00",
             "alpha": 255
           }
         },

+ 1 - 1
src/renderer/src/lvgl-widgets/span-group/Config.vue

@@ -121,7 +121,7 @@ const dialogVisible = ref(false)
 const formData = ref<SpanItem>({
   text: '',
   text_color: '',
-  font_family: '',
+  font_family: 'montserratMedium',
   font_size: 0,
   text_decor: LineEnum.LV_TEXT_DECOR_NONE
 })

+ 1 - 1
src/renderer/src/lvgl-widgets/span-group/index.tsx

@@ -65,7 +65,7 @@ export default {
           color: '#2092f500',
           image: {
             imgId: '',
-            recolor: '',
+            recolor: '#ffffff00',
             alpha: 255
           }
         },

+ 1 - 1
src/renderer/src/lvgl-widgets/span-group/style.json

@@ -9,7 +9,7 @@
           "color": "#2092f500",
           "image": {
             "imgId": "",
-            "recolor": "",
+            "recolor": "#ffffff00",
             "alpha": 255
           }
         },

+ 1 - 1
src/renderer/src/views/designer/config/property/components/StyleBackground.vue

@@ -134,7 +134,7 @@ const image = computed({
       if (!modelValue.value?.image) {
         modelValue.value.image = {
           imgId: '',
-          recolor: '',
+          recolor: '#ffffff00',
           alpha: 255
         }
       }

+ 33 - 3
src/renderer/src/views/designer/config/property/components/StyleBorder.vue

@@ -7,7 +7,13 @@
     <el-row v-if="!onlyRadius" :gutter="12">
       <el-col :span="hideRadius ? 24 : 12">
         <el-form-item label-position="left" label-width="0px">
-          <input-number v-model="width" controls-position="right" style="width: 100%" :min="0">
+          <input-number
+            v-model="width"
+            controls-position="right"
+            style="width: 100%"
+            :min="0"
+            :max="max"
+          >
             <template #prefix>
               <span>宽度</span>
             </template>
@@ -16,7 +22,13 @@
       </el-col>
       <el-col :span="12" v-if="!hideRadius">
         <el-form-item label-position="left" label-width="0px">
-          <input-number v-model="radius" controls-position="right" style="width: 100%" :min="0">
+          <input-number
+            v-model="radius"
+            controls-position="right"
+            style="width: 100%"
+            :min="0"
+            :max="max"
+          >
             <template #prefix>
               <span>圆角</span>
             </template>
@@ -26,7 +38,13 @@
     </el-row>
 
     <el-form-item v-if="onlyRadius" label-position="left" label-width="0px">
-      <input-number v-model="radius" controls-position="right" style="width: 100%" :min="0">
+      <input-number
+        v-model="radius"
+        controls-position="right"
+        style="width: 100%"
+        :min="0"
+        :max="max"
+      >
         <template #prefix>
           <span>圆角</span>
         </template>
@@ -74,6 +92,7 @@ import {
   BsBorderRight,
   BsBorderOuter
 } from 'vue-icons-plus/bs'
+import { useProjectStore } from '@/store/modules/project'
 
 defineProps<{
   hideRadius?: boolean
@@ -87,6 +106,8 @@ const modelValue = defineModel<{
   side: string[]
 }>('modelValue')
 
+const projectStore = useProjectStore()
+
 // 颜色
 const color = computed({
   get: () => modelValue.value?.color,
@@ -127,6 +148,15 @@ const side = computed({
   }
 })
 
+// 最大值为控件宽高最小值的一半
+const max = computed(() => {
+  const activeWidget = projectStore.activeWidget
+  if (!activeWidget) return
+  const width = activeWidget.props.width || 0
+  const height = activeWidget.props.height || 0
+  return Math.min(width, height) / 2
+})
+
 const handleBorder = (val: string) => {
   if (side.value?.includes(val)) {
     side.value = side.value.filter((item) => item !== val)