图表、数据源分组设置菜单文本改为‘移动到’/数据源新增保存按钮可用控制

src/components/chart/list.jsx

@@ -60,7 +60,7 @@ class ChartList extends React.Component {
 
         const operationMenu = (
             <Menu className='menu-operation'>
-                <Menu.SubMenu className='setgroupmenu' title={<div><Icon style={{ marginRight: '6px' }} type='profile' />分组</div>}>
+                <Menu.SubMenu className='setgroupmenu' title={<div><Icon style={{ marginRight: '6px' }} type='profile' />移动到</div>}>
                     {this.createGroupMenu(selectedRecord)}
                 </Menu.SubMenu>
                 <Menu.Divider />

src/components/datasource/columnConfig.jsx

@@ -183,6 +183,7 @@ class DataSourceColumnConfig extends React.Component {
                 return(
                     <Input
                         value={text}
+                        placeholder={record.description ? record.description.substring(0, 10) : record.name}
                         onChange={(e) => {
                             const value = e.target.value;
                             let columns = dataSource.newOne.columns.map(c => {

src/components/datasource/dataSource.jsx

@@ -265,7 +265,7 @@ class DataSource extends React.Component {
                 </Menu.Item>
                 <Menu.Item><Icon type="search" />预览数据</Menu.Item>
                 <Menu.Divider />
-                <Menu.SubMenu className='setgroupmenu' title={<div><Icon style={{ marginRight: '6px' }} type='profile' />分组</div>}>
+                <Menu.SubMenu className='setgroupmenu' title={<div><Icon style={{ marginRight: '6px' }} type='profile' />移动到</div>}>
                     {this.createGroupMenu(selectedRecord)}
                 </Menu.SubMenu>
                 <Menu.Divider />

src/components/datasource/dataSourceDetail.jsx

@@ -128,9 +128,13 @@ class DataSourceDetail extends React.Component {
                                     tab: key
                                 })
                             }}
-                            tabBarExtraContent={<Button onClick={() => {
-                                dispatch({ type: 'dataSource/remoteModify', code: this.props.match.params.code });
-                            }}>保存修改</Button>}
+                            tabBarExtraContent={
+                                <Button disabled={ ( ( type === 'database' && !dataSource.newOne.name) || ( type === 'file' && +1 === 2) ) ||
+                                    (!dataSource.newOne.columns || dataSource.newOne.columns.length === 0)
+                                } type="primary" onClick={() => {
+                                    dispatch({ type: 'dataSource/remoteModify', code: this.props.match.params.code });
+                                }}>保存修改</Button>
+                            }
                         >
                             {tabs.map((item, index) => {
                                 return <TabPane className='tab-datasource' key={item.tabName} tab={item.title}>

src/models/dataSource.js

@@ -226,7 +226,7 @@ export default {
                     columnConfig: model.columns.map((c, i) => {
                         return {
                             columnName: c.name,
-                            columnLable: c.alias,
+                            columnLable: c.alias || c.description || c.name,
                             dataType: c.dataType,
                             columnType: c.columnType,
                             isGroup: c.groupable?'1':'0',
@@ -337,7 +337,7 @@ export default {
                             key: i,
                             using: true,
                             name: d.columnName,
-                            alias: d.remarks?d.remarks.substring(0, 10):'',
+                            alias: d.remarks ? d.remarks.substring(0, 10) : (d.columnName),
                             dataType: d.columnType,
                             columnType: getColumnType(d.columnType),
                             groupable: d.columnType === 'VARCHAR2',
@@ -410,7 +410,7 @@ export default {
                     columnConfig: model.columns ? model.columns.map((c, i) => {
                         return {
                             columnName: c.name,
-                            columnLable: c.alias,
+                            columnLable: c.alias || c.description || c.name,
                             dataType: c.dataType,
                             columnType: c.columnType,
                             isGroup: c.groupable?'1':'0',