1

models/behavior_analysis.py

@@ -292,6 +292,7 @@ class BehaviorAnalysis:
                 event_name = custom['event_name']
                 where = [event_name_col.in_(event_name)]
                 event_filter, _ = self.handler_filts(*event['filts'])
+                select_exprs.extend(self.groupby)
                 qry = sa.select(
                     *select_exprs,
                     custom['select']

models/x_analysis.py

@@ -35,6 +35,11 @@ class XAnalysis:
             report = await crud.report.get(db, id=self.data_in.report_id)
             self.event_view = report['query']['eventView']
             self.events = report['query']['events']
+            try:
+                e_days = self.event_view['e_days']
+                s_days = self.event_view['s_days']
+            except:
+                # 兼容以前的
                 e_days, s_days = self.event_view['recentDay'].split('-')
             self.event_view['endTime'] = arrow.get().shift(days=-int(e_days)+1).strftime('%Y-%m-%d 23:59:59')
             self.event_view['startTime'] = arrow.get().shift(days=-int(s_days)+1).strftime('%Y-%m-%d 00:00:00')