Merge branch 'master' of ssh://10.10.100.21/source/platform-bi-web

src/components/chart/list.jsx

@@ -9,6 +9,7 @@ import 'ant-design-pro/dist/ant-design-pro.css'
 import GroupSelector from '../datasource/groupSelector'
 import Thumbnail from './thumbnail'
 import DistributeBox from './distributeBox';
+import TransferBox from './transferBox'
 const { Content } = Layout
 const { Search } = Input
 const CardGrid = Card.Grid
@@ -22,6 +23,7 @@ class ChartList extends React.Component {
             selectedRecord: null,
             visibleChooseDataSourceBox: false,
             visibleDistributeBox: false,
+            visibleTransferBox: false,
             visibleGroupMenu: false, // 显示分组菜单
         }
     }
@@ -71,6 +73,13 @@ class ChartList extends React.Component {
                     {this.createGroupMenu(selectedRecord)}
                 </Menu.SubMenu>
                 <Menu.Divider />
+                <Menu.Item
+                    onClick={()=>{
+                        this.setState({ visibleTransferBox: true})
+                    }}
+                >
+                    <Icon type="swap" />移交
+                </Menu.Item>
                 <Menu.Item onClick={() => {
                     dispatch({ type: 'chart/remoteDelete', code: this.state.selectedRecord.code });
                 }}>
@@ -326,7 +335,7 @@ class ChartList extends React.Component {
     }
 
     render() {
-        const { visibleChooseDataSourceBox, visibleDistributeBox } = this.state;
+        const { visibleChooseDataSourceBox, visibleDistributeBox, visibleTransferBox } = this.state;
         const { dispatch, chart } = this.props;
         const TAG_COLOR = ['blue'];
         return (
@@ -413,10 +422,17 @@ class ChartList extends React.Component {
                     </Card>
                 </Content>
                 <DistributeBox visibleDistributeBox={visibleDistributeBox} selectedRecord={this.state.selectedRecord} hideBox={() => {
-                                        this.setState({
-                                            visibleDistributeBox: false
-                                        });
-                                    }}/>
+                    this.setState({
+                        visibleDistributeBox: false
+                    });
+                }} />
+                <TransferBox
+                    visibleTransferBox={visibleTransferBox}
+                    onCancel={() => {
+                        this.setState({
+                            visibleTransferBox: false
+                        })
+                    }} />
             </Layout>
         )
     }

src/components/chart/transferBox.jsx

@@ -0,0 +1,19 @@
+import React from 'react'
+import { Modal } from 'antd'
+
+
+class TransferBox extends React.Component {
+    render() {
+        const { visibleTransferBox, onCancel } = this.props
+        return (
+            <Modal 
+                visible={visibleTransferBox}
+                onCancel={onCancel}
+            >
+                <span>Test</span>
+            </Modal>
+        )
+    }
+}
+
+export default TransferBox

src/components/dashboard/list.jsx

@@ -4,6 +4,7 @@ import { connect } from 'dva'
 import { dateFormat } from '../../utils/baseUtils'
 import Ellipsis from 'ant-design-pro/lib/Ellipsis'
 import DistributeBox from './distributeBox'
+import TransferBox from './transferBox'
 import 'ant-design-pro/dist/ant-design-pro.css'
 import Thumbnail from './thumbnail'
 import './list.less'
@@ -19,6 +20,7 @@ class DashboardList extends React.Component {
             selectedRecord: null,
             visibleChooseDataSourceBox: false,
             visibleDistributeBox: false,
+            visibleTransferBox: false,
             visibleGroupMenu: false, // 显示分组菜单
         }
     }
@@ -62,6 +64,13 @@ class DashboardList extends React.Component {
                     <Icon type='share-alt'/>分发
                 </Menu.Item>
                 <Menu.Divider />
+                <Menu.Item
+                    onClick={()=>{
+                        this.setState({ visibleTransferBox: true})
+                    }}
+                >
+                    <Icon type="swap" />移交
+                </Menu.Item>
                 <Menu.Item onClick={() => {
                     dispatch({ type: 'dashboard/remoteDelete', code: selectedRecord.code });
                 }}>
@@ -157,7 +166,7 @@ class DashboardList extends React.Component {
 
     render() {
         const { dispatch, dashboard } = this.props;
-        const { visibleDistributeBox } = this.state
+        const { visibleDistributeBox, visibleTransferBox } = this.state
         return (
             <Layout className='dashboard-list'>
                 <Content>
@@ -190,11 +199,21 @@ class DashboardList extends React.Component {
                         </div>
                     </Card>
                 </Content>
-                <DistributeBox visibleDistributeBox={visibleDistributeBox} selectedRecord={this.state.selectedRecord} hideBox={() => {
-                                        this.setState({
-                                            visibleDistributeBox: false
-                                        });
-                                    }}/>
+                <DistributeBox
+                    visibleDistributeBox={visibleDistributeBox}
+                    selectedRecord={this.state.selectedRecord}
+                    hideBox={() => {
+                        this.setState({
+                            visibleDistributeBox: false
+                        });
+                    }} />
+                <TransferBox
+                    visibleTransferBox={visibleTransferBox}
+                    onCancel={() => {
+                        this.setState({
+                            visibleTransferBox: false
+                        })
+                    }} />
             </Layout>
         )
     }

src/components/dashboard/transferBox.jsx

@@ -0,0 +1,19 @@
+import React from 'react'
+import { Modal } from 'antd'
+
+
+class TransferBox extends React.Component {
+    render() {
+        const { visibleTransferBox, onCancel } = this.props
+        return (
+            <Modal 
+                visible={visibleTransferBox}
+                onCancel={onCancel}
+            >
+                <span>Test</span>
+            </Modal>
+        )
+    }
+}
+
+export default TransferBox

src/components/dashboardDesigner/element.jsx

@@ -1,17 +0,0 @@
-import React from 'react'
-
-const Element = ({ type, content, itemKey }) => {
-    if (type === "simple") {
-        return ( <span>This is a simple element</span>
-        )
-    }else if (type === "chart") {
-        return ( <span>This is a chart element! </span>
-        )
-    }else {
-        return null
-    }
-
-}
-
-
-export default Element

src/components/datasource/dataSource.jsx

@@ -4,6 +4,7 @@ import { connect } from 'dva'
 import './dataSource.less'
 import { dateFormat } from '../../utils/baseUtils'
 import GroupSelector from './groupSelector'
+import TransferBox from './transferBox';
 const { Content } = Layout
 const { Search } = Input
 const { TreeNode } = Tree
@@ -15,10 +16,13 @@ class DataSource extends React.Component {
             selectedRecord: null, // 当前选中的dataSource
             visibleGroupMenu: false, // 显示分组菜单
             visibleSetGroupMenu: false, //
+            visibleTransferBox: false,
             groupEditing: false, // 是否处于编辑状态
         }
     };
-
+    hideTransferBox = () => {
+        this.setState({ visibleTransferBox: false})
+    }
     componentDidMount() {
         const { dispatch } = this.props;
         this.setScrollTableHeight();
@@ -105,12 +109,13 @@ class DataSource extends React.Component {
             let c = cGroups.filter(c => c.pcode === p.code).sort((a, b) => a.index - b.index);
             return c.length > 0 ? (
                 <Menu.SubMenu key={p.code} title={<span style={{ fontWeight: selectedRecord ? 
-                    (p.code+'' === selectedRecord.groupCode+'' ? 'bold' : (
-                        c.find(ch => ch.code+'' === selectedRecord.groupCode+'') && c.find(ch => ch.code+'' === selectedRecord.groupCode+'').pcode === p.code ? 'bold' : 'normal'
+                    (p.code + '' === selectedRecord.groupCode + '' ? 'bold' : (
+                        c.find(ch => ch.code + '' === selectedRecord.groupCode + '') && c.find(ch => ch.code + '' === selectedRecord.groupCode + '').pcode === p.code ? 'bold' : 'normal'
                     ))
-                 : dataSource.currentGroup[0].code === p.code ? 'bold' : 'normal' }}>{p.label}</span>} onTitleClick={(item) => {
+                    : dataSource.currentGroup[0].code === p.code ? 'bold' : 'normal'
+                }}>{p.label}</span>} onTitleClick={(item) => {
                     dispatch({ type: 'dataSource/setCurrentGroup', group1: p });
-                    if(selectedRecord) {
+                    if (selectedRecord) {
                         dispatch({ type: 'dataSource/remoteSetDataSourceGroup', dataSource: selectedRecord, group: p });
                     }
                     this.hideGroupMenu();
@@ -240,7 +245,7 @@ class DataSource extends React.Component {
     render() {
         
         const { dataSource, dispatch } = this.props;
-        const { selectedRecord } = this.state;
+        const { selectedRecord, visibleTransferBox } = this.state;
 
         const reg = new RegExp('([+ \\- & | ! ( ) { } \\[ \\] ^ \" ~ * ? : ( ) \/])', 'g'); // 需要转义的字符
         let filterLabel = dataSource.filterLabel.replace(new RegExp('(\\\\)', 'g'), '\\$1').replace(reg, '\\$1'); // 添加转义符号
@@ -271,11 +276,20 @@ class DataSource extends React.Component {
                     {this.createGroupMenu(selectedRecord)}
                 </Menu.SubMenu>
                 <Menu.Divider />
+                <Menu.Item
+                    onClick={()=>{
+                        this.setState({ visibleTransferBox: true})
+                    }}
+                >
+                    <Icon type="swap" />移交
+                </Menu.Item>
                 <Menu.Item
                     onClick={(e) => {
                         dispatch({ type: 'dataSource/remoteDelete', code: selectedRecord.code });
                     }}
-                ><Icon type="delete" />删除</Menu.Item>
+                >
+                    <Icon type="delete" />删除
+                </Menu.Item>
             </Menu>
         );
         const dataSourceColumns = [{
@@ -443,6 +457,13 @@ class DataSource extends React.Component {
                                 }
                             }}
                         />
+                        <TransferBox
+                            visibleTransferBox={visibleTransferBox}
+                            onCancel={() => {
+                                this.setState({
+                                    visibleTransferBox: false
+                                })
+                            }} />
                     </Card>
                 </Content>
             </Layout>

src/components/datasource/transferBox.jsx

@@ -0,0 +1,19 @@
+import React from 'react'
+import { Modal } from 'antd'
+
+
+class TransferBox extends React.Component {
+    render() {
+        const { visibleTransferBox, onCancel } = this.props
+        return (
+            <Modal 
+                visible={visibleTransferBox}
+                onCancel={onCancel}
+            >
+                <span>Test</span>
+            </Modal>
+        )
+    }
+}
+
+export default TransferBox

src/components/myPage/homePage.jsx → src/components/homePage/homePage.jsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import { Layout } from 'antd'
 
 class HomePage extends React.Component {
     constructor(props) {

src/routes/mainLayout.js

@@ -2,7 +2,7 @@ import React from 'react'
 import { Layout } from 'antd'
 import { Route, Switch } from 'dva/router'
 import Navigator from '../components/common/navigator'
-import Welcome from '../components/myPage/welcome'
+import HomePage from '../components/homePage/homePage'
 import Loading from '../components/common/loading'
 import DataSourceDetail from '../components/datasource/dataSourceDetail'
 import DataSource from '../components/datasource/dataSource'
@@ -23,13 +23,13 @@ const MainLayout = (history) => {
             <Content className='main-content'>
                 <Switch>
                     <Route sensitive path='/demo' component={Demo}/>
-                    <Route sensitive path='/home' component={Welcome}/>
+                    <Route sensitive path='/home' component={HomePage}/>
                     <Route sensitive path='/datasource/:type/:code/:tab' component={DataSourceDetail}/>
                     <Route sensitive path='/datasource' component={DataSource}/>
                     <Route sensitive path='/dashboard' component={Dashboard} />
                     <Route sensitive path='/chart' component={Chart} />
                     <Route sensitive path='/admin' component={Admin} />
-                    <Route path='/' component={Welcome}/>
+                    <Route path='/' component={HomePage}/>
                 </Switch>
             </Content>
         </Layout>