vxe-table 3.15.43 → 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 +3 -3
- package/es/ui/src/log.js +1 -1
- package/lib/index.umd.js +31 -8
- 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 +3 -3
- 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/packages/ui/index.ts +2 -2
- /package/es/{iconfont.1750301122777.ttf → iconfont.1750386589726.ttf} +0 -0
- /package/es/{iconfont.1750301122777.woff → iconfont.1750386589726.woff} +0 -0
- /package/es/{iconfont.1750301122777.woff2 → iconfont.1750386589726.woff2} +0 -0
- /package/lib/{iconfont.1750301122777.ttf → iconfont.1750386589726.ttf} +0 -0
- /package/lib/{iconfont.1750301122777.woff → iconfont.1750386589726.woff} +0 -0
- /package/lib/{iconfont.1750301122777.woff2 → iconfont.1750386589726.woff2} +0 -0
package/es/table/src/methods.js
CHANGED
|
@@ -167,7 +167,7 @@ function restoreCustomStorage($xeTable) {
|
|
|
167
167
|
const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
|
|
168
168
|
const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
|
|
169
169
|
const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom);
|
|
170
|
-
if ((customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
|
|
170
|
+
if (storage && (customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
|
|
171
171
|
if (!tableId) {
|
|
172
172
|
errLog('vxe.error.reqProp', ['id']);
|
|
173
173
|
return;
|
|
@@ -4921,7 +4921,7 @@ const Methods = {
|
|
|
4921
4921
|
const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
|
|
4922
4922
|
const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
|
|
4923
4923
|
const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom);
|
|
4924
|
-
if ((customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
|
|
4924
|
+
if (storage && (customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
|
|
4925
4925
|
if (!tableId) {
|
|
4926
4926
|
errLog('vxe.error.reqProp', ['id']);
|
|
4927
4927
|
return;
|
|
@@ -4965,7 +4965,9 @@ const Methods = {
|
|
|
4965
4965
|
fixedData: undefined
|
|
4966
4966
|
};
|
|
4967
4967
|
if (!id) {
|
|
4968
|
-
|
|
4968
|
+
if (storage) {
|
|
4969
|
+
errLog('vxe.error.reqProp', ['id']);
|
|
4970
|
+
}
|
|
4969
4971
|
return storeData;
|
|
4970
4972
|
}
|
|
4971
4973
|
let hasResizable = 0;
|
|
@@ -5035,7 +5037,7 @@ const Methods = {
|
|
|
5035
5037
|
if (type !== 'reset') {
|
|
5036
5038
|
reactData.isCustomStatus = true;
|
|
5037
5039
|
}
|
|
5038
|
-
if ((customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
|
|
5040
|
+
if (storage && (customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
|
|
5039
5041
|
if (!tableId) {
|
|
5040
5042
|
errLog('vxe.error.reqProp', ['id']);
|
|
5041
5043
|
return this.$nextTick();
|
|
@@ -8890,6 +8892,20 @@ const Methods = {
|
|
|
8890
8892
|
const { isRowGroupStatus } = reactData;
|
|
8891
8893
|
return isRowGroupStatus && row.isAggregate;
|
|
8892
8894
|
},
|
|
8895
|
+
getAggregateContentByRow(row) {
|
|
8896
|
+
const $xeTable = this;
|
|
8897
|
+
const reactData = $xeTable;
|
|
8898
|
+
const { isRowGroupStatus } = reactData;
|
|
8899
|
+
return isRowGroupStatus && row && row.isAggregate ? row.groupContent : '';
|
|
8900
|
+
},
|
|
8901
|
+
getAggregateRowChildren(row) {
|
|
8902
|
+
const $xeTable = this;
|
|
8903
|
+
const reactData = $xeTable;
|
|
8904
|
+
const aggregateOpts = $xeTable.computeAggregateOpts;
|
|
8905
|
+
const { childrenField, mapChildrenField } = aggregateOpts;
|
|
8906
|
+
const { isRowGroupStatus } = reactData;
|
|
8907
|
+
return isRowGroupStatus && row && row.isAggregate && childrenField && mapChildrenField ? (row[mapChildrenField] || []) : [];
|
|
8908
|
+
},
|
|
8893
8909
|
isAggregateExpandByRow(row) {
|
|
8894
8910
|
const $xeTable = this;
|
|
8895
8911
|
const reactData = $xeTable;
|
package/es/ui/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { VxeUI } from '@vxe-ui/core';
|
|
2
2
|
import { getFuncText } from './src/utils';
|
|
3
|
-
export const version = "3.15.
|
|
3
|
+
export const version = "3.15.44";
|
|
4
4
|
VxeUI.version = version;
|
|
5
5
|
VxeUI.tableVersion = version;
|
|
6
6
|
VxeUI.setConfig({
|
|
@@ -210,13 +210,13 @@ VxeUI.setConfig({
|
|
|
210
210
|
isReplace: true
|
|
211
211
|
},
|
|
212
212
|
virtualXConfig: {
|
|
213
|
-
enabled:
|
|
213
|
+
// enabled: false,
|
|
214
214
|
gt: 24,
|
|
215
215
|
preSize: 0,
|
|
216
216
|
oSize: 0
|
|
217
217
|
},
|
|
218
218
|
virtualYConfig: {
|
|
219
|
-
enabled:
|
|
219
|
+
// enabled: false,
|
|
220
220
|
gt: 100,
|
|
221
221
|
preSize: 1,
|
|
222
222
|
oSize: 0
|
package/es/ui/src/log.js
CHANGED
package/lib/index.umd.js
CHANGED
|
@@ -2002,7 +2002,7 @@ function getClass(property, params) {
|
|
|
2002
2002
|
;// CONCATENATED MODULE: ./packages/ui/index.ts
|
|
2003
2003
|
|
|
2004
2004
|
|
|
2005
|
-
const version = "3.15.
|
|
2005
|
+
const version = "3.15.44";
|
|
2006
2006
|
core_.VxeUI.version = version;
|
|
2007
2007
|
core_.VxeUI.tableVersion = version;
|
|
2008
2008
|
core_.VxeUI.setConfig({
|
|
@@ -2212,13 +2212,13 @@ core_.VxeUI.setConfig({
|
|
|
2212
2212
|
isReplace: true
|
|
2213
2213
|
},
|
|
2214
2214
|
virtualXConfig: {
|
|
2215
|
-
enabled:
|
|
2215
|
+
// enabled: false,
|
|
2216
2216
|
gt: 24,
|
|
2217
2217
|
preSize: 0,
|
|
2218
2218
|
oSize: 0
|
|
2219
2219
|
},
|
|
2220
2220
|
virtualYConfig: {
|
|
2221
|
-
enabled:
|
|
2221
|
+
// enabled: false,
|
|
2222
2222
|
gt: 100,
|
|
2223
2223
|
preSize: 1,
|
|
2224
2224
|
oSize: 0
|
|
@@ -2658,7 +2658,7 @@ function isNodeElement(elem) {
|
|
|
2658
2658
|
const {
|
|
2659
2659
|
log: log_log
|
|
2660
2660
|
} = core_.VxeUI;
|
|
2661
|
-
const log_version = `table v${"3.15.
|
|
2661
|
+
const log_version = `table v${"3.15.44"}`;
|
|
2662
2662
|
const warnLog = log_log.create('warn', log_version);
|
|
2663
2663
|
const errLog = log_log.create('error', log_version);
|
|
2664
2664
|
;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
|
|
@@ -5346,7 +5346,7 @@ function restoreCustomStorage($xeTable) {
|
|
|
5346
5346
|
const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
|
|
5347
5347
|
const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
|
|
5348
5348
|
const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom);
|
|
5349
|
-
if ((customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
|
|
5349
|
+
if (storage && (customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
|
|
5350
5350
|
if (!tableId) {
|
|
5351
5351
|
errLog('vxe.error.reqProp', ['id']);
|
|
5352
5352
|
return;
|
|
@@ -10915,7 +10915,7 @@ const Methods = {
|
|
|
10915
10915
|
const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
|
|
10916
10916
|
const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
|
|
10917
10917
|
const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom);
|
|
10918
|
-
if ((customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
|
|
10918
|
+
if (storage && (customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
|
|
10919
10919
|
if (!tableId) {
|
|
10920
10920
|
errLog('vxe.error.reqProp', ['id']);
|
|
10921
10921
|
return;
|
|
@@ -10971,7 +10971,9 @@ const Methods = {
|
|
|
10971
10971
|
fixedData: undefined
|
|
10972
10972
|
};
|
|
10973
10973
|
if (!id) {
|
|
10974
|
-
|
|
10974
|
+
if (storage) {
|
|
10975
|
+
errLog('vxe.error.reqProp', ['id']);
|
|
10976
|
+
}
|
|
10975
10977
|
return storeData;
|
|
10976
10978
|
}
|
|
10977
10979
|
let hasResizable = 0;
|
|
@@ -11048,7 +11050,7 @@ const Methods = {
|
|
|
11048
11050
|
if (type !== 'reset') {
|
|
11049
11051
|
reactData.isCustomStatus = true;
|
|
11050
11052
|
}
|
|
11051
|
-
if ((customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
|
|
11053
|
+
if (storage && (customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
|
|
11052
11054
|
if (!tableId) {
|
|
11053
11055
|
errLog('vxe.error.reqProp', ['id']);
|
|
11054
11056
|
return this.$nextTick();
|
|
@@ -15559,6 +15561,27 @@ const Methods = {
|
|
|
15559
15561
|
} = reactData;
|
|
15560
15562
|
return isRowGroupStatus && row.isAggregate;
|
|
15561
15563
|
},
|
|
15564
|
+
getAggregateContentByRow(row) {
|
|
15565
|
+
const $xeTable = this;
|
|
15566
|
+
const reactData = $xeTable;
|
|
15567
|
+
const {
|
|
15568
|
+
isRowGroupStatus
|
|
15569
|
+
} = reactData;
|
|
15570
|
+
return isRowGroupStatus && row && row.isAggregate ? row.groupContent : '';
|
|
15571
|
+
},
|
|
15572
|
+
getAggregateRowChildren(row) {
|
|
15573
|
+
const $xeTable = this;
|
|
15574
|
+
const reactData = $xeTable;
|
|
15575
|
+
const aggregateOpts = $xeTable.computeAggregateOpts;
|
|
15576
|
+
const {
|
|
15577
|
+
childrenField,
|
|
15578
|
+
mapChildrenField
|
|
15579
|
+
} = aggregateOpts;
|
|
15580
|
+
const {
|
|
15581
|
+
isRowGroupStatus
|
|
15582
|
+
} = reactData;
|
|
15583
|
+
return isRowGroupStatus && row && row.isAggregate && childrenField && mapChildrenField ? row[mapChildrenField] || [] : [];
|
|
15584
|
+
},
|
|
15562
15585
|
isAggregateExpandByRow(row) {
|
|
15563
15586
|
const $xeTable = this;
|
|
15564
15587
|
const reactData = $xeTable;
|