Merge branch 'gn2.6' into debug

src/views/ppt_manage/newVersion/components/catalog/addPptBaseDia.vue

@@ -131,6 +131,7 @@
 import { pptInterface } from '@/api/api.js';
 import chooseCooperaUserDia from '@/views/report_manage/reportV2/components/chooseCooperaUserDia.vue';
 import chooseInherReportDia from '@/views/report_manage/reportV2/components/chooseInherReportDia.vue';
+import { apiSmartReport } from '@/api/modules/smartReport'
 export default {
   name: "BaseInfo",
   components: { chooseCooperaUserDia,chooseInherReportDia },
@@ -156,6 +157,8 @@ export default {
       if (!n) return
       
       this.getclassifylist();
+      this.getBackCoverList()
+      this.getBackGroundList()
       
       if (this.reportInfo) {
           this.formData = {
@@ -183,7 +186,13 @@ export default {
         classify: 0,
         title: "",
         cooperationType: 1,//协作方式
-        cooperationUsers: []
+        cooperationUsers: [],
+        FirstPage:{
+          CurrentBackgroundImg: "", 
+          BackCoverImg: "", 
+          CurrentBackgroundImgId: 0, 
+          BackCoverImgId: 0, 
+        }
       },
 
       classifyArr: [],
@@ -232,7 +241,13 @@ export default {
         classify: 0,
         title: "",
         cooperationType: 1,//协作方式
-        cooperationUsers: []
+        cooperationUsers: [],
+        FirstPage:{
+          CurrentBackgroundImg: "", 
+          BackCoverImg: "", 
+          CurrentBackgroundImgId: 0, 
+          BackCoverImgId: 0, 
+        }
       }
 
       this.$emit("update:show", false);
@@ -247,7 +262,8 @@ export default {
         Title: this.formData.title,
         CollaborateType: this.formData.cooperationType,
         InheritPptId: this.formData.inheritId,
-        CollaborateUserIds: this.formData.cooperationUsers.map(_ => _.NodeId)
+        CollaborateUserIds: this.formData.cooperationUsers.map(_ => _.NodeId),
+        FirstPage:this.formData.FirstPage
       };
 
       // 编辑
@@ -374,6 +390,37 @@ export default {
       });
     },
 
+    // 获取封底列表
+    getBackCoverList(){
+      apiSmartReport.pptMaterialList({
+          CurrentIndex: 1,
+          PageSize: 1000,
+          ImageType: 3,
+          ImageName: '',
+          ConfType: 1
+      }).then(res => {
+        if(res.Data.List){
+          this.formData.FirstPage.BackCoverImg=res.Data.List[0].Url
+          this.formData.FirstPage.BackCoverImgId=res.Data.List[0].ImageConfId
+        }
+      })
+    },
+    // 获取背景列表
+    getBackGroundList(){
+      apiSmartReport.pptMaterialList({
+          CurrentIndex: 1,
+          PageSize: 1000,
+          ImageType: 2,
+          ImageName: '',
+          ConfType: 1
+      }).then(res => {
+        if(res.Data.List){
+          this.formData.FirstPage.CurrentBackgroundImg=res.Data.List[0].Url
+          this.formData.FirstPage.CurrentBackgroundImgId=res.Data.List[0].ImageConfId
+        }
+      })
+    },
+
     filterNodes(arr) {
 			arr.length && arr.forEach(item => {
 				if(item.Child && item.Child.length) {

src/views/ppt_manage/newVersion/components/formatEl/ChartEl.vue

@@ -52,7 +52,7 @@
       </div>
     </el-tooltip>
     <!-- 图表说明 -->
-    <el-tooltip  v-if="showInstruction()" popper-class="tooltip-width" :offset="-40" effect="dark" :content="chartInstructions.text" placement="top-end">
+    <el-tooltip  v-if="showInstruction()" popper-class="tooltip-width" :offset="-40" effect="dark" :content="chartInstructions.text" :placement="!showSource()?'top-start':'top-end'">
       <div 
         class="chart-instruction text_oneLine"
         :class="{'show-width':!showSource()}"

src/views/ppt_manage/newVersion/components/formatEl/SheetEl.vue

@@ -52,15 +52,16 @@
       @click.stop="delChart(position)"
       v-if="isBtnShow"
     ></div>
-  <div class="chart-source">
-    <span
-      v-if="sheetSourceFrom && sheetSourceFrom.isShow"
-      :style="`
-      color: ${sheetSourceFrom.isShow ? sheetSourceFrom.color : '#999'};
-      font-size: ${ sheetSourceFrom.fontSize }px;
-    `"
-    ><!-- 来源 -->{{$t('ETable.Common.source')}}:{{ sheetSourceFrom.text}}</span>
-  </div>
+  <el-tooltip v-if="sheetSourceFrom && sheetSourceFrom.isShow" popper-class="tooltip-width" :offset="50" effect="dark" :content="sheetSourceFrom.text" placement="top-start">
+    <div class="chart-source">
+      <span
+        :style="`
+        color: ${sheetSourceFrom.isShow ? sheetSourceFrom.color : '#999'};
+        font-size: ${ sheetSourceFrom.fontSize }px;
+      `"
+      ><!-- 来源 -->{{$t('ETable.Common.source')}}:{{ sheetSourceFrom.text}}</span>
+    </div>
+  </el-tooltip>
 </div>
   
 </template>