Merge branch 'custom'

src/views/ppt/template/FormatEight.vue

@@ -19,14 +19,21 @@ const lang=ref(window.location.pathname.startsWith('/ppten')?'en':'zh')
 		<!-- 自定义标题 -->
 		<div class="custom-title-wrap" 
 			:style="pageData.titleDetail?{
-				left:pageData.titleDetail.baseLeft+'px',
-				top:pageData.titleDetail.baseTop+'px',
-				width:pageData.titleDetail.baseWidth+'px',
-				height:pageData.titleDetail.baseHeight+'px',
-			}:{
-				left:'90px',top:'34.65px',width:'612px',height:'44.1px'
-			}">
-			<div class="title" v-html="pageData.title"></div>
+				 left:pageData.titleDetail.left+'%',
+						top:pageData.titleDetail.top+'%',
+						width:pageData.titleDetail.width+'%',
+						height:pageData.titleDetail.height+'%',
+				}:{
+						left:'10%',top:'6.6%',width:'68%',height:'5%',
+				}"
+		>
+			<div class="title" v-html="pageData.title"
+				:style="pageData.titleDetail?{
+						color:pageData.titleDetail.color||'#333',
+						fontSize:(pageData.titleDetail.fontSize||22)+'px',
+						fontFamily:pageData.titleDetail.fontFamily||'helvetica'
+				}:{ color:'#333',fontSize:'22px',fontFamily:'helvetica' }"
+			></div>
 		</div>
 		<div class="ppt-content-box">
 			<div class="container">

src/views/ppt/template/FormatEle.vue

@@ -19,14 +19,21 @@ const lang=ref(window.location.pathname.startsWith('/ppten')?'en':'zh')
 		<!-- 自定义标题 -->
 		<div class="custom-title-wrap" 
 			:style="pageData.titleDetail?{
-				left:pageData.titleDetail.baseLeft+'px',
-				top:pageData.titleDetail.baseTop+'px',
-				width:pageData.titleDetail.baseWidth+'px',
-				height:pageData.titleDetail.baseHeight+'px',
-			}:{
-				left:'90px',top:'34.65px',width:'612px',height:'44.1px'
-			}">
-			<div class="title" v-html="pageData.title"></div>
+				 left:pageData.titleDetail.left+'%',
+						top:pageData.titleDetail.top+'%',
+						width:pageData.titleDetail.width+'%',
+						height:pageData.titleDetail.height+'%',
+				}:{
+						left:'10%',top:'6.6%',width:'68%',height:'5%',
+				}"
+		>
+			<div class="title" v-html="pageData.title"
+				:style="pageData.titleDetail?{
+						color:pageData.titleDetail.color||'#333',
+						fontSize:(pageData.titleDetail.fontSize||22)+'px',
+						fontFamily:pageData.titleDetail.fontFamily||'helvetica'
+				}:{ color:'#333',fontSize:'22px',fontFamily:'helvetica' }"
+			></div>
 		</div>
 		<div class="ppt-content-box">
 			<div class="container">

src/views/ppt/template/FormatFive.vue

@@ -19,14 +19,21 @@ const lang=ref(window.location.pathname.startsWith('/ppten')?'en':'zh')
 		<!-- 自定义标题 -->
 		<div class="custom-title-wrap" 
 			:style="pageData.titleDetail?{
-				left:pageData.titleDetail.baseLeft+'px',
-				top:pageData.titleDetail.baseTop+'px',
-				width:pageData.titleDetail.baseWidth+'px',
-				height:pageData.titleDetail.baseHeight+'px',
-			}:{
-				left:'90px',top:'34.65px',width:'612px',height:'44.1px'
-			}">
-			<div class="title" v-html="pageData.title"></div>
+				 left:pageData.titleDetail.left+'%',
+						top:pageData.titleDetail.top+'%',
+						width:pageData.titleDetail.width+'%',
+						height:pageData.titleDetail.height+'%',
+				}:{
+						left:'10%',top:'6.6%',width:'68%',height:'5%',
+				}"
+		>
+			<div class="title" v-html="pageData.title"
+				:style="pageData.titleDetail?{
+						color:pageData.titleDetail.color||'#333',
+						fontSize:(pageData.titleDetail.fontSize||22)+'px',
+						fontFamily:pageData.titleDetail.fontFamily||'helvetica'
+				}:{ color:'#333',fontSize:'22px',fontFamily:'helvetica' }"
+			></div>
 		</div>
 		<div class="ppt-content-box">
 			<div class="container">

src/views/ppt/template/FormatFour.vue

@@ -19,14 +19,21 @@ const lang=ref(window.location.pathname.startsWith('/ppten')?'en':'zh')
 		<!-- 自定义标题 -->
 		<div class="custom-title-wrap" 
 			:style="pageData.titleDetail?{
-				left:pageData.titleDetail.baseLeft+'px',
-				top:pageData.titleDetail.baseTop+'px',
-				width:pageData.titleDetail.baseWidth+'px',
-				height:pageData.titleDetail.baseHeight+'px',
-			}:{
-				left:'90px',top:'34.65px',width:'612px',height:'44.1px'
-			}">
-			<div class="title" v-html="pageData.title"></div>
+				 left:pageData.titleDetail.left+'%',
+						top:pageData.titleDetail.top+'%',
+						width:pageData.titleDetail.width+'%',
+						height:pageData.titleDetail.height+'%',
+				}:{
+						left:'10%',top:'6.6%',width:'68%',height:'5%',
+				}"
+		>
+			<div class="title" v-html="pageData.title"
+				:style="pageData.titleDetail?{
+						color:pageData.titleDetail.color||'#333',
+						fontSize:(pageData.titleDetail.fontSize||22)+'px',
+						fontFamily:pageData.titleDetail.fontFamily||'helvetica'
+				}:{ color:'#333',fontSize:'22px',fontFamily:'helvetica' }"
+			></div>
 		</div>
 		<div class="ppt-content-box">
 			<div class="container">

src/views/ppt/template/FormatNine.vue

@@ -19,14 +19,21 @@ const lang=ref(window.location.pathname.startsWith('/ppten')?'en':'zh')
 		<!-- 自定义标题 -->
 		<div class="custom-title-wrap" 
 			:style="pageData.titleDetail?{
-				left:pageData.titleDetail.baseLeft+'px',
-				top:pageData.titleDetail.baseTop+'px',
-				width:pageData.titleDetail.baseWidth+'px',
-				height:pageData.titleDetail.baseHeight+'px',
-			}:{
-				left:'90px',top:'34.65px',width:'612px',height:'44.1px'
-			}">
-			<div class="title" v-html="pageData.title"></div>
+				 left:pageData.titleDetail.left+'%',
+						top:pageData.titleDetail.top+'%',
+						width:pageData.titleDetail.width+'%',
+						height:pageData.titleDetail.height+'%',
+				}:{
+						left:'10%',top:'6.6%',width:'68%',height:'5%',
+				}"
+		>
+			<div class="title" v-html="pageData.title"
+				:style="pageData.titleDetail?{
+						color:pageData.titleDetail.color||'#333',
+						fontSize:(pageData.titleDetail.fontSize||22)+'px',
+						fontFamily:pageData.titleDetail.fontFamily||'helvetica'
+				}:{ color:'#333',fontSize:'22px',fontFamily:'helvetica' }"
+			></div>
 		</div>
 		<div class="ppt-content-box">
 			<div class="container">

src/views/ppt/template/FormatOne.vue

@@ -19,14 +19,21 @@ const lang=ref(window.location.pathname.startsWith('/ppten')?'en':'zh')
 		<!-- 自定义标题 -->
 		<div class="custom-title-wrap" 
 			:style="pageData.titleDetail?{
-				left:pageData.titleDetail.baseLeft+'px',
-				top:pageData.titleDetail.baseTop+'px',
-				width:pageData.titleDetail.baseWidth+'px',
-				height:pageData.titleDetail.baseHeight+'px',
-			}:{
-				left:'90px',top:'34.65px',width:'612px',height:'44.1px'
-			}">
-			<div class="title" v-html="pageData.title"></div>
+				 left:pageData.titleDetail.left+'%',
+						top:pageData.titleDetail.top+'%',
+						width:pageData.titleDetail.width+'%',
+						height:pageData.titleDetail.height+'%',
+				}:{
+						left:'10%',top:'6.6%',width:'68%',height:'5%',
+				}"
+		>
+			<div class="title" v-html="pageData.title"
+				:style="pageData.titleDetail?{
+						color:pageData.titleDetail.color||'#333',
+						fontSize:(pageData.titleDetail.fontSize||22)+'px',
+						fontFamily:pageData.titleDetail.fontFamily||'helvetica'
+				}:{ color:'#333',fontSize:'22px',fontFamily:'helvetica' }"
+			></div>
 		</div>
 		<div class="ppt-content-box">
 			<div class="container">

src/views/ppt/template/FormatSeven.vue

@@ -19,14 +19,21 @@ const lang=ref(window.location.pathname.startsWith('/ppten')?'en':'zh')
 		<!-- 自定义标题 -->
 		<div class="custom-title-wrap" 
 			:style="pageData.titleDetail?{
-				left:pageData.titleDetail.baseLeft+'px',
-				top:pageData.titleDetail.baseTop+'px',
-				width:pageData.titleDetail.baseWidth+'px',
-				height:pageData.titleDetail.baseHeight+'px',
-			}:{
-				left:'90px',top:'34.65px',width:'612px',height:'44.1px'
-			}">
-			<div class="title" v-html="pageData.title"></div>
+				 left:pageData.titleDetail.left+'%',
+						top:pageData.titleDetail.top+'%',
+						width:pageData.titleDetail.width+'%',
+						height:pageData.titleDetail.height+'%',
+				}:{
+						left:'10%',top:'6.6%',width:'68%',height:'5%',
+				}"
+		>
+			<div class="title" v-html="pageData.title"
+				:style="pageData.titleDetail?{
+						color:pageData.titleDetail.color||'#333',
+						fontSize:(pageData.titleDetail.fontSize||22)+'px',
+						fontFamily:pageData.titleDetail.fontFamily||'helvetica'
+				}:{ color:'#333',fontSize:'22px',fontFamily:'helvetica' }"
+			></div>
 		</div>
 		<div class="ppt-content-box">
 			<div class="container">

src/views/ppt/template/FormatSix.vue

@@ -16,14 +16,21 @@ const props=defineProps({
 		<!-- 自定义标题 -->
 		<div class="custom-title-wrap" 
 			:style="pageData.titleDetail?{
-				left:pageData.titleDetail.baseLeft+'px',
-				top:pageData.titleDetail.baseTop+'px',
-				width:pageData.titleDetail.baseWidth+'px',
-				height:pageData.titleDetail.baseHeight+'px',
-			}:{
-				left:'90px',top:'34.65px',width:'612px',height:'44.1px'
-			}">
-			<div class="title" v-html="pageData.title"></div>
+				 left:pageData.titleDetail.left+'%',
+						top:pageData.titleDetail.top+'%',
+						width:pageData.titleDetail.width+'%',
+						height:pageData.titleDetail.height+'%',
+				}:{
+						left:'10%',top:'6.6%',width:'68%',height:'5%',
+				}"
+		>
+			<div class="title" v-html="pageData.title"
+				:style="pageData.titleDetail?{
+						color:pageData.titleDetail.color||'#333',
+						fontSize:(pageData.titleDetail.fontSize||22)+'px',
+						fontFamily:pageData.titleDetail.fontFamily||'helvetica'
+				}:{ color:'#333',fontSize:'22px',fontFamily:'helvetica' }"
+			></div>
 		</div>
 		<div class="ppt-content-box">
 			<div class="container">

src/views/ppt/template/FormatTen.vue

@@ -19,14 +19,21 @@ const lang=ref(window.location.pathname.startsWith('/ppten')?'en':'zh')
 		<!-- 自定义标题 -->
 		<div class="custom-title-wrap" 
 			:style="pageData.titleDetail?{
-				left:pageData.titleDetail.baseLeft+'px',
-				top:pageData.titleDetail.baseTop+'px',
-				width:pageData.titleDetail.baseWidth+'px',
-				height:pageData.titleDetail.baseHeight+'px',
-			}:{
-				left:'90px',top:'34.65px',width:'612px',height:'44.1px'
-			}">
-			<div class="title" v-html="pageData.title"></div>
+				 left:pageData.titleDetail.left+'%',
+						top:pageData.titleDetail.top+'%',
+						width:pageData.titleDetail.width+'%',
+						height:pageData.titleDetail.height+'%',
+				}:{
+						left:'10%',top:'6.6%',width:'68%',height:'5%',
+				}"
+		>
+			<div class="title" v-html="pageData.title"
+				:style="pageData.titleDetail?{
+						color:pageData.titleDetail.color||'#333',
+						fontSize:(pageData.titleDetail.fontSize||22)+'px',
+						fontFamily:pageData.titleDetail.fontFamily||'helvetica'
+				}:{ color:'#333',fontSize:'22px',fontFamily:'helvetica' }"
+			></div>
 		</div>
 		<div class="ppt-content-box">
 			<div class="container">

src/views/ppt/template/FormatThirteen.vue

@@ -19,14 +19,21 @@ const lang=ref(window.location.pathname.startsWith('/ppten')?'en':'zh')
 		<!-- 自定义标题 -->
 		<div class="custom-title-wrap" 
 			:style="pageData.titleDetail?{
-				left:pageData.titleDetail.baseLeft+'px',
-				top:pageData.titleDetail.baseTop+'px',
-				width:pageData.titleDetail.baseWidth+'px',
-				height:pageData.titleDetail.baseHeight+'px',
-			}:{
-				left:'90px',top:'34.65px',width:'612px',height:'44.1px'
-			}">
-			<div class="title" v-html="pageData.title"></div>
+				 left:pageData.titleDetail.left+'%',
+						top:pageData.titleDetail.top+'%',
+						width:pageData.titleDetail.width+'%',
+						height:pageData.titleDetail.height+'%',
+				}:{
+						left:'10%',top:'6.6%',width:'68%',height:'5%',
+				}"
+		>
+			<div class="title" v-html="pageData.title"
+				:style="pageData.titleDetail?{
+						color:pageData.titleDetail.color||'#333',
+						fontSize:(pageData.titleDetail.fontSize||22)+'px',
+						fontFamily:pageData.titleDetail.fontFamily||'helvetica'
+				}:{ color:'#333',fontSize:'22px',fontFamily:'helvetica' }"
+			></div>
 		</div>
 		<div class="ppt-content-box">
 			<div class="container">

src/views/ppt/template/FormatThree.vue

@@ -16,14 +16,21 @@ const props=defineProps({
 		<!-- 自定义标题 -->
 		<div class="custom-title-wrap" 
 			:style="pageData.titleDetail?{
-				left:pageData.titleDetail.baseLeft+'px',
-				top:pageData.titleDetail.baseTop+'px',
-				width:pageData.titleDetail.baseWidth+'px',
-				height:pageData.titleDetail.baseHeight+'px',
-			}:{
-				left:'90px',top:'34.65px',width:'612px',height:'44.1px'
-			}">
-			<div class="title" v-html="pageData.title"></div>
+				 left:pageData.titleDetail.left+'%',
+						top:pageData.titleDetail.top+'%',
+						width:pageData.titleDetail.width+'%',
+						height:pageData.titleDetail.height+'%',
+				}:{
+						left:'10%',top:'6.6%',width:'68%',height:'5%',
+				}"
+		>
+			<div class="title" v-html="pageData.title"
+				:style="pageData.titleDetail?{
+						color:pageData.titleDetail.color||'#333',
+						fontSize:(pageData.titleDetail.fontSize||22)+'px',
+						fontFamily:pageData.titleDetail.fontFamily||'helvetica'
+				}:{ color:'#333',fontSize:'22px',fontFamily:'helvetica' }"
+			></div>
 		</div>
 		<div class="ppt-content-box">
 			<div class="container">

src/views/ppt/template/FormatTwelve.vue

@@ -19,14 +19,21 @@ const lang=ref(window.location.pathname.startsWith('/ppten')?'en':'zh')
 		<!-- 自定义标题 -->
 		<div class="custom-title-wrap" 
 			:style="pageData.titleDetail?{
-				left:pageData.titleDetail.baseLeft+'px',
-				top:pageData.titleDetail.baseTop+'px',
-				width:pageData.titleDetail.baseWidth+'px',
-				height:pageData.titleDetail.baseHeight+'px',
-			}:{
-				left:'90px',top:'34.65px',width:'612px',height:'44.1px'
-			}">
-			<div class="title" v-html="pageData.title"></div>
+				 left:pageData.titleDetail.left+'%',
+						top:pageData.titleDetail.top+'%',
+						width:pageData.titleDetail.width+'%',
+						height:pageData.titleDetail.height+'%',
+				}:{
+						left:'10%',top:'6.6%',width:'68%',height:'5%',
+				}"
+		>
+			<div class="title" v-html="pageData.title"
+				:style="pageData.titleDetail?{
+						color:pageData.titleDetail.color||'#333',
+						fontSize:(pageData.titleDetail.fontSize||22)+'px',
+						fontFamily:pageData.titleDetail.fontFamily||'helvetica'
+				}:{ color:'#333',fontSize:'22px',fontFamily:'helvetica' }"
+			></div>
 		</div>
 		<div class="ppt-content-box">
 			<div class="container">

src/views/ppt/template/FormatTwo.vue

@@ -17,14 +17,21 @@ const props=defineProps({
 		<!-- 自定义标题 -->
 		<div class="custom-title-wrap" 
 			:style="pageData.titleDetail?{
-				left:pageData.titleDetail.baseLeft+'px',
-				top:pageData.titleDetail.baseTop+'px',
-				width:pageData.titleDetail.baseWidth+'px',
-				height:pageData.titleDetail.baseHeight+'px',
-			}:{
-				left:'90px',top:'34.65px',width:'612px',height:'44.1px'
-			}">
-			<div class="title" v-html="pageData.title"></div>
+				 left:pageData.titleDetail.left+'%',
+						top:pageData.titleDetail.top+'%',
+						width:pageData.titleDetail.width+'%',
+						height:pageData.titleDetail.height+'%',
+				}:{
+						left:'10%',top:'6.6%',width:'68%',height:'5%',
+				}"
+		>
+			<div class="title" v-html="pageData.title"
+				:style="pageData.titleDetail?{
+						color:pageData.titleDetail.color||'#333',
+						fontSize:(pageData.titleDetail.fontSize||22)+'px',
+						fontFamily:pageData.titleDetail.fontFamily||'helvetica'
+				}:{ color:'#333',fontSize:'22px',fontFamily:'helvetica' }"
+			></div>
 		</div>
 		<div class="ppt-content-box">
 			<div class="container">