1.优化分布分析里面列表去重数无法显示数据的问题

api/api_v1/endpoints/query.py

@@ -1014,6 +1014,11 @@ async def scatter_model(
     df = await ckdb.query_dataframe(sql)
     if df.empty:
         return schemas.Msg(code=-9, msg='无数据', data=None)
+    if 'list' in str(type(df['values'][0])):
+        f=lambda x:x[0]
+        df['values']=df['values'].map(f)
+
+        #df['values']=df['values'].astype(str)
     df.fillna(0, inplace=True)
     #转换数据类型为int
     df['values'] = df['values'].astype(int)
@@ -1184,6 +1189,9 @@ async def scatter_model(
         df = await ckdb.query_dataframe(sql)
         if df.empty:
             return schemas.Msg(code=-9, msg='无数据', data=None)
+        if 'list' in str(type(df['values'][0])):
+            f = lambda x: x[0]
+            df['values'] = df['values'].map(f)
         df.fillna(0, inplace=True)
         # 转换数据类型为int
         df['values'] = df['values'].astype(int)

models/behavior_analysis.py

@@ -543,7 +543,7 @@ GROUP BY toDate(addHours("#event_time", 8))"""
                          })
 
         return sqls
-
+    #在漏斗分析，事件分析模型里面都有用到这块
     async def funnel_model_sql(self):
         """
 SELECT level, count(*) AS values
@@ -611,6 +611,8 @@ ORDER BY level
         event = self.events[0]
         event_name = event['eventName']
         analysis = event['analysis']
+        if analysis == 'list_distinct':
+            analysis = 'max'
         e_account_id_col = getattr(self.event_tbl.c, '#account_id').label('uid')
         u_account_id_col = getattr(self.user_tbl.c, '#account_id')
         event_name_col = getattr(self.event_tbl.c, '#event_name')