vxe-table 4.18.8 → 4.18.10
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/body.js +11 -11
- package/es/table/src/table.js +33 -9
- package/es/ui/index.js +3 -2
- package/es/ui/src/log.js +1 -1
- package/lib/index.umd.js +23 -19
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/table/src/body.js +10 -7
- package/lib/table/src/body.min.js +1 -1
- package/lib/table/src/table.js +9 -9
- package/lib/table/src/table.min.js +1 -1
- package/lib/ui/index.js +3 -2
- 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/body.ts +13 -11
- package/packages/table/src/table.ts +32 -9
- package/packages/ui/index.ts +2 -1
- /package/es/{iconfont.1774240404046.ttf → iconfont.1774663263220.ttf} +0 -0
- /package/es/{iconfont.1774240404046.woff → iconfont.1774663263220.woff} +0 -0
- /package/es/{iconfont.1774240404046.woff2 → iconfont.1774663263220.woff2} +0 -0
- /package/lib/{iconfont.1774240404046.ttf → iconfont.1774663263220.ttf} +0 -0
- /package/lib/{iconfont.1774240404046.woff → iconfont.1774663263220.woff} +0 -0
- /package/lib/{iconfont.1774240404046.woff2 → iconfont.1774663263220.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.hooks = 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 = "4.18.
|
|
16
|
+
const version = exports.version = "4.18.10";
|
|
17
17
|
_core.VxeUI.version = version;
|
|
18
18
|
_core.VxeUI.tableVersion = version;
|
|
19
19
|
_core.VxeUI.setConfig({
|
|
@@ -79,7 +79,8 @@ _core.VxeUI.setConfig({
|
|
|
79
79
|
strict: true
|
|
80
80
|
},
|
|
81
81
|
tooltipConfig: {
|
|
82
|
-
enterable: true
|
|
82
|
+
enterable: true,
|
|
83
|
+
defaultPlacement: 'top'
|
|
83
84
|
},
|
|
84
85
|
headerTooltipConfig: {
|
|
85
86
|
enterable: true
|
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.hooks=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="4.18.
|
|
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.hooks=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="4.18.10",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:" ",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,resizeConfig:{},resizableConfig:{dragMode:"auto",showDragTip:!0,isSyncAutoHeight:!0,isSyncAutoWidth:!0,minHeight:18},currentRowConfig:{strict:!0},currentColumnConfig:{strict:!0},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,defaultPlacement:"top"},headerTooltipConfig:{enterable:!0},footerTooltipConfig:{enterable:!0},validConfig:{showErrorMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"beautify"},columnConfig:{autoOptions:{isCalcHeader:!0,isCalcBody:!0,isCalcFooter:!0},maxFixedSize:4},cellConfig:{padding:!0},headerCellConfig:{height:"unset"},footerCellConfig:{height:"unset"},menuConfig:{destroyOnClose:!0},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:{destroyOnClose:!0,multiple:!0,showIcon:!0,maxHeight:280},floatingFilterConfig:{},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,showRootLine:!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:1,oSize:0},virtualYConfig:{gt:100,preSize:1,oSize:0},scrollbarConfig:{x:{visible:!0},y:{visible:!0}},undoHistoryConfig:{isEditRow:!0}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showLoading:!0,showResponseMsg:!0,showActionMsg:!0,response:{list:"list",result:"result",total:"page.total",footerData:"footerData",message:"message"}}},toolbar:{},gantt:{}}),"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_MENU_OPTION_LOADING:iconPrefix+"repeat roll",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,hooks=exports.hooks=_core.VxeUI.hooks,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${"4.18.
|
|
11
|
+
const version = `table v${"4.18.10"}`;
|
|
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 v4.18.
|
|
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 v4.18.10",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": "4.18.
|
|
3
|
+
"version": "4.18.10",
|
|
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",
|
|
@@ -366,6 +366,16 @@ export default defineVxeComponent({
|
|
|
366
366
|
if (treeConfig) {
|
|
367
367
|
tdVNs.push(...renderLine(rowid, cellParams, cellHeight))
|
|
368
368
|
}
|
|
369
|
+
const clVNs: VxeComponentSlotType[] = []
|
|
370
|
+
if (!isVNPreEmptyStatus) {
|
|
371
|
+
clVNs.push(
|
|
372
|
+
h('div', {
|
|
373
|
+
colid,
|
|
374
|
+
rowid,
|
|
375
|
+
class: 'vxe-cell--wrapper vxe-body-cell--wrapper'
|
|
376
|
+
}, column.renderCell(cellParams))
|
|
377
|
+
)
|
|
378
|
+
}
|
|
369
379
|
tdVNs.push(
|
|
370
380
|
h('div', {
|
|
371
381
|
key: 'tc',
|
|
@@ -376,15 +386,7 @@ export default defineVxeComponent({
|
|
|
376
386
|
}],
|
|
377
387
|
style: tcStyle,
|
|
378
388
|
title: showTitle ? $xeTable.getCellLabel(row, column) : null
|
|
379
|
-
},
|
|
380
|
-
? []
|
|
381
|
-
: [
|
|
382
|
-
h('div', {
|
|
383
|
-
colid,
|
|
384
|
-
rowid,
|
|
385
|
-
class: 'vxe-cell--wrapper vxe-body-cell--wrapper'
|
|
386
|
-
}, column.renderCell(cellParams))
|
|
387
|
-
])
|
|
389
|
+
}, clVNs)
|
|
388
390
|
)
|
|
389
391
|
if (showValidTip && errorValidItem) {
|
|
390
392
|
const errRule = errorValidItem.rule
|
|
@@ -489,7 +491,7 @@ export default defineVxeComponent({
|
|
|
489
491
|
const $xeGantt = $xeTable.xeGantt
|
|
490
492
|
|
|
491
493
|
const { stripe, rowKey, highlightHoverRow, rowClassName, rowStyle, editConfig, treeConfig } = tableProps
|
|
492
|
-
const { hasFixedColumn, treeExpandedFlag,
|
|
494
|
+
const { hasFixedColumn, treeExpandedFlag, scrollYLoad, isAllOverflow, rowExpandedFlag, expandColumn, selectRadioRow, pendingRowFlag, rowExpandHeightFlag, isRowGroupStatus } = tableReactData
|
|
493
495
|
const { fullAllDataRowIdData, fullColumnIdData, treeExpandedMaps, pendingRowMaps, rowExpandedMaps } = tableInternalData
|
|
494
496
|
const checkboxOpts = computeCheckboxOpts.value
|
|
495
497
|
const radioOpts = computeRadioOpts.value
|
|
@@ -592,7 +594,7 @@ export default defineVxeComponent({
|
|
|
592
594
|
class: trClass,
|
|
593
595
|
rowid: rowid,
|
|
594
596
|
style: rowStyle ? (XEUtils.isFunction(rowStyle) ? rowStyle(params) : rowStyle) : null,
|
|
595
|
-
key: rowKey ||
|
|
597
|
+
key: rowKey || rowOpts.useKey || rowOpts.drag || columnOpts.drag || isRowGroupStatus || treeConfig ? rowid : $rowIndex,
|
|
596
598
|
...trOn
|
|
597
599
|
}, tdVNs)
|
|
598
600
|
)
|
|
@@ -2288,8 +2288,8 @@ export default defineVxeComponent({
|
|
|
2288
2288
|
const treeOpts = computeTreeOpts.value
|
|
2289
2289
|
const childrenField = treeOpts.children || treeOpts.childrenField
|
|
2290
2290
|
const { transform, rowField, parentField, mapChildrenField } = treeOpts
|
|
2291
|
-
const { isEvery, remote: allRemoteFilter, filterMethod: allFilterMethod } = filterOpts
|
|
2292
|
-
const { remote: allRemoteSort, sortMethod: allSortMethod, multiple: sortMultiple, chronological } = sortOpts
|
|
2291
|
+
const { isEvery, remote: allRemoteFilter, filterMethod: allFilterMethod, isDeep: isFilterDeep } = filterOpts
|
|
2292
|
+
const { remote: allRemoteSort, sortMethod: allSortMethod, multiple: sortMultiple, chronological, isDeep: isSortDeep } = sortOpts
|
|
2293
2293
|
let tableData: any[] = []
|
|
2294
2294
|
let tableTree: any[] = []
|
|
2295
2295
|
// 处理数据
|
|
@@ -2354,7 +2354,7 @@ export default defineVxeComponent({
|
|
|
2354
2354
|
mapChildren: aggregateOpts.childrenField
|
|
2355
2355
|
})
|
|
2356
2356
|
tableData = tableTree
|
|
2357
|
-
} else if (treeConfig && transform) {
|
|
2357
|
+
} else if (treeConfig && transform && isFilterDeep !== false) {
|
|
2358
2358
|
// 筛选虚拟树
|
|
2359
2359
|
tableTree = XEUtils.searchTree(tableFullTreeData, handleFilter, {
|
|
2360
2360
|
original: true,
|
|
@@ -2377,7 +2377,7 @@ export default defineVxeComponent({
|
|
|
2377
2377
|
mapChildren: aggregateOpts.childrenField
|
|
2378
2378
|
})
|
|
2379
2379
|
tableData = tableTree
|
|
2380
|
-
} else if (treeConfig && transform) {
|
|
2380
|
+
} else if (treeConfig && transform && isFilterDeep !== false) {
|
|
2381
2381
|
// 还原虚拟树
|
|
2382
2382
|
tableTree = XEUtils.searchTree(tableFullTreeData, () => true, {
|
|
2383
2383
|
original: true,
|
|
@@ -2417,7 +2417,7 @@ export default defineVxeComponent({
|
|
|
2417
2417
|
)
|
|
2418
2418
|
}
|
|
2419
2419
|
tableData = tableTree
|
|
2420
|
-
} else if (treeConfig && transform) {
|
|
2420
|
+
} else if (treeConfig && transform && isSortDeep !== false) {
|
|
2421
2421
|
// 虚拟树的排序
|
|
2422
2422
|
if (allSortMethod) {
|
|
2423
2423
|
const sortRests = allSortMethod({ data: tableTree, sortList: orderColumns, $table: $xeTable })
|
|
@@ -2458,7 +2458,7 @@ export default defineVxeComponent({
|
|
|
2458
2458
|
mapChildren: aggregateOpts.childrenField
|
|
2459
2459
|
})
|
|
2460
2460
|
tableData = tableTree
|
|
2461
|
-
} else if (treeConfig && transform) {
|
|
2461
|
+
} else if (treeConfig && transform && isSortDeep !== false) {
|
|
2462
2462
|
// 还原虚拟树
|
|
2463
2463
|
tableTree = XEUtils.searchTree(tableFullTreeData, () => true, {
|
|
2464
2464
|
original: true,
|
|
@@ -7446,10 +7446,20 @@ export default defineVxeComponent({
|
|
|
7446
7446
|
/**
|
|
7447
7447
|
* 如果有滚动条，则滚动到对应的行
|
|
7448
7448
|
*/
|
|
7449
|
-
scrollToRow (
|
|
7449
|
+
scrollToRow (rowOrRowid, fieldOrColumn, options) {
|
|
7450
7450
|
const { isAllOverflow, scrollYLoad, scrollXLoad } = reactData
|
|
7451
|
-
const { _sToTime } = internalData
|
|
7451
|
+
const { fullAllDataRowIdData, _sToTime } = internalData
|
|
7452
7452
|
const rest = []
|
|
7453
|
+
let row: any
|
|
7454
|
+
if (XEUtils.isString(rowOrRowid) || XEUtils.isNumber(rowOrRowid)) {
|
|
7455
|
+
const rowid = rowOrRowid
|
|
7456
|
+
const rowRest = rowid ? fullAllDataRowIdData[rowid] : null
|
|
7457
|
+
if (rowRest) {
|
|
7458
|
+
row = rowRest.row
|
|
7459
|
+
}
|
|
7460
|
+
} else {
|
|
7461
|
+
row = rowOrRowid
|
|
7462
|
+
}
|
|
7453
7463
|
if (row) {
|
|
7454
7464
|
if (props.treeConfig) {
|
|
7455
7465
|
rest.push($xeTable.scrollToTreeRow(row))
|
|
@@ -13319,7 +13329,10 @@ export default defineVxeComponent({
|
|
|
13319
13329
|
minWidth: tableTipConfig.minWidth,
|
|
13320
13330
|
minHeight: tableTipConfig.minHeight,
|
|
13321
13331
|
maxWidth: tableTipConfig.maxWidth,
|
|
13322
|
-
maxHeight: tableTipConfig.maxHeight
|
|
13332
|
+
maxHeight: tableTipConfig.maxHeight,
|
|
13333
|
+
placement: tableTipConfig.placement,
|
|
13334
|
+
defaultPlacement: tableTipConfig.defaultPlacement,
|
|
13335
|
+
popupClassName: tableTipConfig.popupClassName
|
|
13323
13336
|
}, currTooltipSlot
|
|
13324
13337
|
? {
|
|
13325
13338
|
content: () => {
|
|
@@ -13643,6 +13656,8 @@ export default defineVxeComponent({
|
|
|
13643
13656
|
// const keyboardOpts = computeKeyboardOpts.value
|
|
13644
13657
|
const rowDragOpts = computeRowDragOpts.value
|
|
13645
13658
|
const areaOpts = computeAreaOpts.value
|
|
13659
|
+
const sortOpts = computeSortOpts.value
|
|
13660
|
+
const filterOpts = computeFilterOpts.value
|
|
13646
13661
|
const { groupFields } = aggregateOpts
|
|
13647
13662
|
|
|
13648
13663
|
if ($xeGantt) {
|
|
@@ -13685,6 +13700,14 @@ export default defineVxeComponent({
|
|
|
13685
13700
|
if (treeConfig && !treeOpts.transform && props.stripe) {
|
|
13686
13701
|
warnLog('vxe.error.noTree', ['stripe'])
|
|
13687
13702
|
}
|
|
13703
|
+
if (treeConfig && !treeOpts.transform) {
|
|
13704
|
+
if (sortOpts.isDeep) {
|
|
13705
|
+
warnLog('vxe.error.reqSupportProp', ['transform=false', 'sort-config.isDeep=false'])
|
|
13706
|
+
}
|
|
13707
|
+
if (filterOpts.isDeep) {
|
|
13708
|
+
warnLog('vxe.error.reqSupportProp', ['transform=false', 'filter-config.isDeep=false'])
|
|
13709
|
+
}
|
|
13710
|
+
}
|
|
13688
13711
|
if (props.showFooter && !(props.footerMethod || props.footerData)) {
|
|
13689
13712
|
warnLog('vxe.error.reqProp', ['footer-data | footer-method'])
|
|
13690
13713
|
}
|
package/packages/ui/index.ts
CHANGED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|