Home Explore Help
Sign In
hongze
/
hongze_yb
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

fix: 报告详情海报

hsun 3 years ago
parent
030233e8ba
commit
0baf321c38
9 changed files with 44 additions and 11 deletions
Split View Show Diff Stats
  1. 12 1
      services/share_poster.go
  2. 4 2
      static/htm2img/activity_detail.html
  3. 4 3
      static/htm2img/activity_list.html
  4. 4 0
      static/htm2img/chart_detail.html
  5. 4 0
      static/htm2img/chart_list.html
  6. 4 0
      static/htm2img/report_detail.html
  7. 4 2
      static/htm2img/report_list.html
  8. 4 0
      static/htm2img/special_column_detail.html
  9. 4 3
      static/htm2img/special_column_list.html

+ 12 - 1
services/share_poster.go
View File 

@@ -361,7 +361,18 @@ func fillContent2Html(source, pars, sunCodeUrl string, height int) (contentStr s
 
 			err = tmpErr
 
 			return
 
 		}
 
-		abstract := doc.Text()
 
+		abstract := ""
 
+		doc.Find("p").Each(func(i int, s *goquery.Selection) {
 
+			phtml, tmpErr := s.Html()
 
+			if tmpErr != nil {
 
+				err = tmpErr
 
+				return
 
+			}
 
+			st := s.Text()
 
+			if st != "" && st != "<br>" && st != "<br style=\"max-width: 100%;\">" && !strings.Contains(st, "iframe") {
 
+				abstract = abstract + "<p>" + phtml + "</p>"
 
+			}
 
+		})
 
 		contentStr = strings.Replace(contentStr, "{{REPORT_TYPE}}", params.ReportType, 1)
 
 		contentStr = strings.Replace(contentStr, "{{REPORT_TITLE}}", params.ReportTitle, 1)
 
 		contentStr = strings.Replace(contentStr, "{{REPORT_ABSTRACT}}", abstract, 1)

+ 4 - 2
static/htm2img/activity_detail.html
View File 

@@ -53,13 +53,15 @@
 
             margin-left: auto;
 
             margin-right: auto;
 
         }
 
-        
-        
         .xcx-img{
 
             width: 256px;
 
             height: 256px;
 
             float: right;
 
         }
 
+        p,span{
 
+            margin: 0 !important;
 
+            padding: 0 !important;
 
+        }
 
     </style>
 
 </head>
 
 <body>

+ 4 - 3
static/htm2img/activity_list.html
View File 

@@ -92,14 +92,15 @@
 
             padding: 8px 32px;
 
             border-top-right-radius: 24px;
 
         }
 
-        
-        
-        
         .xcx-img{
 
             width: 256px;
 
             height: 256px;
 
             float: right;
 
         }
 
+        p,span{
 
+            margin: 0 !important;
 
+            padding: 0 !important;
 
+        }
 
     </style>
 
 </head>
 
 <body>

+ 4 - 0
static/htm2img/chart_detail.html
View File 

@@ -52,6 +52,10 @@
 
             height: 256px;
 
             float: right;
 
         }
 
+        p,span{
 
+            margin: 0 !important;
 
+            padding: 0 !important;
 
+        }
 
     </style>
 
 </head>
 
 <body>

+ 4 - 0
static/htm2img/chart_list.html
View File 

@@ -72,6 +72,10 @@
 
             height: 256px;
 
             float: right;
 
         }
 
+        p,span{
 
+            margin: 0 !important;
 
+            padding: 0 !important;
 
+        }
 
     </style>
 
 </head>
 
 <body>

+ 4 - 0
static/htm2img/report_detail.html
View File 

@@ -85,6 +85,10 @@
 
         .content-box iframe {
 
           display: none;
 
         }
 
+        p,span{
 
+            margin: 0 !important;
 
+            padding: 0 !important;
 
+        }
 
     </style>
 
 </head>
 
 <body>

+ 4 - 2
static/htm2img/report_list.html
View File 

@@ -81,13 +81,15 @@
 
             position: relative;
 
             top: 12px;
 
         }
 
-        
-        
         .xcx-img{
 
             width: 256px;
 
             height: 256px;
 
             float: right;
 
         }
 
+        p,span{
 
+            margin: 0 !important;
 
+            padding: 0 !important;
 
+        }
 
     </style>
 
 </head>
 
 <body>

+ 4 - 0
static/htm2img/special_column_detail.html
View File 

@@ -59,6 +59,10 @@
 
             height: 256px;
 
             float: right;
 
         }
 
+        p,span{
 
+            margin: 0 !important;
 
+            padding: 0 !important;
 
+        }
 
     </style>
 
 </head>
 
 <body>

+ 4 - 3
static/htm2img/special_column_list.html
View File 

@@ -116,14 +116,15 @@
 
             border-bottom-left-radius: 32px;
 
             border-top-right-radius: 24px;
 
         }
 
-        
-        
-        
         .xcx-img{
 
             width: 256px;
 
             height: 256px;
 
             float: right;
 
         }
 
+        p,span{
 
+            margin: 0 !important;
 
+            padding: 0 !important;
 
+        }
 
     </style>
 
 </head>
 
 <body>