Update app.py

app.py

@@ -251,29 +251,31 @@ def create_plot(df, chart_type, x_column, y_column, group_column=None, size_colu
                 # 明確將字符串列轉換為類別型
                 df[x_column] = df[x_column].astype('category')
                 df[group_column] = df[group_column].astype('category')
-                
-                # 先進行計數統計
-                count_df = df.groupby([x_column, group_column]).size().reset_index(name='count')
-                
-                # 創建樞紐表
-                pivot_df = count_df.pivot_table(index=x_column, columns=group_column, 
-                                               values='count', aggfunc='sum').reset_index()
-                pivot_df = pivot_df.fillna(0)
-                
-                # 獲取所有情緒類別
+
+                # 根據使用者選的聚合函數進行分組計算
+                if agg_func == "count" or y_column == "計數":
+                    grouped_df = df.groupby([x_column, group_column]).size().reset_index(name='__y__')
+                else:
+                    grouped_df = df.groupby([x_column, group_column])[y_column].agg(agg_func).reset_index(name='__y__')
+
+                # 建立樞紐表
+                pivot_df = grouped_df.pivot_table(index=x_column, columns=group_column,
+                                                  values='__y__', aggfunc='sum').reset_index().fillna(0)
+
+                # 類別清單
                 categories = pivot_df.columns.tolist()
                 categories.remove(x_column)
-                
-                # 創建圖表
+
+                # 加入每一組 Bar
                 for i, category in enumerate(categories):
                     color = colors[i % len(colors)]
                     if str(category) in custom_colors:
                         color = custom_colors[str(category)]
-                        
+
                     pattern_shape = None
                     if patterns and i < len(patterns) and patterns[i] != "無":
                         pattern_shape = patterns[i]
-                        
+
                     fig.add_trace(go.Bar(
                         x=pivot_df[x_column],
                         y=pivot_df[category],
@@ -281,13 +283,12 @@ def create_plot(df, chart_type, x_column, y_column, group_column=None, size_colu
                         marker_color=color,
                         marker_pattern_shape=pattern_shape
                     ))
-                
+
                 fig.update_layout(barmode='stack')
             else:
-                # 簡單計數
-                counts = df[x_column].value_counts().reset_index()
-                counts.columns = [x_column, 'count']
-                fig = px.bar(counts, x=x_column, y='count', **fig_params)
+                # 如果沒有分組欄，退回一般長條圖的做法
+                grouped_df = df.groupby(x_column)[y_column].agg(agg_func).reset_index()
+                fig = px.bar(grouped_df, x=x_column, y=y_column, color_discrete_sequence=colors, **fig_params)
         
         elif chart_type == "群組長條圖":
             if group_column and group_column in df.columns:
@@ -1159,6 +1160,8 @@ CUSTOM_CSS = """
 /* 下拉選單位置修正 */
 .gradio-dropdown {
     position: relative !important;
+    overflow: visible !important;  /* ✅ 關鍵補充 */
+    z-index: 10 !important;        /* 確保浮在上層 */
 }
 
 .gradio-dropdown .choices__list--dropdown {
@@ -1172,6 +1175,7 @@ CUSTOM_CSS = """
     border: 1px solid #ddd !important;
     border-radius: 4px !important;
     width: 100% !important;
+    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1) !important;
 }
 
 /* 確保下拉項目可見 */
@@ -1179,6 +1183,7 @@ CUSTOM_CSS = """
     padding: 8px 10px !important;
     cursor: pointer !important;
 }
+
 """
 
 # 現代化UI界面