Merge branch 'feature/v4.9.9_ws' of https://jygit.jydev.jianyu360.cn/qmx/jy into feature/v4.9.9_ws

src/jfw/modules/subscribepay/src/util/dataExportExcel.go

@@ -184,11 +184,10 @@ func CreateDataExportExcelFile(list *[]map[string]interface{}, isSenior bool, fi
 						if v.Filed != "legal_person" && v.Filed != "company_phone" && v.Filed != "company_email" && v.Filed != "company_name" {
 							if index == 0 {
 								cell.VMerge = winnerTotal - 1
+
 								if v.Filed == "title" || v.Filed == "url" {
-									//cell.SetFormula(fmt.Sprintf("=HYPERLINK(\"%s\",\"%s\")", data["url_jump"], data[v.Filed]))
 									cell.SetHyperlink(qutil.ObjToString(data["url_jump"]), qutil.ObjToString(data[v.Filed]), "")
 								} else if v.Filed == "href" {
-									//cell.SetFormula(fmt.Sprintf("=HYPERLINK(\"%s\",\"%s\")", data["href"], data[v.Filed]))
 									cell.SetHyperlink(qutil.ObjToString(data["href"]), qutil.ObjToString(data[v.Filed]), "")
 								} else {
 									cell.SetValue(data[v.Filed])
@@ -217,11 +216,9 @@ func CreateDataExportExcelFile(list *[]map[string]interface{}, isSenior bool, fi
 						Alignment: defaultExcelAlignment,
 					}
 					if v.Filed == "title" || v.Filed == "url" {
-						cell.SetFormula(fmt.Sprintf("=HYPERLINK(\"%s\",\"%s\")", data["url_jump"], data[v.Filed]))
-						//cell.SetHyperlink(qutil.ObjToString(data["url_jump"]), qutil.ObjToString(data[v.Filed]), "")
+						cell.SetHyperlink(qutil.ObjToString(data["url_jump"]), qutil.ObjToString(data[v.Filed]), "")
 					} else if v.Filed == "href" {
-						cell.SetFormula(fmt.Sprintf("=HYPERLINK(\"%s\",\"%s\")", data["href"], data[v.Filed]))
-						//cell.SetHyperlink(qutil.ObjToString(data["href"]), qutil.ObjToString(data[v.Filed]), "")
+						cell.SetHyperlink(qutil.ObjToString(data["href"]), qutil.ObjToString(data[v.Filed]), "")
 					} else {
 						cell.SetValue(data[v.Filed])
 					}