vxe-table 4.12.0-beta.24 → 4.12.0-beta.26
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 +16 -3
- package/es/table/src/table.js +26 -75
- package/es/ui/index.js +1 -1
- package/es/ui/src/log.js +1 -1
- package/lib/index.umd.js +41 -14
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/table/src/body.js +17 -1
- package/lib/table/src/body.min.js +1 -1
- package/lib/table/src/table.js +25 -79
- 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 +2 -2
- package/packages/table/src/body.ts +16 -3
- package/packages/table/src/table.ts +27 -74
- /package/es/{iconfont.1742629550485.ttf → iconfont.1742788362296.ttf} +0 -0
- /package/es/{iconfont.1742629550485.woff → iconfont.1742788362296.woff} +0 -0
- /package/es/{iconfont.1742629550485.woff2 → iconfont.1742788362296.woff2} +0 -0
- /package/lib/{iconfont.1742629550485.ttf → iconfont.1742788362296.ttf} +0 -0
- /package/lib/{iconfont.1742629550485.woff → iconfont.1742788362296.woff} +0 -0
- /package/lib/{iconfont.1742629550485.woff2 → iconfont.1742788362296.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.12.0-beta.
|
|
16
|
+
const version = exports.version = "4.12.0-beta.26";
|
|
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.12.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.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.12.0-beta.26",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:" ",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!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},treeConfig:{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:60,preSize:1,oSize:2},virtualYConfig:{enabled:!0,gt:100,preSize:1,oSize:2},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",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.12.0-beta.
|
|
11
|
+
const version = `table v${"4.12.0-beta.26"}`;
|
|
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.12.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 v4.12.0-beta.26",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.12.0-beta.
|
|
3
|
+
"version": "4.12.0-beta.26",
|
|
4
4
|
"description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟树、拖拽排序，懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"update": "npm install --legacy-peer-deps",
|
|
@@ -28,7 +28,7 @@
|
|
|
28
28
|
"style": "lib/style.css",
|
|
29
29
|
"typings": "types/index.d.ts",
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"vxe-pc-ui": "^4.4.
|
|
31
|
+
"vxe-pc-ui": "^4.4.23"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
34
|
"@types/resize-observer-browser": "^0.1.11",
|
|
@@ -27,7 +27,7 @@ export default defineComponent({
|
|
|
27
27
|
const $xeTable = inject('$xeTable', {} as VxeTableConstructor & VxeTablePrivateMethods)
|
|
28
28
|
|
|
29
29
|
const { xID, props: tableProps, context: tableContext, reactData: tableReactData, internalData: tableInternalData } = $xeTable
|
|
30
|
-
const { computeEditOpts, computeMouseOpts, computeAreaOpts, computeDefaultRowHeight, computeEmptyOpts, computeTooltipOpts, computeRadioOpts, computeExpandOpts, computeTreeOpts, computeCheckboxOpts, computeCellOpts, computeValidOpts, computeRowOpts, computeColumnOpts, computeRowDragOpts, computeColumnDragOpts, computeResizableOpts } = $xeTable.getComputeMaps()
|
|
30
|
+
const { computeEditOpts, computeMouseOpts, computeCellOffsetWidth, computeAreaOpts, computeDefaultRowHeight, computeEmptyOpts, computeTooltipOpts, computeRadioOpts, computeExpandOpts, computeTreeOpts, computeCheckboxOpts, computeCellOpts, computeValidOpts, computeRowOpts, computeColumnOpts, computeRowDragOpts, computeColumnDragOpts, computeResizableOpts } = $xeTable.getComputeMaps()
|
|
31
31
|
|
|
32
32
|
const refElem = ref() as Ref<HTMLDivElement>
|
|
33
33
|
const refBodyScroll = ref() as Ref<HTMLDivElement>
|
|
@@ -101,9 +101,9 @@ export default defineComponent({
|
|
|
101
101
|
columns: VxeTableDefines.ColumnInfo[],
|
|
102
102
|
items: any[]
|
|
103
103
|
) => {
|
|
104
|
-
const { fullAllDataRowIdData } = tableInternalData
|
|
104
|
+
const { fullAllDataRowIdData, visibleColumn } = tableInternalData
|
|
105
105
|
const { columnKey, resizable: allResizable, showOverflow: allShowOverflow, border, height, cellClassName: allCellClassName, cellStyle, align: allAlign, spanMethod, mouseConfig, editConfig, editRules, tooltipConfig, padding: allPadding } = tableProps
|
|
106
|
-
const { tableData, dragRow, overflowX, currentColumn, scrollXLoad, scrollYLoad, calcCellHeightFlag, resizeHeightFlag, mergeList, editStore, isAllOverflow, validErrorMaps } = tableReactData
|
|
106
|
+
const { tableData, dragRow, overflowX, currentColumn, scrollXLoad, scrollYLoad, calcCellHeightFlag, resizeHeightFlag, resizeWidthFlag, mergeList, editStore, isAllOverflow, validErrorMaps } = tableReactData
|
|
107
107
|
const { afterFullData, scrollXStore, scrollYStore } = tableInternalData
|
|
108
108
|
const cellOpts = computeCellOpts.value
|
|
109
109
|
const validOpts = computeValidOpts.value
|
|
@@ -120,6 +120,7 @@ export default defineComponent({
|
|
|
120
120
|
const columnOpts = computeColumnOpts.value
|
|
121
121
|
const mouseOpts = computeMouseOpts.value
|
|
122
122
|
const areaOpts = computeAreaOpts.value
|
|
123
|
+
const cellOffsetWidth = computeCellOffsetWidth.value
|
|
123
124
|
const { selectCellToRow } = areaOpts
|
|
124
125
|
const { type, cellRender, editRender, align, showOverflow, className, treeNode, rowResize, padding, verticalAlign, slots } = column
|
|
125
126
|
const { verticalAlign: allVerticalAlign } = cellOpts
|
|
@@ -289,6 +290,18 @@ export default defineComponent({
|
|
|
289
290
|
}
|
|
290
291
|
|
|
291
292
|
const tcStyle: Record<string, string> = {}
|
|
293
|
+
if (hasEllipsis && resizeWidthFlag) {
|
|
294
|
+
let tsColspan = tdAttrs.colspan || 0
|
|
295
|
+
if (tsColspan > 1) {
|
|
296
|
+
for (let index = 1; index < tsColspan; index++) {
|
|
297
|
+
const nextColumn = visibleColumn[columnIndex + index]
|
|
298
|
+
if (nextColumn) {
|
|
299
|
+
tsColspan += nextColumn.renderWidth
|
|
300
|
+
}
|
|
301
|
+
}
|
|
302
|
+
}
|
|
303
|
+
tcStyle.width = `${column.renderWidth - (cellOffsetWidth * tsColspan)}px`
|
|
304
|
+
}
|
|
292
305
|
if (scrollYLoad || hasEllipsis || isCsHeight || isRsHeight) {
|
|
293
306
|
tcStyle.height = `${cellHeight}px`
|
|
294
307
|
} else {
|
|
@@ -267,6 +267,7 @@ export default defineComponent({
|
|
|
267
267
|
rowExpandHeightFlag: 1,
|
|
268
268
|
calcCellHeightFlag: 1,
|
|
269
269
|
resizeHeightFlag: 1,
|
|
270
|
+
resizeWidthFlag: 1,
|
|
270
271
|
|
|
271
272
|
isCustomStatus: false,
|
|
272
273
|
|
|
@@ -1580,6 +1581,7 @@ export default defineComponent({
|
|
|
1580
1581
|
internalData.headerHeight = headerHeight
|
|
1581
1582
|
internalData.footerHeight = footerHeight
|
|
1582
1583
|
reactData.overflowX = overflowX
|
|
1584
|
+
reactData.resizeWidthFlag++
|
|
1583
1585
|
updateColumnOffsetLeft()
|
|
1584
1586
|
updateHeight()
|
|
1585
1587
|
reactData.parentHeight = Math.max(internalData.headerHeight + footerHeight + 20, $xeTable.getParentHeight())
|
|
@@ -1889,7 +1891,7 @@ export default defineComponent({
|
|
|
1889
1891
|
const updateStyle = () => {
|
|
1890
1892
|
const { border, showHeaderOverflow: allColumnHeaderOverflow, showFooterOverflow: allColumnFooterOverflow, mouseConfig, spanMethod, footerSpanMethod } = props
|
|
1891
1893
|
const { isGroup, currentRow, tableColumn, scrollXLoad, scrollYLoad, overflowX, scrollbarWidth, overflowY, scrollbarHeight, scrollXWidth, columnStore, editStore, isAllOverflow, expandColumn } = reactData
|
|
1892
|
-
const { visibleColumn,
|
|
1894
|
+
const { visibleColumn, tableHeight, headerHeight, footerHeight, elemStore, customHeight, customMinHeight, customMaxHeight } = internalData
|
|
1893
1895
|
const el = refElem.value
|
|
1894
1896
|
if (!el) {
|
|
1895
1897
|
return
|
|
@@ -1898,7 +1900,6 @@ export default defineComponent({
|
|
|
1898
1900
|
const osbWidth = overflowY ? scrollbarWidth : 0
|
|
1899
1901
|
const osbHeight = overflowX ? scrollbarHeight : 0
|
|
1900
1902
|
const emptyPlaceholderElem = refEmptyPlaceholder.value
|
|
1901
|
-
const cellOffsetWidth = computeCellOffsetWidth.value
|
|
1902
1903
|
const mouseOpts = computeMouseOpts.value
|
|
1903
1904
|
const expandOpts = computeExpandOpts.value
|
|
1904
1905
|
const bodyWrapperElem = getRefElem(elemStore['main-body-wrapper'])
|
|
@@ -2180,54 +2181,6 @@ export default defineComponent({
|
|
|
2180
2181
|
tableElem.style.width = tWidth ? `${tWidth}px` : ''
|
|
2181
2182
|
}
|
|
2182
2183
|
}
|
|
2183
|
-
const colgroupElem = getRefElem(elemStore[`${name}-${layout}-colgroup`])
|
|
2184
|
-
if (colgroupElem) {
|
|
2185
|
-
XEUtils.arrayEach(colgroupElem.children, (colElem: any) => {
|
|
2186
|
-
const colid = colElem.getAttribute('name')
|
|
2187
|
-
if (fullColumnIdData[colid]) {
|
|
2188
|
-
const colRest = fullColumnIdData[colid]
|
|
2189
|
-
const column = colRest.column
|
|
2190
|
-
const { showHeaderOverflow, showFooterOverflow, showOverflow } = column
|
|
2191
|
-
let cellOverflow
|
|
2192
|
-
colElem.style.width = `${column.renderWidth}px`
|
|
2193
|
-
if (layout === 'header') {
|
|
2194
|
-
cellOverflow = XEUtils.isUndefined(showHeaderOverflow) || XEUtils.isNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow
|
|
2195
|
-
} else if (layout === 'footer') {
|
|
2196
|
-
cellOverflow = XEUtils.isUndefined(showFooterOverflow) || XEUtils.isNull(showFooterOverflow) ? allColumnFooterOverflow : showFooterOverflow
|
|
2197
|
-
} else {
|
|
2198
|
-
cellOverflow = XEUtils.isUndefined(showOverflow) || XEUtils.isNull(showOverflow) ? isAllOverflow : showOverflow
|
|
2199
|
-
}
|
|
2200
|
-
const showEllipsis = cellOverflow === 'ellipsis'
|
|
2201
|
-
const showTitle = cellOverflow === 'title'
|
|
2202
|
-
const showTooltip = cellOverflow === true || cellOverflow === 'tooltip'
|
|
2203
|
-
let hasEllipsis = showTitle || showTooltip || showEllipsis
|
|
2204
|
-
const listElem = getRefElem(elemStore[`${name}-${layout}-list`])
|
|
2205
|
-
// 纵向虚拟滚动不支持动态行高
|
|
2206
|
-
if (scrollYLoad && !hasEllipsis) {
|
|
2207
|
-
hasEllipsis = true
|
|
2208
|
-
}
|
|
2209
|
-
if (listElem) {
|
|
2210
|
-
XEUtils.arrayEach(listElem.querySelectorAll(`.${column.id}`), (elem: any) => {
|
|
2211
|
-
const colspan = parseInt(elem.getAttribute('colspan') || 1)
|
|
2212
|
-
const cellElem = elem.querySelector('.vxe-cell')
|
|
2213
|
-
let colWidth = column.renderWidth
|
|
2214
|
-
if (cellElem) {
|
|
2215
|
-
if (colspan > 1) {
|
|
2216
|
-
const columnIndex = $xeTable.getColumnIndex(column)
|
|
2217
|
-
for (let index = 1; index < colspan; index++) {
|
|
2218
|
-
const nextColumn = $xeTable.getColumns(columnIndex + index)
|
|
2219
|
-
if (nextColumn) {
|
|
2220
|
-
colWidth += nextColumn.renderWidth
|
|
2221
|
-
}
|
|
2222
|
-
}
|
|
2223
|
-
}
|
|
2224
|
-
cellElem.style.width = hasEllipsis ? `${colWidth - (cellOffsetWidth * colspan)}px` : ''
|
|
2225
|
-
}
|
|
2226
|
-
})
|
|
2227
|
-
}
|
|
2228
|
-
}
|
|
2229
|
-
})
|
|
2230
|
-
}
|
|
2231
2184
|
})
|
|
2232
2185
|
})
|
|
2233
2186
|
if (currentRow) {
|
|
@@ -3037,8 +2990,8 @@ export default defineComponent({
|
|
|
3037
2990
|
}
|
|
3038
2991
|
|
|
3039
2992
|
const parseColumns = (isReset: boolean) => {
|
|
3040
|
-
const { showOverflow } = props
|
|
3041
|
-
const rowOpts = computeRowOpts.value
|
|
2993
|
+
// const { showOverflow } = props
|
|
2994
|
+
// const rowOpts = computeRowOpts.value
|
|
3042
2995
|
const leftList: VxeTableDefines.ColumnInfo[] = []
|
|
3043
2996
|
const centerList: VxeTableDefines.ColumnInfo[] = []
|
|
3044
2997
|
const rightList: VxeTableDefines.ColumnInfo[] = []
|
|
@@ -3103,28 +3056,28 @@ export default defineComponent({
|
|
|
3103
3056
|
reactData.hasFixedColumn = leftList.length > 0 || rightList.length > 0
|
|
3104
3057
|
Object.assign(columnStore, { leftList, centerList, rightList })
|
|
3105
3058
|
if (scrollXLoad) {
|
|
3106
|
-
if (showOverflow) {
|
|
3107
|
-
|
|
3108
|
-
|
|
3109
|
-
|
|
3110
|
-
|
|
3111
|
-
|
|
3112
|
-
|
|
3059
|
+
// if (showOverflow) {
|
|
3060
|
+
// if (!rowOpts.height) {
|
|
3061
|
+
// const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false)
|
|
3062
|
+
// if (errColumn) {
|
|
3063
|
+
// errLog('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true'])
|
|
3064
|
+
// }
|
|
3065
|
+
// }
|
|
3066
|
+
// }
|
|
3067
|
+
// if (process.env.VUE_APP_VXE_ENV === 'development') {
|
|
3068
|
+
// if (props.showHeader && !props.showHeaderOverflow) {
|
|
3069
|
+
// warnLog('vxe.error.reqProp', ['show-header-overflow'])
|
|
3070
|
+
// }
|
|
3071
|
+
// if (props.showFooter && !props.showFooterOverflow) {
|
|
3072
|
+
// warnLog('vxe.error.reqProp', ['show-footer-overflow'])
|
|
3073
|
+
// }
|
|
3074
|
+
if (props.spanMethod) {
|
|
3075
|
+
warnLog('vxe.error.scrollErrProp', ['span-method'])
|
|
3113
3076
|
}
|
|
3114
|
-
if (
|
|
3115
|
-
|
|
3116
|
-
// warnLog('vxe.error.reqProp', ['show-header-overflow'])
|
|
3117
|
-
// }
|
|
3118
|
-
// if (props.showFooter && !props.showFooterOverflow) {
|
|
3119
|
-
// warnLog('vxe.error.reqProp', ['show-footer-overflow'])
|
|
3120
|
-
// }
|
|
3121
|
-
if (props.spanMethod) {
|
|
3122
|
-
warnLog('vxe.error.scrollErrProp', ['span-method'])
|
|
3123
|
-
}
|
|
3124
|
-
if (props.footerSpanMethod) {
|
|
3125
|
-
warnLog('vxe.error.scrollErrProp', ['footer-span-method'])
|
|
3126
|
-
}
|
|
3077
|
+
if (props.footerSpanMethod) {
|
|
3078
|
+
warnLog('vxe.error.scrollErrProp', ['footer-span-method'])
|
|
3127
3079
|
}
|
|
3080
|
+
// }
|
|
3128
3081
|
if (isReset) {
|
|
3129
3082
|
const { visibleSize } = handleVirtualXVisible()
|
|
3130
3083
|
scrollXStore.startIndex = 0
|
|
@@ -9109,6 +9062,7 @@ export default defineComponent({
|
|
|
9109
9062
|
return
|
|
9110
9063
|
}
|
|
9111
9064
|
}
|
|
9065
|
+
|
|
9112
9066
|
let scrollTop = yHandleEl.scrollTop
|
|
9113
9067
|
let scrollLeft = xHandleEl.scrollLeft
|
|
9114
9068
|
if (leftScrollElem && fixedType === 'left') {
|
|
@@ -9241,7 +9195,7 @@ export default defineComponent({
|
|
|
9241
9195
|
const { scrollXLoad, scrollYLoad, expandColumn } = reactData
|
|
9242
9196
|
const leftFixedWidth = computeLeftFixedWidth.value
|
|
9243
9197
|
const rightFixedWidth = computeRightFixedWidth.value
|
|
9244
|
-
if (!(
|
|
9198
|
+
if (!(leftFixedWidth || rightFixedWidth || expandColumn)) {
|
|
9245
9199
|
return
|
|
9246
9200
|
}
|
|
9247
9201
|
|
|
@@ -9275,7 +9229,6 @@ export default defineComponent({
|
|
|
9275
9229
|
if (isTopWheel ? currScrollTop <= 0 : currScrollTop >= bodyScrollElem.scrollHeight - bodyScrollElem.clientHeight) {
|
|
9276
9230
|
return
|
|
9277
9231
|
}
|
|
9278
|
-
|
|
9279
9232
|
const scrollTop = currScrollTop + deltaTop
|
|
9280
9233
|
const scrollLeft = bodyScrollElem.scrollLeft + deltaLeft
|
|
9281
9234
|
const isRollX = scrollLeft !== lastScrollLeft
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|