Merge remote-tracking branch 'origin/ETA_2.4.0' into debug

# Conflicts:
#	services/ppt.go

controllers/ppt_english.go

@@ -216,6 +216,12 @@ func (this *PptEnglishController) AddPpt() {
 				return
 			}
 		}
+
+		// 合并ppt后，将ppt的表格关系做处理
+		if len(req.MergePptIdList) > 0 {
+			services.HandlerMergePptTableReferenced(req.MergePptIdList, int(newId), this.SysUser.AdminId, this.SysUser.RealName, utils.TableReferencedByEnPPT)
+		}
+
 	} else {
 		newId = req.PptId
 

controllers/ppt_v2.go

@@ -222,7 +222,7 @@ func (this *PptV2Controller) AddPpt() {
 
 		// 合并ppt后，将ppt的表格关系做处理
 		if len(req.MergePptIdList) > 0 {
-			services.HandlerMergePptTableReferenced(req.MergePptIdList, int(newId), this.SysUser.AdminId, this.SysUser.RealName)
+			services.HandlerMergePptTableReferenced(req.MergePptIdList, int(newId), this.SysUser.AdminId, this.SysUser.RealName, utils.TableReferencedByPPT)
 		}
 	} else {
 		newId = req.PptId

models/ppt_english/ppt_english.go

@@ -125,6 +125,7 @@ type AddPptEnglishReq struct {
 	CoverContent    string                     `description:"PPT内容-JSON"`
 	TitleSetting    string                     `description:"PPT标题设置"`
 	ExcelReferences []excel.ExcelReferencesReq `description:"引用的Excel信息"`
+	MergePptIdList  []int                      `description:"合并的ppt的Id列表"`
 }
 
 type AddPptEnglishResp struct {

services/ppt.go

@@ -248,10 +248,10 @@ func pptContent2Html(content string, isEnglish bool) (htm string, err error) {
 							if len(chartIdInfo) == 2 {
 								v.ChartId = chartIdInfo[1]
 							}
-							htmlContent += fmt.Sprintf(`<iframe src="%s/chartshow?code=%s&fromPage=en&isETAForumChart=true&uid=%s" width="100%%" height="350" style="border-width:0px; min-height:350px;"></iframe>`, chartRoot, v.ChartId, v.Uid)
+							htmlContent += fmt.Sprintf(`<iframe src="%s/chartshow?code=%s&fromPage=en&isETAForumChart=true&uid=%s" width="100%%" height="350" style="border-width:0px; min-height:350px;" class="iframe%s"></iframe>`, chartRoot, v.ChartId, v.Uid, v.Uid)
 							break
 						}
-						htmlContent += fmt.Sprintf(`<iframe src="%s/chartshow?code=%s&fromPage=en&uid=%s" width="100%%" height="350" style="border-width:0px; min-height:350px;"></iframe>`, chartRoot, v.ChartId, v.Uid)
+						htmlContent += fmt.Sprintf(`<iframe src="%s/chartshow?code=%s&fromPage=en&uid=%s" width="100%%" height="350" style="border-width:0px; min-height:350px;" class="iframe%s"></iframe>`, chartRoot, v.ChartId, v.Uid, v.Uid)
 						break
 					}
 					if strings.HasPrefix(v.ChartId, "isETAForumChart_") {
@@ -259,12 +259,12 @@ func pptContent2Html(content string, isEnglish bool) (htm string, err error) {
 						if len(chartIdInfo) == 2 {
 							v.ChartId = chartIdInfo[1]
 						}
-						htmlContent += fmt.Sprintf(`<iframe src="%s/chartshow?code=%s&isETAForumChart=true&uid=%s" width="100%%" height="350" style="border-width:0px; min-height:350px;"></iframe>`, chartRoot, v.ChartId, v.Uid)
+						htmlContent += fmt.Sprintf(`<iframe src="%s/chartshow?code=%s&isETAForumChart=true&uid=%s" width="100%%" height="350" style="border-width:0px; min-height:350px;" class="iframe%s"></iframe>`, chartRoot, v.ChartId, v.Uid, v.Uid)
 						break
 					}
-					htmlContent += fmt.Sprintf(`<iframe src="%s/chartshow?code=%s&uid=%s" width="100%%" height="350" style="border-width:0px; min-height:350px;"></iframe>`, chartRoot, v.ChartId, v.Uid)
+					htmlContent += fmt.Sprintf(`<iframe src="%s/chartshow?code=%s&uid=%s" width="100%%" height="350" style="border-width:0px; min-height:350px;" class="iframe%s"></iframe>`, chartRoot, v.ChartId, v.Uid, v.Uid)
 				case ElementsTypeSheet:
-					htmlContent += fmt.Sprintf(`<iframe src="%s/sheetshow?code=%s&uid=%s" class="iframe%s" width="100%%" height="%s" style="border-width:0px;"></iframe>`, chartRoot, v.SheetId, v.Uid, v.SheetId, v.SheetHeight)
+					htmlContent += fmt.Sprintf(`<iframe src="%s/sheetshow?code=%s&uid=%s" class="iframe%s" width="100%%" height="%s" style="border-width:0px;" class="iframe%s"></iframe>`, chartRoot, v.SheetId, v.Uid, v.SheetId, v.SheetHeight, v.Uid)
 				}
 				htmlContent += htmlSuffix
 			}
@@ -597,7 +597,8 @@ func HandlerPptToEnPptTableReferenced(pptId, enPptId, sysUserId int, sysUserName
 // @param enPptId int
 // @param sysUserId int
 // @param sysUserName string
-func HandlerMergePptTableReferenced(oldPptIdList []int, pptId, sysUserId int, sysUserName string) {
+// @param fromScene int
+func HandlerMergePptTableReferenced(oldPptIdList []int, pptId, sysUserId int, sysUserName string, fromScene int) {
 	var err error
 	defer func() {
 		if err != nil {
@@ -605,7 +606,7 @@ func HandlerMergePptTableReferenced(oldPptIdList []int, pptId, sysUserId int, sy
 		}
 	}()
 
-	_, err = excel.CopyReferencedExcelConfigByReferencedIdListAndFromScene(oldPptIdList, utils.TableReferencedByPPT, pptId, utils.TableReferencedByPPT, sysUserId, sysUserName)
+	_, err = excel.CopyReferencedExcelConfigByReferencedIdListAndFromScene(oldPptIdList, fromScene, pptId, fromScene, sysUserId, sysUserName)
 	if err != nil {
 		return
 	}