eoss-mobiles 0.2.31 → 0.2.32
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +8 -2
- package/lib/checkbox.js +22 -8
- package/lib/eoss-mobile.common.js +23 -9
- package/lib/flow-btn.js +22 -8
- package/lib/flow-list.js +22 -8
- package/lib/flow.js +22 -8
- package/lib/index.js +1 -1
- package/lib/picker.js +22 -8
- package/lib/radio.js +22 -8
- package/lib/retrial-auth.js +22 -8
- package/lib/selector.js +22 -8
- package/lib/table-column.js +22 -8
- package/lib/table.js +22 -8
- package/lib/utils/axios.js +16 -3
- package/lib/utils/http.js +6 -5
- package/package.json +1 -1
- package/src/index.js +1 -1
- package/src/utils/axios.js +30 -6
- package/src/utils/http.js +31 -5
package/CHANGELOG.md
CHANGED
|
@@ -1,9 +1,15 @@
|
|
|
1
1
|
## 更新日志
|
|
2
2
|
|
|
3
|
-
### 0.2.
|
|
3
|
+
### 0.2.31
|
|
4
4
|
|
|
5
|
+
- 2024-02-27
|
|
6
|
+
- fix:<br/>1. picker 新增属性 object-type 是否返回对象格式<br/>
|
|
7
|
+
- 版本号:0.2.31
|
|
8
|
+
- 2024-02-26
|
|
9
|
+
- feat:<br/>1. 新增 flow-list 流程列表<br/>2. 新增 flow-btn 流程按钮<br/>
|
|
10
|
+
- 版本号:0.2.30
|
|
5
11
|
- 2024-01-25
|
|
6
|
-
- fix:<br/>1. 新增 NoticeBar 通知栏<br/>2
|
|
12
|
+
- fix:<br/>1. 新增 NoticeBar 通知栏<br/>2. 新增 RetrialAuth 二次鉴权<br/>3.Table 优化<br/>4.flow 流程组件新增同意/不同意功能<br/>5.Checkbox、Radio 组件新增 allow-html 属性:是否允许文字渲染 HTML
|
|
7
13
|
- 版本号:0.2.20
|
|
8
14
|
- 2024-01-03
|
|
9
15
|
- fix:<br/>1. 新增 Swipe 轮播组件<br/>2. selector 组件优化
|
package/lib/checkbox.js
CHANGED
|
@@ -1744,6 +1744,8 @@ var axios_ajax = function ajax(url) {
|
|
|
1744
1744
|
var headers = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
|
|
1745
1745
|
var format = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
|
|
1746
1746
|
var type = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 'get';
|
|
1747
|
+
var isData = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
|
|
1748
|
+
var isParams = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : true;
|
|
1747
1749
|
|
|
1748
1750
|
var http = external_axios_default.a.create({
|
|
1749
1751
|
baseURL: apiUrl,
|
|
@@ -1807,6 +1809,13 @@ var axios_ajax = function ajax(url) {
|
|
|
1807
1809
|
if (config.url.search('mecp/overtime') !== -1 || config.url.search('mecp/leave') !== -1 || config.url.search('contractext') !== -1 || config.url.search('getSysParam') !== -1) {
|
|
1808
1810
|
delete config.headers.deviceId;
|
|
1809
1811
|
}
|
|
1812
|
+
if (!isData) {
|
|
1813
|
+
delete config.data;
|
|
1814
|
+
}
|
|
1815
|
+
if (!isParams) {
|
|
1816
|
+
delete config.params;
|
|
1817
|
+
}
|
|
1818
|
+
|
|
1810
1819
|
return config;
|
|
1811
1820
|
}, function (error) {
|
|
1812
1821
|
return Promise.error(error);
|
|
@@ -1890,6 +1899,8 @@ var base = {
|
|
|
1890
1899
|
var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
1891
1900
|
var headers = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
|
|
1892
1901
|
var format = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
|
|
1902
|
+
var isData = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true;
|
|
1903
|
+
var isParams = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
|
|
1893
1904
|
|
|
1894
1905
|
if (params.params && url.search('registerNew') === -1) {
|
|
1895
1906
|
params.params.userId = params.params.userId ? params.params.userId : util["a" /* default */].getStorage('userId');
|
|
@@ -1908,16 +1919,18 @@ var base = {
|
|
|
1908
1919
|
}
|
|
1909
1920
|
return axios_ajax(url, {
|
|
1910
1921
|
params: params
|
|
1911
|
-
}, headers, format);
|
|
1922
|
+
}, headers, format, 'get', isData, isParams);
|
|
1912
1923
|
},
|
|
1913
1924
|
post: function post(url, params, headers, format) {
|
|
1914
|
-
|
|
1925
|
+
var isData = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true;
|
|
1926
|
+
var isParams = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
|
|
1927
|
+
|
|
1915
1928
|
if (params.params) {
|
|
1916
1929
|
params.params.userId = params.params.userId || util["a" /* default */].getStorage('userId');
|
|
1917
1930
|
} else {
|
|
1918
1931
|
params.userId = params.userId || util["a" /* default */].getStorage('userId');
|
|
1919
1932
|
}
|
|
1920
|
-
return axios_ajax(url, params, headers, format, 'post');
|
|
1933
|
+
return axios_ajax(url, params, headers, format, 'post', isData, isParams);
|
|
1921
1934
|
}
|
|
1922
1935
|
};
|
|
1923
1936
|
/* harmony default export */ var axios = (base);
|
|
@@ -1925,21 +1938,22 @@ var base = {
|
|
|
1925
1938
|
|
|
1926
1939
|
var http_request = function request(options) {
|
|
1927
1940
|
var fn = void 0;
|
|
1941
|
+
console.log(options, 'sss');
|
|
1928
1942
|
switch (options.type) {
|
|
1929
1943
|
case 'post':
|
|
1930
|
-
fn = axios.post(options.url, options.params, options.headers, options.format);
|
|
1944
|
+
fn = axios.post(options.url, options.params, options.headers, options.format, options.isData, options.isParams);
|
|
1931
1945
|
break;
|
|
1932
1946
|
case 'POST':
|
|
1933
|
-
fn = axios.post(options.url, options.params, options.headers, options.format);
|
|
1947
|
+
fn = axios.post(options.url, options.params, options.headers, options.format, options.isData, options.isParams);
|
|
1934
1948
|
break;
|
|
1935
1949
|
case 'get':
|
|
1936
|
-
fn = axios.get(options.url, options.params, options.headers = {});
|
|
1950
|
+
fn = axios.get(options.url, options.params, options.headers = {}, options.format = false, options.isData = true, options.isParams = true);
|
|
1937
1951
|
break;
|
|
1938
1952
|
case 'GET':
|
|
1939
|
-
fn = axios.get(options.url, options.params, options.headers = {});
|
|
1953
|
+
fn = axios.get(options.url, options.params, options.headers = {}, options.format = false, options.isData = true, options.isParams = true);
|
|
1940
1954
|
break;
|
|
1941
1955
|
default:
|
|
1942
|
-
fn = axios.get(options.url, options.params, options.headers = {});
|
|
1956
|
+
fn = axios.get(options.url, options.params, options.headers = {}, options.format = false, options.isData = true, options.isParams = true);
|
|
1943
1957
|
}
|
|
1944
1958
|
return fn;
|
|
1945
1959
|
};
|
|
@@ -3005,6 +3005,8 @@ var axios_ajax = function ajax(url) {
|
|
|
3005
3005
|
var headers = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
|
|
3006
3006
|
var format = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
|
|
3007
3007
|
var type = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 'get';
|
|
3008
|
+
var isData = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
|
|
3009
|
+
var isParams = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : true;
|
|
3008
3010
|
|
|
3009
3011
|
var http = external_axios_default.a.create({
|
|
3010
3012
|
baseURL: apiUrl,
|
|
@@ -3068,6 +3070,13 @@ var axios_ajax = function ajax(url) {
|
|
|
3068
3070
|
if (config.url.search('mecp/overtime') !== -1 || config.url.search('mecp/leave') !== -1 || config.url.search('contractext') !== -1 || config.url.search('getSysParam') !== -1) {
|
|
3069
3071
|
delete config.headers.deviceId;
|
|
3070
3072
|
}
|
|
3073
|
+
if (!isData) {
|
|
3074
|
+
delete config.data;
|
|
3075
|
+
}
|
|
3076
|
+
if (!isParams) {
|
|
3077
|
+
delete config.params;
|
|
3078
|
+
}
|
|
3079
|
+
|
|
3071
3080
|
return config;
|
|
3072
3081
|
}, function (error) {
|
|
3073
3082
|
return Promise.error(error);
|
|
@@ -3151,6 +3160,8 @@ var base = {
|
|
|
3151
3160
|
var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
3152
3161
|
var headers = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
|
|
3153
3162
|
var format = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
|
|
3163
|
+
var isData = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true;
|
|
3164
|
+
var isParams = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
|
|
3154
3165
|
|
|
3155
3166
|
if (params.params && url.search('registerNew') === -1) {
|
|
3156
3167
|
params.params.userId = params.params.userId ? params.params.userId : util.getStorage('userId');
|
|
@@ -3169,16 +3180,18 @@ var base = {
|
|
|
3169
3180
|
}
|
|
3170
3181
|
return axios_ajax(url, {
|
|
3171
3182
|
params: params
|
|
3172
|
-
}, headers, format);
|
|
3183
|
+
}, headers, format, 'get', isData, isParams);
|
|
3173
3184
|
},
|
|
3174
3185
|
post: function post(url, params, headers, format) {
|
|
3175
|
-
|
|
3186
|
+
var isData = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true;
|
|
3187
|
+
var isParams = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
|
|
3188
|
+
|
|
3176
3189
|
if (params.params) {
|
|
3177
3190
|
params.params.userId = params.params.userId || util.getStorage('userId');
|
|
3178
3191
|
} else {
|
|
3179
3192
|
params.userId = params.userId || util.getStorage('userId');
|
|
3180
3193
|
}
|
|
3181
|
-
return axios_ajax(url, params, headers, format, 'post');
|
|
3194
|
+
return axios_ajax(url, params, headers, format, 'post', isData, isParams);
|
|
3182
3195
|
}
|
|
3183
3196
|
};
|
|
3184
3197
|
/* harmony default export */ var axios = (base);
|
|
@@ -3186,21 +3199,22 @@ var base = {
|
|
|
3186
3199
|
|
|
3187
3200
|
var http_request = function request(options) {
|
|
3188
3201
|
var fn = void 0;
|
|
3202
|
+
console.log(options, 'sss');
|
|
3189
3203
|
switch (options.type) {
|
|
3190
3204
|
case 'post':
|
|
3191
|
-
fn = axios.post(options.url, options.params, options.headers, options.format);
|
|
3205
|
+
fn = axios.post(options.url, options.params, options.headers, options.format, options.isData, options.isParams);
|
|
3192
3206
|
break;
|
|
3193
3207
|
case 'POST':
|
|
3194
|
-
fn = axios.post(options.url, options.params, options.headers, options.format);
|
|
3208
|
+
fn = axios.post(options.url, options.params, options.headers, options.format, options.isData, options.isParams);
|
|
3195
3209
|
break;
|
|
3196
3210
|
case 'get':
|
|
3197
|
-
fn = axios.get(options.url, options.params, options.headers = {});
|
|
3211
|
+
fn = axios.get(options.url, options.params, options.headers = {}, options.format = false, options.isData = true, options.isParams = true);
|
|
3198
3212
|
break;
|
|
3199
3213
|
case 'GET':
|
|
3200
|
-
fn = axios.get(options.url, options.params, options.headers = {});
|
|
3214
|
+
fn = axios.get(options.url, options.params, options.headers = {}, options.format = false, options.isData = true, options.isParams = true);
|
|
3201
3215
|
break;
|
|
3202
3216
|
default:
|
|
3203
|
-
fn = axios.get(options.url, options.params, options.headers = {});
|
|
3217
|
+
fn = axios.get(options.url, options.params, options.headers = {}, options.format = false, options.isData = true, options.isParams = true);
|
|
3204
3218
|
}
|
|
3205
3219
|
return fn;
|
|
3206
3220
|
};
|
|
@@ -21788,7 +21802,7 @@ if (typeof window !== 'undefined' && window.Vue) {
|
|
|
21788
21802
|
}
|
|
21789
21803
|
|
|
21790
21804
|
/* harmony default export */ var src = __webpack_exports__["default"] = ({
|
|
21791
|
-
version: '0.2.
|
|
21805
|
+
version: '0.2.32',
|
|
21792
21806
|
install: install,
|
|
21793
21807
|
Button: packages_button,
|
|
21794
21808
|
ButtonGroup: button_group,
|
package/lib/flow-btn.js
CHANGED
|
@@ -1744,6 +1744,8 @@ var axios_ajax = function ajax(url) {
|
|
|
1744
1744
|
var headers = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
|
|
1745
1745
|
var format = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
|
|
1746
1746
|
var type = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 'get';
|
|
1747
|
+
var isData = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
|
|
1748
|
+
var isParams = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : true;
|
|
1747
1749
|
|
|
1748
1750
|
var http = external_axios_default.a.create({
|
|
1749
1751
|
baseURL: apiUrl,
|
|
@@ -1807,6 +1809,13 @@ var axios_ajax = function ajax(url) {
|
|
|
1807
1809
|
if (config.url.search('mecp/overtime') !== -1 || config.url.search('mecp/leave') !== -1 || config.url.search('contractext') !== -1 || config.url.search('getSysParam') !== -1) {
|
|
1808
1810
|
delete config.headers.deviceId;
|
|
1809
1811
|
}
|
|
1812
|
+
if (!isData) {
|
|
1813
|
+
delete config.data;
|
|
1814
|
+
}
|
|
1815
|
+
if (!isParams) {
|
|
1816
|
+
delete config.params;
|
|
1817
|
+
}
|
|
1818
|
+
|
|
1810
1819
|
return config;
|
|
1811
1820
|
}, function (error) {
|
|
1812
1821
|
return Promise.error(error);
|
|
@@ -1890,6 +1899,8 @@ var base = {
|
|
|
1890
1899
|
var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
1891
1900
|
var headers = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
|
|
1892
1901
|
var format = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
|
|
1902
|
+
var isData = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true;
|
|
1903
|
+
var isParams = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
|
|
1893
1904
|
|
|
1894
1905
|
if (params.params && url.search('registerNew') === -1) {
|
|
1895
1906
|
params.params.userId = params.params.userId ? params.params.userId : util["a" /* default */].getStorage('userId');
|
|
@@ -1908,16 +1919,18 @@ var base = {
|
|
|
1908
1919
|
}
|
|
1909
1920
|
return axios_ajax(url, {
|
|
1910
1921
|
params: params
|
|
1911
|
-
}, headers, format);
|
|
1922
|
+
}, headers, format, 'get', isData, isParams);
|
|
1912
1923
|
},
|
|
1913
1924
|
post: function post(url, params, headers, format) {
|
|
1914
|
-
|
|
1925
|
+
var isData = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true;
|
|
1926
|
+
var isParams = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
|
|
1927
|
+
|
|
1915
1928
|
if (params.params) {
|
|
1916
1929
|
params.params.userId = params.params.userId || util["a" /* default */].getStorage('userId');
|
|
1917
1930
|
} else {
|
|
1918
1931
|
params.userId = params.userId || util["a" /* default */].getStorage('userId');
|
|
1919
1932
|
}
|
|
1920
|
-
return axios_ajax(url, params, headers, format, 'post');
|
|
1933
|
+
return axios_ajax(url, params, headers, format, 'post', isData, isParams);
|
|
1921
1934
|
}
|
|
1922
1935
|
};
|
|
1923
1936
|
/* harmony default export */ var axios = (base);
|
|
@@ -1925,21 +1938,22 @@ var base = {
|
|
|
1925
1938
|
|
|
1926
1939
|
var http_request = function request(options) {
|
|
1927
1940
|
var fn = void 0;
|
|
1941
|
+
console.log(options, 'sss');
|
|
1928
1942
|
switch (options.type) {
|
|
1929
1943
|
case 'post':
|
|
1930
|
-
fn = axios.post(options.url, options.params, options.headers, options.format);
|
|
1944
|
+
fn = axios.post(options.url, options.params, options.headers, options.format, options.isData, options.isParams);
|
|
1931
1945
|
break;
|
|
1932
1946
|
case 'POST':
|
|
1933
|
-
fn = axios.post(options.url, options.params, options.headers, options.format);
|
|
1947
|
+
fn = axios.post(options.url, options.params, options.headers, options.format, options.isData, options.isParams);
|
|
1934
1948
|
break;
|
|
1935
1949
|
case 'get':
|
|
1936
|
-
fn = axios.get(options.url, options.params, options.headers = {});
|
|
1950
|
+
fn = axios.get(options.url, options.params, options.headers = {}, options.format = false, options.isData = true, options.isParams = true);
|
|
1937
1951
|
break;
|
|
1938
1952
|
case 'GET':
|
|
1939
|
-
fn = axios.get(options.url, options.params, options.headers = {});
|
|
1953
|
+
fn = axios.get(options.url, options.params, options.headers = {}, options.format = false, options.isData = true, options.isParams = true);
|
|
1940
1954
|
break;
|
|
1941
1955
|
default:
|
|
1942
|
-
fn = axios.get(options.url, options.params, options.headers = {});
|
|
1956
|
+
fn = axios.get(options.url, options.params, options.headers = {}, options.format = false, options.isData = true, options.isParams = true);
|
|
1943
1957
|
}
|
|
1944
1958
|
return fn;
|
|
1945
1959
|
};
|
package/lib/flow-list.js
CHANGED
|
@@ -1744,6 +1744,8 @@ var axios_ajax = function ajax(url) {
|
|
|
1744
1744
|
var headers = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
|
|
1745
1745
|
var format = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
|
|
1746
1746
|
var type = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 'get';
|
|
1747
|
+
var isData = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
|
|
1748
|
+
var isParams = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : true;
|
|
1747
1749
|
|
|
1748
1750
|
var http = external_axios_default.a.create({
|
|
1749
1751
|
baseURL: apiUrl,
|
|
@@ -1807,6 +1809,13 @@ var axios_ajax = function ajax(url) {
|
|
|
1807
1809
|
if (config.url.search('mecp/overtime') !== -1 || config.url.search('mecp/leave') !== -1 || config.url.search('contractext') !== -1 || config.url.search('getSysParam') !== -1) {
|
|
1808
1810
|
delete config.headers.deviceId;
|
|
1809
1811
|
}
|
|
1812
|
+
if (!isData) {
|
|
1813
|
+
delete config.data;
|
|
1814
|
+
}
|
|
1815
|
+
if (!isParams) {
|
|
1816
|
+
delete config.params;
|
|
1817
|
+
}
|
|
1818
|
+
|
|
1810
1819
|
return config;
|
|
1811
1820
|
}, function (error) {
|
|
1812
1821
|
return Promise.error(error);
|
|
@@ -1890,6 +1899,8 @@ var base = {
|
|
|
1890
1899
|
var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
1891
1900
|
var headers = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
|
|
1892
1901
|
var format = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
|
|
1902
|
+
var isData = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true;
|
|
1903
|
+
var isParams = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
|
|
1893
1904
|
|
|
1894
1905
|
if (params.params && url.search('registerNew') === -1) {
|
|
1895
1906
|
params.params.userId = params.params.userId ? params.params.userId : util["a" /* default */].getStorage('userId');
|
|
@@ -1908,16 +1919,18 @@ var base = {
|
|
|
1908
1919
|
}
|
|
1909
1920
|
return axios_ajax(url, {
|
|
1910
1921
|
params: params
|
|
1911
|
-
}, headers, format);
|
|
1922
|
+
}, headers, format, 'get', isData, isParams);
|
|
1912
1923
|
},
|
|
1913
1924
|
post: function post(url, params, headers, format) {
|
|
1914
|
-
|
|
1925
|
+
var isData = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true;
|
|
1926
|
+
var isParams = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
|
|
1927
|
+
|
|
1915
1928
|
if (params.params) {
|
|
1916
1929
|
params.params.userId = params.params.userId || util["a" /* default */].getStorage('userId');
|
|
1917
1930
|
} else {
|
|
1918
1931
|
params.userId = params.userId || util["a" /* default */].getStorage('userId');
|
|
1919
1932
|
}
|
|
1920
|
-
return axios_ajax(url, params, headers, format, 'post');
|
|
1933
|
+
return axios_ajax(url, params, headers, format, 'post', isData, isParams);
|
|
1921
1934
|
}
|
|
1922
1935
|
};
|
|
1923
1936
|
/* harmony default export */ var axios = (base);
|
|
@@ -1925,21 +1938,22 @@ var base = {
|
|
|
1925
1938
|
|
|
1926
1939
|
var http_request = function request(options) {
|
|
1927
1940
|
var fn = void 0;
|
|
1941
|
+
console.log(options, 'sss');
|
|
1928
1942
|
switch (options.type) {
|
|
1929
1943
|
case 'post':
|
|
1930
|
-
fn = axios.post(options.url, options.params, options.headers, options.format);
|
|
1944
|
+
fn = axios.post(options.url, options.params, options.headers, options.format, options.isData, options.isParams);
|
|
1931
1945
|
break;
|
|
1932
1946
|
case 'POST':
|
|
1933
|
-
fn = axios.post(options.url, options.params, options.headers, options.format);
|
|
1947
|
+
fn = axios.post(options.url, options.params, options.headers, options.format, options.isData, options.isParams);
|
|
1934
1948
|
break;
|
|
1935
1949
|
case 'get':
|
|
1936
|
-
fn = axios.get(options.url, options.params, options.headers = {});
|
|
1950
|
+
fn = axios.get(options.url, options.params, options.headers = {}, options.format = false, options.isData = true, options.isParams = true);
|
|
1937
1951
|
break;
|
|
1938
1952
|
case 'GET':
|
|
1939
|
-
fn = axios.get(options.url, options.params, options.headers = {});
|
|
1953
|
+
fn = axios.get(options.url, options.params, options.headers = {}, options.format = false, options.isData = true, options.isParams = true);
|
|
1940
1954
|
break;
|
|
1941
1955
|
default:
|
|
1942
|
-
fn = axios.get(options.url, options.params, options.headers = {});
|
|
1956
|
+
fn = axios.get(options.url, options.params, options.headers = {}, options.format = false, options.isData = true, options.isParams = true);
|
|
1943
1957
|
}
|
|
1944
1958
|
return fn;
|
|
1945
1959
|
};
|
package/lib/flow.js
CHANGED
|
@@ -1740,6 +1740,8 @@ var axios_ajax = function ajax(url) {
|
|
|
1740
1740
|
var headers = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
|
|
1741
1741
|
var format = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
|
|
1742
1742
|
var type = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 'get';
|
|
1743
|
+
var isData = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
|
|
1744
|
+
var isParams = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : true;
|
|
1743
1745
|
|
|
1744
1746
|
var http = external_axios_default.a.create({
|
|
1745
1747
|
baseURL: apiUrl,
|
|
@@ -1803,6 +1805,13 @@ var axios_ajax = function ajax(url) {
|
|
|
1803
1805
|
if (config.url.search('mecp/overtime') !== -1 || config.url.search('mecp/leave') !== -1 || config.url.search('contractext') !== -1 || config.url.search('getSysParam') !== -1) {
|
|
1804
1806
|
delete config.headers.deviceId;
|
|
1805
1807
|
}
|
|
1808
|
+
if (!isData) {
|
|
1809
|
+
delete config.data;
|
|
1810
|
+
}
|
|
1811
|
+
if (!isParams) {
|
|
1812
|
+
delete config.params;
|
|
1813
|
+
}
|
|
1814
|
+
|
|
1806
1815
|
return config;
|
|
1807
1816
|
}, function (error) {
|
|
1808
1817
|
return Promise.error(error);
|
|
@@ -1886,6 +1895,8 @@ var base = {
|
|
|
1886
1895
|
var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
1887
1896
|
var headers = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
|
|
1888
1897
|
var format = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
|
|
1898
|
+
var isData = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true;
|
|
1899
|
+
var isParams = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
|
|
1889
1900
|
|
|
1890
1901
|
if (params.params && url.search('registerNew') === -1) {
|
|
1891
1902
|
params.params.userId = params.params.userId ? params.params.userId : util["a" /* default */].getStorage('userId');
|
|
@@ -1904,16 +1915,18 @@ var base = {
|
|
|
1904
1915
|
}
|
|
1905
1916
|
return axios_ajax(url, {
|
|
1906
1917
|
params: params
|
|
1907
|
-
}, headers, format);
|
|
1918
|
+
}, headers, format, 'get', isData, isParams);
|
|
1908
1919
|
},
|
|
1909
1920
|
post: function post(url, params, headers, format) {
|
|
1910
|
-
|
|
1921
|
+
var isData = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true;
|
|
1922
|
+
var isParams = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
|
|
1923
|
+
|
|
1911
1924
|
if (params.params) {
|
|
1912
1925
|
params.params.userId = params.params.userId || util["a" /* default */].getStorage('userId');
|
|
1913
1926
|
} else {
|
|
1914
1927
|
params.userId = params.userId || util["a" /* default */].getStorage('userId');
|
|
1915
1928
|
}
|
|
1916
|
-
return axios_ajax(url, params, headers, format, 'post');
|
|
1929
|
+
return axios_ajax(url, params, headers, format, 'post', isData, isParams);
|
|
1917
1930
|
}
|
|
1918
1931
|
};
|
|
1919
1932
|
/* harmony default export */ var axios = (base);
|
|
@@ -1921,21 +1934,22 @@ var base = {
|
|
|
1921
1934
|
|
|
1922
1935
|
var http_request = function request(options) {
|
|
1923
1936
|
var fn = void 0;
|
|
1937
|
+
console.log(options, 'sss');
|
|
1924
1938
|
switch (options.type) {
|
|
1925
1939
|
case 'post':
|
|
1926
|
-
fn = axios.post(options.url, options.params, options.headers, options.format);
|
|
1940
|
+
fn = axios.post(options.url, options.params, options.headers, options.format, options.isData, options.isParams);
|
|
1927
1941
|
break;
|
|
1928
1942
|
case 'POST':
|
|
1929
|
-
fn = axios.post(options.url, options.params, options.headers, options.format);
|
|
1943
|
+
fn = axios.post(options.url, options.params, options.headers, options.format, options.isData, options.isParams);
|
|
1930
1944
|
break;
|
|
1931
1945
|
case 'get':
|
|
1932
|
-
fn = axios.get(options.url, options.params, options.headers = {});
|
|
1946
|
+
fn = axios.get(options.url, options.params, options.headers = {}, options.format = false, options.isData = true, options.isParams = true);
|
|
1933
1947
|
break;
|
|
1934
1948
|
case 'GET':
|
|
1935
|
-
fn = axios.get(options.url, options.params, options.headers = {});
|
|
1949
|
+
fn = axios.get(options.url, options.params, options.headers = {}, options.format = false, options.isData = true, options.isParams = true);
|
|
1936
1950
|
break;
|
|
1937
1951
|
default:
|
|
1938
|
-
fn = axios.get(options.url, options.params, options.headers = {});
|
|
1952
|
+
fn = axios.get(options.url, options.params, options.headers = {}, options.format = false, options.isData = true, options.isParams = true);
|
|
1939
1953
|
}
|
|
1940
1954
|
return fn;
|
|
1941
1955
|
};
|