分组过滤规则调整

src/components/chart/list.jsx

@@ -72,10 +72,10 @@ class ChartList extends React.Component {
             </Menu>
         )
         
-        let groupFilter = groupList.concat({ code: 'all', label: '全部分组' }).filter(g => (
+        let groupFilter = groupList.concat({ code: '-1', label: '未分组' }).filter(g => (
             currentGroup[0].code === 'all' || 
             (
-                currentGroup[0].code === 'nogroup' ? g.code === 'all' : (
+                currentGroup[0].code === '-1' ? g.code === '-1' : (
                     currentGroup[1] ? (g.code === currentGroup[1].code) : 
                     (
                         g.code === currentGroup[0].code ||
@@ -167,9 +167,11 @@ class ChartList extends React.Component {
         const pGroups = groupList.filter(d => d.pcode === '-1').sort((a, b) => a.index - b.index);
         const cGroups = groupList.filter(d => d.pcode !== '-1');
 
-        let allGroups = selectedRecord ? pGroups : [
+        let allGroups = selectedRecord ? [
+            { code: '-1', label: '未分组' }
+        ].concat(pGroups) : [
             { code: 'all', label: '全部分组' },
-            { code: 'nogroup', label: '未分组' }
+            { code: '-1', label: '未分组' }
         ].concat(pGroups);
 
         return allGroups.map(p => {

src/components/chartDesigner/sections/otherConfigForm.jsx

@@ -34,7 +34,7 @@ const OtherConfigForm = ({ chart, chartDesigner, dispatch, formItemLayout }) =>
                             key: p.code,
 							value: p.code,
 							label: p.label,
-							children: chart.groupList.filter(g => g.pcode === p.code).map(c => {
+							children: chart.groupList.filter(g => g.pcode === p.code && p.code !== '-1').map(c => {
                                 return {
                                     key: c.code,
                                     value: c.code,

src/components/datasource/baseConfig.jsx

@@ -18,7 +18,7 @@ const DataSourceBaseConfig = ({ dataSource, dataConnect, dispatch, mode }) => {
         const { group } = dataSource.newOne;
         let g1 = groupList.filter(g => g.code+'' === group+'')[0];
         if(!g1) {
-            return ['nogroup']
+            return ['-1']
         }
         if(g1.pcode === '-1') {
             return [g1.code]
@@ -150,12 +150,12 @@ const DataSourceBaseConfig = ({ dataSource, dataConnect, dispatch, mode }) => {
                     changeOnSelect={true}
                     expandTrigger='hover'
 					placeholder='未分组'
-					options={[{pcode: '-1', code: 'nogroup', label: '未分组'}].concat(dataSource.groupList).filter(g => g.pcode === '-1').map((p, i)=>{
+					options={[{pcode: '-1', code: '-1', label: '未分组'}].concat(dataSource.groupList).filter(g => g.pcode === '-1').map((p, i)=>{
 						return {
                             key: p.code,
 							value: p.code,
 							label: p.label,
-							children: dataSource.groupList.filter(g => g.pcode === p.code).map(c => {
+							children: dataSource.groupList.filter(g => g.pcode === p.code && p.code !== '-1').map(c => {
                                 return {
                                     key: c.code,
                                     value: c.code,

src/components/datasource/dataSource.jsx

@@ -43,10 +43,10 @@ class DataSource extends React.Component {
         const list = dataSource.list;
         const currentGroup = dataSource.currentGroup;
         
-        let groupFilter = groupList.concat({ code: 'all', label: '全部分组' }).filter(g => (
+        let groupFilter = groupList.concat({ code: '-1', label: '未分组' }).filter(g => (
             currentGroup[0].code === 'all' || 
             (
-                currentGroup[0].code === 'nogroup' ? g.code === 'all' : (
+                currentGroup[0].code === '-1' ? g.code === '-1' : (
                     currentGroup[1] ? (g.code === currentGroup[1].code) : 
                     (
                         g.code === currentGroup[0].code ||
@@ -56,6 +56,8 @@ class DataSource extends React.Component {
             )
         )).map(g => g.code);
 
+        console.log('分组范围', groupFilter);
+
         return list.filter(l => groupFilter.indexOf(l.groupCode+'') !== -1);
     }
 

src/components/datasource/groupSelector.jsx

@@ -38,7 +38,7 @@ class GroupSelector extends React.Component {
                 visible={visible}
                 onVisibleChange={this.handleVisibleChange}
                 content={
-                    [{code: 'all', label: '全部分组'}, { code: 'nogroup', label: '未分组' }].concat(pgroups).map(p => {
+                    [{code: 'all', label: '全部分组'}, { code: '-1', label: '未分组' }].concat(pgroups).map(p => {
                         let cgroups = grouplist.filter(g => g.pcode === p.code && p.code !== '-1');
                         return <Row type='flex' justify='left' key={`gr-${p.code}`}>
                             <Col key={`rc-${p.code}`} onClick={() => {

src/models/chart.js

@@ -128,7 +128,7 @@ export default {
                             creator: d.createBy,
                             createTime: d.createDate,
                             description: d.describes || '',
-                            groupCode: d.chartsGroup+'' === '-1' ? 'all' : d.chartsGroup + ''
+                            groupCode: d.chartsGroup + ''
                         }
                     })
                     yield put({ type: 'list', list: list });

src/models/dataSource.js

@@ -190,7 +190,7 @@ export default {
                             createTime: new Date(r.createDate),
                             tags: tags,
                             description: r.note,
-                            groupCode: r.connectorGroup+'' === '-1' ? 'all' : r.connectorGroup+''
+                            groupCode: r.connectorGroup+''
                         }
                     });
                     console.log('请求数据源列表', res, data);