Merge branch 'master' of ssh://10.10.100.21/source/platform-bi-web

src/components/dataSourceDetail/baseConfig.jsx

@@ -92,7 +92,10 @@ class DataSourceBaseConfig extends React.Component {
                         key={dataSourceDetail.name}
                         defaultValue={dataSourceDetail.name}
                         onBlur={(e) => {
-                            dispatch({ type: 'dataSourceDetail/setField', name: 'name', value: e.target.value+'' });
+                            let value = e.target.value;
+                            if(value !== dataSourceDetail.name) {
+                                dispatch({ type: 'dataSourceDetail/setField', name: 'name', value });
+                            }
                         }}
                         onChange={e => {
                             let val = e.target.value + '';
@@ -264,7 +267,10 @@ class DataSourceBaseConfig extends React.Component {
                         autosize={{ minRows: 2, maxRows: 5 }}
                         defaultValue={dataSourceDetail.description}
                         onBlur={(e) => {
-                            dispatch({ type: 'dataSourceDetail/setField', name: 'description', value: e.target.value });
+                            let value = e.target.value;
+                            if(value !== dataSourceDetail.description) {
+                                dispatch({ type: 'dataSourceDetail/setField', name: 'description', value });
+                            }
                         }}
                         onChange={e => {
                             let val = e.target.value + '';

src/models/dataSource.js

@@ -390,6 +390,7 @@ export default {
                 });
                 if(res.code > 0) {
                     yield put({ type: 'fetchList', mandatory: true });
+                    yield put({ type: 'dataSourceDetail/setDirty', dirty: false });
                     message.success('保存成功');
                 }else {
                     message.error('保存失败: ' + res.msg);