vxe-table 3.17.0-beta.1 → 3.17.0-beta.3
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 +74 -12
- package/es/ui/index.js +1 -1
- package/es/ui/src/log.js +1 -1
- package/lib/index.umd.js +86 -15
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/table/src/methods.js +84 -13
- 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 +77 -13
- /package/es/{iconfont.1753080034233.ttf → iconfont.1753246448689.ttf} +0 -0
- /package/es/{iconfont.1753080034233.woff → iconfont.1753246448689.woff} +0 -0
- /package/es/{iconfont.1753080034233.woff2 → iconfont.1753246448689.woff2} +0 -0
- /package/lib/{iconfont.1753080034233.ttf → iconfont.1753246448689.ttf} +0 -0
- /package/lib/{iconfont.1753080034233.woff → iconfont.1753246448689.woff} +0 -0
- /package/lib/{iconfont.1753080034233.woff2 → iconfont.1753246448689.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.17.0-beta.
|
|
16
|
+
const version = exports.version = "3.17.0-beta.3";
|
|
17
17
|
_core.VxeUI.version = version;
|
|
18
18
|
_core.VxeUI.tableVersion = version;
|
|
19
19
|
_core.VxeUI.setConfig({
|
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.17.0-beta.
|
|
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.17.0-beta.3",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",storeOptions:{visible:!0,resizable:!0,sort:!0,fixed:!0},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},aggregateConfig:{padding:!0,rowField:"id",parentField:"_X_ROW_PARENT_KEY",childrenField:"_X_ROW_CHILDREN",mapChildrenField:"_X_ROW_CHILD_LIST",indent:20,showIcon:!0,maxGroupSize:4,showAggFuncTitle:!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:{isAll:!0,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:{gt:24,preSize:0,oSize:0},virtualYConfig:{gt:100,preSize:1,oSize:0},scrollbarConfig:{}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showLoading:!0,showResponseMsg:!0,showActionMsg:!0,response:{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_CHECKBOX_DISABLED_UNCHECKED:iconPrefix+"checkbox-unchecked-fill",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked-fill",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",TABLE_RADIO_DISABLED_UNCHECKED:iconPrefix+"radio-unchecked-fill",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_AGG_GROUP:iconPrefix+"grouping",TABLE_DRAG_STATUS_AGG_VALUES:iconPrefix+"values",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",TABLE_AGGREGATE_GROUPING:iconPrefix+"grouping",TABLE_AGGREGATE_VALUES:iconPrefix+"values",TABLE_AGGREGATE_SORT:iconPrefix+"drag-handle",TABLE_AGGREGATE_DELETE:iconPrefix+"close",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.17.0-beta.
|
|
11
|
+
const version = `table v${"3.17.0-beta.3"}`;
|
|
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.17.0-beta.
|
|
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.17.0-beta.3",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "vxe-table",
|
|
3
|
-
"version": "3.17.0-beta.
|
|
3
|
+
"version": "3.17.0-beta.3",
|
|
4
4
|
"description": "A PC-end table component based on Vxe UI, supporting copy-paste, data pivot table, and high-performance virtual list table solution.",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"update": "npm install --legacy-peer-deps",
|
|
@@ -532,6 +532,24 @@ function handleRowGroupVirtualExpand ($xeTable: VxeTableConstructor & VxeTablePr
|
|
|
532
532
|
})
|
|
533
533
|
}
|
|
534
534
|
|
|
535
|
+
/**
|
|
536
|
+
* 处理默认展开分组行
|
|
537
|
+
*/
|
|
538
|
+
function handleDefaultRowGroupExpand ($xeTable: VxeTableConstructor & VxeTablePrivateMethods) {
|
|
539
|
+
const reactData = $xeTable as unknown as TableReactData
|
|
540
|
+
|
|
541
|
+
const { isRowGroupStatus } = reactData
|
|
542
|
+
if (isRowGroupStatus) {
|
|
543
|
+
const aggregateOpts = $xeTable.computeAggregateOpts
|
|
544
|
+
const { expandAll, expandGroupFields } = aggregateOpts
|
|
545
|
+
if (expandAll) {
|
|
546
|
+
$xeTable.setAllRowGroupExpand(true)
|
|
547
|
+
} else if (expandGroupFields && expandGroupFields.length) {
|
|
548
|
+
$xeTable.setRowGroupExpandByField(expandGroupFields, true)
|
|
549
|
+
}
|
|
550
|
+
}
|
|
551
|
+
}
|
|
552
|
+
|
|
535
553
|
function updateAfterListIndex ($xeTable: VxeTableConstructor & VxeTablePrivateMethods) {
|
|
536
554
|
const props = $xeTable
|
|
537
555
|
const internalData = $xeTable as unknown as TableInternalData
|
|
@@ -3069,6 +3087,13 @@ function loadTableData ($xeTable: VxeTableConstructor & VxeTablePrivateMethods,
|
|
|
3069
3087
|
}
|
|
3070
3088
|
reactData.isRowLoading = false
|
|
3071
3089
|
handleRecalculateStyle($xeTable, false, false, false)
|
|
3090
|
+
// 如果是自动行高，特殊情况需调用 recalculate 手动刷新
|
|
3091
|
+
if (!props.showOverflow) {
|
|
3092
|
+
setTimeout(() => {
|
|
3093
|
+
handleLazyRecalculate($xeTable, false, true, true)
|
|
3094
|
+
setTimeout(() => handleLazyRecalculate($xeTable, false, true, true), 3000)
|
|
3095
|
+
}, 2000)
|
|
3096
|
+
}
|
|
3072
3097
|
// 是否变更虚拟滚动
|
|
3073
3098
|
if (oldScrollYLoad === sYLoad) {
|
|
3074
3099
|
restoreScrollLocation($xeTable, targetScrollLeft, targetScrollTop)
|
|
@@ -3101,6 +3126,7 @@ function handleLoadDefaults ($xeTable: VxeTableConstructor & VxeTablePrivateMeth
|
|
|
3101
3126
|
handleDefaultRadioChecked($xeTable)
|
|
3102
3127
|
handleDefaultRowExpand($xeTable)
|
|
3103
3128
|
handleDefaultTreeExpand($xeTable)
|
|
3129
|
+
handleDefaultRowGroupExpand($xeTable)
|
|
3104
3130
|
handleDefaultMergeCells($xeTable)
|
|
3105
3131
|
handleDefaultMergeFooterItems($xeTable)
|
|
3106
3132
|
$xeTable.$nextTick(() => setTimeout(() => $xeTable.recalculate()))
|
|
@@ -5426,7 +5452,7 @@ const Methods = {
|
|
|
5426
5452
|
evnt.preventDefault()
|
|
5427
5453
|
const { column } = params
|
|
5428
5454
|
const { columnStore, overflowX, scrollbarHeight } = reactData
|
|
5429
|
-
const {
|
|
5455
|
+
const { visibleColumn } = internalData
|
|
5430
5456
|
const { leftList, rightList } = columnStore
|
|
5431
5457
|
const resizableOpts = $xeTable.computeResizableOpts
|
|
5432
5458
|
const osbHeight = overflowX ? scrollbarHeight : 0
|
|
@@ -5444,25 +5470,30 @@ const Methods = {
|
|
|
5444
5470
|
const { clientX: dragClientX } = evnt
|
|
5445
5471
|
const dragBtnElem = evnt.target as HTMLDivElement
|
|
5446
5472
|
let resizeColumn = column
|
|
5447
|
-
|
|
5473
|
+
const isDragGroupCol = column.children && column.children.length
|
|
5474
|
+
if (isDragGroupCol) {
|
|
5448
5475
|
XEUtils.eachTree(column.children, childColumn => {
|
|
5449
5476
|
resizeColumn = childColumn
|
|
5450
5477
|
})
|
|
5451
5478
|
}
|
|
5452
|
-
|
|
5453
|
-
|
|
5454
|
-
|
|
5455
|
-
|
|
5456
|
-
|
|
5479
|
+
let cell = dragBtnElem.parentElement as HTMLTableCellElement | null
|
|
5480
|
+
if (isDragGroupCol) {
|
|
5481
|
+
const trEl = cell ? cell.parentElement as HTMLTableRowElement : null
|
|
5482
|
+
const theadEl = trEl ? trEl.parentElement as HTMLTableElement : null
|
|
5483
|
+
cell = theadEl ? theadEl.querySelector<HTMLTableCellElement>(`.vxe-header--column[colid="${resizeColumn.id}"]`) : null
|
|
5484
|
+
}
|
|
5485
|
+
if (!cell) {
|
|
5457
5486
|
return
|
|
5458
5487
|
}
|
|
5488
|
+
const cellParams = XEUtils.assign(params, { cell })
|
|
5489
|
+
let dragLeft = 0
|
|
5459
5490
|
const tableRect = tableEl.getBoundingClientRect()
|
|
5460
5491
|
const rightContainerRect = rightContainerElem ? rightContainerElem.getBoundingClientRect() : null
|
|
5461
5492
|
const cellRect = cell.getBoundingClientRect()
|
|
5462
5493
|
const dragBtnRect = dragBtnElem.getBoundingClientRect()
|
|
5463
5494
|
|
|
5464
5495
|
const dragBtnWidth = dragBtnElem.clientWidth
|
|
5465
|
-
const dragBtnOffsetWidth =
|
|
5496
|
+
const dragBtnOffsetWidth = XEUtils.floor(dragBtnWidth / 2)
|
|
5466
5497
|
const dragPosLeft = dragBtnRect.x - tableRect.x + dragBtnOffsetWidth
|
|
5467
5498
|
|
|
5468
5499
|
const minInterval = getColReMinWidth(cellParams) - dragBtnOffsetWidth // 列之间的最小间距
|
|
@@ -8946,8 +8977,7 @@ const Methods = {
|
|
|
8946
8977
|
setSort (sortConfs: VxeTableDefines.SortConfs | VxeTableDefines.SortConfs[], isUpdate?: boolean) {
|
|
8947
8978
|
const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
|
|
8948
8979
|
|
|
8949
|
-
|
|
8950
|
-
return handleSortEvent($xeTable, new Event('click'), sortConfs, isUpdate)
|
|
8980
|
+
return handleSortEvent($xeTable, null, sortConfs, isUpdate)
|
|
8951
8981
|
},
|
|
8952
8982
|
setSortByEvent (evnt: Event, sortConfs: VxeTableDefines.SortConfs | VxeTableDefines.SortConfs[], isUpdate?: boolean) {
|
|
8953
8983
|
const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
|
|
@@ -9478,6 +9508,36 @@ const Methods = {
|
|
|
9478
9508
|
}
|
|
9479
9509
|
return $xeTable.$nextTick()
|
|
9480
9510
|
},
|
|
9511
|
+
setRowGroupExpandByField (groupFields: string | string[], expanded: boolean) {
|
|
9512
|
+
const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
|
|
9513
|
+
const reactData = $xeTable as unknown as TableReactData
|
|
9514
|
+
const internalData = $xeTable as unknown as TableInternalData
|
|
9515
|
+
|
|
9516
|
+
const { isRowGroupStatus } = reactData
|
|
9517
|
+
const aggregateOpts = $xeTable.computeAggregateOpts
|
|
9518
|
+
const { childrenField } = aggregateOpts
|
|
9519
|
+
if (groupFields) {
|
|
9520
|
+
if (!XEUtils.isArray(groupFields)) {
|
|
9521
|
+
groupFields = [groupFields]
|
|
9522
|
+
}
|
|
9523
|
+
if (isRowGroupStatus) {
|
|
9524
|
+
const rows: any[] = []
|
|
9525
|
+
const gfKeys: Record<string, boolean> = {}
|
|
9526
|
+
groupFields.forEach(groupField => {
|
|
9527
|
+
gfKeys[groupField] = true
|
|
9528
|
+
})
|
|
9529
|
+
XEUtils.eachTree(internalData.afterGroupFullData, (row) => {
|
|
9530
|
+
if (row.isAggregate && gfKeys[row.groupField]) {
|
|
9531
|
+
rows.push(row)
|
|
9532
|
+
}
|
|
9533
|
+
}, { children: childrenField })
|
|
9534
|
+
if (rows.length) {
|
|
9535
|
+
return handleRowGroupVirtualExpand($xeTable, rows, expanded)
|
|
9536
|
+
}
|
|
9537
|
+
}
|
|
9538
|
+
}
|
|
9539
|
+
return $xeTable.$nextTick()
|
|
9540
|
+
},
|
|
9481
9541
|
setAllRowGroupExpand (expanded: boolean) {
|
|
9482
9542
|
const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
|
|
9483
9543
|
const reactData = $xeTable as unknown as TableReactData
|
|
@@ -10531,10 +10591,8 @@ const Methods = {
|
|
|
10531
10591
|
},
|
|
10532
10592
|
/**
|
|
10533
10593
|
* 如果有滚动条，则滚动到对应的位置
|
|
10534
|
-
* @param {Number} scrollLeft 左距离
|
|
10535
|
-
* @param {Number} scrollTop 上距离
|
|
10536
10594
|
*/
|
|
10537
|
-
scrollTo (scrollLeft: number | null, scrollTop?: number | null) {
|
|
10595
|
+
scrollTo (scrollLeft: { top?: number | null; left?: number | null; } | number | null | undefined, scrollTop?: number | null) {
|
|
10538
10596
|
const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
|
|
10539
10597
|
const reactData = $xeTable as unknown as TableReactData
|
|
10540
10598
|
const internalData = $xeTable as unknown as TableInternalData
|
|
@@ -10550,6 +10608,12 @@ const Methods = {
|
|
|
10550
10608
|
|
|
10551
10609
|
internalData.intoRunScroll = true
|
|
10552
10610
|
|
|
10611
|
+
if (scrollLeft) {
|
|
10612
|
+
if (!XEUtils.isNumber(scrollLeft)) {
|
|
10613
|
+
scrollTop = scrollLeft.top
|
|
10614
|
+
scrollLeft = scrollLeft.left
|
|
10615
|
+
}
|
|
10616
|
+
}
|
|
10553
10617
|
if (XEUtils.isNumber(scrollLeft)) {
|
|
10554
10618
|
setScrollLeft(xHandleEl, scrollLeft)
|
|
10555
10619
|
setScrollLeft(bodyScrollElem, scrollLeft)
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|