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

src/components/model-auxiliary-blank/model-auxiliary-blank-content.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="auxiliary-line">
-        <el-form :model="state" label-width="70">
+        <el-form :model="state" label-width="70" @submit.prevent>
             <card-container>
                 <div class="mb-12">高度设置</div>
                 <el-form-item label-width="0">

src/components/model-auxiliary-line/model-auxiliary-line-styles.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="auxiliary-line-styles">
-        <el-form :model="form" label-width="70">
+        <el-form :model="form" label-width="70" @submit.prevent>
             <card-container>
                 <div class="mb-12">线条样式</div>
                 <el-form-item label="线条颜色">

src/components/model-custom/model-custom-content.vue

@@ -196,7 +196,7 @@ const replace_data = () => {
     display: flex;
     flex-direction: column;
 }
-@media screen and (max-width: 1540px) {
+@media screen and (max-width: 1560px) {
     .settings {
         width: 40rem;
     }

src/components/model-data-magic/model-data-magic-content.vue

@@ -144,7 +144,7 @@ onUnmounted(() => {
 });
 
 const handleResize = () => {
-    if (window.innerWidth <= 1540) {
+    if (window.innerWidth <= 1560) {
         cubeWidth.value = 330;
         cubeHeight.value = 330;
     } else {

src/components/model-img-magic/model-img-magic-content.vue

@@ -105,7 +105,7 @@ onUnmounted(() => {
 });
 
 const handleResize = () => {
-    if (window.innerWidth <= 1540) {
+    if (window.innerWidth <= 1560) {
         cubeWidth.value = 330;
         cubeHeight.value = 330;
     } else {

src/views/layout/components/main/default/text-title.ts

@@ -55,6 +55,7 @@ const defaultSearch: defaultSearch = {
         right_size: 12, 
         common_style: {
             ...defaultCommon,
+            color_list: [{ color: '#fff', color_percentage: undefined }],
             padding: 15,
             padding_top: 15,
             padding_bottom: 15,

src/views/layout/components/main/index.scss

@@ -38,10 +38,13 @@
         display: none;
     }
 }
-@media screen and (max-width: 1540px) {
+@media screen and (max-width: 1560px) {
     .siderbar {
         width: 32rem;
     }
+    .drawer-container {
+        display: none;
+    }
 }
 .main {
     flex: 1;
@@ -95,6 +98,21 @@
                 &::-webkit-scrollbar {
                     display: none;
                 }
+                .model-wall {
+                    width: 39rem;
+                    background: #f5f5f5;
+                    margin: 0 auto;
+                    .drag-area .float-window {
+                        position: fixed;
+                        max-width: 39rem;
+                        margin: 0 auto;
+                        z-index: 3;
+                    }
+                    .main-content {
+                        max-width: 39rem;
+                        overflow: hidden;
+                    }
+                }
             }
             // 悬浮按钮控制， 未选中情况下宽度自适应
             .plug-in-table.float-window {
@@ -247,15 +265,18 @@
 .drawer-container {
     position: relative;
     overflow: hidden;
-    width: 12.8rem;
     margin-left: 0.1rem;
+    transition: 0.8s ease;
     .drawer-content {
         position: absolute;
         top: 0;
         width: 12.8rem;
         height: 100%;
         background: #fff;
-        transition: left 0.5s ease;
+        transition: left 0.8s ease;
+    }
+    .drawer-title {
+        transition: 0.4s ease;
     }
     .drawer-drag-bg {
         background: #F2F8FF;

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

@@ -15,9 +15,9 @@
             </el-collapse-item>
         </el-collapse>
     </div>
-    <div class="drawer-container">
+    <div class="drawer-container" :style="`width: ${ diy_data.length > 0 ? '12.8rem' : '0px' }`">
         <div class="drawer-content" :style="{ left: diy_data.length > 0 ? '0' : '-100%' }">
-            <div class="size-14 cr-3 fw ptb-20 pl-12">已选组件({{ diy_data.length }})</div>
+            <div class="size-14 cr-3 fw ptb-20 pl-12 drawer-title" :style="{ opacity: diy_data.length > 0 ? '1' : '0' }">已选组件({{ diy_data.length }})</div>
             <div ref="left_scrollTop" class="drawer-drag-area">
                 <VueDraggable v-model="diy_data" :animation="500" target=".sort-target" :scroll="true" :on-sort="on_sort">
                     <TransitionGroup type="transition" tag="ul" name="fade" class="sort-target flex-col">
@@ -600,22 +600,7 @@ const float_bottom_change = (val: { bottom: string; location: string }, id: stri
 
 <style lang="scss" scoped>
 @import 'index.scss';
-.model-wall {
-    width: 39rem;
-    background: #f5f5f5;
-    margin: 0 auto;
-    .drag-area {
-        min-height: v-bind(height);
-    }
-    .drag-area .float-window {
-        position: fixed;
-        max-width: 39rem;
-        margin: 0 auto;
-        z-index: 3;
-    }
-    .main-content {
-        max-width: 39rem;
-        overflow: hidden;
-    }
+.drag-area {
+    min-height: v-bind(height);
 }
 </style>

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

@@ -151,7 +151,7 @@ const radio = ref('1'); // 创建一个响应式的数字变量，初始值为0
         background-color: #fff;
     }
 }
-@media screen and (max-width: 1540px) {
+@media screen and (max-width: 1560px) {
     .settings {
         width: 40rem;
     }