Commit 4e84451e authored by zhengke's avatar zhengke

FiledTypeStr 改成 contentStr 纯文本内容

parent 7d7a65bd
......@@ -154,7 +154,7 @@ export interface DataSourceType {
*
* vertical?: 竖向文本
*
* FiledTypeStr?: 纯文本内容
* contentStr?: 纯文本内容
*/
export interface PPTTextElement extends PPTBaseElement {
type: 'text'
......@@ -169,7 +169,7 @@ export interface PPTTextElement extends PPTBaseElement {
shadow?: PPTElementShadow
paragraphSpace?: number
vertical?: boolean,
FiledTypeStr?: string,
contentStr?: string,
TemplateList?: unknown,
TemplateDataSource?: DataSourceType,
}
......
......@@ -90,7 +90,7 @@ export const ResolveText = (item: any, index: number,offsetLeft:number,offsetTop
lineHeight: leading,
wordSpace: tracking,
vertical: isVertical,
FiledTypeStr: content
contentStr: content
}
if (textShadow) element.shadow = textShadow
......
......@@ -19,11 +19,11 @@
<template #default="scope">
<div class="DataaSourceL">
<div v-if="scope.row.type=='text'">
{{scope.row.FiledTypeStr}}
{{scope.row.contentStr}}
</div>
<div v-if="scope.row.type=='image'">
<img style="width: 20px; height: 20px"
:src="scope.row.FiledTypeStr" />
:src="scope.row.contentStr" />
</div>
</div>
</template>
......@@ -56,7 +56,6 @@
clearable class="m-2"
placeholder="请绑定数据源"
@change="setTemplateDataSource(scope.row.TemplateDataSource.Id,scope.$index)">
<!-- :disabled="scope.row.type=='image'&&item.Name.indexOf('图')==-1" -->
<el-option
v-for="item in setType(scope.row)"
:key="item.Id"
......@@ -128,7 +127,7 @@
x.TemplateDataSource.index = null
}
// if(x.type=="text"){
// x.FiledTypeStr = obj.Name
// x.contentStr = obj.Name
// x.content = x.content.replace(getHtmlPlainText(x.content),obj.Name)
// }
}
......
......@@ -351,13 +351,13 @@ const changeSlideIndex = (index: number) => {
datas.DataSource.DataSourceList = []
newElements&&newElements.elements&&newElements.elements.forEach(slide=>{
if(slide.type=="text"||slide.type=="image") {
let FiledTypeStr
if(slide.type=="text") FiledTypeStr = getHtmlPlainText(slide.content)
if(slide.type=="image") FiledTypeStr = slide.src
let contentStr
if(slide.type=="text") contentStr = getHtmlPlainText(slide.content)
if(slide.type=="image") contentStr = slide.src
let Obj = {}
Obj = {
...slide,
FiledTypeStr: FiledTypeStr,
contentStr: contentStr,
TemplateList: TemplateList,
TemplateDataSource: {
Content: slide.TemplateDataSource&&slide.TemplateDataSource.Content?slide.TemplateDataSource.Content:'',
......
......@@ -217,14 +217,14 @@
let index = item.TemplateDataSource&&item.TemplateDataSource.index>=0?item.TemplateDataSource.index:null as Number
Reflect.set(item.TemplateDataSource, 'index', index)
}
let FiledTypeStr
if(item.type=="text") FiledTypeStr = getHtmlPlainText(item.content)
if(item.type=="image") FiledTypeStr = item.src
let contentStr
if(item.type=="text") contentStr = getHtmlPlainText(item.content)
if(item.type=="image") contentStr = item.src
let Obj = {}
Obj = {
...item,
FiledTypeStr: FiledTypeStr,
contentStr: contentStr,
TemplateList: TemplateList,
TemplateDataSource: {
Content: item.TemplateDataSource&&item.TemplateDataSource.Content?item.TemplateDataSource.Content:'',
......@@ -241,7 +241,6 @@
})
slidesStore.setSlides(JSON.parse(JSON.stringify(newSlides)))
}
getPageType()
const showInput = () => {
inputVisible.value = true
nextTick(() => {
......@@ -285,6 +284,7 @@
// 所有数据源
const AllDataSource = () => {
getPageType()
datas.DataSource.DataSourceOverlay = !datas.DataSource.DataSourceOverlay
return
if(slides.value.elements&&slides.value.elements.length==0){
......@@ -305,13 +305,13 @@
datas.DataSource.DataSourceList = []
newElements.elements.forEach(slide=>{
if(slide.type=="text"||slide.type=="image") {
let FiledTypeStr
if(slide.type=="text") FiledTypeStr = getHtmlPlainText(slide.content)
if(slide.type=="image") FiledTypeStr = slide.src
let contentStr
if(slide.type=="text") contentStr = getHtmlPlainText(slide.content)
if(slide.type=="image") contentStr = slide.src
let Obj = {}
Obj = {
...slide,
FiledTypeStr: FiledTypeStr,
contentStr: contentStr,
TemplateList: TemplateList,
TemplateDataSource: {
Content: slide.TemplateDataSource&&slide.TemplateDataSource.Content?slide.TemplateDataSource.Content:'',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment