From c73534823e428b216a51555f98d794b7d2a759f4 Mon Sep 17 00:00:00 2001
From: Seagull-Ling <1299890870@qq.com>
Date: Fri, 24 Apr 2026 16:34:21 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E7=9C=8B=E6=9D=BF):=20=E6=B7=BB=E5=8A=A0?=
=?UTF-8?q?=E6=94=B6=E8=97=8F=E5=8A=9F=E8=83=BD=E5=92=8C=E5=AF=BC=E5=87=BA?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=E5=B7=A5=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 新增FavoritesManager类实现看板收藏功能
- 添加ExportManager类提供数据导出管理
- 重构main.py支持多选叠加显示和对比模式
- 实现数据收集装饰器自动捕获图表数据
- 添加侧边栏UI组件管理收藏和导出功能
---
.favorites.json | 5 +
enhanced_tool.py | 364 +++++++++++++++++++++++++++++++++++++++++++++++
main.py | 222 +++++++++++++++++++++++++++--
3 files changed, 576 insertions(+), 15 deletions(-)
create mode 100644 .favorites.json
create mode 100644 enhanced_tool.py
diff --git a/.favorites.json b/.favorites.json
new file mode 100644
index 0000000..6464edb
--- /dev/null
+++ b/.favorites.json
@@ -0,0 +1,5 @@
+[
+ "股票市场",
+ "债券利率",
+ "GDP分析"
+]
\ No newline at end of file
diff --git a/enhanced_tool.py b/enhanced_tool.py
new file mode 100644
index 0000000..13e5426
--- /dev/null
+++ b/enhanced_tool.py
@@ -0,0 +1,364 @@
+import os
+import json
+import datetime
+import pandas as pd
+import streamlit as st
+from io import BytesIO
+from functools import wraps
+
+
+class FavoritesManager:
+ def __init__(self, storage_file=".favorites.json"):
+ self.storage_file = storage_file
+ self.favorites = self._load_favorites()
+
+ def _load_favorites(self):
+ if os.path.exists(self.storage_file):
+ try:
+ with open(self.storage_file, 'r', encoding='utf-8') as f:
+ return json.load(f)
+ except:
+ return []
+ return []
+
+ def _save_favorites(self):
+ with open(self.storage_file, 'w', encoding='utf-8') as f:
+ json.dump(self.favorites, f, ensure_ascii=False, indent=2)
+
+ def add_favorite(self, item_name):
+ if item_name not in self.favorites:
+ self.favorites.append(item_name)
+ self._save_favorites()
+ return True
+ return False
+
+ def remove_favorite(self, item_name):
+ if item_name in self.favorites:
+ self.favorites.remove(item_name)
+ self._save_favorites()
+ return True
+ return False
+
+ def is_favorite(self, item_name):
+ return item_name in self.favorites
+
+ def get_favorites(self):
+ return self.favorites.copy()
+
+
+def get_favorites_manager():
+ if 'favorites_manager' not in st.session_state:
+ st.session_state.favorites_manager = FavoritesManager()
+ return st.session_state.favorites_manager
+
+
+class DataCollector:
+ def __init__(self):
+ self.collected_data = {}
+ self.collected_filters = {}
+ self._counter = 0
+
+ def _get_unique_key(self, name):
+ self._counter += 1
+ return f"{name}_{self._counter}"
+
+ def collect_data(self, name, df, filters=None, description=""):
+ key = self._get_unique_key(name)
+ if isinstance(df, pd.DataFrame) or isinstance(df, pd.Series):
+ self.collected_data[key] = {
+ "name": name,
+ "data": df.copy() if isinstance(df, pd.DataFrame) else df.copy(),
+ "filters": filters or {},
+ "description": description,
+ "timestamp": datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+ }
+ for filter_key, filter_value in (filters or {}).items():
+ self.collected_filters[f"{name}: {filter_key}"] = filter_value
+ return df
+
+ def get_all_data(self):
+ return self.collected_data.copy()
+
+ def get_all_filters(self):
+ return self.collected_filters.copy()
+
+ def clear(self):
+ self.collected_data = {}
+ self.collected_filters = {}
+ self._counter = 0
+
+
+def get_data_collector():
+ if 'data_collector' not in st.session_state:
+ st.session_state.data_collector = DataCollector()
+ return st.session_state.data_collector
+
+
+def reset_data_collector():
+ st.session_state.data_collector = DataCollector()
+
+
+def collect_chart_data(name, filters=None, description=""):
+ def decorator(func):
+ @wraps(func)
+ def wrapper(*args, **kwargs):
+ result = func(*args, **kwargs)
+ collector = get_data_collector()
+ if hasattr(args[0] if args else None, 'df'):
+ df = getattr(args[0], 'df', None)
+ if df is not None:
+ collector.collect_data(name, df, filters, description)
+ return result
+ return wrapper
+ return decorator
+
+
+class ComparisonMode:
+ @staticmethod
+ def wrap_chart(chart_func, chart_name, chart_key):
+ st.markdown(f"**{chart_name}**")
+
+ col1, col2 = st.columns([3, 1])
+ with col2:
+ enable_comparison = st.checkbox(
+ "开启对比模式",
+ key=f"comparison_mode_{chart_key}",
+ value=False
+ )
+
+ if enable_comparison:
+ main_col, compare_col = st.columns(2)
+ with main_col:
+ st.markdown("**主要视图**")
+ with st.container():
+ chart_func()
+
+ with compare_col:
+ st.markdown("**对比视图**")
+ with st.container():
+ st.info("对比模式 - 可独立选择时间范围")
+ chart_func()
+ else:
+ chart_func()
+
+
+class ExportManager:
+ def __init__(self):
+ self.export_data = {}
+ self.filter_conditions = {}
+ self.data_collector = get_data_collector()
+
+ def add_data(self, name, df, description=""):
+ self.export_data[name] = {
+ "data": df,
+ "description": description
+ }
+
+ def add_filter_condition(self, key, value):
+ self.filter_conditions[key] = value
+
+ def _get_all_collected_data(self):
+ all_data = {}
+ all_data.update(self.export_data)
+
+ collected = self.data_collector.get_all_data()
+ for key, info in collected.items():
+ all_data[key] = {
+ "data": info["data"],
+ "description": info.get("description", "")
+ }
+
+ return all_data
+
+ def _get_all_filters(self):
+ all_filters = {}
+ all_filters.update(self.filter_conditions)
+ all_filters.update(self.data_collector.get_all_filters())
+ return all_filters
+
+ def generate_excel_report(self):
+ output = BytesIO()
+ all_data = self._get_all_collected_data()
+ all_filters = self._get_all_filters()
+
+ with pd.ExcelWriter(output, engine='openpyxl') as writer:
+ if all_filters:
+ filter_df = pd.DataFrame(
+ list(all_filters.items()),
+ columns=['筛选条件', '值']
+ )
+ filter_df.to_excel(writer, sheet_name='筛选条件', index=False)
+
+ for name, info in all_data.items():
+ safe_sheet_name = name[:31].replace('/', '_').replace('\\', '_').replace('*', '_').replace('?', '_').replace('[', '_').replace(']', '_').replace(':', '_')
+ df = info["data"]
+ if isinstance(df, pd.DataFrame):
+ df.to_excel(writer, sheet_name=safe_sheet_name, index=True)
+ elif isinstance(df, pd.Series):
+ df.to_excel(writer, sheet_name=safe_sheet_name, index=True)
+
+ output.seek(0)
+ return output
+
+ def generate_json_report(self):
+ all_data = self._get_all_collected_data()
+ all_filters = self._get_all_filters()
+
+ export_dict = {
+ "export_time": datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
+ "filter_conditions": all_filters,
+ "datasets": {}
+ }
+
+ for name, info in all_data.items():
+ df = info["data"]
+ if isinstance(df, pd.DataFrame):
+ export_dict["datasets"][name] = {
+ "description": info.get("description", ""),
+ "columns": list(df.columns),
+ "row_count": len(df),
+ "data": df.reset_index().to_dict(orient='records')
+ }
+ elif isinstance(df, pd.Series):
+ export_dict["datasets"][name] = {
+ "description": info.get("description", ""),
+ "row_count": len(df),
+ "data": df.reset_index().to_dict(orient='records')
+ }
+
+ return json.dumps(export_dict, ensure_ascii=False, indent=2, default=str)
+
+ def generate_csv_zip(self):
+ import zipfile
+ output = BytesIO()
+ all_data = self._get_all_collected_data()
+ all_filters = self._get_all_filters()
+
+ with zipfile.ZipFile(output, 'w', zipfile.ZIP_DEFLATED) as zf:
+ if all_filters:
+ filter_content = "筛选条件:\n"
+ for key, value in all_filters.items():
+ filter_content += f"{key}: {value}\n"
+ zf.writestr("筛选条件.txt", filter_content.encode('utf-8-sig'))
+
+ for name, info in all_data.items():
+ safe_name = name[:50].replace('/', '_').replace('\\', '_')
+ df = info["data"]
+ if isinstance(df, pd.DataFrame) or isinstance(df, pd.Series):
+ csv_content = df.to_csv(encoding='utf-8-sig')
+ zf.writestr(f"{safe_name}.csv", csv_content)
+
+ output.seek(0)
+ return output
+
+
+def get_export_manager():
+ if 'export_manager' not in st.session_state:
+ st.session_state.export_manager = ExportManager()
+ return st.session_state.export_manager
+
+
+def reset_export_manager():
+ st.session_state.export_manager = ExportManager()
+ reset_data_collector()
+
+
+def render_export_buttons():
+ st.sidebar.markdown("#### 导出格式")
+
+ col1, col2, col3 = st.sidebar.columns(3)
+
+ with col1:
+ excel_data = None
+ try:
+ if 'export_manager' in st.session_state:
+ excel_data = st.session_state.export_manager.generate_excel_report()
+ except:
+ pass
+
+ if excel_data:
+ st.download_button(
+ label="📥 Excel",
+ data=excel_data,
+ file_name=f"macropage_{datetime.datetime.now().strftime('%Y%m%d_%H%M%S')}.xlsx",
+ mime="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+ use_container_width=True,
+ help="导出为Excel格式，包含筛选条件和所有数据表"
+ )
+ else:
+ st.button("📥 Excel", use_container_width=True, disabled=True, help="请先选择看板查看数据")
+
+ with col2:
+ json_data = None
+ try:
+ if 'export_manager' in st.session_state:
+ json_data = st.session_state.export_manager.generate_json_report()
+ except:
+ pass
+
+ if json_data:
+ st.download_button(
+ label="📥 JSON",
+ data=json_data,
+ file_name=f"macropage_{datetime.datetime.now().strftime('%Y%m%d_%H%M%S')}.json",
+ mime="application/json",
+ use_container_width=True,
+ help="导出为JSON格式，包含完整数据结构"
+ )
+ else:
+ st.button("📥 JSON", use_container_width=True, disabled=True, help="请先选择看板查看数据")
+
+ with col3:
+ csv_data = None
+ try:
+ if 'export_manager' in st.session_state:
+ csv_data = st.session_state.export_manager.generate_csv_zip()
+ except:
+ pass
+
+ if csv_data:
+ st.download_button(
+ label="📥 CSV",
+ data=csv_data,
+ file_name=f"macropage_{datetime.datetime.now().strftime('%Y%m%d_%H%M%S')}.zip",
+ mime="application/zip",
+ use_container_width=True,
+ help="导出为CSV格式压缩包"
+ )
+ else:
+ st.button("📥 CSV", use_container_width=True, disabled=True, help="请先选择看板查看数据")
+
+ if st.sidebar.button("🔄 重置导出", use_container_width=True, help="清除当前收集的所有数据和筛选条件"):
+ reset_export_manager()
+ st.sidebar.success("已重置导出数据")
+ time.sleep(0.3)
+ st.rerun()
+
+ st.sidebar.markdown("""
+
+ 💡 提示：导出的数据是当前页面筛选后的结果，不是全量原始数据。
+ 选择看板后，数据会自动被收集用于导出。
+
+ """, unsafe_allow_html=True)
+
+
+def show_export_info():
+ collector = get_data_collector()
+ collected = collector.get_all_data()
+ filters = collector.get_all_filters()
+
+ if collected or filters:
+ with st.expander("📊 当前已收集的数据（用于导出）", expanded=False):
+ if filters:
+ st.markdown("**筛选条件：**")
+ for key, value in filters.items():
+ st.text(f" • {key}: {value}")
+
+ if collected:
+ st.markdown("**已收集的数据表：**")
+ for key, info in collected.items():
+ row_count = len(info["data"]) if isinstance(info["data"], (pd.DataFrame, pd.Series)) else 0
+ st.text(f" • {info['name']} ({row_count} 行)")
+
+
+import time
diff --git a/main.py b/main.py
index ece6047..a6c778f 100644
--- a/main.py
+++ b/main.py
@@ -7,6 +7,12 @@
import streamlit as st
from streamlit_echarts import st_echarts
from tool import preprocess_choice_data, get_choice_unit_arr
+from enhanced_tool import (
+ get_favorites_manager,
+ get_export_manager,
+ reset_export_manager,
+ render_export_buttons
+)
# 数据的列名不要有太多的:，不然会报错： If you are trying to use a column name that contains a colon, prefix it with a backslash; for example "column\:name" instead of "column:name".
@@ -1602,21 +1608,29 @@ def SeventyCityIndex_analysis():
seventy_city_index.class_city_plot()
-if __name__ == "__main__":
- st.sidebar.markdown("# 中国宏观经济看板")
- st.sidebar.markdown("作者：AFAN（微信：afan-life）")
- st.sidebar.markdown("项目介绍：[macropage](https://github.com/AFAN-LIFE/macropage)")
- selection = st.sidebar.radio("当前支持的分析图表：",
- ["股票市场", "债券利率", "GDP分析", "社会消费品零售总额分析", "进出口分析",
- "固定资产投资分析", "CPI和PPI分析",
- "PMI分析", "社融和货币供应分析", "财政数据分析", "人口就业分析", "外汇分析",
- "房地产投资分析", "70城房价指数", "美国宏观"
- # , "开发测试"
- ])
+DASHBOARD_OPTIONS = {
+ "股票市场": "股票市场分析",
+ "债券利率": "债券利率分析",
+ "GDP分析": "GDP分析",
+ "社会消费品零售总额分析": "社会消费品零售总额分析",
+ "进出口分析": "进出口分析",
+ "固定资产投资分析": "固定资产投资分析",
+ "CPI和PPI分析": "CPI和PPI分析",
+ "PMI分析": "PMI分析",
+ "社融和货币供应分析": "社融和货币供应分析",
+ "财政数据分析": "财政数据分析",
+ "人口就业分析": "人口就业分析",
+ "外汇分析": "外汇分析",
+ "房地产投资分析": "房地产投资分析",
+ "70城房价指数": "70城房价指数",
+ "美国宏观": "美国宏观分析"
+ }
+
+def render_dashboard(selection):
if selection == "股票市场":
from stock import stock_market_analysis
stock_market_analysis()
- if selection == "债券利率":
+ elif selection == "债券利率":
from bond_interest import bond_interest_analysis
bond_interest_analysis()
elif selection == "GDP分析":
@@ -1647,6 +1661,184 @@ def SeventyCityIndex_analysis():
from universe.america import AmericaBasic_analysis
AmericaBasic_analysis()
- # elif selection == "开发测试":
- # from test import test_func
- # test_func()
+if __name__ == "__main__":
+ st.sidebar.markdown("# 中国宏观经济看板")
+ st.sidebar.markdown("作者：AFAN（微信：afan-life）")
+ st.sidebar.markdown("项目介绍：[macropage](https://github.com/AFAN-LIFE/macropage)")
+
+ favorites_manager = get_favorites_manager()
+ favorites = favorites_manager.get_favorites()
+
+ valid_favorites = [f for f in favorites if f in DASHBOARD_OPTIONS]
+ other_options = [opt for opt in DASHBOARD_OPTIONS.keys() if opt not in valid_favorites]
+
+ st.sidebar.markdown("---")
+ st.sidebar.markdown("### 📁 我的常用看板")
+
+ if valid_favorites:
+ favorite_selection = st.sidebar.multiselect(
+ "从常用看板选择（可多选）",
+ options=valid_favorites,
+ default=[],
+ key="favorite_multiselect"
+ )
+ else:
+ st.sidebar.info("暂无收藏的看板，可从下方列表中收藏")
+ favorite_selection = []
+
+ st.sidebar.markdown("---")
+ st.sidebar.markdown("### 📊 全部看板")
+
+ all_selection = st.sidebar.multiselect(
+ "从全部看板选择（可多选，支持叠加显示）",
+ options=list(DASHBOARD_OPTIONS.keys()),
+ default=[],
+ key="all_multiselect"
+ )
+
+ final_selections = list(dict.fromkeys(favorite_selection + all_selection))
+
+ st.sidebar.markdown("---")
+ st.sidebar.markdown("### ⭐ 管理收藏")
+
+ favorite_manage = st.sidebar.selectbox(
+ "选择看板进行收藏管理",
+ options=["请选择..."] + list(DASHBOARD_OPTIONS.keys()),
+ key="favorite_manage_select"
+ )
+
+ if favorite_manage != "请选择...":
+ col1, col2 = st.sidebar.columns(2)
+ with col1:
+ if st.button("➕ 添加收藏", use_container_width=True):
+ if favorites_manager.add_favorite(favorite_manage):
+ st.sidebar.success(f"已收藏: {favorite_manage}")
+ time.sleep(0.5)
+ st.rerun()
+ else:
+ st.sidebar.warning("该看板已收藏")
+ with col2:
+ if st.button("➖ 取消收藏", use_container_width=True):
+ if favorites_manager.remove_favorite(favorite_manage):
+ st.sidebar.success(f"已取消收藏: {favorite_manage}")
+ time.sleep(0.5)
+ st.rerun()
+ else:
+ st.sidebar.warning("该看板未收藏")
+
+ st.sidebar.markdown("---")
+ st.sidebar.markdown("### 📤 导出当前视图")
+ render_export_buttons()
+
+ st.sidebar.markdown("---")
+ st.sidebar.markdown("### ⚙️ 显示设置")
+
+ enable_comparison = st.sidebar.checkbox(
+ "启用全局对比模式",
+ key="global_comparison_mode",
+ value=False,
+ help="为每个图表添加对比视图，可独立选择不同时间范围"
+ )
+
+ if final_selections:
+ if len(final_selections) == 1:
+ selection = final_selections[0]
+ if 'current_dashboard' not in st.session_state or st.session_state.current_dashboard != selection:
+ st.session_state.current_dashboard = selection
+ reset_export_manager()
+
+ export_manager = get_export_manager()
+ export_manager.add_filter_condition("当前看板", selection)
+ export_manager.add_filter_condition("对比模式", "开启" if enable_comparison else "关闭")
+
+ if enable_comparison:
+ col_main, col_compare = st.columns(2)
+
+ with col_main:
+ st.markdown(f"# 📊 {selection} (主要视图)")
+ st.markdown("---")
+ render_dashboard(selection)
+
+ with col_compare:
+ st.markdown(f"# 📊 {selection} (对比视图)")
+ st.markdown("---")
+ st.info("💡 提示：对比视图可独立选择不同的时间范围进行对比分析")
+ render_dashboard(selection)
+ else:
+ render_dashboard(selection)
+ else:
+ st.sidebar.success(f"已选择 {len(final_selections)} 个看板，将按顺序叠加显示")
+
+ for idx, selection in enumerate(final_selections):
+ if idx > 0:
+ st.markdown("---")
+ st.markdown(f"⬇️ 下一个看板: {selection} ⬇️
", unsafe_allow_html=True)
+ st.markdown("---")
+
+ if enable_comparison:
+ col_main, col_compare = st.columns(2)
+
+ with col_main:
+ st.markdown(f"# 📊 {selection} (主要视图)")
+ st.markdown("---")
+ render_dashboard(selection)
+
+ with col_compare:
+ st.markdown(f"# 📊 {selection} (对比视图)")
+ st.markdown("---")
+ st.info("💡 提示：对比视图可独立选择不同的时间范围")
+ render_dashboard(selection)
+ else:
+ st.markdown(f"# 📊 {selection}")
+ render_dashboard(selection)
+ else:
+ st.markdown("# 👋 欢迎使用中国宏观经济看板")
+ st.markdown("---")
+ st.markdown("""
+ ## 📋 使用说明
+
+ 请从左侧边栏选择要查看的看板，支持以下功能：
+
+ ### 1. 收藏看板 ⭐
+ - 在左侧"管理收藏"区域选择看板
+ - 点击"添加收藏"将其加入"我的常用看板"
+ - 收藏的看板会显示在最上方，方便快速访问
+
+ ### 2. 多选叠加显示 📊
+ - 支持从"我的常用看板"或"全部看板"中多选
+ - 选中的看板将按选择顺序在页面中叠加显示
+ - 无需来回切换，一次查看多个相关看板
+
+ ### 3. 对比模式 🔄
+ - 勾选"启用全局对比模式"
+ - 每个看板将并排显示两个独立视图
+ - 可在两个视图中分别选择不同的时间范围进行对比分析
+
+ ### 4. 导出功能 📤
+ - 点击"导出Excel"或"导出JSON"
+ - 导出当前筛选条件下的数据
+ - 导出文件包含当前视图的筛选条件信息
+ """)
+
+ st.markdown("---")
+ st.markdown("### 🎯 快速开始")
+ st.info("👈 请从左侧边栏选择一个或多个看板开始分析")
+
+ col1, col2, col3 = st.columns(3)
+ with col1:
+ st.markdown("#### 📈 经济增长")
+ st.markdown("- GDP分析")
+ st.markdown("- 社会消费品零售总额分析")
+ st.markdown("- 固定资产投资分析")
+
+ with col2:
+ st.markdown("#### 💹 价格指数")
+ st.markdown("- CPI和PPI分析")
+ st.markdown("- PMI分析")
+ st.markdown("- 70城房价指数")
+
+ with col3:
+ st.markdown("#### 💰 金融市场")
+ st.markdown("- 股票市场")
+ st.markdown("- 债券利率")
+ st.markdown("- 社融和货币供应分析")