Merge pull request #41 from edp963/dev-0.3

merge from edp963/davinci dev-0.3
xxxllluuu · Oct 29, 2020 · 1e8bc49 · 1e8bc49
2 parents 4272405 + 567412d
commit 1e8bc49
Show file tree

Hide file tree

Showing 12 changed files with 1,529 additions and 808 deletions.
diff --git a/webapp/app/app.tsx b/webapp/app/app.tsx
@@ -33,7 +33,7 @@ import zh_CN from 'antd/es/locale/zh_CN'
 import LanguageProvider from 'containers/LanguageProvider'
 import { translationMessages } from './i18n'
 import moment from 'moment'
-import 'moment/src/locale/zh-cn'
+import 'moment/dist/locale/zh-cn'
 moment.locale('zh-cn')
 
 import '!file-loader?name=[name].[ext]!./favicon.ico'

diff --git a/webapp/app/components/Control/util.ts b/webapp/app/components/Control/util.ts
@@ -155,7 +155,7 @@ export function getVariableParams(
     case ControlTypes.NumberRange:
     case ControlTypes.Slider:
       params = value.reduce((arr, val, index) => {
-        if (val !== '' && !isNaN(val)) {
+        if (fieldsVariables[index] && val !== '' && !isNaN(val)) {
           const { name, valueType } = fieldsVariables[index]
           return arr.concat({
             name,
@@ -183,13 +183,16 @@ export function getVariableParams(
       break
     case ControlTypes.DateRange:
       if (value.length) {
-        params = value.map((v, index) => {
-          const { name } = fieldsVariables[index]
-          return {
-            name,
-            value: `'${moment(v).format(dateFormat)}'`
-          }
-        })
+        params = value
+          .map((v, index) => {
+            return fieldsVariables[index]
+              ? {
+                  name: fieldsVariables[index].name,
+                  value: `'${moment(v).format(dateFormat)}'`
+                }
+              : null
+          })
+          .filter((p) => p)
       }
       break
     default:

diff --git a/webapp/app/components/DataDrill/EnhancerPanel.tsx b/webapp/app/components/DataDrill/EnhancerPanel.tsx
@@ -23,28 +23,45 @@ import utilStyles from 'app/assets/less/util.less'
 import styles from './datadrill.less'
 import { IDataDrillProps, IEnhancerPanel } from './types'
 import DataDrill from './Panel'
+import {
+  DrillableChart,
+  DrillableChartNeedNotFilter
+} from 'containers/Widget/config/chart/DrillableChart'
 
 function enhancePanel<T>() {
   return (WrapperComponent) => {
     class EnhancerPanel extends React.PureComponent<T & IEnhancerPanel, {}> {
+      private isDrillableChart() {
+        const { chartStyle } = this.props
+        return DrillableChart.some((drillable) => drillable === chartStyle)
+      }
+      private isDrillableChartNeedNotFilter() {
+        const { chartStyle } = this.props
+        return DrillableChartNeedNotFilter.some(
+          (drillable) => drillable === chartStyle
+        )
+      }
       private hide() {
         let isHide = true
-        const {
-          isSelectedGroup,
-          isDrillableChart,
-          isSelectedfilter
-        } = this.props
+        const { isSelectedGroup, isSelectedfilter } = this.props
+        const isDrillableChart = this.isDrillableChart()
+        const isDrillableChartNeedNotFilter = this.isDrillableChartNeedNotFilter()
         if (!isDrillableChart) {
           isHide = true
           return isHide
         }
 
-        if (isSelectedfilter) {
+        if (!(isSelectedfilter && isSelectedfilter.length === 0)) {
+          isHide = false
+          return isHide
+        }
+
+        if (!(isSelectedGroup && isSelectedGroup.length === 0)) {
           isHide = false
           return isHide
         }
 
-        if (isSelectedGroup) {
+        if (isDrillableChartNeedNotFilter) {
           isHide = false
           return isHide
         }
@@ -57,6 +74,7 @@ function enhancePanel<T>() {
           [styles.dataDrillPanel]: true,
           [utilStyles.hide]: this.hide()
         })
+
         return (
           <div className={dataDrillPanelClass}>
             <WrapperComponent {...this.props} />

diff --git a/webapp/app/components/DataDrill/strategies.ts b/webapp/app/components/DataDrill/strategies.ts
@@ -479,6 +479,9 @@ function collectKeyValue(sourceDataFilter) {
 }
 
 function mappingFilters(sourceDataFilter, group): IFilter[] {
+  if (!(sourceDataFilter && sourceDataFilter.length)) {
+    return []
+  }
   const mappgingSource = sourceDataFilter.map((source) =>
     source && source[group] ? source[group] : source
   )

diff --git a/webapp/app/components/DataDrill/types.ts b/webapp/app/components/DataDrill/types.ts
@@ -123,7 +123,6 @@ export interface ISourceDataFilter {
   value: string
 }
 
-
 export interface IDataDrillProps {
   widgetConfig: IWidgetConfig
   drillHistory?: IDrillDetail[]
@@ -136,7 +135,7 @@ export interface IDataDrillProps {
 }
 
 export interface IEnhancerPanel {
-  isDrillableChart: boolean
-  isSelectedfilter: boolean | object []
-  isSelectedGroup: boolean | string[]
+  isSelectedfilter: object[]
+  isSelectedGroup: string[]
+  chartStyle: number
 }