Bladeren bron

fix: 修改问题

liaojiaxing 1 week geleden
bovenliggende
commit
7b24997bc7

+ 16 - 11
src/renderer/src/lvgl-widgets/message/MessageBox.vue

@@ -15,8 +15,9 @@
       />
       <span class="whitespace-pre! z-2" :style="titleTextStyle">{{ resolvedTitle.text }}</span>
       <span
+        v-if="props.closebtn"
         :style="styleMap?.titleButtonStyle"
-        class="bg-#2195f6 z-2 shadow-[0_4px_0_#cccccc] text-white w-40px h-30px rounded-10px relative grid place-items-center"
+        class="bg-#2195f6 z-2 shadow-[0_4px_0_#cccccc] text-white w-43px h-21px rounded-13px relative grid place-items-center"
       >
         <ImageBg
           :src="styleMap?.titleButtonStyle?.imageSrc"
@@ -46,19 +47,19 @@
     <div class="h-40px shrink-0 flex items-center justify-around z-2">
       <div
         :style="{
-          ...styleMap?.bottomButtonStyle,
-          width: btnWidth + 'px',
-          height: btnHeight + 'px'
+          ...styleMap?.bottomButtonStyle
         }"
         v-for="(btn, index) in btns"
         :key="index"
-        class="relative grid place-items-center shadow-[0_4px_0_#cccccc] whitespace-pre!"
+        class="relative grid place-items-center shadow-[0_4px_0_#cccccc] whitespace-pre! h-21px rounded-13px"
       >
         <ImageBg
           :src="styleMap?.bottomButtonStyle?.imageSrc"
           :imageStyle="styleMap?.bottomButtonStyle?.imageStyle"
         />
-        <span class="z-2" :style="getButtonTextStyle(btn.text)">{{ resolveText(btn.text).text }}</span>
+        <span class="z-2 px-12px" :style="getButtonTextStyle(btn.text)">{{
+          resolveText(btn.text).text
+        }}</span>
       </div>
     </div>
   </div>
@@ -82,9 +83,7 @@ const props = defineProps<{
   part: string
   title: string
   content: string
-  // closeBtn: boolean
-  btnWidth: number
-  btnHeight: number
+  closebtn: boolean
   btns: { text: string }[]
   id?: string
   fixedHeight?: boolean
@@ -100,8 +99,14 @@ const textBoxHeight = ref(0)
 const textHeight = ref(0)
 const resolvedTitle = computed(() => resolveText(props.title))
 const resolvedContent = computed(() => resolveText(props.content))
-const titleTextStyle = getTextStyle(() => undefined, () => props.title)
-const contentTextStyle = getTextStyle(() => undefined, () => props.content)
+const titleTextStyle = getTextStyle(
+  () => undefined,
+  () => props.title
+)
+const contentTextStyle = getTextStyle(
+  () => undefined,
+  () => props.content
+)
 
 useResizeObserver(txtBoxRef, (entries) => {
   const entry = entries[0]

+ 8 - 35
src/renderer/src/lvgl-widgets/message/index.tsx

@@ -62,9 +62,7 @@ export default {
       states: [],
       title: 'Title',
       content: 'Content',
-      // closeBtn: true,
-      btnWidth: 60,
-      btnHeight: 30,
+      closebtn: true,
       btns: [{ text: 'Apply' }, { text: 'Close' }]
     },
     styles: [
@@ -193,6 +191,12 @@ export default {
       }
     ],
     coreProps: [
+       {
+        label: '关闭按钮',
+        field: 'props.closebtn',
+        valueType: 'switch',
+        labelWidth: '80px'
+      },
       {
         label: '标题',
         field: 'props.title',
@@ -204,12 +208,7 @@ export default {
         },
         canUseEventSet: true
       },
-      // {
-      //   label: '关闭按钮',
-      //   field: 'props.closeBtn',
-      //   valueType: 'switch',
-      //   labelWidth: '80px'
-      // },
+     
       {
         label: '文本',
         field: 'props.content',
@@ -220,32 +219,6 @@ export default {
         },
         canUseEventSet: true
       },
-      {
-        label: '按钮尺寸',
-        valueType: 'group',
-        children: [
-          {
-            field: 'props.btnWidth',
-            valueType: 'number',
-            componentProps: {
-              span: 12,
-              min: 0,
-              max: 200
-            },
-            slots: { prefix: 'W' }
-          },
-          {
-            field: 'props.btnHeight',
-            valueType: 'number',
-            componentProps: {
-              span: 12,
-              min: 0,
-              max: 200
-            },
-            slots: { prefix: 'Y' }
-          }
-        ]
-      },
       {
         label: '按钮组',
         field: 'props.btns',

+ 2 - 2
src/renderer/src/lvgl-widgets/message/style.json

@@ -105,7 +105,7 @@
         "border": {
           "color": "#2092f5ff",
           "width": 0,
-          "radius": 10,
+          "radius": 13,
           "side": ["all"]
         },
         "shadow": {
@@ -139,7 +139,7 @@
         "border": {
           "color": "#2092f5ff",
           "width": 0,
-          "radius": 10,
+          "radius": 13,
           "side": ["all"]
         },
         "shadow": {

+ 2 - 2
src/renderer/src/views/designer/config/property/components/BezierConfig.vue

@@ -267,9 +267,9 @@ const easingOptions = [
   { label: 'Ease In', value: 'ease-in' },
   { label: 'Ease Out', value: 'ease-out' },
   { label: 'Ease In Out', value: 'ease-in-out' },
+  { label: 'Overshoot', value: 'overshoot' },
   { label: 'Bounce', value: 'bounce' },
-  { label: 'Back', value: 'back' },
-  { label: 'Cubic In Out', value: 'cubic-in-out' }
+  { label: 'Step', value: 'step' }
 ]
 
 const createDefaultSegment = (): BezierSegment => ({