为chart和datasource添加remoteSetGroup方法; 修正hideGroupMenu和visibleGroupMenu命名错误

src/components/chart/list.jsx

@@ -18,7 +18,7 @@ class ChartList extends React.Component {
         this.state = {
             selectedRecord: null,
             visibleBox: false,
-            visibleGrouMenu: false, // 显示分组菜单
+            visibleGroupMenu: false, // 显示分组菜单
         }
     }
 
@@ -161,7 +161,7 @@ class ChartList extends React.Component {
                     if(selectedRecord) {
                         dispatch({ type: 'chart/remoteSetGroup', chart: selectedRecord, group: p });
                     }
-                    this.hideGourMenu();
+                    this.hideGroupMenu();
                 }}>
                     {c.map(c => {
                         return (<Menu.Item key={c.code} onClick={(item) => {
@@ -175,7 +175,7 @@ class ChartList extends React.Component {
             ) : (
                 <Menu.Item key={p.code} onClick={() => {
                     dispatch({ type: 'chart/setCurrentGroup', group1: p });
-                    this.hideGourMenu();
+                    this.hideGroupMenu();
                 }}><span style={{ fontWeight: chart.currentGroup[0] && (chart.currentGroup[0].code === p.code) ? 'bold' : 'normal' }}>{p.label}</span></Menu.Item>
             );
         });
@@ -262,10 +262,10 @@ class ChartList extends React.Component {
     }
 
     handleVisibleChange = (flag) => {
-        this.setState({ visibleGrouMenu: flag });
+        this.setState({ visibleGroupMenu: flag });
     }
 
-    hideGourMenu = () => {
+    hideGroupMenu = () => {
         this.setState({
             visibleGrouMenu: false
         });
@@ -283,7 +283,7 @@ class ChartList extends React.Component {
     }
 
     render() {
-        const { visibleBox, visibleGrouMenu } = this.state;
+        const { visibleBox, visibleGroupMenu } = this.state;
         const { dispatch, chart } = this.props;
 
         return (
@@ -324,7 +324,7 @@ class ChartList extends React.Component {
                                         <Dropdown
                                             trigger={['click']}
                                             onVisibleChange={this.handleVisibleChange}
-                                            visible={visibleGrouMenu}
+                                            visible={visibleGroupMenu}
                                             overlay={(
                                             <Menu>
                                                 {this.createGroupMenu()}

src/components/datasource/dataSource.jsx

@@ -12,7 +12,7 @@ class DataSource extends React.Component {
         super(props);
         this.state = {
             selectedRecord: null, // 当前选中的dataSource
-            visibleGrouMenu: false, // 显示分组菜单
+            visibleGroupMenu: false, // 显示分组菜单
             visibleSetGroupMenu: false, //
             groupEditing: false, // 是否处于编辑状态
         }
@@ -54,7 +54,7 @@ class DataSource extends React.Component {
     }
 
     handleVisibleChange = (flag) => {
-        this.setState({ visibleGrouMenu: flag });
+        this.setState({ visibleGroupMenu: flag });
     }
 
     createGroupMenu = (selectedRecord) => {
@@ -73,9 +73,9 @@ class DataSource extends React.Component {
                 <Menu.SubMenu key={p.code} title={<span style={{ fontWeight: dataSource.currentGroup[0].code === p.code ? 'bold' : 'normal' }}>{p.label}</span>} onTitleClick={(item) => {
                     dispatch({ type: 'dataSource/setCurrentGroup', group1: p });
                     if(selectedRecord) {
-                        dispatch({ type: 'dataSource/remoteSetGroup', chart: selectedRecord, group: p });
+                        dispatch({ type: 'dataSource/remoteSetGroup', dataSource: selectedRecord, group: p });
                     }
-                    this.hideGourMenu();
+                    this.hideGroupMenu();
                 }}>
                     {c.map(c => {
                         return (<Menu.Item key={c.code} onClick={(item) => {
@@ -89,7 +89,7 @@ class DataSource extends React.Component {
             ) : (
                 <Menu.Item key={p.code} onClick={() => {
                     dispatch({ type: 'dataSource/setCurrentGroup', group1: p });
-                    this.hideGourMenu();
+                    this.hideGroupMenu();
                 }}><span style={{ fontWeight: dataSource.currentGroup[0] && (dataSource.currentGroup[0].code === p.code) ? 'bold' : 'normal' }}>{p.label}</span></Menu.Item>
             );
         });
@@ -175,9 +175,9 @@ class DataSource extends React.Component {
         return groupTree;
     }
 
-    hideGourMenu = () => {
+    hideGroupMenu = () => {
         this.setState({
-            visibleGrouMenu: false
+            visibleGroupMenu: false
         });
     }
 
@@ -195,7 +195,7 @@ class DataSource extends React.Component {
     render() {
         
         const { dataSource, dispatch } = this.props;
-        const { selectedRecord, visibleGrouMenu } = this.state;
+        const { selectedRecord, visibleGroupMenu } = this.state;
 
         const reg = new RegExp('([+ \\- & | ! ( ) { } \\[ \\] ^ \" ~ * ? : ( ) \/])', 'g'); // 需要转义的字符
         let filterLabel = dataSource.filterLabel.replace(new RegExp('(\\\\)', 'g'), '\\$1').replace(reg, '\\$1'); // 添加转义符号
@@ -338,7 +338,7 @@ class DataSource extends React.Component {
                                         <Dropdown
                                             trigger={['click']}
                                             onVisibleChange={this.handleVisibleChange}
-                                            visible={visibleGrouMenu}
+                                            visible={visibleGroupMenu}
                                             overlay={(
                                             <Menu>
                                                 {this.createGroupMenu()}

src/models/chart.js

@@ -645,8 +645,20 @@ export default {
         /**
          * 设置图表所属分组
          */
-        *remoteSetGroup(action, { select, call, put, takeEvery, takeLatest }) {
-            yield console.log('remoteSetGroup', action);
+        *remoteSetGroup(action, { select, call, put }) {
+            let id = action.dataSource.code
+            let groupID = action.group.code
+            try {
+                yield call(service.fetch, {
+                    url: URLS.GROUP_DATASOURCE_ADD,
+                    body: {
+                        id: id,
+                        groupID: groupID
+                    }
+                });
+            } catch(e) {
+                message.error('读取数据连接配置列表错误');
+            }
         },
     },
     subscriptions: {

src/models/dataSource.js

@@ -752,7 +752,19 @@ export default {
          * 为数据源设置所属分组
          */
         *remoteSetGroup(action, { select, call, put }) {
-            yield console.log('remoteSetGroup', action);
+            let id = action.dataSource.code
+            let groupID = action.group.code
+            try {
+                yield call(service.fetch, {
+                    url: URLS.GROUP_DATASOURCE_ADD,
+                    body: {
+                        id: id,
+                        groupID: groupID
+                    }
+                });
+            } catch(e) {
+                message.error('读取数据连接配置列表错误');
+            }
         }
     },
     subscriptions: {