[Feat 0000]解决合并冲突

src/views/vent/home/configurable/configurable.data.ts

@@ -2225,6 +2225,7 @@ export const testConfigVentNew: Config[] = [
       size: 'width:380px;height:280px;',
       version: '原版',
       position: 'top:60px;left:0;',
+      headerPosition: 'leftTop',
     },
   },
   {
@@ -2277,6 +2278,7 @@ export const testConfigVentNew: Config[] = [
       size: 'width:377px;height:280px;',
       version: '原版',
       position: 'top:350px;left:0;',
+      headerPosition: 'leftCenter',
     },
   },
   {
@@ -2355,6 +2357,7 @@ export const testConfigVentNew: Config[] = [
       size: 'width:387px;height:280px;',
       version: '新版',
       position: 'top:640px;left:0;',
+      headerPosition: 'leftBottom',
     },
   },
   {
@@ -2402,6 +2405,7 @@ export const testConfigVentNew: Config[] = [
       size: 'width:1000px;height:120px;',
       version: '新版',
       position: 'top:85px;left:460px;',
+      headerPosition: 'centerTop',
     },
   },
   {
@@ -2449,6 +2453,7 @@ export const testConfigVentNew: Config[] = [
       size: 'width:1000px;height:100px;',
       version: '新版',
       position: 'bottom:0;left:460px;',
+      headerPosition: 'centerBottom',
     },
   },
   {
@@ -2520,6 +2525,7 @@ export const testConfigVentNew: Config[] = [
       size: 'width:377px;height:280px;',
       version: '原版',
       position: 'top:60px;right:0;',
+      headerPosition: 'rightTop',
     },
   },
 
@@ -2588,6 +2594,7 @@ export const testConfigVentNew: Config[] = [
       size: 'width:377px;height:280px;',
       version: '新版',
       position: 'top:350px;right:0;',
+      headerPosition: 'rightCenter',
     },
   },
   {
@@ -2667,6 +2674,7 @@ export const testConfigVentNew: Config[] = [
       size: 'width:377px;height:280px;',
       version: '新版',
       position: 'top:640px;right:0;',
+      headerPosition: 'rightBottom',
     },
   },
 ];