Update app.py

app.py

@@ -119,13 +119,15 @@ def create_print_layout(data, title, date_str):
     png_fig = plt.figure(figsize=(5.83, 8.27), dpi=300) # A5 竖向
     png_ax_container = png_fig.add_subplot(111) # 创建一个容器轴，用于隐藏外部边框
     png_ax_container.set_axis_off()
-    png_fig.subplots_adjust(left=0.05, right=0.95, top=0.95, bottom=0.05)
+    # 减小边距，例如从 0.05 减小到 0.02
+    png_fig.subplots_adjust(left=0.02, right=0.98, top=0.98, bottom=0.02)
 
     # --- 创建 PDF 图形 ---
     pdf_fig = plt.figure(figsize=(5.83, 8.27), dpi=300) # A5 竖向
     pdf_ax_container = pdf_fig.add_subplot(111)
     pdf_ax_container.set_axis_off()
-    pdf_fig.subplots_adjust(left=0.05, right=0.95, top=0.95, bottom=0.05)
+    # 减小边距，例如从 0.05 减小到 0.02
+    pdf_fig.subplots_adjust(left=0.02, right=0.98, top=0.98, bottom=0.02)
 
     # --- 内部绘图函数 ---
     def process_figure(fig, is_pdf=False):
@@ -139,7 +141,8 @@ def create_print_layout(data, title, date_str):
         num_rows = math.ceil(total_items / num_cols)
 
         # 创建网格 (在 figure 内部创建)
-        gs = gridspec.GridSpec(num_rows + 1, num_cols, hspace=0.1, wspace=0.1, height_ratios=[0.2] + [1] * num_rows, figure=fig) # 将日期行放在顶部
+        # 减小子图间距 hspace/wspace，减小日期行高度比例 height_ratios
+        gs = gridspec.GridSpec(num_rows + 1, num_cols, hspace=0.05, wspace=0.05, height_ratios=[0.1] + [1] * num_rows, figure=fig) # 将日期行放在顶部
 
         # 调整基础字体大小，避免过大或过小
         # A5 宽度大约 1749 像素 @ 300dpi, 高度 2481
@@ -217,7 +220,8 @@ def create_print_layout(data, title, date_str):
 
     # --- 保存 PNG ---
     png_buffer = io.BytesIO()
-    png_fig.savefig(png_buffer, format='png', bbox_inches='tight', pad_inches=0.05)
+    # 可以尝试减小 pad_inches，甚至设为 0
+    png_fig.savefig(png_buffer, format='png', bbox_inches='tight', pad_inches=0.02)
     png_buffer.seek(0)
     png_base64 = base64.b64encode(png_buffer.getvalue()).decode()
     plt.close(png_fig)
@@ -225,7 +229,8 @@ def create_print_layout(data, title, date_str):
     # --- 保存 PDF ---
     pdf_buffer = io.BytesIO()
     with PdfPages(pdf_buffer) as pdf:
-        pdf.savefig(pdf_fig, bbox_inches='tight', pad_inches=0.05)
+        # 可以尝试减小 pad_inches，甚至设为 0
+        pdf.savefig(pdf_fig, bbox_inches='tight', pad_inches=0.02)
     pdf_buffer.seek(0)
     pdf_base64 = base64.b64encode(pdf_buffer.getvalue()).decode()
     plt.close(pdf_fig)
@@ -245,7 +250,7 @@ def display_pdf(base64_pdf):
 st.set_page_config(page_title="散厅时间快捷打印", layout="wide")
 st.title("散厅时间快捷打印")
 
-uploaded_file = st.file_uploader("上传【放映场次核对表.xls】文件", type=["xls"])
+uploaded_file = st.file_uploader("上传【放映场次核对表.xls】文件", type=["xls", "xlsx"])
 
 if uploaded_file:
     part1, part2, date_str = process_schedule(uploaded_file)