‘文件结构调整-通用组件移动到common文件夹下

src/components/admin/userGroupManagement.jsx

@@ -6,7 +6,7 @@ import { Layout, Input, Table, Button, Icon, Menu } from 'antd'
 import { connect } from 'dva'
 import './userGroupManagement.less'
 import DetailBox from './userGroupDetailBox'
-import AddMemberBox from '../common/selectUserBox'
+import AddMemberBox from '../common/selectUserBox/selectUserBox'
 const { Sider, Content } = Layout
 const { Search } = Input
 

src/components/chart/distributeBox.jsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import { Modal, Layout, Card, Table, Col, Row, Button, Input, Icon, Tag, Checkbox } from 'antd'
 import { connect } from 'dva'
-import FilterBox from '../chartDesigner/sections/filterBox'
+import FilterBox from '../common/filterBox/filterBox'
 import AccessObjectBox from '../datasource/accessObjectBox'
 import * as moment from 'moment'
 import './distributeBox.less'

src/components/chart/list.jsx

@@ -12,8 +12,8 @@ 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 '../common/selectUserBox'
-import DeleteBox from '../common/deleteBox'
+import TransferBox from '../common/selectUserBox/selectUserBox'
+import DeleteBox from '../common/deleteBox/deleteBox'
 const { Content } = Layout
 const { Search } = Input
 const CardGrid = Card.Grid

src/components/chartDesigner/sections/toolbar.jsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import { Tag, Icon, Button } from 'antd'
-import FilterBox from './filterBox'
+import FilterBox from '../../common/filterBox/filterBox'
 import { connect } from 'dva'
 import { dateFormat } from '../../../utils/baseUtils'
 import './toolbar.less'

src/components/common/filterBox/filterOperators.json

@@ -0,0 +1,150 @@
+{
+    "index": [{
+        "value": "contain",
+        "label": "包含"
+    }, {
+        "value": "notContain",
+        "label": "不包含"
+    }, {
+        "value": "startsWith",
+        "label": "开头是"
+    }, {
+        "value": "endsWith",
+        "label": "结尾是"
+    }, {
+        "value": "equals",
+        "label": "等于"
+    }, {
+        "value": "notEquals",
+        "label": "不等于"
+    }, {
+        "value": "null",
+        "label": "为空"
+    }, {
+        "value": "notNull",
+        "label": "不为空"
+    }],
+    "string": [{
+        "value": "contain",
+        "label": "包含"
+    }, {
+        "value": "notContain",
+        "label": "不包含"
+    }, {
+        "value": "startsWith",
+        "label": "开头是"
+    }, {
+        "value": "endsWith",
+        "label": "结尾是"
+    }, {
+        "value": "equals",
+        "label": "等于"
+    }, {
+        "value": "notEquals",
+        "label": "不等于"
+    }, {
+        "value": "null",
+        "label": "为空"
+    }, {
+        "value": "notNull",
+        "label": "不为空"
+    }],
+    "scale": [{
+        "value": ">",
+        "label": "大于"
+    }, {
+        "value": ">=",
+        "label": "大于等于"
+    }, {
+        "value": "=",
+        "label": "等于"
+    }, {
+        "value": "<=",
+        "label": "小于等于"
+    }, {
+        "value": "<",
+        "label": "小于"
+    }, {
+        "value": "<>",
+        "label": "不等于"
+    }, {
+        "value": "between",
+        "label": "介于"
+    }, {
+        "value": "null",
+        "label": "为空"
+    }, {
+        "value": "notNull",
+        "label": "不为空"
+    }],
+    "time": [{
+        "value": "=",
+        "label": "等于"
+    }, {
+        "value": ">",
+        "label": "开始于"
+    }, {
+        "value": "<=",
+        "label": "结束于"
+    }, {
+        "value": "between",
+        "label": "介于"
+    }, {
+        "value": "null",
+        "label": "为空"
+    }, {
+        "value": "notNull",
+        "label": "不为空"
+    }],
+    "categorical": [{
+        "value": "=",
+        "label": "等于"
+    }, {
+        "value": "in",
+        "label": "包含"
+    }, {
+        "value": "<>",
+        "label": "不等于"
+    }, {
+        "value": "noIn",
+        "label": "不包含"
+    }, {
+        "value": "null",
+        "label": "为空"
+    }, {
+        "value": "notNull",
+        "label": "不为空"
+    }],
+    "ordinal": [{
+        "value": ">",
+        "label": "大于"
+    }, {
+        "value": ">=",
+        "label": "大于等于"
+    }, {
+        "value": "=",
+        "label": "等于"
+    }, {
+        "value": "<=",
+        "label": "小于等于"
+    }, {
+        "value": "<",
+        "label": "小于"
+    }, {
+        "value": "<>",
+        "label": "不等于"
+    }, {
+        "value": "between",
+        "label": "介于"
+    }, {
+        "value": "null",
+        "label": "为空"
+    }, {
+        "value": "notNull",
+        "label": "不为空"
+    }],
+    "undefined": [{
+        "value": "null",
+        "label": "无"
+    }]
+}

src/components/common/login.jsx → src/components/common/login/login.jsx

@@ -3,8 +3,8 @@ import Login from 'ant-design-pro/lib/Login'
 import { Alert, Checkbox } from 'antd'
 import { Link, Redirect } from 'dva/router'
 import { connect } from 'dva'
-import * as service from '../../services/index'
-import URLS from '../../constants/url'
+import * as service from '../../../services/index'
+import URLS from '../../../constants/url'
 import './login.less'
 
 const { UserName, Password, Submit } = Login;

src/components/common/rootLayout.jsx

@@ -32,7 +32,7 @@ class RootLayout extends React.Component {
                 <div className='confirm-body'>
                     <div className='confirm-icon'><Icon type="info-circle" /></div>
                     <div className='confirm-label'>登录已过期</div>
-                    <div className='confirm-text'>距离上次登录已经超过30分钟，您必须重新登录以继续使用本系统</div>
+                    <div className='confirm-text'>距离上次登录已经超过30分钟，请重新登录</div>
                     <div className='confirm-button'>
                         <Button type="primary" onClick={this.setGoLogin}>重新登录</Button>
                     </div>

src/components/common/selectUserBox.jsx → src/components/common/selectUserBox/selectUserBox.jsx

@@ -3,8 +3,8 @@
  */
 import React from 'react'
 import { Modal, Row, Col, Select, Spin } from 'antd'
-import * as service from '../../services/index'
-import URLS from '../../constants/url'
+import * as service from '../../../services/index'
+import URLS from '../../../constants/url'
 const SelectOption = Select.Option
 
 class AddGroupMemberBox extends React.Component {

src/components/dashboard/distributeBox.jsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import { Modal, Layout, Card, Table, Col, Row, Button, Input, Icon, Tag, Checkbox } from 'antd'
 import { connect } from 'dva'
-import FilterBox from '../chartDesigner/sections/filterBox'
+import FilterBox from '../common/filterBox/filterBox'
 import AccessObjectBox from '../datasource/accessObjectBox'
 import * as moment from 'moment'
 import './distributeBox.less'

src/components/dashboard/list.jsx

@@ -4,11 +4,11 @@ import { connect } from 'dva'
 import { dateFormat } from '../../utils/baseUtils'
 import Ellipsis from 'ant-design-pro/lib/Ellipsis'
 import DistributeBox from './distributeBox'
-import TransferBox from '../common/selectUserBox';
+import TransferBox from '../common/selectUserBox/selectUserBox';
 import 'ant-design-pro/dist/ant-design-pro.css'
 import Thumbnail from './thumbnail'
 import './list.less'
-import DeleteBox from '../common/deleteBox'
+import DeleteBox from '../common/deleteBox/deleteBox'
 const { Content } = Layout
 const { Search } = Input
 const CardGrid = Card.Grid

src/components/datasource/accessConfig.jsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import { connect } from 'dva'
 import { Layout, Card, Row, Col, Table, Input, Checkbox, Button, Switch, Icon, Tag } from 'antd'
-import FilterBox from '../chartDesigner/sections/filterBox'
+import FilterBox from '../common/filterBox/filterBox'
 import AccessObjectBox from './accessObjectBox'
 import * as moment from 'moment'
 import './accessConfig.less'

src/components/datasource/dataSource.jsx

@@ -4,8 +4,8 @@ import { connect } from 'dva'
 import './dataSource.less'
 import { dateFormat } from '../../utils/baseUtils'
 import GroupSelector from './groupSelector'
-import TransferBox from '../common/selectUserBox';
-import DeleteBox from '../common/deleteBox';
+import TransferBox from '../common/selectUserBox/selectUserBox';
+import DeleteBox from '../common/deleteBox/deleteBox';
 const { Content } = Layout
 const { Search } = Input
 const { TreeNode } = Tree

src/routes/mainLayout.js

@@ -3,7 +3,7 @@ import { Layout } from 'antd'
 import { Route, Switch } from 'dva/router'
 import Navigator from '../components/common/navigator'
 import HomePage from '../components/homePage/homePage'
-import Loading from '../components/common/loading'
+import Loading from '../components/common/loading/loading'
 import DataSourceDetail from '../components/datasource/dataSourceDetail'
 import DataSource from '../components/datasource/dataSource'
 import Dashboard from '../components/dashboard/list'

src/routes/router.js

@@ -2,8 +2,8 @@ import React from 'react'
 import { LocaleProvider } from 'antd'
 import { Router, Route, Switch } from 'dva/router'
 import RootLayout from '../components/common/rootLayout'
-import Login from '../components/common/login'
-import Register from '../components/common/register'
+import Login from '../components/common/login/login'
+import Register from '../components/common/login/register'
 import MainLayout from './mainLayout'
 import ChartDesigner from '../components/chartDesigner/layout'
 import DashboardDesigner from '../components/dashboardDesigner/layout'

src/utils/request.js

@@ -5,6 +5,7 @@ function parseJSON(response) {
 }
 
 function checkStatus(response) {
+  console.log(response);
   if (response.status >= 200 && response.status < 300) {
     return response;
   }