Przeglądaj źródła

fix:兼容处理ubuntu中libreoffice对于空格的处理

Roc 3 lat temu
rodzic
commit
944c421dfb
2 zmienionych plików z 7 dodań i 3 usunięć
  1. 1 1
      services/contract/contract_approval.go
  2. 6 2
      services/word.go

+ 1 - 1
services/contract/contract_approval.go

@@ -718,7 +718,7 @@ func AfterApproved(contractId int) (err error) {
 
 		//生成word
 		wordPath := fmt.Sprint("./static/系统生成合同_", contractDetail.ContractId, ".docx")
-		tmpErr := services.GenerateWordV2(contractDetail, wordPath)
+		tmpErr := services.GenerateWordV2(contractDetail, wordPath, true)
 		if tmpErr != nil {
 			err = tmpErr
 			return

+ 6 - 2
services/word.go

@@ -1079,7 +1079,7 @@ type WordElement struct {
 }
 
 // GenerateWordV2 生成word
-func GenerateWordV2(contractDetail *contract.ContractDetail, wordPath string) (err error) {
+func GenerateWordV2(contractDetail *contract.ContractDetail, wordPath string, isWordToPdf bool) (err error) {
 	contractTemplate, err := contract_template.GetContractTemplateByTemplateId(contractDetail.TemplateId)
 	if err != nil {
 		return
@@ -1446,7 +1446,11 @@ func GenerateWordV2(contractDetail *contract.ContractDetail, wordPath string) (e
 				if data.ElementType == "column" {
 					for j := 0; j < addTabNum; j++ {
 						//headerRun.AddTab()
-						printContent = "  " + printContent
+						tabStr := "  "
+						if isWordToPdf && utils.RunMode == "release" {
+							tabStr = "   "
+						}
+						printContent = tabStr + printContent
 					}
 				}
 				fontSize := text.FontSize