初始化行程数据排序

src/views/Editor/DataaSource/index.vue

@@ -2,6 +2,11 @@
         <div v-if="datas.DataSource.DataSourceOverlay">
             <div class="DataaSourceOverlay" @click="OffDataSource"></div>
             <div class="DataaSource">
+                <div class="DataaSourceButtom">
+                    <el-button type="primary"
+                    style="color: #ffff;"
+                    @click="setNewDatas()">暂存选择</el-button>
+                </div>
                 <div class="DataaSourceList">
                     <el-table
                     :data="datas.DataSource.DataSourceList"
@@ -31,7 +36,7 @@
                                     <el-select v-model="scope.row.TemplateDataSource.index"
                                     clearable class="m-2" 
                                     placeholder="请选择排序"
-                                    @change="setTemplateDataSource()">
+                                    @change="setTemplateDataSource(scope.row.TemplateDataSource.Id,scope.$index,1)">
                                     <el-option
                                         v-for="item in datas.sortList"
                                         :key="item"
@@ -131,8 +136,9 @@
         }
     }
     // 数据源关键数据赋值
-    const setTemplateDataSource = (Id,index) => {
+    const setTemplateDataSource = (Id,index,type) => {
         datas.loading = true
+        if(type) return
         datas.DataSource.DataSourceList.forEach((x,indexs)=>{
             if(index==indexs){
                 let obj = x.TemplateList.find(y=>{
@@ -141,7 +147,6 @@
                 if(obj){
                     x.TemplateDataSource.Content = obj.Content
                     x.TemplateDataSource.Name = obj.Name
-                    x.TemplateDataSource.index = obj.index
                 }else{
                     x.TemplateDataSource.Content = ''
                     x.TemplateDataSource.Name = ''
@@ -181,12 +186,16 @@
         right: 300px;
         bottom: 30px;
         z-index: 2;
-        padding: 40px;
+        padding: 20px 40px 40px 40px;
         border-radius: 10px;
         background: #fff;
     }
+    .DataaSourceButtom{
+        text-align: right;
+        padding-bottom: 10px;
+    }
     .DataaSourceList{
-        height: 100%;
+        height: 96%;
         border: 1px solid #ebeef5;
         padding: 20px;
         border-radius: 5px;

src/views/Editor/EditorHeader/index.vue

@@ -233,6 +233,7 @@ const SetTripTemplateSlide = async () => {
         message: '操作成功',
         type: 'success',
       })
+      datas.DataSource.DataSourceOverlay = false
       dataLoadingStore.setDataLoading(1)
     }else{
       ElMessage({

src/views/Editor/Thumbnails/index.vue

@@ -185,8 +185,12 @@ const GetTripFiledData = async () =>{
                         temp={key:oo,index:0}
                         cursors.push(temp)
                       }
-                      if(value[oo].length>temp.index) value=value[oo][temp.index]
-                      else value=value[oo]
+                      if(y.TemplateDataSource.index!=null&&y.TemplateDataSource.index>=0){
+                        if(value[oo].length>temp.index) value=value[oo][y.TemplateDataSource.index]
+                      }else{
+                        if(value[oo].length>temp.index) value=value[oo][temp.index]
+                        else value=value[oo]
+                      }
                     }else{
                       value=value[oo]
                     }
@@ -263,7 +267,7 @@ const GetTripTemplate = async () =>{
         slidesStore.setSlides(newSlides)
         layoutsStore.setLayouts(JSON.parse(JSON.stringify(newSlides)))
         CoverImgStore.setCoverImg(dataRes.data.data.CoverImg)
-        
+
         queryObj.value.TempId = dataRes.data.data.TempId
         queryObj.value.LineId = dataRes.data.data.LineId
         queryObj.value.LineName = dataRes.data.data.LineName
@@ -277,6 +281,7 @@ const GetTripTemplate = async () =>{
         queryObj.value.ColorStr = dataRes.data.data.ColorStr
         queryObj.value.TempType = dataRes.data.data.TempType
         slidesStore.updateSlideIndex(0)
+        datas.DataSource.pageType = newSlides[0].pageType
         if(TempId.value&&!searchData.value.TempId) await GetTripConfig()
         if(ConfigId.value==0) return 
         await GetTripFiledData()

src/views/Editor/Toolbar/ElementTemplateData.vue

@@ -202,6 +202,7 @@
         const newSlides = slides.value
         newSlides.forEach((slide,indexs)=>{
             if(slideIndex.value==indexs){
+                slide.pageType = datas.DataSource.pageType
                 datas.DataSource.DataSourceList = []
                 slide.elements.forEach(item=>{
                     if(item.type=="text"||item.type=="image") {