修复总体统计图分组无法选中的问题/localStorage保存账号信息逻辑调整/

src/components/chartDesigner/sections/aggregateTableConfigForm.jsx

@@ -68,9 +68,14 @@ class AggregateTableConfigForm extends React.Component {
 						allowClear={true}
 						showSearch
 						filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
-						onChange={(value) => {
-							const column = value ? columns.find(c => c.name === value.key) : null;
-							const groupBy = column ? { ...value, type: column.type } : undefined;
+						onChange={(values) => {
+							const groupBy = [];
+							values.forEach(value => {
+								const column = value.key ? columns.find(c => c.name === value.key) : null;
+								const g = column ? { ...value, type: column.type } : undefined;
+								groupBy.push(g);
+							});
+							
 							dispatch({ type: 'chartDesigner/changeField', name: 'aggregateTableConfig', value: { ...props.chartDesigner.aggregateTableConfig, groupBy }, autoRefresh });
 						}}
 						value={chartDesigner.aggregateTableConfig.groupBy}

src/components/common/login/login.jsx

@@ -16,7 +16,8 @@ function authenticate(token, expireTime, user, autoLogin, cb ) {
 
     window.localStorage.setItem("usercode", user.code);
     autoLogin ? window.localStorage.setItem("autoLogin", 'true') : window.localStorage.setItem("autoLogin", 'false');
-    autoLogin ? window.localStorage.setItem("account", user.account) : window.localStorage.removeItem('account');
+    // autoLogin ? window.localStorage.setItem("account", user.account) : window.localStorage.removeItem('account');
+    window.localStorage.setItem("account", user.account);
     autoLogin ? window.localStorage.setItem("password", user.password) : window.localStorage.removeItem('password');
     window.localStorage.setItem("username", user.name);
     window.localStorage.setItem("userrole", user.role);
@@ -127,7 +128,8 @@ class LoginComponent extends React.Component {
                                 name="username"
                                 disabled={fetching}
                                 placeholder='输入用户名'
-                                defaultValue={autoLogin ? defaultAccount : ''}
+                                // defaultValue={autoLogin ? defaultAccount : ''}
+                                defaultValue={defaultAccount}
                                 onChange={() => {
                                     this.setState({
                                         notice: ''
@@ -135,7 +137,8 @@ class LoginComponent extends React.Component {
                                 }}
                                 rules={[{
                                     required: true,
-                                    message: '用户名不能为空'
+                                    whitespace: true,
+                                    message: '用户名不能为空！'
                                 }]}
                                 onPressEnter={(e) => {
                                     document.getElementsByClassName('antd-pro-login-submit')[0].click();
@@ -153,7 +156,8 @@ class LoginComponent extends React.Component {
                                 }}
                                 rules={[{
                                     required: true,
-                                    message: '密码不能为空'
+                                    whitespace: true,
+                                    message: "密码不能为空！",
                                 }]}
                                 onPressEnter={(e) => {
                                     document.getElementsByClassName('antd-pro-login-submit')[0].click();
@@ -161,16 +165,16 @@ class LoginComponent extends React.Component {
                             />
                             <div>
                                 <Checkbox defaultChecked={autoLogin} onChange={this.changeAutoLogin}>记住密码</Checkbox>
-                                <a style={{ float: 'right' }} href="">忘记密码</a>
+                                {/* <a style={{ float: 'right' }} href="">忘记密码</a> */}
                             </div>
                             <Submit disabled={fetching}>
                                 {fetching && <Icon type="loading" theme="outlined" />}
                                 {fetching ? '登录中...' : '登录'}
                             </Submit>
                             <div>
-                                <Link to="/register">
-                                    <span style={{ float: 'right' }} href="">注册</span>
-                                </Link>
+                                {/* <Link to="/register">
+                                    <span style={{ float: 'right' }}>注册</span>
+                                </Link> */}
                             </div>
                         </Login>
                     </div>

src/components/dataSourceDetail/content.less

@@ -8,6 +8,7 @@
             padding-top: 32px;
             padding-bottom: 60px;
             .ant-steps {
+                border-bottom: none;
                 margin-top: -32px;
             }
         }

src/components/dataSourceDetail/header.jsx

@@ -16,7 +16,7 @@ class DataSourceDetailHeader extends React.Component {
                     }}>
                         <Icon type='left' />返回
                     </Button>
-                    {code && <Button disabled={ ( ( type === 'database' && !name) || ( type === 'file' && +1 === 2) ) ||
+                    {code && code !== 'create' && <Button disabled={ ( ( type === 'database' && !name) || ( type === 'file' && +1 === 2) ) ||
                         (!columns || columns.length === 0)
                     } onClick={() => {
                         dispatch({ type: 'dataSource/remoteModify' });