eoss-mobiles 0.2.21 → 0.2.23

package/lib/picker.js

@@ -1740,18 +1740,19 @@ var axios_ajax = function ajax(url) {
     withCredentials: false
   });
   http.interceptors.request.use(function (config) {
-    if (type === 'post' && !format) {
-      config.params = external_qs_default.a.stringify(params.params || params);
-      if (!config.headers['content-type'] && !headers['Content-Type']) {
-        config.headers['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
-      }
-    } else {
-      if (!config.headers['content-type'] && !headers['Content-Type']) {
-        config.headers['content-type'] = 'application/json;charset=UTF-8';
+    if ((params.params || params) instanceof FormData === false) {
+      if (type === 'post' && !format) {
+        config.params = external_qs_default.a.stringify(params.params || params);
+        if (!config.headers['content-type'] && !headers['Content-Type']) {
+          config.headers['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
+        }
+      } else {
+        if (!config.headers['content-type'] && !headers['Content-Type']) {
+          config.headers['content-type'] = 'application/json;charset=UTF-8';
+        }
+        config.params = params.params || params;
       }
-      config.params = params.params || params;
     }
-
     if (util["a" /* default */].getStorage('token')) {
       config.headers.Authorization = util["a" /* default */].getStorage('token');
     }

package/lib/radio.js

@@ -1740,18 +1740,19 @@ var axios_ajax = function ajax(url) {
     withCredentials: false
   });
   http.interceptors.request.use(function (config) {
-    if (type === 'post' && !format) {
-      config.params = external_qs_default.a.stringify(params.params || params);
-      if (!config.headers['content-type'] && !headers['Content-Type']) {
-        config.headers['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
-      }
-    } else {
-      if (!config.headers['content-type'] && !headers['Content-Type']) {
-        config.headers['content-type'] = 'application/json;charset=UTF-8';
+    if ((params.params || params) instanceof FormData === false) {
+      if (type === 'post' && !format) {
+        config.params = external_qs_default.a.stringify(params.params || params);
+        if (!config.headers['content-type'] && !headers['Content-Type']) {
+          config.headers['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
+        }
+      } else {
+        if (!config.headers['content-type'] && !headers['Content-Type']) {
+          config.headers['content-type'] = 'application/json;charset=UTF-8';
+        }
+        config.params = params.params || params;
       }
-      config.params = params.params || params;
     }
-
     if (util["a" /* default */].getStorage('token')) {
       config.headers.Authorization = util["a" /* default */].getStorage('token');
     }

package/lib/retrial-auth.js

@@ -1744,18 +1744,19 @@ var axios_ajax = function ajax(url) {
     withCredentials: false
   });
   http.interceptors.request.use(function (config) {
-    if (type === 'post' && !format) {
-      config.params = external_qs_default.a.stringify(params.params || params);
-      if (!config.headers['content-type'] && !headers['Content-Type']) {
-        config.headers['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
-      }
-    } else {
-      if (!config.headers['content-type'] && !headers['Content-Type']) {
-        config.headers['content-type'] = 'application/json;charset=UTF-8';
+    if ((params.params || params) instanceof FormData === false) {
+      if (type === 'post' && !format) {
+        config.params = external_qs_default.a.stringify(params.params || params);
+        if (!config.headers['content-type'] && !headers['Content-Type']) {
+          config.headers['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
+        }
+      } else {
+        if (!config.headers['content-type'] && !headers['Content-Type']) {
+          config.headers['content-type'] = 'application/json;charset=UTF-8';
+        }
+        config.params = params.params || params;
       }
-      config.params = params.params || params;
     }
-
     if (util["a" /* default */].getStorage('token')) {
       config.headers.Authorization = util["a" /* default */].getStorage('token');
     }

package/lib/selector.js

@@ -1740,18 +1740,19 @@ var axios_ajax = function ajax(url) {
     withCredentials: false
   });
   http.interceptors.request.use(function (config) {
-    if (type === 'post' && !format) {
-      config.params = external_qs_default.a.stringify(params.params || params);
-      if (!config.headers['content-type'] && !headers['Content-Type']) {
-        config.headers['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
-      }
-    } else {
-      if (!config.headers['content-type'] && !headers['Content-Type']) {
-        config.headers['content-type'] = 'application/json;charset=UTF-8';
+    if ((params.params || params) instanceof FormData === false) {
+      if (type === 'post' && !format) {
+        config.params = external_qs_default.a.stringify(params.params || params);
+        if (!config.headers['content-type'] && !headers['Content-Type']) {
+          config.headers['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
+        }
+      } else {
+        if (!config.headers['content-type'] && !headers['Content-Type']) {
+          config.headers['content-type'] = 'application/json;charset=UTF-8';
+        }
+        config.params = params.params || params;
       }
-      config.params = params.params || params;
     }
-
     if (util["a" /* default */].getStorage('token')) {
       config.headers.Authorization = util["a" /* default */].getStorage('token');
     }

package/lib/table-column.js

@@ -1740,18 +1740,19 @@ var axios_ajax = function ajax(url) {
     withCredentials: false
   });
   http.interceptors.request.use(function (config) {
-    if (type === 'post' && !format) {
-      config.params = external_qs_default.a.stringify(params.params || params);
-      if (!config.headers['content-type'] && !headers['Content-Type']) {
-        config.headers['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
-      }
-    } else {
-      if (!config.headers['content-type'] && !headers['Content-Type']) {
-        config.headers['content-type'] = 'application/json;charset=UTF-8';
+    if ((params.params || params) instanceof FormData === false) {
+      if (type === 'post' && !format) {
+        config.params = external_qs_default.a.stringify(params.params || params);
+        if (!config.headers['content-type'] && !headers['Content-Type']) {
+          config.headers['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
+        }
+      } else {
+        if (!config.headers['content-type'] && !headers['Content-Type']) {
+          config.headers['content-type'] = 'application/json;charset=UTF-8';
+        }
+        config.params = params.params || params;
       }
-      config.params = params.params || params;
     }
-
     if (util["a" /* default */].getStorage('token')) {
       config.headers.Authorization = util["a" /* default */].getStorage('token');
     }

package/lib/table.js

@@ -1628,18 +1628,19 @@ var axios_ajax = function ajax(url) {
     withCredentials: false
   });
   http.interceptors.request.use(function (config) {
-    if (type === 'post' && !format) {
-      config.params = external_qs_default.a.stringify(params.params || params);
-      if (!config.headers['content-type'] && !headers['Content-Type']) {
-        config.headers['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
-      }
-    } else {
-      if (!config.headers['content-type'] && !headers['Content-Type']) {
-        config.headers['content-type'] = 'application/json;charset=UTF-8';
+    if ((params.params || params) instanceof FormData === false) {
+      if (type === 'post' && !format) {
+        config.params = external_qs_default.a.stringify(params.params || params);
+        if (!config.headers['content-type'] && !headers['Content-Type']) {
+          config.headers['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
+        }
+      } else {
+        if (!config.headers['content-type'] && !headers['Content-Type']) {
+          config.headers['content-type'] = 'application/json;charset=UTF-8';
+        }
+        config.params = params.params || params;
       }
-      config.params = params.params || params;
     }
-
     if (util["a" /* default */].getStorage('token')) {
       config.headers.Authorization = util["a" /* default */].getStorage('token');
     }

package/lib/utils/axios.js

@@ -35,18 +35,19 @@ var ajax = function ajax(url) {
     withCredentials: false
   });
   http.interceptors.request.use(function (config) {
-    if (type === 'post' && !format) {
-      config.params = _qs2.default.stringify(params.params || params);
-      if (!config.headers['content-type'] && !headers['Content-Type']) {
-        config.headers['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
-      }
-    } else {
-      if (!config.headers['content-type'] && !headers['Content-Type']) {
-        config.headers['content-type'] = 'application/json;charset=UTF-8';
+    if ((params.params || params) instanceof FormData === false) {
+      if (type === 'post' && !format) {
+        config.params = _qs2.default.stringify(params.params || params);
+        if (!config.headers['content-type'] && !headers['Content-Type']) {
+          config.headers['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
+        }
+      } else {
+        if (!config.headers['content-type'] && !headers['Content-Type']) {
+          config.headers['content-type'] = 'application/json;charset=UTF-8';
+        }
+        config.params = params.params || params;
       }
-      config.params = params.params || params;
     }
-
     if (_util2.default.getStorage('token')) {
       config.headers.Authorization = _util2.default.getStorage('token');
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-mobiles",
-  "version": "0.2.21",
+  "version": "0.2.23",
   "description": "eoss内部移动端业务组件",
   "main": "lib/eoss-mobile.common.js",
   "files": [

package/packages/flow/src/components/Handle.vue

@@ -437,6 +437,7 @@ import Opinion from './Opinion.vue';
 import Reject from './Reject.vue';
 import Message from './Message.vue';
 import FlowMix from '../flowMix';
+import $ from '../../../../src/utils/util'
 export default {
   name: 'Handle',
   inheritAttrs: false,
@@ -701,7 +702,7 @@ export default {
         pendingId,
         opinion: this.form.opinion,
         taskAction: 'complete',
-        userId: this.userId
+        userId: this.userId || $.getStorage('userId')
       };
       let formData = new FormData();
       if (this.form.isImageOpinion == 1) {
@@ -869,7 +870,7 @@ export default {
       _that.form.processDefinitionId = taskExamineInfo.processDefinitionId;
       _that.form.isSubFlow = taskExamineInfo.isSubFlow;
       _that.form.nodeId = taskExamineInfo.nodeId;
-      _that.form.userId = _that.userId;
+      _that.form.userId = _that.userId || $.getStorage('userId');
       _that.form.nextNodeId =
         _that.form.nextOperate == 0 || _that.form.nextOperate == 1
           ? _that.form.nextNodeId || nodeInfoMapInfo.nodeExtAttr.defaultNextNode

package/packages/flow/src/components/Reject.vue

@@ -45,6 +45,7 @@ import { taskRejectHtml, toTaskRejectHtml } from '../../../../src/config/api';
 import request from '../../../../src/utils/http.js';
 import Opinion from './Opinion.vue';
 import Message from './Message.vue';
+import $ from '../../../../src/utils/util'
 export default {
   name: 'Reject',
   props: {
@@ -141,7 +142,7 @@ export default {
         formData.append('file', this.file);
       }
       formData.append('pendingId', this.pendingId);
-      this.form.userId = this.userId;
+      this.form.userId = this.userId || $.getStorage('userId');
       for (let key in this.form) {
         if (this.form[key] !== '' && this.form[key] !== undefined) {
           formData.append(key, this.form[key]);

package/packages/flow/src/components/StartFlow.vue

@@ -116,6 +116,7 @@ import request from '../../../../src/utils/http.js';
 import Opinion from './Opinion.vue';
 import Message from './Message.vue';
 import { Dialog } from 'eoss-mobile-vant';
+import $ from '../../../../src/utils/util'
 export default {
   name: 'StartFlow',
   inheritAttrs: false,
@@ -282,7 +283,7 @@ export default {
         notificationMsg: this.form.notificationMsg,
         loginType: 2, //登录方式
         isImageOpinion:this.form.isImageOpinion,
-        userId: this.userId
+        userId: this.userId || $.getStorage('userId')
       };
       if (this.beforeSubmit) {
         this.beforeSubmit(info);
@@ -292,7 +293,6 @@ export default {
       if (this.form.isImageOpinion == 1) {
         formData.append('file', this.file);
       }
-      formData.append('pendingId', this.pendingId);
       for (let key in info) {
         if (info[key] !== '' && info[key] !== undefined) {
           formData.append(key, info[key]);

package/packages/flow/src/components/taskUnionExamine.vue

@@ -99,6 +99,7 @@ import {
 import request from '../../../../src/utils/http.js';
 import Opinion from './Opinion.vue';
 import Message from './Message.vue';
+import $ from '../../../../src/utils/util'
 export default {
   name: 'TaskUnionExamine',
   props: {
@@ -457,7 +458,7 @@ export default {
           choiceDeptId,
           isSubFlow,
           choiceOrgId,
-          userId: this.userId
+          userId: this.userId || $.getStorage('userId')
         }
         let formData = new FormData();
       if (isImageOpinion == 1) {

package/src/index.js

@@ -101,7 +101,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.2.21',
+  version: '0.2.23',
   install,
   Button,
   ButtonGroup,

package/src/utils/axios.js

@@ -15,19 +15,20 @@ const ajax = (url, params = {}, headers = {}, format = true, type = 'get') => {
   });
   http.interceptors.request.use(
     config => {
-      if (type === 'post' && !format) {
-        config.params = qs.stringify(params.params || params);
-        if (!config.headers['content-type'] && !headers['Content-Type']) {
-          config.headers['content-type'] =
-            'application/x-www-form-urlencoded;charset=UTF-8';
-        }
-      } else {
-        if (!config.headers['content-type'] && !headers['Content-Type']) {
-          config.headers['content-type'] = 'application/json;charset=UTF-8';
+      if ((params.params || params) instanceof FormData === false) {
+        if (type === 'post' && !format) {
+          config.params = qs.stringify(params.params || params);
+          if (!config.headers['content-type'] && !headers['Content-Type']) {
+            config.headers['content-type'] =
+              'application/x-www-form-urlencoded;charset=UTF-8';
+          }
+        } else {
+          if (!config.headers['content-type'] && !headers['Content-Type']) {
+            config.headers['content-type'] = 'application/json;charset=UTF-8';
+          }
+          config.params = params.params || params;
         }
-        config.params = params.params || params;
       }
-
       if ($.getStorage('token')) {
         config.headers.Authorization = $.getStorage('token');
       }