vxe-table 3.15.42 → 3.15.44
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/es/style.css +1 -1
- package/es/table/src/methods.js +20 -4
- package/es/ui/index.js +1 -1
- package/es/ui/src/log.js +1 -1
- package/lib/index.umd.js +29 -6
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/table/src/methods.js +27 -4
- package/lib/table/src/methods.min.js +1 -1
- package/lib/ui/index.js +1 -1
- package/lib/ui/index.min.js +1 -1
- package/lib/ui/src/log.js +1 -1
- package/lib/ui/src/log.min.js +1 -1
- package/package.json +1 -1
- package/packages/table/src/methods.ts +23 -4
- /package/es/{iconfont.1750240479938.ttf → iconfont.1750386589726.ttf} +0 -0
- /package/es/{iconfont.1750240479938.woff → iconfont.1750386589726.woff} +0 -0
- /package/es/{iconfont.1750240479938.woff2 → iconfont.1750386589726.woff2} +0 -0
- /package/lib/{iconfont.1750240479938.ttf → iconfont.1750386589726.ttf} +0 -0
- /package/lib/{iconfont.1750240479938.woff → iconfont.1750386589726.woff} +0 -0
- /package/lib/{iconfont.1750240479938.woff2 → iconfont.1750386589726.woff2} +0 -0
package/lib/table/src/methods.js
CHANGED
|
@@ -213,7 +213,7 @@ function restoreCustomStorage($xeTable) {
|
|
|
213
213
|
const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
|
|
214
214
|
const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
|
|
215
215
|
const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom);
|
|
216
|
-
if ((customConfig ? (0, _utils.isEnableConf)(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
|
|
216
|
+
if (storage && (customConfig ? (0, _utils.isEnableConf)(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
|
|
217
217
|
if (!tableId) {
|
|
218
218
|
(0, _log.errLog)('vxe.error.reqProp', ['id']);
|
|
219
219
|
return;
|
|
@@ -5780,7 +5780,7 @@ const Methods = {
|
|
|
5780
5780
|
const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
|
|
5781
5781
|
const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
|
|
5782
5782
|
const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom);
|
|
5783
|
-
if ((customConfig ? (0, _utils.isEnableConf)(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
|
|
5783
|
+
if (storage && (customConfig ? (0, _utils.isEnableConf)(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
|
|
5784
5784
|
if (!tableId) {
|
|
5785
5785
|
(0, _log.errLog)('vxe.error.reqProp', ['id']);
|
|
5786
5786
|
return;
|
|
@@ -5836,7 +5836,9 @@ const Methods = {
|
|
|
5836
5836
|
fixedData: undefined
|
|
5837
5837
|
};
|
|
5838
5838
|
if (!id) {
|
|
5839
|
-
(
|
|
5839
|
+
if (storage) {
|
|
5840
|
+
(0, _log.errLog)('vxe.error.reqProp', ['id']);
|
|
5841
|
+
}
|
|
5840
5842
|
return storeData;
|
|
5841
5843
|
}
|
|
5842
5844
|
let hasResizable = 0;
|
|
@@ -5913,7 +5915,7 @@ const Methods = {
|
|
|
5913
5915
|
if (type !== 'reset') {
|
|
5914
5916
|
reactData.isCustomStatus = true;
|
|
5915
5917
|
}
|
|
5916
|
-
if ((customConfig ? (0, _utils.isEnableConf)(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
|
|
5918
|
+
if (storage && (customConfig ? (0, _utils.isEnableConf)(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
|
|
5917
5919
|
if (!tableId) {
|
|
5918
5920
|
(0, _log.errLog)('vxe.error.reqProp', ['id']);
|
|
5919
5921
|
return this.$nextTick();
|
|
@@ -10417,6 +10419,27 @@ const Methods = {
|
|
|
10417
10419
|
} = reactData;
|
|
10418
10420
|
return isRowGroupStatus && row.isAggregate;
|
|
10419
10421
|
},
|
|
10422
|
+
getAggregateContentByRow(row) {
|
|
10423
|
+
const $xeTable = this;
|
|
10424
|
+
const reactData = $xeTable;
|
|
10425
|
+
const {
|
|
10426
|
+
isRowGroupStatus
|
|
10427
|
+
} = reactData;
|
|
10428
|
+
return isRowGroupStatus && row && row.isAggregate ? row.groupContent : '';
|
|
10429
|
+
},
|
|
10430
|
+
getAggregateRowChildren(row) {
|
|
10431
|
+
const $xeTable = this;
|
|
10432
|
+
const reactData = $xeTable;
|
|
10433
|
+
const aggregateOpts = $xeTable.computeAggregateOpts;
|
|
10434
|
+
const {
|
|
10435
|
+
childrenField,
|
|
10436
|
+
mapChildrenField
|
|
10437
|
+
} = aggregateOpts;
|
|
10438
|
+
const {
|
|
10439
|
+
isRowGroupStatus
|
|
10440
|
+
} = reactData;
|
|
10441
|
+
return isRowGroupStatus && row && row.isAggregate && childrenField && mapChildrenField ? row[mapChildrenField] || [] : [];
|
|
10442
|
+
},
|
|
10420
10443
|
isAggregateExpandByRow(row) {
|
|
10421
10444
|
const $xeTable = this;
|
|
10422
10445
|
const reactData = $xeTable;
|