vxe-table 4.17.21 → 4.17.22
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 +7 -5
- package/es/table/src/table.js +145 -53
- package/es/ui/index.js +1 -1
- package/es/ui/src/log.js +1 -1
- package/lib/index.umd.js +23 -13
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/table/src/cell.js +7 -4
- package/lib/table/src/cell.min.js +1 -1
- package/lib/table/src/table.js +14 -7
- package/lib/table/src/table.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/cell.ts +7 -5
- package/packages/table/src/table.ts +144 -51
- /package/es/{iconfont.1764298161293.ttf → iconfont.1764380640866.ttf} +0 -0
- /package/es/{iconfont.1764298161293.woff → iconfont.1764380640866.woff} +0 -0
- /package/es/{iconfont.1764298161293.woff2 → iconfont.1764380640866.woff2} +0 -0
- /package/lib/{iconfont.1764298161293.ttf → iconfont.1764380640866.ttf} +0 -0
- /package/lib/{iconfont.1764298161293.woff → iconfont.1764380640866.woff} +0 -0
- /package/lib/{iconfont.1764298161293.woff2 → iconfont.1764380640866.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.17.
|
|
16
|
+
const version = exports.version = "4.17.22";
|
|
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.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.17.
|
|
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.17.22",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},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},headerTooltipConfig:{enterable:!0},footerTooltipConfig:{enterable:!0},validConfig:{showMessage:!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},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}}},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.17.
|
|
11
|
+
const version = `table v${"4.17.22"}`;
|
|
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.17.
|
|
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.17.22",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.17.
|
|
3
|
+
"version": "4.17.22",
|
|
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",
|
|
@@ -397,8 +397,9 @@ export const Cell = {
|
|
|
397
397
|
const { fullColumnFieldData } = tableInternalData
|
|
398
398
|
const { computeAggregateOpts } = $table.getComputeMaps()
|
|
399
399
|
const aggregateOpts = computeAggregateOpts.value
|
|
400
|
-
const { mode, showTotal, totalMethod, countFields, contentMethod, mapChildrenField } = aggregateOpts
|
|
401
|
-
const
|
|
400
|
+
const { mode, showTotal, totalMethod, countFields, contentMethod, formatValuesMethod, mapChildrenField } = aggregateOpts
|
|
401
|
+
const aggData = aggRow.aggData
|
|
402
|
+
const currAggData = aggData ? aggData[field] : null
|
|
402
403
|
const groupField = aggRow.groupField
|
|
403
404
|
const groupContent = aggRow.groupContent
|
|
404
405
|
const childList = mapChildrenField ? (aggRow[mapChildrenField] || []) : []
|
|
@@ -439,9 +440,10 @@ export const Cell = {
|
|
|
439
440
|
} else if ($table.getPivotTableAggregateCellAggValue) {
|
|
440
441
|
cellValue = $table.getPivotTableAggregateCellAggValue(params)
|
|
441
442
|
} else if (aggFunc === true || (countFields && countFields.includes(field))) {
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
443
|
+
cellValue = currAggData ? currAggData.value : childCount
|
|
444
|
+
ctParams.aggValue = cellValue
|
|
445
|
+
if (formatValuesMethod) {
|
|
446
|
+
cellValue = formatValuesMethod(ctParams)
|
|
445
447
|
}
|
|
446
448
|
}
|
|
447
449
|
} else {
|
|
@@ -932,6 +932,14 @@ export default defineVxeComponent({
|
|
|
932
932
|
return rgColumns
|
|
933
933
|
})
|
|
934
934
|
|
|
935
|
+
const computeAggFuncColumns = computed(() => {
|
|
936
|
+
const { rowGroupList, tableColumn } = reactData
|
|
937
|
+
if (rowGroupList.length) {
|
|
938
|
+
return tableColumn.filter(column => column.aggFunc)
|
|
939
|
+
}
|
|
940
|
+
return []
|
|
941
|
+
})
|
|
942
|
+
|
|
935
943
|
const refMaps: VxeTablePrivateRef = {
|
|
936
944
|
refElem,
|
|
937
945
|
refTooltip,
|
|
@@ -1032,6 +1040,7 @@ export default defineVxeComponent({
|
|
|
1032
1040
|
computeVirtualScrollBars,
|
|
1033
1041
|
computeRowGroupFields,
|
|
1034
1042
|
computeRowGroupColumns,
|
|
1043
|
+
computeAggFuncColumns,
|
|
1035
1044
|
|
|
1036
1045
|
computeFNROpts,
|
|
1037
1046
|
computeSXOpts,
|
|
@@ -2213,23 +2222,46 @@ export default defineVxeComponent({
|
|
|
2213
2222
|
}
|
|
2214
2223
|
|
|
2215
2224
|
const getOrderField = (column: VxeTableDefines.ColumnInfo) => {
|
|
2216
|
-
const {
|
|
2217
|
-
|
|
2218
|
-
|
|
2219
|
-
|
|
2220
|
-
|
|
2221
|
-
|
|
2222
|
-
|
|
2223
|
-
|
|
2224
|
-
|
|
2225
|
-
|
|
2226
|
-
|
|
2227
|
-
|
|
2228
|
-
|
|
2229
|
-
|
|
2230
|
-
|
|
2231
|
-
|
|
2232
|
-
|
|
2225
|
+
const { isRowGroupStatus } = reactData
|
|
2226
|
+
const { sortBy, sortType, aggFunc } = column
|
|
2227
|
+
return isRowGroupStatus && aggFunc
|
|
2228
|
+
? (row: any) => {
|
|
2229
|
+
if (row.isAggregate) {
|
|
2230
|
+
const aggData = row.aggData
|
|
2231
|
+
const currAggData = aggData ? aggData[column.field] : null
|
|
2232
|
+
return currAggData ? currAggData.value : null
|
|
2233
|
+
}
|
|
2234
|
+
let cellValue
|
|
2235
|
+
if (sortBy) {
|
|
2236
|
+
cellValue = XEUtils.isFunction(sortBy) ? sortBy({ row, column }) : XEUtils.get(row, sortBy)
|
|
2237
|
+
} else {
|
|
2238
|
+
cellValue = tableMethods.getCellLabel(row, column)
|
|
2239
|
+
}
|
|
2240
|
+
if (!sortType || sortType === 'auto') {
|
|
2241
|
+
return isNaN(cellValue) ? cellValue : XEUtils.toNumber(cellValue)
|
|
2242
|
+
} else if (sortType === 'number') {
|
|
2243
|
+
return XEUtils.toNumber(cellValue)
|
|
2244
|
+
} else if (sortType === 'string') {
|
|
2245
|
+
return XEUtils.toValueString(cellValue)
|
|
2246
|
+
}
|
|
2247
|
+
return cellValue
|
|
2248
|
+
}
|
|
2249
|
+
: (row: any) => {
|
|
2250
|
+
let cellValue
|
|
2251
|
+
if (sortBy) {
|
|
2252
|
+
cellValue = XEUtils.isFunction(sortBy) ? sortBy({ row, column }) : XEUtils.get(row, sortBy)
|
|
2253
|
+
} else {
|
|
2254
|
+
cellValue = tableMethods.getCellLabel(row, column)
|
|
2255
|
+
}
|
|
2256
|
+
if (!sortType || sortType === 'auto') {
|
|
2257
|
+
return isNaN(cellValue) ? cellValue : XEUtils.toNumber(cellValue)
|
|
2258
|
+
} else if (sortType === 'number') {
|
|
2259
|
+
return XEUtils.toNumber(cellValue)
|
|
2260
|
+
} else if (sortType === 'string') {
|
|
2261
|
+
return XEUtils.toValueString(cellValue)
|
|
2262
|
+
}
|
|
2263
|
+
return cellValue
|
|
2264
|
+
}
|
|
2233
2265
|
}
|
|
2234
2266
|
|
|
2235
2267
|
const updateAfterListIndex = () => {
|
|
@@ -3585,8 +3617,11 @@ export default defineVxeComponent({
|
|
|
3585
3617
|
}
|
|
3586
3618
|
|
|
3587
3619
|
const handleeGroupSummary = (aggList: VxeTableDefines.AggregateRowInfo[]) => {
|
|
3620
|
+
const { fullColumnFieldData } = internalData
|
|
3588
3621
|
const aggregateOpts = computeAggregateOpts.value
|
|
3622
|
+
const aggFuncColumns = computeAggFuncColumns.value
|
|
3589
3623
|
const { mapChildrenField } = aggregateOpts
|
|
3624
|
+
const aggCalcMethod = aggregateOpts.calcValuesMethod || aggregateOpts.countMethod || aggregateOpts.aggregateMethod
|
|
3590
3625
|
if (mapChildrenField) {
|
|
3591
3626
|
XEUtils.lastEach(aggList, aggRow => {
|
|
3592
3627
|
let count = 0
|
|
@@ -3601,6 +3636,67 @@ export default defineVxeComponent({
|
|
|
3601
3636
|
})
|
|
3602
3637
|
if ($xeTable.handlePivotTableAggregateData) {
|
|
3603
3638
|
$xeTable.handlePivotTableAggregateData(aggList)
|
|
3639
|
+
} else {
|
|
3640
|
+
if (aggFuncColumns.length) {
|
|
3641
|
+
XEUtils.lastEach(aggList, aggRow => {
|
|
3642
|
+
const aggDtObj: Record<string, {
|
|
3643
|
+
type: string
|
|
3644
|
+
value: any
|
|
3645
|
+
label: any
|
|
3646
|
+
}> = {}
|
|
3647
|
+
const aggData = aggRow.aggData
|
|
3648
|
+
const groupField = aggRow.groupField
|
|
3649
|
+
const groupContent = aggRow.groupContent
|
|
3650
|
+
const childList = mapChildrenField ? (aggRow[mapChildrenField] || []) : []
|
|
3651
|
+
const childCount = aggRow.childCount
|
|
3652
|
+
const colRest = fullColumnFieldData[groupField] || {}
|
|
3653
|
+
aggFuncColumns.forEach(column => {
|
|
3654
|
+
const { field } = column
|
|
3655
|
+
const currAggData = aggData ? aggData[field] : null
|
|
3656
|
+
const ctParams = {
|
|
3657
|
+
$table: $xeTable,
|
|
3658
|
+
groupField,
|
|
3659
|
+
groupColumn: (colRest ? colRest.column : null) as VxeTableDefines.ColumnInfo,
|
|
3660
|
+
column,
|
|
3661
|
+
groupValue: groupContent,
|
|
3662
|
+
childList,
|
|
3663
|
+
childCount,
|
|
3664
|
+
aggValue: currAggData ? currAggData.value : 0,
|
|
3665
|
+
|
|
3666
|
+
/**
|
|
3667
|
+
* 已废弃
|
|
3668
|
+
* @deprecated
|
|
3669
|
+
*/
|
|
3670
|
+
children: childList,
|
|
3671
|
+
/**
|
|
3672
|
+
* 已废弃
|
|
3673
|
+
* @deprecated
|
|
3674
|
+
*/
|
|
3675
|
+
totalValue: childCount
|
|
3676
|
+
}
|
|
3677
|
+
let aggVal = 0
|
|
3678
|
+
// 如果下层同时也是分组
|
|
3679
|
+
if (childList.length && childList[0].isAggregate) {
|
|
3680
|
+
XEUtils.each(childList, (row: VxeTableDefines.AggregateRowInfo) => {
|
|
3681
|
+
if (row.isAggregate) {
|
|
3682
|
+
const currAggData = row.aggData[field]
|
|
3683
|
+
if (currAggData) {
|
|
3684
|
+
aggVal += currAggData.value
|
|
3685
|
+
}
|
|
3686
|
+
}
|
|
3687
|
+
})
|
|
3688
|
+
} else {
|
|
3689
|
+
aggVal = aggCalcMethod ? aggCalcMethod(ctParams) : aggRow.childCount
|
|
3690
|
+
}
|
|
3691
|
+
aggDtObj[field] = {
|
|
3692
|
+
type: 'count',
|
|
3693
|
+
value: aggVal,
|
|
3694
|
+
label: aggVal
|
|
3695
|
+
}
|
|
3696
|
+
})
|
|
3697
|
+
aggRow.aggData = aggDtObj
|
|
3698
|
+
})
|
|
3699
|
+
}
|
|
3604
3700
|
}
|
|
3605
3701
|
}
|
|
3606
3702
|
}
|
|
@@ -4835,6 +4931,34 @@ export default defineVxeComponent({
|
|
|
4835
4931
|
}
|
|
4836
4932
|
}
|
|
4837
4933
|
|
|
4934
|
+
const handleColumnVisible = (visible: boolean) => {
|
|
4935
|
+
return function (fieldOrColumn: string | string[] | VxeTableDefines.ColumnInfo | VxeTableDefines.ColumnInfo[]) {
|
|
4936
|
+
let status = false
|
|
4937
|
+
const cols = XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn]
|
|
4938
|
+
cols.forEach(item => {
|
|
4939
|
+
const column = handleFieldOrColumn($xeTable, item)
|
|
4940
|
+
if (column) {
|
|
4941
|
+
if (column.children && column.children.length) {
|
|
4942
|
+
XEUtils.eachTree([column], (item) => {
|
|
4943
|
+
item.visible = visible
|
|
4944
|
+
item.renderVisible = visible
|
|
4945
|
+
})
|
|
4946
|
+
} else {
|
|
4947
|
+
column.visible = visible
|
|
4948
|
+
column.renderVisible = visible
|
|
4949
|
+
}
|
|
4950
|
+
if (!status) {
|
|
4951
|
+
status = true
|
|
4952
|
+
}
|
|
4953
|
+
}
|
|
4954
|
+
})
|
|
4955
|
+
if (status) {
|
|
4956
|
+
return $xeTable.handleCustom()
|
|
4957
|
+
}
|
|
4958
|
+
return nextTick()
|
|
4959
|
+
}
|
|
4960
|
+
}
|
|
4961
|
+
|
|
4838
4962
|
tableMethods = {
|
|
4839
4963
|
dispatchEvent,
|
|
4840
4964
|
getEl () {
|
|
@@ -5832,43 +5956,11 @@ export default defineVxeComponent({
|
|
|
5832
5956
|
/**
|
|
5833
5957
|
* 隐藏指定列
|
|
5834
5958
|
*/
|
|
5835
|
-
hideColumn (
|
|
5836
|
-
let status = false
|
|
5837
|
-
const cols = XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn]
|
|
5838
|
-
cols.forEach(item => {
|
|
5839
|
-
const column = handleFieldOrColumn($xeTable, item)
|
|
5840
|
-
if (column && column.visible) {
|
|
5841
|
-
column.visible = false
|
|
5842
|
-
if (!status) {
|
|
5843
|
-
status = true
|
|
5844
|
-
}
|
|
5845
|
-
}
|
|
5846
|
-
})
|
|
5847
|
-
if (status) {
|
|
5848
|
-
return tablePrivateMethods.handleCustom()
|
|
5849
|
-
}
|
|
5850
|
-
return nextTick()
|
|
5851
|
-
},
|
|
5959
|
+
hideColumn: handleColumnVisible(false),
|
|
5852
5960
|
/**
|
|
5853
5961
|
* 显示指定列
|
|
5854
5962
|
*/
|
|
5855
|
-
showColumn (
|
|
5856
|
-
let status = false
|
|
5857
|
-
const cols = XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn]
|
|
5858
|
-
cols.forEach(item => {
|
|
5859
|
-
const column = handleFieldOrColumn($xeTable, item)
|
|
5860
|
-
if (column && !column.visible) {
|
|
5861
|
-
column.visible = true
|
|
5862
|
-
if (!status) {
|
|
5863
|
-
status = true
|
|
5864
|
-
}
|
|
5865
|
-
}
|
|
5866
|
-
})
|
|
5867
|
-
if (status) {
|
|
5868
|
-
return tablePrivateMethods.handleCustom()
|
|
5869
|
-
}
|
|
5870
|
-
return nextTick()
|
|
5871
|
-
},
|
|
5963
|
+
showColumn: handleColumnVisible(true),
|
|
5872
5964
|
setColumnWidth (fieldOrColumn, width) {
|
|
5873
5965
|
const { elemStore } = internalData
|
|
5874
5966
|
let status = false
|
|
@@ -13639,6 +13731,7 @@ export default defineVxeComponent({
|
|
|
13639
13731
|
if (resizeObserver) {
|
|
13640
13732
|
resizeObserver.disconnect()
|
|
13641
13733
|
}
|
|
13734
|
+
$xeTable.closeTooltip()
|
|
13642
13735
|
tableMethods.closeFilter()
|
|
13643
13736
|
if ($xeTable.closeMenu) {
|
|
13644
13737
|
$xeTable.closeMenu()
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|