删除多余代码 及修复数据源bug

src/views/Editor/Toolbar/ElementTemplateData.vue

@@ -215,9 +215,9 @@
                     if(item.type=="text"||item.type=="image") {
                         item.TemplateList = JSON.parse(JSON.stringify(TemplateList))
                         item.TemplateDataSource = {
-                            Content: item.TemplateDataSource.Content,
-                            Name: item.TemplateDataSource.Name,
-                            Id: item.TemplateDataSource.Id,
+                            Content: item.TemplateDataSource&&item.TemplateDataSource.Content?item.TemplateDataSource.Content:'',
+                            Name: item.TemplateDataSource&&item.TemplateDataSource.Name?item.TemplateDataSource.Name:'',
+                            Id: item.TemplateDataSource&&item.TemplateDataSource.Id?item.TemplateDataSource.Id: null as Number,
                         }
                         if(datas.DataSource.pageType!=1){
                             let index = item.TemplateDataSource&&item.TemplateDataSource.index>=0?item.TemplateDataSource.index:null as Number
@@ -318,50 +318,8 @@
     // 所有数据源
     const AllDataSource = () => {
         if(SourceLoading.value) setNewDatasList(datas.DataSource)
-        // getPageType()
+        getPageType()
         datas.DataSource.DataSourceOverlay = !datas.DataSource.DataSourceOverlay
-        return
-        if(slides.value.elements&&slides.value.elements.length==0){
-            return ElMessage({
-                showClose: true,
-                message: '请完善PDF内容填充',
-                type: 'warning',
-            })
-        }
-        // 绑定数据源
-        const newElements = slides.value.find((slide,indexs) => {
-            return slideIndex.value==indexs
-        })
-        datas.DataSource.DataSourceOverlay = !datas.DataSource.DataSourceOverlay
-        let TemplateList = TemplateDataSource.value.filter(x=>{
-            return x.FiledType==newElements.pageType
-        })
-        datas.DataSource.DataSourceList = []
-        newElements.elements.forEach(slide=>{
-            if(slide.type=="text"||slide.type=="image") {
-                let contentStr
-                if(slide.type=="text") contentStr = getHtmlPlainText(slide.content)
-                if(slide.type=="image") contentStr = slide.src
-                let Obj = {}
-                Obj = {
-                    ...slide,
-                    contentStr: contentStr,
-                    TemplateList: TemplateList,
-                    TemplateDataSource: {
-                        Content: slide.TemplateDataSource&&slide.TemplateDataSource.Content?slide.TemplateDataSource.Content:'',
-                        Name: slide.TemplateDataSource&&slide.TemplateDataSource.Name?slide.TemplateDataSource.Name:'',
-                        Id: slide.TemplateDataSource&&slide.TemplateDataSource.Id?slide.TemplateDataSource.Id:null as Number,
-                    },
-                }
-                if(newElements.pageType!=1){
-                    let index = slide.TemplateDataSource&&slide.TemplateDataSource.index>=0?slide.TemplateDataSource.index:null as Number
-                    Reflect.set(Obj.TemplateDataSource, 'index', index)
-                }
-                if(Obj){
-                    datas.DataSource.DataSourceList.push(Obj)
-                }
-            }
-        })
     }