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

src/models/dataConnect.js

@@ -160,9 +160,15 @@ export default {
             }
         },
         *remoteAdd(action, { select, call, put, takeEvery, takeLatest }) {
-            const dataConnect = yield select(state => state.present.dataConnect);
-            const model = dataConnect.newOne;
             try {
+                yield put({ type: 'remoteValidate' }); // 新增前校验
+
+                const dataConnect = yield select(state => state.present.dataConnect);
+                const model = dataConnect.newOne;
+
+                if(model.invalid) {
+                    return;
+                }
                 let body = {
                     name: model.name,
                     addrass: model.address,
@@ -189,11 +195,16 @@ export default {
             }
         },
         *remoteModify(action, { select, call, put }) {
-            const dataConnect = yield select(state => state.present.dataConnect);
-            let model = dataConnect.newOne;
-            const code = action.code;
-            let list = dataConnect.list;
             try{
+                const dataConnect = yield select(state => state.present.dataConnect);
+                const model = dataConnect.newOne;
+                
+                if(model.invalid) {
+                    return;
+                }
+
+                const code = action.code;
+
                 let data = {
                     id: code,
                     name: model.name,
@@ -210,6 +221,7 @@ export default {
                     body: data
                 });
                 if(!res.err && res.data.code > 0) {
+                    let list = dataConnect.list;
                     list = list.map(l => {
                         if((l.code+'') === (action.code+'')) {
                             l = model;