Merge pull request #714 from teambition/feat/dingtalk-project-analytics

feat(analytics): 统计增加适配钉钉桌面端基础类型
teambition · Mar 31, 2020 · 57b8e66 · 57b8e66
2 parents 1c62097 + 5ec8342
commit 57b8e66
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/src/schemas/TapChart.ts b/src/schemas/TapChart.ts
@@ -18,7 +18,19 @@ import {
   TapGenericFilterResponse as FilterResponse
 } from 'teambition-types'
 
-export type TapChartType = 'line' | 'bar' | 'linebar' | 'pie' | 'number' | 'table' | 'details' | 'overview' | 'customset' | 'area' | 'bubble'
+export type TapChartType =
+  | 'line'
+  | 'bar'
+  | 'linebar'
+  | 'pie'
+  | 'number'
+  | 'table'
+  | 'details'
+  | 'overview'
+  | 'customset'
+  | 'area'
+  | 'bubble'
+  | 'multiDetails'
 
 // tapGraph definition
 export type TapGraphColType = 'type/Date' | 'type/DateTime' | 'type/Integer' | 'type/String' | 'type/Task'
@@ -181,7 +193,8 @@ export type TapGraphVisualizationSettingsSet =
   TapGraphVisualizationSettings<'overview', TapGraphOverviewDisplay> |
   TapGraphVisualizationSettings<'customset', TapGraphOverviewDisplay> |
   TapGraphVisualizationSettings<'area', TapGraphAreaDisplay> |
-  TapGraphVisualizationSettings<'bubble', TapGraphBubbleDisplay>
+  TapGraphVisualizationSettings<'bubble', TapGraphBubbleDisplay> |
+  TapGraphVisualizationSettings<'multiDetails', TapGraphOverviewDisplay>
 
 export interface TapBaseChart <T extends FilterRequest | FilterResponse> {
   _id: TapChartId

diff --git a/src/teambition.ts b/src/teambition.ts
@@ -412,7 +412,7 @@ declare module 'teambition-types' {
 
   export type TapBaseDataType = 'type/MongoId' | 'type/Date' | 'type/DateCollection' | 'type/Number' | 'type/String' | 'type/Boolean'
 
-  export type TapSupportedRelative = 'all' | 'past7days' | 'pastmonth' | 'past3months'
+  export type TapSupportedRelative = 'all' | 'past7days' | 'pastmonth' | 'past3months' | 'past30days'
 
   export type TapSupportedDateSeries = '0to3' | '3to6' | '6to10' | '10to14' | '14plus'
 
@@ -525,6 +525,7 @@ declare module 'teambition-types' {
     proTemplateConfigType?: ScenarioProTemplateConfigType[]
     isDuedateExist?: boolean
     weekSeries?: TapSupportedWeekSeries[]
+    date?: string
   }
 
   export type TapFilterItem =
@@ -577,6 +578,7 @@ declare module 'teambition-types' {
     | TapFilterTarget<'proTemplateConfigType', 'string', ScenarioProTemplateConfigType>
     | TapFilterTarget<'isDuedateExist', 'boolean', boolean>
     | TapFilterTarget<'weekSeries', 'type/String', TapSupportedWeekSeries[]>
+    | TapFilterTarget<'date', 'type/Date', string>
 
   export type TapGenericFilterResponse = TapFilterItem[]