Merge dev-0.3

webapp/app/containers/Bizlogic/reducer.ts

@@ -40,6 +40,8 @@ import {
   LOAD_VIEW_TEAM_SUCCESS,
   LOAD_VIEW_TEAM_FAILURE
 } from './constants'
+import { LOAD_DASHBOARD_DETAIL_SUCCESS } from '../Dashboard/constants'
+import { ActionTypes } from '../Display/constants'
 import { fromJS } from 'immutable'
 
 const initialState = fromJS({
@@ -115,6 +117,10 @@ function bizlogicReducer (state = initialState, action) {
       return state.set('viewTeam', payload.result)
     case LOAD_VIEW_TEAM_FAILURE:
       return state
+    case LOAD_DASHBOARD_DETAIL_SUCCESS:
+      return state.set('bizlogics', payload.bizlogics)
+    case ActionTypes.LOAD_DISPLAY_DETAIL_SUCCESS:
+      return state.set('bizlogics', payload.bizlogics)
     default:
       return state
   }

webapp/app/containers/Dashboard/Grid.tsx

@@ -89,7 +89,6 @@ import {
   makeSelectCurrentLinkages
 } from './selectors'
 import {
-  loadBizlogics,
   loadDataFromItem,
   loadCascadeSource,
   loadBizdataSchema,
@@ -165,7 +164,6 @@ interface IGridProps {
   onEditDashboardItem: (item: IDashboardItem, resolve: () => void) => void
   onEditDashboardItems: (item: IDashboardItem[]) => void
   onDeleteDashboardItem: (id: number, resolve?: () => void) => void
-  onLoadBizlogics: (projectId: number, resolve?: any) => any
   onLoadDataFromItem: (
     renderType: RenderType,
     dashboardItemId: number,
@@ -291,12 +289,10 @@ export class Grid extends React.Component<IGridProps, IGridStates> {
 
   public componentWillMount () {
     const {
-      onLoadBizlogics,
       onLoadDashboardDetail,
       params
     } = this.props
     const { pid, portalId, dashboardId } = params
-    onLoadBizlogics(pid)
     if (dashboardId && Number(dashboardId) !== -1) {
       onLoadDashboardDetail(pid, portalId, Number(dashboardId))
     }
@@ -885,16 +881,18 @@ export class Grid extends React.Component<IGridProps, IGridStates> {
     })
   }
   private currentWidgetInFullScreen = (id) => {
-    const {currentItems, currentItemsInfo, widgets} = this.props
+    const {currentItems, currentItemsInfo, widgets, bizlogics} = this.props
     const item = currentItems.find((ci) => ci.id === id)
     const widget = widgets.find((w) => w.id === item.widgetId)
+    const model = JSON.parse(bizlogics.find((b) => b.id === widget.viewId).model)
     const data = currentItemsInfo[id]
     const loading = currentItemsInfo['loading']
     this.setState({
       currentDataInFullScreen: {
             itemId: id,
             widgetId: widget.id,
             widget,
+            model,
             data,
             loading,
             onGetChartData: this.getChartData
@@ -1110,8 +1108,8 @@ export class Grid extends React.Component<IGridProps, IGridStates> {
         } = currentItemsInfo[id]
 
         const widget = widgets.find((w) => w.id === widgetId)
-        const interacting = interactingStatus[id] || false
         const view = bizlogics.find((b) => b.id === widget.viewId)
+        const interacting = interactingStatus[id] || false
         const drillHistory = currentItemsInfo[id]['queryParams']['drillHistory'] ? currentItemsInfo[id]['queryParams']['drillHistory'] : void 0
 
         itemblocks.push((
@@ -1362,7 +1360,6 @@ export function mapDispatchToProps (dispatch) {
     onEditDashboardItem: (item, resolve) => dispatch(editDashboardItem(item, resolve)),
     onEditDashboardItems: (items) => dispatch(editDashboardItems(items)),
     onDeleteDashboardItem: (id, resolve) => dispatch(deleteDashboardItem(id, resolve)),
-    onLoadBizlogics: (projectId, resolve) => dispatch(loadBizlogics(projectId, resolve)),
     onLoadDataFromItem: (renderType, itemId, viewId, params) =>
                         dispatch(loadDataFromItem(renderType, itemId, viewId, params, 'dashboard')),
     onClearCurrentDashboard: () => dispatch(clearCurrentDashboard()),

webapp/app/containers/Dashboard/actions.ts

@@ -233,13 +233,14 @@ export function loadDashboardDetail (projectId, portalId, dashboardId) {
   }
 }
 
-export function dashboardDetailLoaded (dashboardId, dashboardDetail, widgets) {
+export function dashboardDetailLoaded (dashboardId, dashboardDetail, widgets, bizlogics) {
   return {
     type: LOAD_DASHBOARD_DETAIL_SUCCESS,
     payload: {
       dashboardId,
       dashboardDetail,
-      widgets
+      widgets,
+      bizlogics
     }
   }
 }

webapp/app/containers/Dashboard/components/DashboardItem.tsx

@@ -51,10 +51,10 @@ const utilStyles = require('../../../assets/less/util.less')
 interface IDashboardItemProps {
   itemId: number
   widget: any
+  view?: Partial<IView>
   data: any
   loading: boolean
   polling: string
-  view?: IView
   interacting: boolean
   frequency: string
   shareInfo: string
@@ -67,7 +67,7 @@ interface IDashboardItemProps {
   router?: InjectedRouter
   currentProject?: IProject
   container?: string
-  onSelectDrillHistory: (history?: any, item?: number, itemId?: number, widgetId?: number) => void
+  onSelectDrillHistory?: (history?: any, item?: number, itemId?: number, widgetId?: number) => void
   onGetChartData: (renderType: RenderType, itemId: number, widgetId: number, queryParams?: any) => void
   onShowEdit?: (itemId: number) => (e: React.MouseEvent<HTMLSpanElement>) => void
   onDeleteDashboardItem?: (itemId: number) => () => void
@@ -85,6 +85,7 @@ interface IDashboardItemStates {
   controlPanelVisible: boolean
   sharePanelAuthorized: boolean
   widgetProps: IWidgetProps
+  model: IModel
   isDrilling: boolean
   dataDrillPanelPosition: boolean | object
   whichDataDrillBrushed: boolean | object []
@@ -100,6 +101,7 @@ export class DashboardItem extends React.PureComponent<IDashboardItemProps, IDas
       controlPanelVisible: false,
       sharePanelAuthorized: false,
       widgetProps: null,
+      model: null,
       isDrilling: false,
       dataDrillPanelPosition: false,
       whichDataDrillBrushed: false,
@@ -117,20 +119,24 @@ export class DashboardItem extends React.PureComponent<IDashboardItemProps, IDas
   private container: HTMLDivElement = null
 
   public componentWillMount () {
-    const { itemId, widget, onGetChartData, container } = this.props
+    const { itemId, widget, view, onGetChartData, container } = this.props
     if (container === 'share') {
       onGetChartData('clear', itemId, widget.id)
       this.setFrequent(this.props)
     }
+    const widgetProps = JSON.parse(widget.config)
     this.setState({
-      widgetProps: JSON.parse(widget.config)
+      widgetProps,
+      model: JSON.parse(view.model),
+      cacheWidgetProps: {...widgetProps}
     })
   }
 
   public componentWillReceiveProps (nextProps) {
     if (nextProps.widget !== this.props.widget) {
       this.setState({
-        widgetProps: JSON.parse(nextProps.widget.config)
+        widgetProps: JSON.parse(nextProps.widget.config),
+        model: JSON.parse(nextProps.view.model)
       })
     }
   }
@@ -215,9 +221,17 @@ export class DashboardItem extends React.PureComponent<IDashboardItemProps, IDas
       renderType,
       onGetChartData
     } = this.props
-    const chartsData = {itemId, widget, data, loading, renderType, onGetChartData}
+
     if (onShowFullScreen) {
-      onShowFullScreen(chartsData)
+      onShowFullScreen({
+        itemId,
+        widget,
+        model: this.state.model,
+        data,
+        loading,
+        renderType,
+        onGetChartData
+      })
     }
   }
 
@@ -287,10 +301,7 @@ export class DashboardItem extends React.PureComponent<IDashboardItemProps, IDas
       }
     }
   }
-  public componentDidMount () {
-    const {widgetProps} = this.state
-    this.setState({cacheWidgetProps: {...widgetProps}})
-  }
+
   private drillDataHistory = (history, item, itemId, widgetId) => {
     const {onSelectDrillHistory, drillHistory} = this.props
     const { widgetProps, cacheWidgetProps } = this.state
@@ -364,7 +375,6 @@ export class DashboardItem extends React.PureComponent<IDashboardItemProps, IDas
       widget,
       data,
       loading,
-      view,
       interacting,
       shareInfo,
       secretInfo,
@@ -383,7 +393,8 @@ export class DashboardItem extends React.PureComponent<IDashboardItemProps, IDas
     const {
       controlPanelVisible,
       sharePanelAuthorized,
-      widgetProps
+      widgetProps,
+      model
     } = this.state
 
     let downloadButton
@@ -511,12 +522,6 @@ export class DashboardItem extends React.PureComponent<IDashboardItemProps, IDas
       <span style={{marginLeft: '8px', cursor: 'pointer'}} onClick={this.doDrill} className="iconfont icon-iconxiazuan"/>
     </Tooltip>)
 
-    const chartClass = {
-      chart: styles.chartBlock,
-      table: styles.tableBlock,
-      container: styles.block
-    }
-
     const gridItemClass = classnames({
       [styles.gridItem]: true,
       [styles.interact]: interacting
@@ -530,18 +535,15 @@ export class DashboardItem extends React.PureComponent<IDashboardItemProps, IDas
       })
     }
     const categoriesCol = []
-    if (view) {
-      const model: IModel = JSON.parse(view.model)
-      Object.entries(model).forEach(([key, m]) => {
-        if (m.modelType === 'category') {
-          categoriesCol.push({
-            name: key,
-            type: 'category',
-            visualType: m.visualType
-          })
-        }
-      })
-    }
+    Object.entries(model).forEach(([key, m]) => {
+      if (m.modelType === 'category') {
+        categoriesCol.push({
+          name: key,
+          type: 'category',
+          visualType: m.visualType
+        })
+      }
+    })
 
     const dataDrillPanelClass = classnames({
       [styles.dataDrillPanel]: true,
@@ -627,6 +629,7 @@ export class DashboardItem extends React.PureComponent<IDashboardItemProps, IDas
             renderType={loading ? 'refresh' : renderType}
             data={data}
             loading={loading}
+            model={model}
             onCheckTableInteract={this.checkTableInteract}
             onDoInteract={this.doInteract}
             getDataDrillDetail={this.getDataDrillDetail}

webapp/app/containers/Dashboard/components/fullScreenPanel/FullScreenPanel.tsx

@@ -6,6 +6,7 @@ import * as echarts from 'echarts/lib/echarts'
 import DashboardItemControlForm from '../DashboardItemControlForm'
 import {iconMapping, echartsOptionsGenerator} from '../../../Widget/components/chartUtil'
 import Chart from '../Chart'
+import { IModel } from '../../../Widget/components/Workbench/index'
 import Widget from '../../../Widget/components/Widget/WidgetInViz'
 import {ECHARTS_RENDERER} from '../../../../globalConstants'
 const styles = require('./fullScreenPanel.less')
@@ -17,11 +18,12 @@ interface IFullScreenPanelProps {
     loading?: any
     renderType?: string
     widget?: any
+    model?: IModel
     itemId?: number
     onGetChartData?: any
   }
   currentItems?: any[]
-  widgets: any
+  widgets: any[]
   currentDatasources: boolean | object
   currentDashboard: {
     widgets?: any[]
@@ -160,6 +162,7 @@ class FullScreenPanel extends React.PureComponent<IFullScreenPanelProps, IFullSc
             {...widgetProps}
             renderType="rerender"
             data={data && data.datasource ? data.datasource : []}
+            model={currentDataInFullScreen.model}
           />
         )
         :

webapp/app/containers/Dashboard/sagas.ts

@@ -155,9 +155,10 @@ export function* getDashboardDetail ({ payload }) {
   try {
     const result = yield all({
       dashboardDetail: call(request, `${api.portal}/${portalId}/dashboards/${dashboardId}`),
-      widgets: call(request, `${api.widget}?projectId=${projectId}`)
+      widgets: call(request, `${api.widget}?projectId=${projectId}`),
+      bizlogics: call(request, `${api.bizlogic}?projectId=${projectId}`)
     })
-    yield put(dashboardDetailLoaded(dashboardId, result.dashboardDetail.payload, result.widgets.payload))
+    yield put(dashboardDetailLoaded(dashboardId, result.dashboardDetail.payload, result.widgets.payload, result.bizlogics.payload))
   } catch (err) {
     yield put(loadDashboardDetailFail())
     errorHandler(err)

webapp/app/containers/Display/Editor.tsx

@@ -92,7 +92,6 @@ const styles = require('./Display.less')
 import { IWidgetProps, RenderType } from '../Widget/components/Widget'
 import { decodeMetricName } from '../Widget/components/util'
 import {
-  loadBizlogics,
   loadDataFromItem,
   loadCascadeSource, // TODO global filter in Display
   loadBizdataSchema  } from '../Bizlogic/actions'
@@ -145,12 +144,10 @@ interface IEditorProps extends RouteComponentProps<{}, IParams> {
   currentState
   nextState
   editorBaselines: IBaseline[]
-  onLoadWidgets: (projectId) => void
-  onLoadBizlogics: (projectId, resolve?: any) => any
   onEditCurrentDisplay: (display: any, resolve?: any) => void
   onEditCurrentSlide: (displayId: number, slide: any, resolve?: any) => void
   onUploadCurrentSlideCover: (cover: Blob, resolve: any) => void
-  onLoadDisplayDetail: (id: number) => void
+  onLoadDisplayDetail: (projectId: number, displayId: number) => void
   onSelectLayer: (obj: { id: any, selected: boolean, exclusive: boolean }) => void
   onClearLayersSelection: () => void
   onDragSelectedLayer: (id: number, deltaX: number, deltaY: number) => void
@@ -227,15 +224,11 @@ export class Editor extends React.Component<IEditorProps, IEditorStates> {
   public componentWillMount () {
     const {
       params,
-      onLoadWidgets,
-      onLoadBizlogics,
       onLoadDisplayDetail
     } = this.props
     const projectId = +params.pid
     const displayId = +params.displayId
-    // onLoadBizlogics(projectId)
-    onLoadDisplayDetail(displayId)
-    onLoadWidgets(projectId)
+    onLoadDisplayDetail(projectId, displayId)
   }
 
   public componentDidMount () {
@@ -767,6 +760,7 @@ export class Editor extends React.Component<IEditorProps, IEditorStates> {
       currentLayersOperationInfo,
       currentSelectedLayers,
       widgets,
+      bizlogics,
       currentDisplay,
       onSelectLayer,
       onLoadDisplayShareLink,
@@ -786,8 +780,9 @@ export class Editor extends React.Component<IEditorProps, IEditorStates> {
 
     if (!currentDisplay) { return null }
 
-    const layerItems =  !Array.isArray(widgets) ? null : currentLocalLayers.map((layer, idx) => {
+    const layerItems = !Array.isArray(widgets) ? null : currentLocalLayers.map((layer, idx) => {
       const widget = widgets.find((w) => w.id === layer.widgetId)
+      const view = widget && bizlogics.find((b) => b.id === widget.viewId)
       const layerId = layer.id
 
       const { polling, frequency } = JSON.parse(layer.params)
@@ -807,6 +802,7 @@ export class Editor extends React.Component<IEditorProps, IEditorStates> {
           dragging={dragging}
           itemId={layerId}
           widget={widget}
+          view={view}
           data={datasource}
           loading={loading}
           polling={polling}
@@ -937,9 +933,7 @@ const mapStateToProps = createStructuredSelector({
 
 function mapDispatchToProps (dispatch) {
   return {
-    onLoadDisplayDetail: (id) => dispatch(loadDisplayDetail(id)),
-    onLoadWidgets: (projectId) => dispatch(loadWidgets(projectId)),
-    onLoadBizlogics: (projectId, resolve) => dispatch(loadBizlogics(projectId, resolve)),
+    onLoadDisplayDetail: (projectId, displayId) => dispatch(loadDisplayDetail(projectId, displayId)),
     onEditCurrentDisplay: (display, resolve?) => dispatch(editCurrentDisplay(display, resolve)),
     onEditCurrentSlide: (displayId, slide, resolve?) => dispatch(editCurrentSlide(displayId, slide, resolve)),
     onUploadCurrentSlideCover: (cover, resolve) => dispatch(uploadCurrentSlideCover(cover, resolve)),