数据源、图表移动分组后留在当前分组

src/components/chart/list.jsx

@@ -193,6 +193,11 @@ class ChartList extends React.Component {
                         <span onClick={() => {
                             let group = chart.groupList.find(group => group.code === g.code);
                             dispatch({ type: 'chart/setCurrentGroup', group: group });
+                            this.setState({
+                                page: 1
+                            }, () => {
+                                this.bodyRef.current.parentNode.scrollTo(0, 0)
+                            })
                         }}>{g.label}</span>
                         <GroupSelector
                             visible={this.state['visibleGroupSelector' + g.code]}
@@ -208,6 +213,11 @@ class ChartList extends React.Component {
                                 obj['visibleGroupSelector' + g.code] = false;
                                 this.setState(obj);
                                 dispatch({ type: 'chart/setCurrentGroup', group });
+                                this.setState({
+                                    page: 1
+                                }, () => {
+                                    this.bodyRef.current.parentNode.scrollTo(0, 0)
+                                })
                             }}
                         >
                             <Icon style={{ marginLeft: '2px', fontSize: '12px' }} type="down" />
@@ -243,10 +253,12 @@ class ChartList extends React.Component {
                 { selectedRecord && (currentUser.code === selectedRecord.creatorCode || currentUser.role === 'superAdmin') && <Menu.SubMenu className='setgroupmenu' title={<div><Icon style={{ marginRight: '6px' }} type='profile' />移动到</div>}>
                     {[<Menu.Item key='-1' onClick={() => {
                         dispatch({ type: 'chart/remoteSetGroup', chart: selectedRecord, group: { code: '-1'} });
-                        this.setState({
-                            noGroup: true
-                        });
-                    }}>未分组</Menu.Item>].concat(this.createGroupMenu(treeData))}
+                        // this.setState({
+                        //     noGroup: true
+                        // });
+                    }}>
+                        {selectedRecord.groupCode === '-1' ? <span className='current' style={{ fontWeight: 'bold' }}>未分组</span> : '未分组'}
+                    </Menu.Item>].concat(this.createGroupMenu(treeData))}
                 </Menu.SubMenu>}
                 <Menu.Divider />
                 { selectedRecord && (currentUser.code === selectedRecord.creatorCode || currentUser.role === 'superAdmin') && <Menu.Item
@@ -369,8 +381,13 @@ class ChartList extends React.Component {
                     title={selectedRecord.groupCode === t.code ? <span className='current' style={{ fontWeight: 'bold' }}>{t.label}</span> : t.label}
                     onTitleClick={() => {
                         dispatch({ type: 'chart/remoteSetGroup', chart: selectedRecord, group: t });
-                        dispatch({ type: 'chart/setCurrentGroup', group: t });
-                        this.setState({noGroup: false})
+                        // dispatch({ type: 'chart/setCurrentGroup', group: t });
+                        // this.setState({noGroup: false})
+                        // this.setState({
+                        //     page: 1
+                        // }, () => {
+                        //     this.bodyRef.current.parentNode.scrollTo(0, 0)
+                        // })
                     }}
                 >
                     {this.createGroupMenu(t.children)}
@@ -378,8 +395,13 @@ class ChartList extends React.Component {
             }else {
                 return <Menu.Item key={t.code} onClick={() => {
                     dispatch({ type: 'chart/remoteSetGroup', chart: selectedRecord, group: t });
-                    dispatch({ type: 'chart/setCurrentGroup', group: t });
-                    this.setState({noGroup: false})
+                    // dispatch({ type: 'chart/setCurrentGroup', group: t });
+                    // this.setState({noGroup: false})
+                    // this.setState({
+                    //     page: 1
+                    // }, () => {
+                    //     this.bodyRef.current.parentNode.scrollTo(0, 0)
+                    // })
                 }}>{selectedRecord.groupCode === t.code ? <span className='current' style={{ fontWeight: 'bold' }}>{t.label}</span> : t.label}</Menu.Item>
             }
         })

src/components/dashboardDesigner/viewLayout.less

@@ -94,7 +94,6 @@
         background-repeat: no-repeat;
       }
       .richtexteditor { // 富文本
-        padding-bottom: 10px;
         height: 100%;
         .w-e-toolbar {
           height: 40px;
@@ -264,23 +263,21 @@
   }
   
   .react-grid-item > .react-resizable-handle {
-    position: absolute;
-    width: 20px;
-    height: 20px;
+    height: 10px;
     bottom: 0;
     right: 0;
-    cursor: se-resize;
-  }
-  
-  .react-grid-item > .react-resizable-handle::after {
-    content: "";
-    position: absolute;
-    right: 3px;
-    bottom: 3px;
-    width: 5px;
-    height: 5px;
-    border-right: 2px solid rgba(0, 0, 0, 0.4);
-    border-bottom: 2px solid rgba(0, 0, 0, 0.4);
+    cursor: s-resize;
+    &::after {
+      content: "";
+      cursor: se-resize;
+      position: absolute;
+      right: 3px;
+      bottom: 3px;
+      width: 7px;
+      height: 7px;
+      border-right: 2px solid rgba(0, 0, 0, 0.4);
+      border-bottom: 2px solid rgba(0, 0, 0, 0.4);
+    }
   }
 }
 .previewbox {

src/components/dataSource/list.jsx

@@ -187,8 +187,8 @@ class DataSource extends React.Component {
                     title={selectedRecord.groupCode === t.code ? <span className='current' style={{ fontWeight: 'bold' }}>{t.label}</span> : t.label}
                     onTitleClick={() => {
                         dispatch({ type: 'dataSource/remoteSetGroup', dataSource: selectedRecord, group: t });
-                        dispatch({ type: 'dataSource/setCurrentGroup', group: t });
-                        this.setState({noGroup: false})
+                        // dispatch({ type: 'dataSource/setCurrentGroup', group: t });
+                        // this.setState({noGroup: false})
                     }}
                 >
                     {this.createGroupMenu(t.children)}
@@ -196,8 +196,8 @@ class DataSource extends React.Component {
             }else {
                 return <Menu.Item key={t.code} onClick={() => {
                     dispatch({ type: 'dataSource/remoteSetGroup', dataSource: selectedRecord, group: t });
-                    dispatch({ type: 'dataSource/setCurrentGroup', group: t });
-                    this.setState({noGroup: false})
+                    // dispatch({ type: 'dataSource/setCurrentGroup', group: t });
+                    // this.setState({noGroup: false})
                 }}>
                     {selectedRecord.groupCode === t.code ? <span className='current' style={{ fontWeight: 'bold' }}>{t.label}</span> : t.label}
                 </Menu.Item>
@@ -255,10 +255,12 @@ class DataSource extends React.Component {
                 { selectedRecord && (currentUser.code === selectedRecord.creatorCode || currentUser.role === 'superAdmin') && <Menu.SubMenu className='setgroupmenu' title={<div><Icon style={{ marginRight: '6px' }} type='profile' />移动到</div>}>
                     {[<Menu.Item key='-1' onClick={() => {
                         dispatch({ type: 'dataSource/remoteSetGroup', dataSource: selectedRecord, group: { code: '-1'} });
-                        this.setState({
-                            noGroup: true
-                        });
-                    }}>未分组</Menu.Item>].concat(this.createGroupMenu(treeData))}
+                        // this.setState({
+                        //     noGroup: true
+                        // });
+                    }}>
+                         {selectedRecord.groupCode === '-1' ? <span className='current' style={{ fontWeight: 'bold' }}>未分组</span> : '未分组'}
+                    </Menu.Item>].concat(this.createGroupMenu(treeData))}
                 </Menu.SubMenu>}
                 <Menu.Divider />
                 { selectedRecord && (currentUser.code === selectedRecord.creatorCode || currentUser.role === 'superAdmin') && <Menu.Item