Merge remote-tracking branch 'origin/dev-yxl' into dev-sws

src/components/model-float-window/index.vue

@@ -10,6 +10,8 @@
     </div>
 </template>
 <script setup lang="ts">
+import { percentage_count } from '@/utils';
+
 const props = defineProps({
     value: {
         type: Object,
@@ -41,7 +43,8 @@ watch(props.value, (val) => {
     }
 
     style.value = location;
-
+    // 60 为自身高度
+    new_style.value.offset_number_percentage = (new_style.value.offset_number / (846 - 60)).toFixed(4);
     emits('change', { bottom: new_style.value.offset_number, location: new_style.value.display_location });
 }, {immediate: true, deep: true});
 </script>

src/views/layout/components/main/default/float-window.ts

@@ -9,6 +9,7 @@ interface defaultSearch {
     style: {
         display_location: string;
         offset_number: number;
+        offset_number_percentage: string;
         float_style: string;
         float_style_color: string;
     };
@@ -22,6 +23,7 @@ const defaultSearch: defaultSearch = {
     style: {
         display_location: 'right',
         offset_number: 120,
+        offset_number_percentage: '100%',
         float_style: 'shadow',
         float_style_color: '#32373a1a',
     },

src/views/layout/components/settings/index.vue

@@ -103,9 +103,9 @@
             <template v-else-if="value.key == 'rich-text'">
                 <model-rich-text-setting :type="radio" :value="value.com_data"></model-rich-text-setting>
             </template>
-            <!-- 文本标题 -->
-            <template v-else-if="value.key == 'text-title'">
-                <model-text-title-setting :type="radio" :value="value.com_data"></model-text-title-setting>
+            <!-- 标题 -->
+            <template v-else-if="value.key == 'title'">
+                <model-title-setting :type="radio" :value="value.com_data"></model-title-setting>
             </template>
             <!-- 悬浮按钮 -->
             <template v-else-if="value.key == 'float-window'">