vxe-table 3.15.32 → 3.15.33
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/cell.js +31 -15
- package/es/table/src/methods.js +18 -2
- package/es/ui/index.js +3 -3
- package/es/ui/src/log.js +1 -1
- package/lib/index.umd.js +60 -18
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/table/src/cell.js +39 -12
- package/lib/table/src/cell.min.js +1 -1
- package/lib/table/src/methods.js +17 -2
- 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/cell.ts +31 -16
- package/packages/table/src/methods.ts +17 -2
- package/packages/ui/index.ts +2 -2
- /package/es/{iconfont.1748578557669.ttf → iconfont.1749019365308.ttf} +0 -0
- /package/es/{iconfont.1748578557669.woff → iconfont.1749019365308.woff} +0 -0
- /package/es/{iconfont.1748578557669.woff2 → iconfont.1749019365308.woff2} +0 -0
- /package/lib/{iconfont.1748578557669.ttf → iconfont.1749019365308.ttf} +0 -0
- /package/lib/{iconfont.1748578557669.woff → iconfont.1749019365308.woff} +0 -0
- /package/lib/{iconfont.1748578557669.woff2 → iconfont.1749019365308.woff2} +0 -0
package/lib/ui/index.js
CHANGED
|
@@ -13,7 +13,7 @@ Object.defineProperty(exports, "VxeUI", {
|
|
|
13
13
|
exports.version = exports.validators = exports.use = exports.t = exports.setup = exports.setTheme = exports.setLanguage = exports.setIcon = exports.setI18n = exports.setConfig = exports.saveFile = exports.renderer = exports.readFile = exports.print = exports.modal = exports.menus = exports.log = exports.interceptor = exports.globalResize = exports.globalEvents = exports.getTheme = exports.getIcon = exports.getI18n = exports.getConfig = exports.formats = exports.default = exports.config = exports.commands = exports.clipboard = exports._t = void 0;
|
|
14
14
|
var _core = require("@vxe-ui/core");
|
|
15
15
|
var _utils = require("./src/utils");
|
|
16
|
-
const version = exports.version = "3.15.
|
|
16
|
+
const version = exports.version = "3.15.33";
|
|
17
17
|
_core.VxeUI.version = version;
|
|
18
18
|
_core.VxeUI.tableVersion = version;
|
|
19
19
|
_core.VxeUI.setConfig({
|
|
@@ -214,13 +214,13 @@ _core.VxeUI.setConfig({
|
|
|
214
214
|
isReplace: true
|
|
215
215
|
},
|
|
216
216
|
virtualXConfig: {
|
|
217
|
-
|
|
217
|
+
enabled: true,
|
|
218
218
|
gt: 24,
|
|
219
219
|
preSize: 0,
|
|
220
220
|
oSize: 0
|
|
221
221
|
},
|
|
222
222
|
virtualYConfig: {
|
|
223
|
-
|
|
223
|
+
enabled: true,
|
|
224
224
|
gt: 100,
|
|
225
225
|
preSize: 1,
|
|
226
226
|
oSize: 0
|
package/lib/ui/index.min.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
Object.defineProperty(exports,"__esModule",{value:!0}),exports.VXETable=void 0,Object.defineProperty(exports,"VxeUI",{enumerable:!0,get:function(){return _core.VxeUI}}),exports.version=exports.validators=exports.use=exports.t=exports.setup=exports.setTheme=exports.setLanguage=exports.setIcon=exports.setI18n=exports.setConfig=exports.saveFile=exports.renderer=exports.readFile=exports.print=exports.modal=exports.menus=exports.log=exports.interceptor=exports.globalResize=exports.globalEvents=exports.getTheme=exports.getIcon=exports.getI18n=exports.getConfig=exports.formats=exports.default=exports.config=exports.commands=exports.clipboard=exports._t=void 0;var _core=require("@vxe-ui/core"),_utils=require("./src/utils");let version=exports.version="3.15.
|
|
1
|
+
Object.defineProperty(exports,"__esModule",{value:!0}),exports.VXETable=void 0,Object.defineProperty(exports,"VxeUI",{enumerable:!0,get:function(){return _core.VxeUI}}),exports.version=exports.validators=exports.use=exports.t=exports.setup=exports.setTheme=exports.setLanguage=exports.setIcon=exports.setI18n=exports.setConfig=exports.saveFile=exports.renderer=exports.readFile=exports.print=exports.modal=exports.menus=exports.log=exports.interceptor=exports.globalResize=exports.globalEvents=exports.getTheme=exports.getIcon=exports.getI18n=exports.getConfig=exports.formats=exports.default=exports.config=exports.commands=exports.clipboard=exports._t=void 0;var _core=require("@vxe-ui/core"),_utils=require("./src/utils");let version=exports.version="3.15.33",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:" ",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,padding:!0,minHeight:144,resizeConfig:{},resizableConfig:{dragMode:"auto",showDragTip:!0,isSyncAutoHeight:!0,isSyncAutoWidth:!0,minHeight:18},radioConfig:{strict:!0},rowDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},columnDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"beautify"},columnConfig:{maxFixedSize:4},cellConfig:{padding:!0},headerCellConfig:{height:"unset"},footerCellConfig:{height:"unset"},customConfig:{allowVisible:!0,allowResizable:!0,allowFixed:!0,allowSort:!0,showFooter:!0,placement:"top-right",modalOptions:{showMaximize:!0,mask:!0,lockView:!0,resize:!0,escClosable:!0},drawerOptions:{mask:!0,lockView:!0,escClosable:!0,resize:!0}},sortConfig:{showIcon:!0,allowClear:!0,allowBtn:!0,iconLayout:"vertical"},filterConfig:{showIcon:!0},rowGroupConfig:{padding:!0,rowField:"id",parentField:"_X_ROW_PARENT_KEY",childrenField:"_X_ROW_CHILDREN",mapChildrenField:"_X_ROW_CHILD_LIST",indent:20,showIcon:!0},treeConfig:{padding:!0,rowField:"id",parentField:"parentId",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_X_ROW_CHILD",indent:20,showIcon:!0},expandConfig:{showIcon:!0,mode:"fixed"},editConfig:{showIcon:!0,showAsterisk:!0,autoFocus:!0},importConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},exportConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},printConfig:{},mouseConfig:{extension:!0},keyboardConfig:{isEsc:!0},areaConfig:{autoClear:!0,selectCellByHeader:!0,selectCellByBody:!0,extendDirection:{top:!0,left:!0,bottom:!0,right:!0}},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},virtualXConfig:{enabled:!0,gt:24,preSize:0,oSize:0},virtualYConfig:{enabled:!0,gt:100,preSize:1,oSize:0},scrollbarConfig:{}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showResponseMsg:!0,showActiveMsg:!0,props:{list:null,result:"result",total:"page.total",message:"message"}}},toolbar:{}}),"vxe-table-icon-"),setTheme=(_core.VxeUI.setIcon({TABLE_SORT_ASC:iconPrefix+"caret-up",TABLE_SORT_DESC:iconPrefix+"caret-down",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit",TABLE_TITLE_PREFIX:iconPrefix+"question-circle-fill",TABLE_TITLE_SUFFIX:iconPrefix+"question-circle-fill",TABLE_TREE_LOADED:iconPrefix+"spinner roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"spinner roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",TABLE_CHECKBOX_CHECKED:iconPrefix+"checkbox-checked-fill",TABLE_CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",TABLE_CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate-fill",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked-fill",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",TABLE_CUSTOM_SORT:iconPrefix+"drag-handle",TABLE_MENU_OPTIONS:iconPrefix+"arrow-right",TABLE_DRAG_ROW:iconPrefix+"drag-handle",TABLE_DRAG_COLUMN:iconPrefix+"drag-handle",TABLE_DRAG_STATUS_ROW:iconPrefix+"sort",TABLE_DRAG_STATUS_SUB_ROW:iconPrefix+"add-sub",TABLE_DRAG_STATUS_COLUMN:iconPrefix+"swap",TABLE_DRAG_DISABLED:iconPrefix+"no-drop",TABLE_ROW_GROUP_OPEN:iconPrefix+"arrow-right rotate90",TABLE_ROW_GROUP_CLOSE:iconPrefix+"arrow-right",TOOLBAR_TOOLS_REFRESH:iconPrefix+"repeat",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"repeat roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_FULLSCREEN:iconPrefix+"fullscreen",TOOLBAR_TOOLS_MINIMIZE:iconPrefix+"minimize",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"custom-column",TOOLBAR_TOOLS_FIXED_LEFT:iconPrefix+"fixed-left",TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:iconPrefix+"fixed-left-fill",TOOLBAR_TOOLS_FIXED_RIGHT:iconPrefix+"fixed-right",TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:iconPrefix+"fixed-right-fill"}),exports.setTheme=_core.VxeUI.setTheme),getTheme=exports.getTheme=_core.VxeUI.getTheme,setConfig=exports.setConfig=_core.VxeUI.setConfig,getConfig=exports.getConfig=_core.VxeUI.getConfig,setIcon=exports.setIcon=_core.VxeUI.setIcon,getIcon=exports.getIcon=_core.VxeUI.getIcon,setLanguage=exports.setLanguage=_core.VxeUI.setLanguage,setI18n=exports.setI18n=_core.VxeUI.setI18n,getI18n=exports.getI18n=_core.VxeUI.getI18n,globalEvents=exports.globalEvents=_core.VxeUI.globalEvents,globalResize=exports.globalResize=_core.VxeUI.globalResize,renderer=exports.renderer=_core.VxeUI.renderer,validators=exports.validators=_core.VxeUI.validators,menus=exports.menus=_core.VxeUI.menus,formats=exports.formats=_core.VxeUI.formats,commands=exports.commands=_core.VxeUI.commands,interceptor=exports.interceptor=_core.VxeUI.interceptor,clipboard=exports.clipboard=_core.VxeUI.clipboard,log=exports.log=_core.VxeUI.log,use=exports.use=_core.VxeUI.use,setup=e=>_core.VxeUI.setConfig(e),config=(exports.setup=setup,_core.VxeUI.setup=setup,e=>_core.VxeUI.setConfig(e)),t=(exports.config=config,_core.VxeUI.config=config,(e,o)=>_core.VxeUI.getI18n(e,o)),_t=(exports.t=t,_core.VxeUI.t=t,(e,o)=>(0,_utils.getFuncText)(e,o)),VXETable=(exports._t=_t,_core.VxeUI._t=_t,exports.VXETable=_core.VxeUI),saveFile=e=>_core.VxeUI.saveFile(e),readFile=(exports.saveFile=saveFile,e=>_core.VxeUI.readFile(e)),print=(exports.readFile=readFile,e=>_core.VxeUI.print(e)),modal=(exports.print=print,exports.modal={get(e){return _core.VxeUI.modal.get(e)},close(e){return _core.VxeUI.modal.close(e)},open(e){return _core.VxeUI.modal.open(e)},alert(e,o,r){return _core.VxeUI.modal.alert(e,o,r)},confirm(e,o,r){return _core.VxeUI.modal.confirm(e,o,r)},message(e,o){return _core.VxeUI.modal.message(e,o)},notification(e,o,r){return _core.VxeUI.modal.notification(e,o,r)}});var _default=exports.default=_core.VxeUI;
|
package/lib/ui/src/log.js
CHANGED
|
@@ -8,6 +8,6 @@ var _core = require("@vxe-ui/core");
|
|
|
8
8
|
const {
|
|
9
9
|
log
|
|
10
10
|
} = _core.VxeUI;
|
|
11
|
-
const version = `table v${"3.15.
|
|
11
|
+
const version = `table v${"3.15.33"}`;
|
|
12
12
|
const warnLog = exports.warnLog = log.create('warn', version);
|
|
13
13
|
const errLog = exports.errLog = log.create('error', version);
|
package/lib/ui/src/log.min.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,version="table v3.15.
|
|
1
|
+
Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,version="table v3.15.33",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);
|
package/package.json
CHANGED
|
@@ -264,13 +264,17 @@ function getDefaultCellLabel (params: VxeTableDefines.CellRenderBodyParams) {
|
|
|
264
264
|
function renderCellHandle (h: CreateElement, params: VxeTableDefines.CellRenderBodyParams & {
|
|
265
265
|
$table: VxeTableConstructor & VxeTablePrivateMethods;
|
|
266
266
|
}) {
|
|
267
|
-
const { column, $table } = params
|
|
267
|
+
const { column, row, $table } = params
|
|
268
268
|
const tableProps = $table
|
|
269
|
+
const tableReactData = $table as unknown as TableReactData
|
|
269
270
|
const { editConfig } = tableProps
|
|
271
|
+
const { isRowGroupStatus } = tableReactData
|
|
270
272
|
const { type, treeNode, rowGroupNode, editRender } = column
|
|
273
|
+
const rowGroupOpts = $table.computeRowGroupOpts
|
|
274
|
+
const { mode } = rowGroupOpts
|
|
271
275
|
const checkboxOpts = $table.computeCheckboxOpts
|
|
272
276
|
const editOpts = $table.computeEditOpts
|
|
273
|
-
const isDeepCell = treeNode || rowGroupNode
|
|
277
|
+
const isDeepCell = treeNode || (isRowGroupStatus && row.isAggregate && (mode === 'column' ? column.field === row.groupField : rowGroupNode))
|
|
274
278
|
switch (type) {
|
|
275
279
|
case 'seq':
|
|
276
280
|
return isDeepCell ? Cell.renderDeepIndexCell(h, params) : Cell.renderSeqCell(h, params)
|
|
@@ -371,7 +375,7 @@ export const Cell = {
|
|
|
371
375
|
const tableReactData = $table as unknown as TableReactData
|
|
372
376
|
const tableInternalData = $table as unknown as TableInternalData
|
|
373
377
|
const { isRowGroupStatus } = tableReactData
|
|
374
|
-
const { slots, editRender, cellRender, rowGroupNode } = column
|
|
378
|
+
const { field, slots, editRender, cellRender, rowGroupNode } = column
|
|
375
379
|
const renderOpts = editRender || cellRender
|
|
376
380
|
if (slots && slots.default) {
|
|
377
381
|
return renderCellBaseVNs(h, params, $table.callSlot(slots.default, params, h))
|
|
@@ -386,29 +390,36 @@ export const Cell = {
|
|
|
386
390
|
}
|
|
387
391
|
}
|
|
388
392
|
let cellValue: string | number | null = ''
|
|
389
|
-
if (isRowGroupStatus &&
|
|
393
|
+
if (isRowGroupStatus && row.isAggregate) {
|
|
390
394
|
const { fullColumnFieldData } = tableInternalData
|
|
391
395
|
const rowGroupOpts = $table.computeRowGroupOpts
|
|
392
|
-
const { showTotal, totalMethod, contentMethod, mapChildrenField } = rowGroupOpts
|
|
396
|
+
const { mode, showTotal, totalMethod, countFields, countMethod, contentMethod, mapChildrenField } = rowGroupOpts
|
|
393
397
|
const groupField = row.groupField
|
|
394
|
-
|
|
398
|
+
const groupContent = row.groupContent
|
|
395
399
|
const childList = mapChildrenField ? (row[mapChildrenField] || []) : []
|
|
396
|
-
const totalValue =
|
|
400
|
+
const totalValue = row.childCount
|
|
397
401
|
const colRest = fullColumnFieldData[groupField] || {}
|
|
398
402
|
const params = {
|
|
399
403
|
$table,
|
|
400
404
|
groupField,
|
|
401
405
|
groupColumn: (colRest ? colRest.column : null) as VxeTableDefines.ColumnInfo,
|
|
402
406
|
column,
|
|
403
|
-
groupValue:
|
|
407
|
+
groupValue: groupContent,
|
|
404
408
|
children: childList,
|
|
405
409
|
totalValue: totalValue
|
|
406
410
|
}
|
|
407
|
-
if (
|
|
408
|
-
cellValue =
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
411
|
+
if (mode === 'column' ? column.field === row.groupField : rowGroupNode) {
|
|
412
|
+
cellValue = groupContent
|
|
413
|
+
if (contentMethod) {
|
|
414
|
+
cellValue = `${contentMethod(params)}`
|
|
415
|
+
}
|
|
416
|
+
if (showTotal) {
|
|
417
|
+
cellValue = getI18n('vxe.table.rowGroupContentTotal', [cellValue, totalMethod ? totalMethod(params) : totalValue, totalValue])
|
|
418
|
+
}
|
|
419
|
+
} else if (countFields && countFields.includes(field)) {
|
|
420
|
+
if (countMethod) {
|
|
421
|
+
cellValue = `${countMethod(params)}`
|
|
422
|
+
}
|
|
412
423
|
}
|
|
413
424
|
} else if (!(isRowGroupStatus && row.isAggregate)) {
|
|
414
425
|
cellValue = $table.getCellLabel(row, column)
|
|
@@ -550,10 +561,14 @@ export const Cell = {
|
|
|
550
561
|
* 行分组、树结构
|
|
551
562
|
*/
|
|
552
563
|
renderDeepNodeBtn (h: CreateElement, params: VxeTableDefines.CellRenderBodyParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }, cellVNodes: VxeComponentSlotType[]) {
|
|
553
|
-
const { row, column } = params
|
|
564
|
+
const { $table, row, column } = params
|
|
554
565
|
const { rowGroupNode } = column
|
|
555
|
-
if (
|
|
556
|
-
|
|
566
|
+
if (row.isAggregate) {
|
|
567
|
+
const rowGroupOpts = $table.computeRowGroupOpts
|
|
568
|
+
const { mode } = rowGroupOpts
|
|
569
|
+
if (mode === 'column' ? column.field === row.groupField : rowGroupNode) {
|
|
570
|
+
return [Cell.renderRowGroupBtn(h, params, cellVNodes)]
|
|
571
|
+
}
|
|
557
572
|
}
|
|
558
573
|
return [Cell.renderTreeNodeBtn(h, params, cellVNodes)]
|
|
559
574
|
},
|
|
@@ -110,7 +110,7 @@ function handleVirtualXVisible ($xeTable: VxeTableConstructor & VxeTablePrivateM
|
|
|
110
110
|
}
|
|
111
111
|
}
|
|
112
112
|
let visibleSize = 0
|
|
113
|
-
const toVisibleIndex = Math.max(0, leftIndex < visibleColumn.length ? leftIndex - 2 : 0)
|
|
113
|
+
const toVisibleIndex = leftIndex === visibleColumn.length ? leftIndex : Math.max(0, leftIndex < visibleColumn.length ? leftIndex - 2 : 0)
|
|
114
114
|
for (let cIndex = toVisibleIndex, cLen = visibleColumn.length; cIndex < cLen; cIndex++) {
|
|
115
115
|
const column = visibleColumn[cIndex]
|
|
116
116
|
const colid = column.id
|
|
@@ -1757,7 +1757,7 @@ function handleVirtualYVisible ($xeTable: VxeTableConstructor) {
|
|
|
1757
1757
|
rightIndex = rIndex
|
|
1758
1758
|
}
|
|
1759
1759
|
}
|
|
1760
|
-
toVisibleIndex = Math.max(0, leftIndex < afterFullData.length ? leftIndex - 2 : 0)
|
|
1760
|
+
toVisibleIndex = leftIndex === afterFullData.length ? leftIndex : Math.max(0, leftIndex < afterFullData.length ? leftIndex - 2 : 0)
|
|
1761
1761
|
for (let rIndex = toVisibleIndex, rLen = afterFullData.length; rIndex < rLen; rIndex++) {
|
|
1762
1762
|
const row = afterFullData[rIndex]
|
|
1763
1763
|
const rowid = handleGetRowId(row)
|
|
@@ -2727,6 +2727,7 @@ function handleGroupData ($xeTable: VxeTableConstructor & VxeTablePrivateMethods
|
|
|
2727
2727
|
const groupField = rgItem.field
|
|
2728
2728
|
const groupColumn = $xeTable.getColumnByField(groupField)
|
|
2729
2729
|
const groupMaps: Record<string, any[]> = {}
|
|
2730
|
+
const groupList: any[] = []
|
|
2730
2731
|
const rowkey = getRowkey($xeTable)
|
|
2731
2732
|
list.forEach((row) => {
|
|
2732
2733
|
const cellValue = groupColumn ? $xeTable.getCellLabel(row, groupColumn) : XEUtils.get(row, groupField)
|
|
@@ -2743,8 +2744,10 @@ function handleGroupData ($xeTable: VxeTableConstructor & VxeTablePrivateMethods
|
|
|
2743
2744
|
})
|
|
2744
2745
|
XEUtils.objectEach(groupMaps, (childList, groupValue) => {
|
|
2745
2746
|
const { fullData: childFullData, treeData: childTreeData } = handleGroupData($xeTable, childList, rowGroups.slice(1))
|
|
2747
|
+
const childCount = 0
|
|
2746
2748
|
const groupRow = {
|
|
2747
2749
|
isAggregate: true,
|
|
2750
|
+
childCount,
|
|
2748
2751
|
groupContent: groupValue,
|
|
2749
2752
|
groupField,
|
|
2750
2753
|
[rowField]: getRowUniqueId(),
|
|
@@ -2759,12 +2762,24 @@ function handleGroupData ($xeTable: VxeTableConstructor & VxeTablePrivateMethods
|
|
|
2759
2762
|
if (indeterminateField) {
|
|
2760
2763
|
groupRow[indeterminateField] = false
|
|
2761
2764
|
}
|
|
2765
|
+
groupList.push(groupRow)
|
|
2762
2766
|
treeData.push(groupRow)
|
|
2763
2767
|
fullData.push(groupRow)
|
|
2764
2768
|
if (childFullData.length) {
|
|
2765
2769
|
fullData.push(...childFullData)
|
|
2766
2770
|
}
|
|
2767
2771
|
})
|
|
2772
|
+
XEUtils.lastEach(groupList, groupItem => {
|
|
2773
|
+
let count = 0
|
|
2774
|
+
XEUtils.each(groupItem[childrenField], row => {
|
|
2775
|
+
if (row.isAggregate) {
|
|
2776
|
+
count += row[childrenField] ? row[childrenField].length : 0
|
|
2777
|
+
} else {
|
|
2778
|
+
count++
|
|
2779
|
+
}
|
|
2780
|
+
})
|
|
2781
|
+
groupItem.childCount = count
|
|
2782
|
+
})
|
|
2768
2783
|
}
|
|
2769
2784
|
}
|
|
2770
2785
|
return {
|
package/packages/ui/index.ts
CHANGED
|
@@ -208,13 +208,13 @@ VxeUI.setConfig({
|
|
|
208
208
|
isReplace: true
|
|
209
209
|
},
|
|
210
210
|
virtualXConfig: {
|
|
211
|
-
|
|
211
|
+
enabled: true,
|
|
212
212
|
gt: 24,
|
|
213
213
|
preSize: 0,
|
|
214
214
|
oSize: 0
|
|
215
215
|
},
|
|
216
216
|
virtualYConfig: {
|
|
217
|
-
|
|
217
|
+
enabled: true,
|
|
218
218
|
gt: 100,
|
|
219
219
|
preSize: 1,
|
|
220
220
|
oSize: 0
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|