vxe-table 3.6.0 → 3.6.1
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/form/style/style.css +1 -0
- package/lib/form/style/style.min.css +1 -1
- package/lib/icon/style/style.css +41 -10
- package/lib/icon/style/style.min.css +1 -1
- package/lib/index.css +1 -1
- package/lib/index.umd.js +11 -7
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/style.min.css +1 -1
- package/lib/table/style/style.css +1 -0
- package/lib/table/style/style.min.css +1 -1
- package/lib/toolbar/src/toolbar.js +9 -5
- package/lib/toolbar/src/toolbar.min.js +1 -1
- package/lib/tools/log.js +1 -1
- package/lib/tools/log.min.js +1 -1
- package/lib/v-x-e-table/index.js +1 -1
- package/lib/v-x-e-table/index.min.js +1 -1
- package/lib/v-x-e-table/style/style.css +41 -10
- package/lib/v-x-e-table/style/style.min.css +1 -1
- package/package.json +1 -1
- package/packages/toolbar/src/toolbar.js +7 -5
- package/styles/form.scss +1 -0
- package/styles/icon.scss +54 -13
- package/styles/table.scss +1 -0
package/lib/index.umd.js
CHANGED
|
@@ -8812,7 +8812,7 @@ var es_array_concat = __webpack_require__("99af");
|
|
|
8812
8812
|
|
|
8813
8813
|
|
|
8814
8814
|
function getLog(message, params) {
|
|
8815
|
-
return "[vxe-table v".concat("3.6.0
|
|
8815
|
+
return "[vxe-table v".concat("3.6.0", "] ").concat(src_conf.i18n(message, params));
|
|
8816
8816
|
}
|
|
8817
8817
|
|
|
8818
8818
|
function outLog(type) {
|
|
@@ -10093,7 +10093,7 @@ function _t(key, args) {
|
|
|
10093
10093
|
var v = 'v3';
|
|
10094
10094
|
var VXETable = {
|
|
10095
10095
|
v: v,
|
|
10096
|
-
version: "3.6.0
|
|
10096
|
+
version: "3.6.0",
|
|
10097
10097
|
reg: reg,
|
|
10098
10098
|
use: use,
|
|
10099
10099
|
setup: setup,
|
|
@@ -34461,8 +34461,10 @@ function renderCustoms(h, _vm) {
|
|
|
34461
34461
|
this.$nextTick(function () {
|
|
34462
34462
|
var $xetable = _this.fintTable();
|
|
34463
34463
|
|
|
34464
|
-
|
|
34465
|
-
|
|
34464
|
+
var queryMethod = refreshOpts.queryMethod || refreshOpts.query;
|
|
34465
|
+
|
|
34466
|
+
if (refresh && !_this.$xegrid && !queryMethod) {
|
|
34467
|
+
warnLog('vxe.error.notFunc', ['queryMethod']);
|
|
34466
34468
|
}
|
|
34467
34469
|
|
|
34468
34470
|
if ($xetable) {
|
|
@@ -34771,11 +34773,13 @@ function renderCustoms(h, _vm) {
|
|
|
34771
34773
|
isRefresh = this.isRefresh;
|
|
34772
34774
|
|
|
34773
34775
|
if (!isRefresh) {
|
|
34774
|
-
|
|
34776
|
+
var queryMethod = refreshOpts.queryMethod || refreshOpts.query;
|
|
34777
|
+
|
|
34778
|
+
if (queryMethod) {
|
|
34775
34779
|
this.isRefresh = true;
|
|
34776
34780
|
|
|
34777
34781
|
try {
|
|
34778
|
-
Promise.resolve(
|
|
34782
|
+
Promise.resolve(queryMethod({})).catch(function (e) {
|
|
34779
34783
|
return e;
|
|
34780
34784
|
}).then(function () {
|
|
34781
34785
|
_this4.isRefresh = false;
|
|
@@ -34785,7 +34789,7 @@ function renderCustoms(h, _vm) {
|
|
|
34785
34789
|
}
|
|
34786
34790
|
} else if ($xegrid) {
|
|
34787
34791
|
this.isRefresh = true;
|
|
34788
|
-
$xegrid.commitProxy('reload').catch(function (e) {
|
|
34792
|
+
$xegrid.commitProxy(refreshOpts.code || 'reload').catch(function (e) {
|
|
34789
34793
|
return e;
|
|
34790
34794
|
}).then(function () {
|
|
34791
34795
|
_this4.isRefresh = false;
|