eoss-mobiles 0.2.30 → 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 +85 -54
- 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 +79 -48
- 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/packages/picker/src/main.vue +20 -2
- 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
|
};
|
|
@@ -5500,8 +5514,8 @@ radio_src_main.install = function (Vue) {
|
|
|
5500
5514
|
};
|
|
5501
5515
|
|
|
5502
5516
|
/* harmony default export */ var packages_radio = (radio_src_main);
|
|
5503
|
-
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/picker/src/main.vue?vue&type=template&id=
|
|
5504
|
-
var
|
|
5517
|
+
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/picker/src/main.vue?vue&type=template&id=6f8d4ed8&
|
|
5518
|
+
var mainvue_type_template_id_6f8d4ed8_render = function () {
|
|
5505
5519
|
var _vm = this
|
|
5506
5520
|
var _h = _vm.$createElement
|
|
5507
5521
|
var _c = _vm._self._c || _h
|
|
@@ -5768,11 +5782,11 @@ var mainvue_type_template_id_f54ad734_render = function () {
|
|
|
5768
5782
|
1
|
|
5769
5783
|
)
|
|
5770
5784
|
}
|
|
5771
|
-
var
|
|
5772
|
-
|
|
5785
|
+
var mainvue_type_template_id_6f8d4ed8_staticRenderFns = []
|
|
5786
|
+
mainvue_type_template_id_6f8d4ed8_render._withStripped = true
|
|
5773
5787
|
|
|
5774
5788
|
|
|
5775
|
-
// CONCATENATED MODULE: ./packages/picker/src/main.vue?vue&type=template&id=
|
|
5789
|
+
// CONCATENATED MODULE: ./packages/picker/src/main.vue?vue&type=template&id=6f8d4ed8&
|
|
5776
5790
|
|
|
5777
5791
|
// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/picker/src/main.vue?vue&type=script&lang=js&
|
|
5778
5792
|
var src_mainvue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
|
|
@@ -5980,6 +5994,10 @@ var mainvue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof
|
|
|
5980
5994
|
type: String,
|
|
5981
5995
|
default: 'name'
|
|
5982
5996
|
},
|
|
5997
|
+
objectType: {
|
|
5998
|
+
type: Boolean,
|
|
5999
|
+
default: true
|
|
6000
|
+
},
|
|
5983
6001
|
sysAppCode: {
|
|
5984
6002
|
type: String,
|
|
5985
6003
|
default: ''
|
|
@@ -6028,7 +6046,20 @@ var mainvue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof
|
|
|
6028
6046
|
return this.getValue();
|
|
6029
6047
|
},
|
|
6030
6048
|
set: function set(val) {
|
|
6031
|
-
this
|
|
6049
|
+
var _this = this;
|
|
6050
|
+
|
|
6051
|
+
if (!this.objectType && val.length === undefined) {
|
|
6052
|
+
this.$emit('input', val[this.sysAppCode ? 'cciValue' : this.valueKey]);
|
|
6053
|
+
} else if (!this.objectType && val.length != undefined) {
|
|
6054
|
+
val.map(function (x) {
|
|
6055
|
+
if ((typeof x === 'undefined' ? 'undefined' : mainvue_type_script_lang_js_typeof(x)) === 'object') {
|
|
6056
|
+
x = x[_this.sysAppCode ? 'cciValue' : _this.valueKey];
|
|
6057
|
+
}
|
|
6058
|
+
});
|
|
6059
|
+
this.$emit('input', val);
|
|
6060
|
+
} else {
|
|
6061
|
+
this.$emit('input', val);
|
|
6062
|
+
}
|
|
6032
6063
|
}
|
|
6033
6064
|
}
|
|
6034
6065
|
},
|
|
@@ -6076,7 +6107,7 @@ var mainvue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof
|
|
|
6076
6107
|
}
|
|
6077
6108
|
},
|
|
6078
6109
|
mounted: function mounted() {
|
|
6079
|
-
var
|
|
6110
|
+
var _this2 = this;
|
|
6080
6111
|
|
|
6081
6112
|
if ((this.sysAppCode || this.url) && this.newColumns.length == 0 && !this.isCheck) {
|
|
6082
6113
|
this.getSysCode();
|
|
@@ -6091,7 +6122,7 @@ var mainvue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof
|
|
|
6091
6122
|
} else if (this.isCheck) {
|
|
6092
6123
|
var _data = this.value;
|
|
6093
6124
|
_data.map(function (item) {
|
|
6094
|
-
|
|
6125
|
+
_this2.checkList.push(item[_this2.valueKey] || item.value || item);
|
|
6095
6126
|
});
|
|
6096
6127
|
}
|
|
6097
6128
|
},
|
|
@@ -6132,13 +6163,13 @@ var mainvue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof
|
|
|
6132
6163
|
this.$refs.checkboxes[index].toggle();
|
|
6133
6164
|
},
|
|
6134
6165
|
onConfirm: function onConfirm(value, isConfirm) {
|
|
6135
|
-
var
|
|
6166
|
+
var _this3 = this;
|
|
6136
6167
|
|
|
6137
6168
|
if (isConfirm) {
|
|
6138
6169
|
if (this.isCheck) {
|
|
6139
6170
|
var data = [];
|
|
6140
6171
|
this.newColumns.filter(function (x) {
|
|
6141
|
-
|
|
6172
|
+
_this3.checkList.find(function (y) {
|
|
6142
6173
|
if (x.value === y) {
|
|
6143
6174
|
data.push(x);
|
|
6144
6175
|
}
|
|
@@ -6152,7 +6183,7 @@ var mainvue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof
|
|
|
6152
6183
|
if (this.isCheck) {
|
|
6153
6184
|
this.checkList = [];
|
|
6154
6185
|
this.pickerValue.map(function (x) {
|
|
6155
|
-
|
|
6186
|
+
_this3.checkList.push(x.value);
|
|
6156
6187
|
});
|
|
6157
6188
|
}
|
|
6158
6189
|
}
|
|
@@ -6160,15 +6191,15 @@ var mainvue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof
|
|
|
6160
6191
|
this.showPicker = false;
|
|
6161
6192
|
},
|
|
6162
6193
|
getValue: function getValue() {
|
|
6163
|
-
var
|
|
6194
|
+
var _this4 = this;
|
|
6164
6195
|
|
|
6165
6196
|
var value = '';
|
|
6166
6197
|
if (this.isCheck) {
|
|
6167
6198
|
var val = [];
|
|
6168
6199
|
if (this.newColumns && this.newColumns.length > 0) {
|
|
6169
6200
|
this.newColumns.filter(function (x) {
|
|
6170
|
-
|
|
6171
|
-
if (x[
|
|
6201
|
+
_this4.value.find(function (y) {
|
|
6202
|
+
if (x[_this4.valueKey] == y || x[_this4.valueKey] == y.value) {
|
|
6172
6203
|
val.push(x);
|
|
6173
6204
|
}
|
|
6174
6205
|
});
|
|
@@ -6186,7 +6217,7 @@ var mainvue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof
|
|
|
6186
6217
|
this.newColumns.map(function (x, i) {
|
|
6187
6218
|
if (typeof x === 'string' && value.indexOf(x) != -1) {
|
|
6188
6219
|
index = i;
|
|
6189
|
-
} else if (x[
|
|
6220
|
+
} else if (x[_this4.newValueKey] == value || x[_this4.newValueKey].indexOf(value) != -1) {
|
|
6190
6221
|
index = i;
|
|
6191
6222
|
}
|
|
6192
6223
|
});
|
|
@@ -6194,8 +6225,8 @@ var mainvue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof
|
|
|
6194
6225
|
} else {
|
|
6195
6226
|
var list = [];
|
|
6196
6227
|
this.value.map(function (item) {
|
|
6197
|
-
if (item[
|
|
6198
|
-
list.push(item[
|
|
6228
|
+
if (item[_this4.labelKey] || item[_this4.newValueKey]) {
|
|
6229
|
+
list.push(item[_this4.labelKey] || item[_this4.newValueKey]);
|
|
6199
6230
|
} else if (typeof item === 'string') {
|
|
6200
6231
|
list.push(item);
|
|
6201
6232
|
}
|
|
@@ -6205,7 +6236,7 @@ var mainvue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof
|
|
|
6205
6236
|
this.newColumns.map(function (x, i) {
|
|
6206
6237
|
if (typeof x === 'string' && value.indexOf(x) != -1) {
|
|
6207
6238
|
_index = i;
|
|
6208
|
-
} else if (x[
|
|
6239
|
+
} else if (x[_this4.newValueKey] === value) {
|
|
6209
6240
|
_index = i;
|
|
6210
6241
|
}
|
|
6211
6242
|
});
|
|
@@ -6218,9 +6249,9 @@ var mainvue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof
|
|
|
6218
6249
|
if (typeof x === 'string' && value.indexOf(x) != -1) {
|
|
6219
6250
|
_index2 = i;
|
|
6220
6251
|
value = x;
|
|
6221
|
-
} else if (x[
|
|
6252
|
+
} else if (x[_this4.newValueKey] === value) {
|
|
6222
6253
|
_index2 = i;
|
|
6223
|
-
value = x[
|
|
6254
|
+
value = x[_this4.labelKey] || x[_this4.newValueKey];
|
|
6224
6255
|
}
|
|
6225
6256
|
});
|
|
6226
6257
|
this.newDefaultIndex = _index2;
|
|
@@ -6230,7 +6261,7 @@ var mainvue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof
|
|
|
6230
6261
|
return value;
|
|
6231
6262
|
},
|
|
6232
6263
|
getSysCode: function getSysCode() {
|
|
6233
|
-
var
|
|
6264
|
+
var _this5 = this;
|
|
6234
6265
|
|
|
6235
6266
|
var url = this.url,
|
|
6236
6267
|
method = this.method,
|
|
@@ -6253,45 +6284,45 @@ var mainvue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof
|
|
|
6253
6284
|
rCode = res.rCode,
|
|
6254
6285
|
results = res.results;
|
|
6255
6286
|
|
|
6256
|
-
|
|
6287
|
+
_this5.listLoading = false;
|
|
6257
6288
|
if (status == 'success' || rCode === 0 || status === true) {
|
|
6258
|
-
var info =
|
|
6289
|
+
var info = _this5.resultsName ? data ? data[_this5.resultsName] : results[_this5.resultsName] : data ? data : results;
|
|
6259
6290
|
info.map(function (x) {
|
|
6260
|
-
if (
|
|
6261
|
-
x.name = x[sysAppCode ? 'shortName' :
|
|
6291
|
+
if (_this5.isCheck) {
|
|
6292
|
+
x.name = x[sysAppCode ? 'shortName' : _this5.labelKey] && x[sysAppCode ? 'shortName' : _this5.labelKey].replace(/<[^>]+>/g, '');
|
|
6262
6293
|
} else {
|
|
6263
|
-
x.name = x[sysAppCode ? 'shortName' :
|
|
6294
|
+
x.name = x[sysAppCode ? 'shortName' : _this5.labelKey];
|
|
6264
6295
|
}
|
|
6265
|
-
x.value = x[sysAppCode ? 'cciValue' :
|
|
6296
|
+
x.value = x[sysAppCode ? 'cciValue' : _this5.valueKey];
|
|
6266
6297
|
});
|
|
6267
6298
|
if (data && data.totalCount) {
|
|
6268
|
-
|
|
6269
|
-
if (data.totalCount ===
|
|
6270
|
-
|
|
6299
|
+
_this5.total = data.totalCount;
|
|
6300
|
+
if (data.totalCount === _this5.newColumns.length) {
|
|
6301
|
+
_this5.listFinished = true;
|
|
6271
6302
|
} else {
|
|
6272
|
-
if (
|
|
6273
|
-
|
|
6303
|
+
if (_this5.newColumns.length != 0) {
|
|
6304
|
+
_this5.newColumns.push.apply(_this5.newColumns, info);
|
|
6274
6305
|
} else {
|
|
6275
|
-
|
|
6306
|
+
_this5.newColumns = info;
|
|
6276
6307
|
}
|
|
6277
|
-
|
|
6308
|
+
_this5.pageIndex = res.data.nextPageNo;
|
|
6278
6309
|
}
|
|
6279
6310
|
} else {
|
|
6280
|
-
|
|
6281
|
-
|
|
6311
|
+
_this5.listFinished = true;
|
|
6312
|
+
_this5.newColumns = info;
|
|
6282
6313
|
}
|
|
6283
|
-
if (
|
|
6284
|
-
|
|
6285
|
-
|
|
6314
|
+
if (_this5.beforResponse) {
|
|
6315
|
+
_this5.newColumns = _this5.beforResponse(_this5.newColumns);
|
|
6316
|
+
_this5.getValue();
|
|
6286
6317
|
} else {
|
|
6287
|
-
|
|
6318
|
+
_this5.getValue();
|
|
6288
6319
|
}
|
|
6289
6320
|
} else {
|
|
6290
|
-
|
|
6321
|
+
_this5.$toast(message);
|
|
6291
6322
|
}
|
|
6292
|
-
|
|
6323
|
+
_this5.newLoading = false;
|
|
6293
6324
|
}).catch(function (err) {
|
|
6294
|
-
|
|
6325
|
+
_this5.$toast(err.message);
|
|
6295
6326
|
});
|
|
6296
6327
|
},
|
|
6297
6328
|
handlePicker: function handlePicker() {
|
|
@@ -6313,8 +6344,8 @@ var mainvue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof
|
|
|
6313
6344
|
|
|
6314
6345
|
var picker_src_main_component = normalizeComponent(
|
|
6315
6346
|
packages_picker_src_mainvue_type_script_lang_js_,
|
|
6316
|
-
|
|
6317
|
-
|
|
6347
|
+
mainvue_type_template_id_6f8d4ed8_render,
|
|
6348
|
+
mainvue_type_template_id_6f8d4ed8_staticRenderFns,
|
|
6318
6349
|
false,
|
|
6319
6350
|
null,
|
|
6320
6351
|
null,
|
|
@@ -21771,7 +21802,7 @@ if (typeof window !== 'undefined' && window.Vue) {
|
|
|
21771
21802
|
}
|
|
21772
21803
|
|
|
21773
21804
|
/* harmony default export */ var src = __webpack_exports__["default"] = ({
|
|
21774
|
-
version: '0.2.
|
|
21805
|
+
version: '0.2.32',
|
|
21775
21806
|
install: install,
|
|
21776
21807
|
Button: packages_button,
|
|
21777
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
|
};
|