vxe-table 3.21.17 → 3.21.18
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/index.css +1 -1
- package/es/index.min.css +1 -1
- package/es/style.css +1 -1
- package/es/style.min.css +1 -1
- package/es/table/module/custom/panel.js +5 -2
- package/es/table/src/columnInfo.js +6 -6
- package/es/table/src/footer.js +5 -5
- package/es/table/src/header.js +10 -8
- package/es/table/src/methods.js +8 -2
- package/es/ui/index.js +1 -1
- package/es/ui/src/log.js +1 -1
- package/lib/index.css +1 -1
- package/lib/index.min.css +1 -1
- package/lib/index.umd.js +979 -964
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/style.min.css +1 -1
- package/lib/table/module/custom/panel.js +5 -2
- package/lib/table/module/custom/panel.min.js +1 -1
- package/lib/table/src/columnInfo.js +6 -0
- package/lib/table/src/footer.js +5 -4
- package/lib/table/src/footer.min.js +1 -1
- package/lib/table/src/header.js +12 -8
- package/lib/table/src/header.min.js +1 -1
- package/lib/table/src/methods.js +3 -2
- 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 +3 -3
- package/packages/table/module/custom/panel.ts +5 -2
- package/packages/table/src/footer.ts +5 -5
- package/packages/table/src/header.ts +10 -8
- package/packages/table/src/methods.ts +6 -1
- package/packages/table/src/util.ts +2 -16
- package/styles/theme/dark.scss +1 -1
- package/styles/variable.scss +1 -1
- /package/es/{iconfont.1781876872867.ttf → iconfont.1782186465261.ttf} +0 -0
- /package/es/{iconfont.1781876872867.woff → iconfont.1782186465261.woff} +0 -0
- /package/es/{iconfont.1781876872867.woff2 → iconfont.1782186465261.woff2} +0 -0
- /package/lib/{iconfont.1781876872867.ttf → iconfont.1782186465261.ttf} +0 -0
- /package/lib/{iconfont.1781876872867.woff → iconfont.1782186465261.woff} +0 -0
- /package/lib/{iconfont.1781876872867.woff2 → iconfont.1782186465261.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.21.
|
|
16
|
+
const version = exports.version = "3.21.18";
|
|
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.21.
|
|
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.21.18",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,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,showSortDragButton:!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,placement:"left",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:0,oSize:0},virtualYConfig:{gt:100,preSize:1,oSize:0},scrollbarConfig:{x:{visible:!0},y:{visible:!0}},undoRedoHistoryConfig:{stackSize:50}},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,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
|
@@ -9,7 +9,7 @@ var _core = require("@vxe-ui/core");
|
|
|
9
9
|
const {
|
|
10
10
|
log
|
|
11
11
|
} = _core.VxeUI;
|
|
12
|
-
const tableVersion = `table v${"3.21.
|
|
12
|
+
const tableVersion = `table v${"3.21.18"}`;
|
|
13
13
|
function createComponentLog(name) {
|
|
14
14
|
const uiVersion = _core.VxeUI.uiVersion ? `ui v${_core.VxeUI.uiVersion}` : '';
|
|
15
15
|
const ganttVersion = _core.VxeUI.ganttVersion ? `gantt v${_core.VxeUI.ganttVersion}` : '';
|
package/lib/ui/src/log.min.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
Object.defineProperty(exports,"__esModule",{value:!0}),exports.createComponentLog=createComponentLog,exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,tableVersion="table v3.21.
|
|
1
|
+
Object.defineProperty(exports,"__esModule",{value:!0}),exports.createComponentLog=createComponentLog,exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,tableVersion="table v3.21.18";function createComponentLog(e){var r=_core.VxeUI.uiVersion?"ui v"+_core.VxeUI.uiVersion:"",o=_core.VxeUI.ganttVersion?"gantt v"+_core.VxeUI.ganttVersion:"",t=_core.VxeUI.designVersion?"design v"+_core.VxeUI.designVersion:"";return{warnLog:log.create("warn",r+tableVersion+o+t+"] ["+e),errLog:log.create("error",r+tableVersion+o+t+"] ["+e)}}let warnLog=exports.warnLog=log.create("warn",tableVersion),errLog=exports.errLog=log.create("error",tableVersion);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "vxe-table",
|
|
3
|
-
"version": "3.21.
|
|
3
|
+
"version": "3.21.18",
|
|
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",
|
|
@@ -63,12 +63,12 @@
|
|
|
63
63
|
"gulp-uglify": "^3.0.2",
|
|
64
64
|
"sass": "^1.80.4",
|
|
65
65
|
"sass-loader": "^14.2.1",
|
|
66
|
-
"typescript": "~
|
|
66
|
+
"typescript": "~5.9.3",
|
|
67
67
|
"vue": "~2.6.14",
|
|
68
68
|
"vue-i18n": "^8.15.1",
|
|
69
69
|
"vue-router": "^3.5.1",
|
|
70
70
|
"vue-template-compiler": "2.6.14",
|
|
71
|
-
"vxe-pc-ui": "3.15.
|
|
71
|
+
"vxe-pc-ui": "3.15.9"
|
|
72
72
|
},
|
|
73
73
|
"vetur": {
|
|
74
74
|
"tags": "helper/vetur/tags.json",
|
|
@@ -1247,8 +1247,11 @@ export default /* define-vxe-component start */ defineVxeComponent({
|
|
|
1247
1247
|
const resizeParams = {
|
|
1248
1248
|
$table: $xeTable,
|
|
1249
1249
|
column,
|
|
1250
|
-
columnIndex:
|
|
1251
|
-
$columnIndex:
|
|
1250
|
+
columnIndex: $xeTable.getColumnIndex(column),
|
|
1251
|
+
$columnIndex: $xeTable.getVMColumnIndex(column),
|
|
1252
|
+
_columnIndex: $xeTable.getVTColumnIndex(column),
|
|
1253
|
+
rowIndex: -1,
|
|
1254
|
+
_rowIndex: -1,
|
|
1252
1255
|
$rowIndex: -1
|
|
1253
1256
|
}
|
|
1254
1257
|
if (reMinWidth) {
|
|
@@ -208,18 +208,18 @@ function renderHeads (h: CreateElement, _vm: any, isOptimizeMode: boolean, rende
|
|
|
208
208
|
|
|
209
209
|
const { footerRowClassName, footerRowStyle } = tableProps
|
|
210
210
|
|
|
211
|
-
return (footerTableData as any[][]).map((row,
|
|
212
|
-
const
|
|
213
|
-
const rowParams = { $table: $xeTable, row, _rowIndex, $rowIndex, fixed: fixedType, type: renderType }
|
|
211
|
+
return (footerTableData as any[][]).map((row, _rowIndex) => {
|
|
212
|
+
const $rowIndex = _rowIndex
|
|
213
|
+
const rowParams = { $table: $xeTable, row, rowIndex: _rowIndex, _rowIndex, $rowIndex, fixed: fixedType, type: renderType }
|
|
214
214
|
|
|
215
215
|
return h('tr', {
|
|
216
|
-
key:
|
|
216
|
+
key: _rowIndex,
|
|
217
217
|
class: [
|
|
218
218
|
'vxe-footer--row',
|
|
219
219
|
footerRowClassName ? XEUtils.isFunction(footerRowClassName) ? footerRowClassName(rowParams) : footerRowClassName : ''
|
|
220
220
|
],
|
|
221
221
|
style: footerRowStyle ? (XEUtils.isFunction(footerRowStyle) ? footerRowStyle(rowParams) : footerRowStyle) as VxeComponentStyleType : undefined
|
|
222
|
-
}, renderRows(h, _vm, isOptimizeMode, renderColumnList, footerTableData, row,
|
|
222
|
+
}, renderRows(h, _vm, isOptimizeMode, renderColumnList, footerTableData, row, _rowIndex, _rowIndex))
|
|
223
223
|
})
|
|
224
224
|
}
|
|
225
225
|
|
|
@@ -13,7 +13,7 @@ const { renderer, renderEmptyElement } = VxeUI
|
|
|
13
13
|
const sourceType = 'table'
|
|
14
14
|
const renderType = 'header'
|
|
15
15
|
|
|
16
|
-
function renderRows (h: CreateElement, _vm: any, isGroup: boolean, isOptimizeMode: boolean, headerGroups: VxeTableDefines.ColumnInfo[][],
|
|
16
|
+
function renderRows (h: CreateElement, _vm: any, isGroup: boolean, isOptimizeMode: boolean, headerGroups: VxeTableDefines.ColumnInfo[][], _rowIndex: number, cols: VxeTableDefines.ColumnInfo[]) {
|
|
17
17
|
const props = _vm
|
|
18
18
|
const $xeTable = _vm.$parent as VxeTableConstructor & VxeTablePrivateMethods
|
|
19
19
|
const $xeGrid = $xeTable.$xeGrid
|
|
@@ -34,7 +34,7 @@ function renderRows (h: CreateElement, _vm: any, isGroup: boolean, isOptimizeMod
|
|
|
34
34
|
const headerCellOpts = $xeTable.computeHeaderCellOpts
|
|
35
35
|
const currCellHeight = getCalcHeight(headerCellOpts.height) || defaultRowHeight
|
|
36
36
|
const { disabledMethod: dragDisabledMethod, isCrossDrag, isPeerDrag } = columnDragOpts
|
|
37
|
-
const isLastRow =
|
|
37
|
+
const isLastRow = _rowIndex === headerGroups.length - 1
|
|
38
38
|
|
|
39
39
|
return cols.map((column, $columnIndex) => {
|
|
40
40
|
const { type, showHeaderOverflow, headerAlign, align, filters, headerClassName, editRender, cellRender } = column
|
|
@@ -66,7 +66,9 @@ function renderRows (h: CreateElement, _vm: any, isGroup: boolean, isOptimizeMod
|
|
|
66
66
|
$table: $xeTable,
|
|
67
67
|
$grid: $xeGrid,
|
|
68
68
|
$gantt: $xeGantt,
|
|
69
|
-
|
|
69
|
+
rowIndex: _rowIndex,
|
|
70
|
+
_rowIndex,
|
|
71
|
+
$rowIndex: _rowIndex,
|
|
70
72
|
column,
|
|
71
73
|
columnIndex,
|
|
72
74
|
$columnIndex,
|
|
@@ -88,7 +90,7 @@ function renderRows (h: CreateElement, _vm: any, isGroup: boolean, isOptimizeMod
|
|
|
88
90
|
thAttrs.rowspan = column.rowSpan > 1 ? column.rowSpan : null
|
|
89
91
|
}
|
|
90
92
|
if (mergeHeadFlag && mergeHeaderList.length && (showCustomHeader || isLastRow)) {
|
|
91
|
-
const spanRest = mergeHeaderCellMaps[`${
|
|
93
|
+
const spanRest = mergeHeaderCellMaps[`${_rowIndex}:${showCustomHeader ? $columnIndex : _columnIndex}`]
|
|
92
94
|
if (spanRest) {
|
|
93
95
|
const { rowspan, colspan } = spanRest
|
|
94
96
|
if (!rowspan || !colspan) {
|
|
@@ -339,16 +341,16 @@ function renderHeads (h: CreateElement, _vm: any, isGroup: boolean, isOptimizeMo
|
|
|
339
341
|
|
|
340
342
|
const { headerRowClassName, headerRowStyle } = tableProps
|
|
341
343
|
const floatingFilterOpts = $xeTable.computeFloatingFilterOpts
|
|
342
|
-
const rowVNs = headerGroups.map((cols,
|
|
343
|
-
const params = { $table: $xeTable, $rowIndex, fixed: fixedType, type: renderType }
|
|
344
|
+
const rowVNs = headerGroups.map((cols, _rowIndex) => {
|
|
345
|
+
const params = { $table: $xeTable, rowIndex: _rowIndex, _rowIndex, $rowIndex: _rowIndex, fixed: fixedType, type: renderType }
|
|
344
346
|
return h('tr', {
|
|
345
|
-
key:
|
|
347
|
+
key: _rowIndex,
|
|
346
348
|
class: [
|
|
347
349
|
'vxe-header--row',
|
|
348
350
|
headerRowClassName ? XEUtils.isFunction(headerRowClassName) ? headerRowClassName(params) : headerRowClassName : ''
|
|
349
351
|
],
|
|
350
352
|
style: headerRowStyle ? (XEUtils.isFunction(headerRowStyle) ? headerRowStyle(params) : headerRowStyle) as VxeComponentStyleType : undefined
|
|
351
|
-
}, renderRows(h, _vm, isGroup, isOptimizeMode, headerGroups,
|
|
353
|
+
}, renderRows(h, _vm, isGroup, isOptimizeMode, headerGroups, _rowIndex, cols))
|
|
352
354
|
})
|
|
353
355
|
|
|
354
356
|
if (floatingFilterOpts.enabled) {
|
|
@@ -9829,7 +9829,12 @@ const tableMethods: any = {
|
|
|
9829
9829
|
}
|
|
9830
9830
|
if (editOpts.trigger === 'manual') {
|
|
9831
9831
|
if (actived.args && actived.row === row && column !== actived.column) {
|
|
9832
|
-
|
|
9832
|
+
if (editOpts.mode === 'row') {
|
|
9833
|
+
handleChangeCell($xeTable, evnt, params)
|
|
9834
|
+
} else {
|
|
9835
|
+
checkValidate($xeTable, 'blur')
|
|
9836
|
+
.catch((e: any) => e)
|
|
9837
|
+
}
|
|
9833
9838
|
}
|
|
9834
9839
|
} else if (!actived.args || row !== actived.row || column !== actived.column) {
|
|
9835
9840
|
if (editOpts.trigger === 'click') {
|
|
@@ -802,14 +802,7 @@ export function toFilters (filters: any, colid?: string | number) {
|
|
|
802
802
|
/**
|
|
803
803
|
* 列宽拖动最大宽度
|
|
804
804
|
*/
|
|
805
|
-
export function getColReMaxWidth (params: {
|
|
806
|
-
$table: VxeTableConstructor & VxeTablePrivateMethods;
|
|
807
|
-
column: VxeTableDefines.ColumnInfo;
|
|
808
|
-
columnIndex: number;
|
|
809
|
-
$columnIndex: number;
|
|
810
|
-
$rowIndex: number;
|
|
811
|
-
cell: HTMLTableCellElement;
|
|
812
|
-
}) {
|
|
805
|
+
export function getColReMaxWidth (params: (VxeTableDefines.CellRenderHeaderParams| VxeTableDefines.CellRenderBodyParams | VxeTableDefines.CellRenderFooterParams) & { cell: HTMLTableCellElement }) {
|
|
813
806
|
const { $table, column, cell } = params
|
|
814
807
|
const internalData = $table as unknown as TableInternalData
|
|
815
808
|
const { elemStore } = internalData
|
|
@@ -846,14 +839,7 @@ export function getColReMaxWidth (params: {
|
|
|
846
839
|
/**
|
|
847
840
|
* 列宽拖动最小宽度
|
|
848
841
|
*/
|
|
849
|
-
export function getColReMinWidth (params: {
|
|
850
|
-
$table: VxeTableConstructor & VxeTablePrivateMethods;
|
|
851
|
-
column: VxeTableDefines.ColumnInfo;
|
|
852
|
-
columnIndex: number;
|
|
853
|
-
$columnIndex: number;
|
|
854
|
-
$rowIndex: number;
|
|
855
|
-
cell: HTMLTableCellElement;
|
|
856
|
-
}) {
|
|
842
|
+
export function getColReMinWidth (params: (VxeTableDefines.CellRenderHeaderParams| VxeTableDefines.CellRenderBodyParams | VxeTableDefines.CellRenderFooterParams) & { cell: HTMLTableCellElement }) {
|
|
857
843
|
const { $table, column, cell } = params
|
|
858
844
|
const tableProps = $table
|
|
859
845
|
const internalData = $table as unknown as TableInternalData
|
package/styles/theme/dark.scss
CHANGED
package/styles/variable.scss
CHANGED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|