eoss-mobiles 0.2.30 → 0.2.32

package/lib/table.js

@@ -1619,6 +1619,8 @@ var axios_ajax = function ajax(url) {
   var headers = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   var format = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
   var type = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 'get';
+  var isData = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
+  var isParams = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : true;
 
   var http = external_axios_default.a.create({
     baseURL: apiUrl,
@@ -1682,6 +1684,13 @@ var axios_ajax = function ajax(url) {
     if (config.url.search('mecp/overtime') !== -1 || config.url.search('mecp/leave') !== -1 || config.url.search('contractext') !== -1 || config.url.search('getSysParam') !== -1) {
       delete config.headers.deviceId;
     }
+    if (!isData) {
+      delete config.data;
+    }
+    if (!isParams) {
+      delete config.params;
+    }
+
     return config;
   }, function (error) {
     return Promise.error(error);
@@ -1765,6 +1774,8 @@ var base = {
     var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     var headers = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
     var format = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+    var isData = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true;
+    var isParams = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
 
     if (params.params && url.search('registerNew') === -1) {
       params.params.userId = params.params.userId ? params.params.userId : util["a" /* default */].getStorage('userId');
@@ -1783,16 +1794,18 @@ var base = {
     }
     return axios_ajax(url, {
       params: params
-    }, headers, format);
+    }, headers, format, 'get', isData, isParams);
   },
   post: function post(url, params, headers, format) {
-    console.log(params, 'params');
+    var isData = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true;
+    var isParams = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
+
     if (params.params) {
       params.params.userId = params.params.userId || util["a" /* default */].getStorage('userId');
     } else {
       params.userId = params.userId || util["a" /* default */].getStorage('userId');
     }
-    return axios_ajax(url, params, headers, format, 'post');
+    return axios_ajax(url, params, headers, format, 'post', isData, isParams);
   }
 };
 /* harmony default export */ var axios = (base);
@@ -1800,21 +1813,22 @@ var base = {
 
 var http_request = function request(options) {
   var fn = void 0;
+  console.log(options, 'sss');
   switch (options.type) {
     case 'post':
-      fn = axios.post(options.url, options.params, options.headers, options.format);
+      fn = axios.post(options.url, options.params, options.headers, options.format, options.isData, options.isParams);
       break;
     case 'POST':
-      fn = axios.post(options.url, options.params, options.headers, options.format);
+      fn = axios.post(options.url, options.params, options.headers, options.format, options.isData, options.isParams);
       break;
     case 'get':
-      fn = axios.get(options.url, options.params, options.headers = {});
+      fn = axios.get(options.url, options.params, options.headers = {}, options.format = false, options.isData = true, options.isParams = true);
       break;
     case 'GET':
-      fn = axios.get(options.url, options.params, options.headers = {});
+      fn = axios.get(options.url, options.params, options.headers = {}, options.format = false, options.isData = true, options.isParams = true);
       break;
     default:
-      fn = axios.get(options.url, options.params, options.headers = {});
+      fn = axios.get(options.url, options.params, options.headers = {}, options.format = false, options.isData = true, options.isParams = true);
   }
   return fn;
 };

package/lib/utils/axios.js

@@ -25,6 +25,8 @@ var ajax = function ajax(url) {
   var headers = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   var format = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
   var type = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 'get';
+  var isData = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
+  var isParams = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : true;
 
   var http = _axios2.default.create({
     baseURL: apiUrl,
@@ -88,6 +90,13 @@ var ajax = function ajax(url) {
     if (config.url.search('mecp/overtime') !== -1 || config.url.search('mecp/leave') !== -1 || config.url.search('contractext') !== -1 || config.url.search('getSysParam') !== -1) {
       delete config.headers.deviceId;
     }
+    if (!isData) {
+      delete config.data;
+    }
+    if (!isParams) {
+      delete config.params;
+    }
+
     return config;
   }, function (error) {
     return Promise.error(error);
@@ -171,6 +180,8 @@ var base = {
     var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     var headers = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
     var format = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+    var isData = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true;
+    var isParams = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
 
     if (params.params && url.search('registerNew') === -1) {
       params.params.userId = params.params.userId ? params.params.userId : _util2.default.getStorage('userId');
@@ -189,16 +200,18 @@ var base = {
     }
     return ajax(url, {
       params: params
-    }, headers, format);
+    }, headers, format, 'get', isData, isParams);
   },
   post: function post(url, params, headers, format) {
-    console.log(params, 'params');
+    var isData = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true;
+    var isParams = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
+
     if (params.params) {
       params.params.userId = params.params.userId || _util2.default.getStorage('userId');
     } else {
       params.userId = params.userId || _util2.default.getStorage('userId');
     }
-    return ajax(url, params, headers, format, 'post');
+    return ajax(url, params, headers, format, 'post', isData, isParams);
   }
 };
 exports.default = base;

package/lib/utils/http.js

@@ -10,21 +10,22 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 var request = function request(options) {
   var fn = void 0;
+  console.log(options, 'sss');
   switch (options.type) {
     case 'post':
-      fn = _axios2.default.post(options.url, options.params, options.headers, options.format);
+      fn = _axios2.default.post(options.url, options.params, options.headers, options.format, options.isData, options.isParams);
       break;
     case 'POST':
-      fn = _axios2.default.post(options.url, options.params, options.headers, options.format);
+      fn = _axios2.default.post(options.url, options.params, options.headers, options.format, options.isData, options.isParams);
       break;
     case 'get':
-      fn = _axios2.default.get(options.url, options.params, options.headers = {});
+      fn = _axios2.default.get(options.url, options.params, options.headers = {}, options.format = false, options.isData = true, options.isParams = true);
       break;
     case 'GET':
-      fn = _axios2.default.get(options.url, options.params, options.headers = {});
+      fn = _axios2.default.get(options.url, options.params, options.headers = {}, options.format = false, options.isData = true, options.isParams = true);
       break;
     default:
-      fn = _axios2.default.get(options.url, options.params, options.headers = {});
+      fn = _axios2.default.get(options.url, options.params, options.headers = {}, options.format = false, options.isData = true, options.isParams = true);
   }
   return fn;
 };

package/package.json

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

package/packages/picker/src/main.vue

@@ -198,6 +198,10 @@ export default {
       type: String,
       default: 'name'
     },
+    objectType: {
+      type: Boolean,
+      default: true
+    },
     sysAppCode: {
       type: String,
       default: ''
@@ -244,7 +248,21 @@ export default {
         return this.getValue();
       },
       set(val) {
-        this.$emit('input', val);
+        if (!this.objectType && val.length === undefined) {
+          this.$emit(
+            'input',
+            val[this.sysAppCode ? 'cciValue' : this.valueKey]
+          );
+        } else if (!this.objectType && val.length != undefined) {
+          val.map(x => {
+            if (typeof x === 'object') {
+              x = x[this.sysAppCode ? 'cciValue' : this.valueKey];
+            }
+          });
+          this.$emit('input', val);
+        } else {
+          this.$emit('input', val);
+        }
       }
     }
   },
@@ -459,7 +477,7 @@ export default {
         .then(res => {
           const { status, data, message, rCode, results } = res;
           this.listLoading = false;
-          if (status == 'success' || rCode === 0|| status === true) {
+          if (status == 'success' || rCode === 0 || status === true) {
             let info = this.resultsName
               ? data
                 ? data[this.resultsName]

package/src/index.js

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

package/src/utils/axios.js

@@ -4,7 +4,15 @@ import $ from './util';
 import qs from 'qs';
 let apiUrl = $.getStorage('host');
 
-const ajax = (url, params = {}, headers = {}, format = true, type = 'get') => {
+const ajax = (
+  url,
+  params = {},
+  headers = {},
+  format = true,
+  type = 'get',
+  isData = true,
+  isParams = true
+) => {
   let http = Axios.create({
     baseURL: apiUrl,
     timeout: 60000,
@@ -77,6 +85,13 @@ const ajax = (url, params = {}, headers = {}, format = true, type = 'get') => {
       ) {
         delete config.headers.deviceId;
       }
+      if (!isData) {
+        delete config.data;
+      }
+      if (!isParams) {
+        delete config.params;
+      }
+
       return config;
     },
     error => {
@@ -161,7 +176,14 @@ const ajax = (url, params = {}, headers = {}, format = true, type = 'get') => {
 // 响应拦截器
 
 const base = {
-  get: (url, params = {}, headers = {}, format = false) => {
+  get: (
+    url,
+    params = {},
+    headers = {},
+    format = false,
+    isData = true,
+    isParams = true
+  ) => {
     if (params.params && url.search('registerNew') === -1) {
       params.params.userId = params.params.userId
         ? params.params.userId
@@ -185,17 +207,19 @@ const base = {
         params
       },
       headers,
-      format
+      format,
+      'get',
+      isData,
+      isParams
     );
   },
-  post: (url, params, headers, format) => {
-    console.log(params, 'params');
+  post: (url, params, headers, format, isData = true, isParams = true) => {
     if (params.params) {
       params.params.userId = params.params.userId || $.getStorage('userId');
     } else {
       params.userId = params.userId || $.getStorage('userId');
     }
-    return ajax(url, params, headers, format, 'post');
+    return ajax(url, params, headers, format, 'post', isData, isParams);
   }
 };
 export default base;

package/src/utils/http.js

@@ -1,13 +1,16 @@
 import base from './axios';
 const request = options => {
   let fn;
+  console.log(options, 'sss');
   switch (options.type) {
     case 'post':
       fn = base.post(
         options.url,
         options.params,
         options.headers,
-        options.format
+        options.format,
+        options.isData,
+        options.isParams
       );
       break;
     case 'POST':
@@ -15,17 +18,40 @@ const request = options => {
         options.url,
         options.params,
         options.headers,
-        options.format
+        options.format,
+        options.isData,
+        options.isParams
       );
       break;
     case 'get':
-      fn = base.get(options.url, options.params, (options.headers = {}));
+      fn = base.get(
+        options.url,
+        options.params,
+        (options.headers = {}),
+        (options.format = false),
+        (options.isData = true),
+        (options.isParams = true)
+      );
       break;
     case 'GET':
-      fn = base.get(options.url, options.params, (options.headers = {}));
+      fn = base.get(
+        options.url,
+        options.params,
+        (options.headers = {}),
+        (options.format = false),
+        (options.isData = true),
+        (options.isParams = true)
+      );
       break;
     default:
-      fn = base.get(options.url, options.params, (options.headers = {}));
+      fn = base.get(
+        options.url,
+        options.params,
+        (options.headers = {}),
+        (options.format = false),
+        (options.isData = true),
+        (options.isParams = true)
+      );
   }
   return fn;
 };