eoss-mobiles 0.2.32 → 0.2.34
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/lib/checkbox.js +3 -16
- package/lib/eoss-mobile.common.js +58 -52
- package/lib/flow-btn.js +3 -16
- package/lib/flow-list.js +3 -16
- package/lib/flow.js +3 -16
- package/lib/index.js +1 -1
- package/lib/picker.js +3 -16
- package/lib/radio.js +3 -16
- package/lib/retrial-auth.js +3 -16
- package/lib/selector.js +51 -45
- package/lib/table-column.js +3 -16
- package/lib/table.js +3 -16
- package/lib/utils/axios.js +3 -16
- package/package.json +1 -1
- package/packages/selector/src/selector-tree.vue +44 -16
- package/src/index.js +1 -1
- package/src/utils/axios.js +6 -30
package/lib/picker.js
CHANGED
|
@@ -1740,8 +1740,6 @@ 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;
|
|
1745
1743
|
|
|
1746
1744
|
var http = external_axios_default.a.create({
|
|
1747
1745
|
baseURL: apiUrl,
|
|
@@ -1805,13 +1803,6 @@ var axios_ajax = function ajax(url) {
|
|
|
1805
1803
|
if (config.url.search('mecp/overtime') !== -1 || config.url.search('mecp/leave') !== -1 || config.url.search('contractext') !== -1 || config.url.search('getSysParam') !== -1) {
|
|
1806
1804
|
delete config.headers.deviceId;
|
|
1807
1805
|
}
|
|
1808
|
-
if (!isData) {
|
|
1809
|
-
delete config.data;
|
|
1810
|
-
}
|
|
1811
|
-
if (!isParams) {
|
|
1812
|
-
delete config.params;
|
|
1813
|
-
}
|
|
1814
|
-
|
|
1815
1806
|
return config;
|
|
1816
1807
|
}, function (error) {
|
|
1817
1808
|
return Promise.error(error);
|
|
@@ -1895,8 +1886,6 @@ var base = {
|
|
|
1895
1886
|
var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
1896
1887
|
var headers = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
|
|
1897
1888
|
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;
|
|
1900
1889
|
|
|
1901
1890
|
if (params.params && url.search('registerNew') === -1) {
|
|
1902
1891
|
params.params.userId = params.params.userId ? params.params.userId : util["a" /* default */].getStorage('userId');
|
|
@@ -1915,18 +1904,16 @@ var base = {
|
|
|
1915
1904
|
}
|
|
1916
1905
|
return axios_ajax(url, {
|
|
1917
1906
|
params: params
|
|
1918
|
-
}, headers, format
|
|
1907
|
+
}, headers, format);
|
|
1919
1908
|
},
|
|
1920
1909
|
post: function post(url, params, headers, format) {
|
|
1921
|
-
|
|
1922
|
-
var isParams = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
|
|
1923
|
-
|
|
1910
|
+
console.log(params, 'params');
|
|
1924
1911
|
if (params.params) {
|
|
1925
1912
|
params.params.userId = params.params.userId || util["a" /* default */].getStorage('userId');
|
|
1926
1913
|
} else {
|
|
1927
1914
|
params.userId = params.userId || util["a" /* default */].getStorage('userId');
|
|
1928
1915
|
}
|
|
1929
|
-
return axios_ajax(url, params, headers, format, 'post'
|
|
1916
|
+
return axios_ajax(url, params, headers, format, 'post');
|
|
1930
1917
|
}
|
|
1931
1918
|
};
|
|
1932
1919
|
/* harmony default export */ var axios = (base);
|
package/lib/radio.js
CHANGED
|
@@ -1740,8 +1740,6 @@ 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;
|
|
1745
1743
|
|
|
1746
1744
|
var http = external_axios_default.a.create({
|
|
1747
1745
|
baseURL: apiUrl,
|
|
@@ -1805,13 +1803,6 @@ var axios_ajax = function ajax(url) {
|
|
|
1805
1803
|
if (config.url.search('mecp/overtime') !== -1 || config.url.search('mecp/leave') !== -1 || config.url.search('contractext') !== -1 || config.url.search('getSysParam') !== -1) {
|
|
1806
1804
|
delete config.headers.deviceId;
|
|
1807
1805
|
}
|
|
1808
|
-
if (!isData) {
|
|
1809
|
-
delete config.data;
|
|
1810
|
-
}
|
|
1811
|
-
if (!isParams) {
|
|
1812
|
-
delete config.params;
|
|
1813
|
-
}
|
|
1814
|
-
|
|
1815
1806
|
return config;
|
|
1816
1807
|
}, function (error) {
|
|
1817
1808
|
return Promise.error(error);
|
|
@@ -1895,8 +1886,6 @@ var base = {
|
|
|
1895
1886
|
var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
1896
1887
|
var headers = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
|
|
1897
1888
|
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;
|
|
1900
1889
|
|
|
1901
1890
|
if (params.params && url.search('registerNew') === -1) {
|
|
1902
1891
|
params.params.userId = params.params.userId ? params.params.userId : util["a" /* default */].getStorage('userId');
|
|
@@ -1915,18 +1904,16 @@ var base = {
|
|
|
1915
1904
|
}
|
|
1916
1905
|
return axios_ajax(url, {
|
|
1917
1906
|
params: params
|
|
1918
|
-
}, headers, format
|
|
1907
|
+
}, headers, format);
|
|
1919
1908
|
},
|
|
1920
1909
|
post: function post(url, params, headers, format) {
|
|
1921
|
-
|
|
1922
|
-
var isParams = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
|
|
1923
|
-
|
|
1910
|
+
console.log(params, 'params');
|
|
1924
1911
|
if (params.params) {
|
|
1925
1912
|
params.params.userId = params.params.userId || util["a" /* default */].getStorage('userId');
|
|
1926
1913
|
} else {
|
|
1927
1914
|
params.userId = params.userId || util["a" /* default */].getStorage('userId');
|
|
1928
1915
|
}
|
|
1929
|
-
return axios_ajax(url, params, headers, format, 'post'
|
|
1916
|
+
return axios_ajax(url, params, headers, format, 'post');
|
|
1930
1917
|
}
|
|
1931
1918
|
};
|
|
1932
1919
|
/* harmony default export */ var axios = (base);
|
package/lib/retrial-auth.js
CHANGED
|
@@ -1744,8 +1744,6 @@ 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;
|
|
1749
1747
|
|
|
1750
1748
|
var http = external_axios_default.a.create({
|
|
1751
1749
|
baseURL: apiUrl,
|
|
@@ -1809,13 +1807,6 @@ var axios_ajax = function ajax(url) {
|
|
|
1809
1807
|
if (config.url.search('mecp/overtime') !== -1 || config.url.search('mecp/leave') !== -1 || config.url.search('contractext') !== -1 || config.url.search('getSysParam') !== -1) {
|
|
1810
1808
|
delete config.headers.deviceId;
|
|
1811
1809
|
}
|
|
1812
|
-
if (!isData) {
|
|
1813
|
-
delete config.data;
|
|
1814
|
-
}
|
|
1815
|
-
if (!isParams) {
|
|
1816
|
-
delete config.params;
|
|
1817
|
-
}
|
|
1818
|
-
|
|
1819
1810
|
return config;
|
|
1820
1811
|
}, function (error) {
|
|
1821
1812
|
return Promise.error(error);
|
|
@@ -1899,8 +1890,6 @@ var base = {
|
|
|
1899
1890
|
var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
1900
1891
|
var headers = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
|
|
1901
1892
|
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;
|
|
1904
1893
|
|
|
1905
1894
|
if (params.params && url.search('registerNew') === -1) {
|
|
1906
1895
|
params.params.userId = params.params.userId ? params.params.userId : util["a" /* default */].getStorage('userId');
|
|
@@ -1919,18 +1908,16 @@ var base = {
|
|
|
1919
1908
|
}
|
|
1920
1909
|
return axios_ajax(url, {
|
|
1921
1910
|
params: params
|
|
1922
|
-
}, headers, format
|
|
1911
|
+
}, headers, format);
|
|
1923
1912
|
},
|
|
1924
1913
|
post: function post(url, params, headers, format) {
|
|
1925
|
-
|
|
1926
|
-
var isParams = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
|
|
1927
|
-
|
|
1914
|
+
console.log(params, 'params');
|
|
1928
1915
|
if (params.params) {
|
|
1929
1916
|
params.params.userId = params.params.userId || util["a" /* default */].getStorage('userId');
|
|
1930
1917
|
} else {
|
|
1931
1918
|
params.userId = params.userId || util["a" /* default */].getStorage('userId');
|
|
1932
1919
|
}
|
|
1933
|
-
return axios_ajax(url, params, headers, format, 'post'
|
|
1920
|
+
return axios_ajax(url, params, headers, format, 'post');
|
|
1934
1921
|
}
|
|
1935
1922
|
};
|
|
1936
1923
|
/* harmony default export */ var axios = (base);
|
package/lib/selector.js
CHANGED
|
@@ -1740,8 +1740,6 @@ 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;
|
|
1745
1743
|
|
|
1746
1744
|
var http = external_axios_default.a.create({
|
|
1747
1745
|
baseURL: apiUrl,
|
|
@@ -1805,13 +1803,6 @@ var axios_ajax = function ajax(url) {
|
|
|
1805
1803
|
if (config.url.search('mecp/overtime') !== -1 || config.url.search('mecp/leave') !== -1 || config.url.search('contractext') !== -1 || config.url.search('getSysParam') !== -1) {
|
|
1806
1804
|
delete config.headers.deviceId;
|
|
1807
1805
|
}
|
|
1808
|
-
if (!isData) {
|
|
1809
|
-
delete config.data;
|
|
1810
|
-
}
|
|
1811
|
-
if (!isParams) {
|
|
1812
|
-
delete config.params;
|
|
1813
|
-
}
|
|
1814
|
-
|
|
1815
1806
|
return config;
|
|
1816
1807
|
}, function (error) {
|
|
1817
1808
|
return Promise.error(error);
|
|
@@ -1895,8 +1886,6 @@ var base = {
|
|
|
1895
1886
|
var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
1896
1887
|
var headers = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
|
|
1897
1888
|
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;
|
|
1900
1889
|
|
|
1901
1890
|
if (params.params && url.search('registerNew') === -1) {
|
|
1902
1891
|
params.params.userId = params.params.userId ? params.params.userId : util["a" /* default */].getStorage('userId');
|
|
@@ -1915,18 +1904,16 @@ var base = {
|
|
|
1915
1904
|
}
|
|
1916
1905
|
return axios_ajax(url, {
|
|
1917
1906
|
params: params
|
|
1918
|
-
}, headers, format
|
|
1907
|
+
}, headers, format);
|
|
1919
1908
|
},
|
|
1920
1909
|
post: function post(url, params, headers, format) {
|
|
1921
|
-
|
|
1922
|
-
var isParams = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
|
|
1923
|
-
|
|
1910
|
+
console.log(params, 'params');
|
|
1924
1911
|
if (params.params) {
|
|
1925
1912
|
params.params.userId = params.params.userId || util["a" /* default */].getStorage('userId');
|
|
1926
1913
|
} else {
|
|
1927
1914
|
params.userId = params.userId || util["a" /* default */].getStorage('userId');
|
|
1928
1915
|
}
|
|
1929
|
-
return axios_ajax(url, params, headers, format, 'post'
|
|
1916
|
+
return axios_ajax(url, params, headers, format, 'post');
|
|
1930
1917
|
}
|
|
1931
1918
|
};
|
|
1932
1919
|
/* harmony default export */ var axios = (base);
|
|
@@ -2181,8 +2168,8 @@ render._withStripped = true
|
|
|
2181
2168
|
|
|
2182
2169
|
// CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=3fb4f01a&
|
|
2183
2170
|
|
|
2184
|
-
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/selector-tree.vue?vue&type=template&id=
|
|
2185
|
-
var
|
|
2171
|
+
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/selector-tree.vue?vue&type=template&id=d6539ebe&
|
|
2172
|
+
var selector_treevue_type_template_id_d6539ebe_render = function () {
|
|
2186
2173
|
var _vm = this
|
|
2187
2174
|
var _h = _vm.$createElement
|
|
2188
2175
|
var _c = _vm._self._c || _h
|
|
@@ -2349,11 +2336,11 @@ var selector_treevue_type_template_id_72ba252b_render = function () {
|
|
|
2349
2336
|
1
|
|
2350
2337
|
)
|
|
2351
2338
|
}
|
|
2352
|
-
var
|
|
2353
|
-
|
|
2339
|
+
var selector_treevue_type_template_id_d6539ebe_staticRenderFns = []
|
|
2340
|
+
selector_treevue_type_template_id_d6539ebe_render._withStripped = true
|
|
2354
2341
|
|
|
2355
2342
|
|
|
2356
|
-
// CONCATENATED MODULE: ./packages/selector/src/selector-tree.vue?vue&type=template&id=
|
|
2343
|
+
// CONCATENATED MODULE: ./packages/selector/src/selector-tree.vue?vue&type=template&id=d6539ebe&
|
|
2357
2344
|
|
|
2358
2345
|
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/tree.vue?vue&type=template&id=33f22d0d&
|
|
2359
2346
|
var treevue_type_template_id_33f22d0d_render = function () {
|
|
@@ -2973,6 +2960,8 @@ var util = __webpack_require__(0);
|
|
|
2973
2960
|
var http = __webpack_require__(3);
|
|
2974
2961
|
|
|
2975
2962
|
// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/selector-tree.vue?vue&type=script&lang=js&
|
|
2963
|
+
var _methods;
|
|
2964
|
+
|
|
2976
2965
|
var _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; };
|
|
2977
2966
|
|
|
2978
2967
|
//
|
|
@@ -3527,7 +3516,6 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
|
|
|
3527
3516
|
mounted: function mounted() {
|
|
3528
3517
|
// typeof this.selectList != 'string' &&
|
|
3529
3518
|
// (this.list = $.deepClone(this.selectList));
|
|
3530
|
-
|
|
3531
3519
|
// this.$nextTick(() => {
|
|
3532
3520
|
// if (this.nodeList) {
|
|
3533
3521
|
// this.getNodeList();
|
|
@@ -3537,7 +3525,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
|
|
|
3537
3525
|
// });
|
|
3538
3526
|
},
|
|
3539
3527
|
|
|
3540
|
-
methods: {
|
|
3528
|
+
methods: (_methods = {
|
|
3541
3529
|
handleClick: function handleClick(index) {
|
|
3542
3530
|
this.selectIndex = index;
|
|
3543
3531
|
this.getContent();
|
|
@@ -3786,7 +3774,10 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
|
|
|
3786
3774
|
var _this8 = this;
|
|
3787
3775
|
|
|
3788
3776
|
var _that = this;
|
|
3789
|
-
var data =
|
|
3777
|
+
var data = [];
|
|
3778
|
+
if (this.isDefaultNode) {
|
|
3779
|
+
data = _that.$listeners[key] ? _that.$listeners[key](res.obj, !!res.obj.children) : undefined;
|
|
3780
|
+
}
|
|
3790
3781
|
if (!isStart) {
|
|
3791
3782
|
if (res.obj.open) {
|
|
3792
3783
|
this.$set(res.obj, 'open', false);
|
|
@@ -3863,7 +3854,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
|
|
|
3863
3854
|
this.getChiled(res, isStart, 'left-icon');
|
|
3864
3855
|
} else if (this.showMore && this.$listeners['right-icon'] && key === 'node') {
|
|
3865
3856
|
this.getChiled(res, isStart, 'right-icon');
|
|
3866
|
-
} else if (!this.isDefaultNode && key ===
|
|
3857
|
+
} else if (!this.isDefaultNode && key === 'title' || this.$listeners['node-click'] && this.$listeners['left-icon'] && !this.showMore && !this.isDefaultNode) {
|
|
3867
3858
|
_that.$listeners['node-click'](res.obj, !!res.obj.children);
|
|
3868
3859
|
} else {
|
|
3869
3860
|
this.getChiled(res, isStart, 'node-click');
|
|
@@ -3908,10 +3899,10 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
|
|
|
3908
3899
|
this.$set(res.obj, 'checked', false);
|
|
3909
3900
|
}
|
|
3910
3901
|
} else {
|
|
3911
|
-
if (!this.multiple && this.list.length >= 1) {
|
|
3912
|
-
|
|
3913
|
-
|
|
3914
|
-
}
|
|
3902
|
+
// if (!this.multiple && this.list.length >= 1) {
|
|
3903
|
+
// this.$toast(this.promptText);
|
|
3904
|
+
// return;
|
|
3905
|
+
// }
|
|
3915
3906
|
if (res.obj.isAllCheck) {
|
|
3916
3907
|
var _list;
|
|
3917
3908
|
|
|
@@ -3921,7 +3912,11 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
|
|
|
3921
3912
|
(_list = this.list).unshift.apply(_list, model.slice(1, model.length));
|
|
3922
3913
|
} else {
|
|
3923
3914
|
this.$set(res.obj, 'checked', true);
|
|
3924
|
-
this.
|
|
3915
|
+
if (!this.multiple) {
|
|
3916
|
+
this.list = [res.obj];
|
|
3917
|
+
this.setChecked(this.personnel, res.obj);
|
|
3918
|
+
}
|
|
3919
|
+
// this.list.unshift(res.obj);
|
|
3925
3920
|
}
|
|
3926
3921
|
}
|
|
3927
3922
|
if (this.isAllCheck && this.multiple) {
|
|
@@ -3939,20 +3934,31 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
|
|
|
3939
3934
|
this.$set(model[0], 'checked', false);
|
|
3940
3935
|
}
|
|
3941
3936
|
}
|
|
3942
|
-
},
|
|
3943
|
-
dispose: function dispose() {
|
|
3944
|
-
var obj = {
|
|
3945
|
-
list: this.list,
|
|
3946
|
-
label: this.label ? this.label : undefined
|
|
3947
|
-
};
|
|
3948
|
-
this.oldIsSearch = this.isSearch;
|
|
3949
|
-
this.$emit('dispose', obj);
|
|
3950
|
-
this.$parent.$emit('change', obj);
|
|
3951
|
-
},
|
|
3952
|
-
navigateBack: function navigateBack() {
|
|
3953
|
-
this.$emit('close');
|
|
3954
3937
|
}
|
|
3955
|
-
}
|
|
3938
|
+
}, _methods['setChecked'] = function setChecked(data, item) {
|
|
3939
|
+
var _this10 = this;
|
|
3940
|
+
|
|
3941
|
+
data.map(function (x) {
|
|
3942
|
+
if (x[_this10.valueKey] === item[_this10.valueKey] && !x[_this10.nodeKey]) {
|
|
3943
|
+
_this10.$set(x, 'checked', true);
|
|
3944
|
+
} else if (!x[_this10.nodeKey]) {
|
|
3945
|
+
_this10.$set(x, 'checked', false);
|
|
3946
|
+
}
|
|
3947
|
+
if (x[_this10.nodeKey] && x.children) {
|
|
3948
|
+
_this10.setChecked(x.children, item);
|
|
3949
|
+
}
|
|
3950
|
+
});
|
|
3951
|
+
}, _methods.dispose = function dispose() {
|
|
3952
|
+
var obj = {
|
|
3953
|
+
list: this.list,
|
|
3954
|
+
label: this.label ? this.label : undefined
|
|
3955
|
+
};
|
|
3956
|
+
this.oldIsSearch = this.isSearch;
|
|
3957
|
+
this.$emit('dispose', util["a" /* default */].deepClone(obj));
|
|
3958
|
+
this.$parent.$emit('change', util["a" /* default */].deepClone(obj));
|
|
3959
|
+
}, _methods.navigateBack = function navigateBack() {
|
|
3960
|
+
this.$emit('close');
|
|
3961
|
+
}, _methods)
|
|
3956
3962
|
});
|
|
3957
3963
|
// CONCATENATED MODULE: ./packages/selector/src/selector-tree.vue?vue&type=script&lang=js&
|
|
3958
3964
|
/* harmony default export */ var src_selector_treevue_type_script_lang_js_ = (selector_treevue_type_script_lang_js_);
|
|
@@ -3966,8 +3972,8 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
|
|
|
3966
3972
|
|
|
3967
3973
|
var selector_tree_component = Object(componentNormalizer["a" /* default */])(
|
|
3968
3974
|
src_selector_treevue_type_script_lang_js_,
|
|
3969
|
-
|
|
3970
|
-
|
|
3975
|
+
selector_treevue_type_template_id_d6539ebe_render,
|
|
3976
|
+
selector_treevue_type_template_id_d6539ebe_staticRenderFns,
|
|
3971
3977
|
false,
|
|
3972
3978
|
null,
|
|
3973
3979
|
null,
|
package/lib/table-column.js
CHANGED
|
@@ -1740,8 +1740,6 @@ 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;
|
|
1745
1743
|
|
|
1746
1744
|
var http = external_axios_default.a.create({
|
|
1747
1745
|
baseURL: apiUrl,
|
|
@@ -1805,13 +1803,6 @@ var axios_ajax = function ajax(url) {
|
|
|
1805
1803
|
if (config.url.search('mecp/overtime') !== -1 || config.url.search('mecp/leave') !== -1 || config.url.search('contractext') !== -1 || config.url.search('getSysParam') !== -1) {
|
|
1806
1804
|
delete config.headers.deviceId;
|
|
1807
1805
|
}
|
|
1808
|
-
if (!isData) {
|
|
1809
|
-
delete config.data;
|
|
1810
|
-
}
|
|
1811
|
-
if (!isParams) {
|
|
1812
|
-
delete config.params;
|
|
1813
|
-
}
|
|
1814
|
-
|
|
1815
1806
|
return config;
|
|
1816
1807
|
}, function (error) {
|
|
1817
1808
|
return Promise.error(error);
|
|
@@ -1895,8 +1886,6 @@ var base = {
|
|
|
1895
1886
|
var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
1896
1887
|
var headers = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
|
|
1897
1888
|
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;
|
|
1900
1889
|
|
|
1901
1890
|
if (params.params && url.search('registerNew') === -1) {
|
|
1902
1891
|
params.params.userId = params.params.userId ? params.params.userId : util["a" /* default */].getStorage('userId');
|
|
@@ -1915,18 +1904,16 @@ var base = {
|
|
|
1915
1904
|
}
|
|
1916
1905
|
return axios_ajax(url, {
|
|
1917
1906
|
params: params
|
|
1918
|
-
}, headers, format
|
|
1907
|
+
}, headers, format);
|
|
1919
1908
|
},
|
|
1920
1909
|
post: function post(url, params, headers, format) {
|
|
1921
|
-
|
|
1922
|
-
var isParams = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
|
|
1923
|
-
|
|
1910
|
+
console.log(params, 'params');
|
|
1924
1911
|
if (params.params) {
|
|
1925
1912
|
params.params.userId = params.params.userId || util["a" /* default */].getStorage('userId');
|
|
1926
1913
|
} else {
|
|
1927
1914
|
params.userId = params.userId || util["a" /* default */].getStorage('userId');
|
|
1928
1915
|
}
|
|
1929
|
-
return axios_ajax(url, params, headers, format, 'post'
|
|
1916
|
+
return axios_ajax(url, params, headers, format, 'post');
|
|
1930
1917
|
}
|
|
1931
1918
|
};
|
|
1932
1919
|
/* harmony default export */ var axios = (base);
|
package/lib/table.js
CHANGED
|
@@ -1619,8 +1619,6 @@ var axios_ajax = function ajax(url) {
|
|
|
1619
1619
|
var headers = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
|
|
1620
1620
|
var format = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
|
|
1621
1621
|
var type = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 'get';
|
|
1622
|
-
var isData = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
|
|
1623
|
-
var isParams = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : true;
|
|
1624
1622
|
|
|
1625
1623
|
var http = external_axios_default.a.create({
|
|
1626
1624
|
baseURL: apiUrl,
|
|
@@ -1684,13 +1682,6 @@ var axios_ajax = function ajax(url) {
|
|
|
1684
1682
|
if (config.url.search('mecp/overtime') !== -1 || config.url.search('mecp/leave') !== -1 || config.url.search('contractext') !== -1 || config.url.search('getSysParam') !== -1) {
|
|
1685
1683
|
delete config.headers.deviceId;
|
|
1686
1684
|
}
|
|
1687
|
-
if (!isData) {
|
|
1688
|
-
delete config.data;
|
|
1689
|
-
}
|
|
1690
|
-
if (!isParams) {
|
|
1691
|
-
delete config.params;
|
|
1692
|
-
}
|
|
1693
|
-
|
|
1694
1685
|
return config;
|
|
1695
1686
|
}, function (error) {
|
|
1696
1687
|
return Promise.error(error);
|
|
@@ -1774,8 +1765,6 @@ var base = {
|
|
|
1774
1765
|
var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
1775
1766
|
var headers = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
|
|
1776
1767
|
var format = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
|
|
1777
|
-
var isData = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true;
|
|
1778
|
-
var isParams = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
|
|
1779
1768
|
|
|
1780
1769
|
if (params.params && url.search('registerNew') === -1) {
|
|
1781
1770
|
params.params.userId = params.params.userId ? params.params.userId : util["a" /* default */].getStorage('userId');
|
|
@@ -1794,18 +1783,16 @@ var base = {
|
|
|
1794
1783
|
}
|
|
1795
1784
|
return axios_ajax(url, {
|
|
1796
1785
|
params: params
|
|
1797
|
-
}, headers, format
|
|
1786
|
+
}, headers, format);
|
|
1798
1787
|
},
|
|
1799
1788
|
post: function post(url, params, headers, format) {
|
|
1800
|
-
|
|
1801
|
-
var isParams = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
|
|
1802
|
-
|
|
1789
|
+
console.log(params, 'params');
|
|
1803
1790
|
if (params.params) {
|
|
1804
1791
|
params.params.userId = params.params.userId || util["a" /* default */].getStorage('userId');
|
|
1805
1792
|
} else {
|
|
1806
1793
|
params.userId = params.userId || util["a" /* default */].getStorage('userId');
|
|
1807
1794
|
}
|
|
1808
|
-
return axios_ajax(url, params, headers, format, 'post'
|
|
1795
|
+
return axios_ajax(url, params, headers, format, 'post');
|
|
1809
1796
|
}
|
|
1810
1797
|
};
|
|
1811
1798
|
/* harmony default export */ var axios = (base);
|
package/lib/utils/axios.js
CHANGED
|
@@ -25,8 +25,6 @@ var ajax = function ajax(url) {
|
|
|
25
25
|
var headers = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
|
|
26
26
|
var format = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
|
|
27
27
|
var type = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 'get';
|
|
28
|
-
var isData = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
|
|
29
|
-
var isParams = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : true;
|
|
30
28
|
|
|
31
29
|
var http = _axios2.default.create({
|
|
32
30
|
baseURL: apiUrl,
|
|
@@ -90,13 +88,6 @@ var ajax = function ajax(url) {
|
|
|
90
88
|
if (config.url.search('mecp/overtime') !== -1 || config.url.search('mecp/leave') !== -1 || config.url.search('contractext') !== -1 || config.url.search('getSysParam') !== -1) {
|
|
91
89
|
delete config.headers.deviceId;
|
|
92
90
|
}
|
|
93
|
-
if (!isData) {
|
|
94
|
-
delete config.data;
|
|
95
|
-
}
|
|
96
|
-
if (!isParams) {
|
|
97
|
-
delete config.params;
|
|
98
|
-
}
|
|
99
|
-
|
|
100
91
|
return config;
|
|
101
92
|
}, function (error) {
|
|
102
93
|
return Promise.error(error);
|
|
@@ -180,8 +171,6 @@ var base = {
|
|
|
180
171
|
var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
181
172
|
var headers = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
|
|
182
173
|
var format = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
|
|
183
|
-
var isData = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true;
|
|
184
|
-
var isParams = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
|
|
185
174
|
|
|
186
175
|
if (params.params && url.search('registerNew') === -1) {
|
|
187
176
|
params.params.userId = params.params.userId ? params.params.userId : _util2.default.getStorage('userId');
|
|
@@ -200,18 +189,16 @@ var base = {
|
|
|
200
189
|
}
|
|
201
190
|
return ajax(url, {
|
|
202
191
|
params: params
|
|
203
|
-
}, headers, format
|
|
192
|
+
}, headers, format);
|
|
204
193
|
},
|
|
205
194
|
post: function post(url, params, headers, format) {
|
|
206
|
-
|
|
207
|
-
var isParams = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
|
|
208
|
-
|
|
195
|
+
console.log(params, 'params');
|
|
209
196
|
if (params.params) {
|
|
210
197
|
params.params.userId = params.params.userId || _util2.default.getStorage('userId');
|
|
211
198
|
} else {
|
|
212
199
|
params.userId = params.userId || _util2.default.getStorage('userId');
|
|
213
200
|
}
|
|
214
|
-
return ajax(url, params, headers, format, 'post'
|
|
201
|
+
return ajax(url, params, headers, format, 'post');
|
|
215
202
|
}
|
|
216
203
|
};
|
|
217
204
|
exports.default = base;
|
package/package.json
CHANGED
|
@@ -544,7 +544,6 @@ export default {
|
|
|
544
544
|
mounted() {
|
|
545
545
|
// typeof this.selectList != 'string' &&
|
|
546
546
|
// (this.list = $.deepClone(this.selectList));
|
|
547
|
-
|
|
548
547
|
// this.$nextTick(() => {
|
|
549
548
|
// if (this.nodeList) {
|
|
550
549
|
// this.getNodeList();
|
|
@@ -798,9 +797,12 @@ export default {
|
|
|
798
797
|
},
|
|
799
798
|
getChiled(res, isStart, key) {
|
|
800
799
|
const _that = this;
|
|
801
|
-
let data =
|
|
802
|
-
|
|
803
|
-
|
|
800
|
+
let data = [];
|
|
801
|
+
if (this.isDefaultNode) {
|
|
802
|
+
data = _that.$listeners[key]
|
|
803
|
+
? _that.$listeners[key](res.obj, !!res.obj.children)
|
|
804
|
+
: undefined;
|
|
805
|
+
}
|
|
804
806
|
if (!isStart) {
|
|
805
807
|
if (res.obj.open) {
|
|
806
808
|
this.$set(res.obj, 'open', false);
|
|
@@ -870,7 +872,7 @@ export default {
|
|
|
870
872
|
}
|
|
871
873
|
}
|
|
872
874
|
},
|
|
873
|
-
open(res, isStart, isNode,key) {
|
|
875
|
+
open(res, isStart, isNode, key) {
|
|
874
876
|
const _that = this;
|
|
875
877
|
_that.oldIsSearch = _that.isSearch;
|
|
876
878
|
// debugger
|
|
@@ -880,11 +882,21 @@ export default {
|
|
|
880
882
|
) {
|
|
881
883
|
if (this.$listeners['left-icon'] && key === 'node') {
|
|
882
884
|
this.getChiled(res, isStart, 'left-icon');
|
|
883
|
-
} else if (
|
|
885
|
+
} else if (
|
|
886
|
+
this.showMore &&
|
|
887
|
+
this.$listeners['right-icon'] &&
|
|
888
|
+
key === 'node'
|
|
889
|
+
) {
|
|
884
890
|
this.getChiled(res, isStart, 'right-icon');
|
|
885
|
-
}else if
|
|
886
|
-
|
|
887
|
-
|
|
891
|
+
} else if (
|
|
892
|
+
(!this.isDefaultNode && key === 'title') ||
|
|
893
|
+
(this.$listeners['node-click'] &&
|
|
894
|
+
this.$listeners['left-icon'] &&
|
|
895
|
+
!this.showMore &&
|
|
896
|
+
!this.isDefaultNode)
|
|
897
|
+
) {
|
|
898
|
+
_that.$listeners['node-click'](res.obj, !!res.obj.children);
|
|
899
|
+
} else {
|
|
888
900
|
this.getChiled(res, isStart, 'node-click');
|
|
889
901
|
}
|
|
890
902
|
} else if (
|
|
@@ -936,10 +948,10 @@ _that.$listeners['node-click'](res.obj, !!res.obj.children);
|
|
|
936
948
|
this.$set(res.obj, 'checked', false);
|
|
937
949
|
}
|
|
938
950
|
} else {
|
|
939
|
-
if (!this.multiple && this.list.length >= 1) {
|
|
940
|
-
|
|
941
|
-
|
|
942
|
-
}
|
|
951
|
+
// if (!this.multiple && this.list.length >= 1) {
|
|
952
|
+
// this.$toast(this.promptText);
|
|
953
|
+
// return;
|
|
954
|
+
// }
|
|
943
955
|
if (res.obj.isAllCheck) {
|
|
944
956
|
model.map(x => {
|
|
945
957
|
this.$set(x, 'checked', true);
|
|
@@ -947,7 +959,11 @@ _that.$listeners['node-click'](res.obj, !!res.obj.children);
|
|
|
947
959
|
this.list.unshift(...model.slice(1, model.length));
|
|
948
960
|
} else {
|
|
949
961
|
this.$set(res.obj, 'checked', true);
|
|
950
|
-
this.
|
|
962
|
+
if(!this.multiple){
|
|
963
|
+
this.list = [res.obj]
|
|
964
|
+
this.setChecked(this.personnel,res.obj)
|
|
965
|
+
}
|
|
966
|
+
// this.list.unshift(res.obj);
|
|
951
967
|
}
|
|
952
968
|
}
|
|
953
969
|
if (this.isAllCheck && this.multiple) {
|
|
@@ -964,14 +980,26 @@ _that.$listeners['node-click'](res.obj, !!res.obj.children);
|
|
|
964
980
|
}
|
|
965
981
|
}
|
|
966
982
|
},
|
|
983
|
+
setChecked(data,item){
|
|
984
|
+
data.map(x => {
|
|
985
|
+
if(x[this.valueKey] === item[this.valueKey] && !x[this.nodeKey]){
|
|
986
|
+
this.$set(x, 'checked', true);
|
|
987
|
+
}else if(!x[this.nodeKey]){
|
|
988
|
+
this.$set(x, 'checked', false);
|
|
989
|
+
}
|
|
990
|
+
if(x[this.nodeKey] && x.children){
|
|
991
|
+
this.setChecked(x.children,item)
|
|
992
|
+
}
|
|
993
|
+
})
|
|
994
|
+
},
|
|
967
995
|
dispose() {
|
|
968
996
|
let obj = {
|
|
969
997
|
list: this.list,
|
|
970
998
|
label: this.label ? this.label : undefined
|
|
971
999
|
};
|
|
972
1000
|
this.oldIsSearch = this.isSearch;
|
|
973
|
-
this.$emit('dispose', obj);
|
|
974
|
-
this.$parent.$emit('change', obj);
|
|
1001
|
+
this.$emit('dispose', $.deepClone(obj));
|
|
1002
|
+
this.$parent.$emit('change', $.deepClone(obj));
|
|
975
1003
|
},
|
|
976
1004
|
navigateBack() {
|
|
977
1005
|
this.$emit('close');
|