lxm_front/vxe-table
1
0
Fork 0
mirror of https://gitee.com/xuliangzhan_admin/vxe-table.git synced 2026-01-21 05:27:57 +08:00
Code Issues Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
xuliangzhan
2019-06-08 16:04:25 +08:00
parent 0b05b99d08
commit b220b5ac4d
5 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/index.common.js
View File

@@ -5786,8 +5786,8 @@ function syncBodyScroll(scrollTop, elem1, elem2) {
var customHeight = height === 'auto' ? containerHeight : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toNumber(height);
var style = {};
if (customHeight) {
style.height = "".concat(fixedType ? (customHeight ? customHeight - headerHeight - footerHeight : tableHeight) - (showFooter ? 0 : scrollXHeight) : customHeight - headerHeight - footerHeight, "px");
if (customHeight > 0) {
style.height = "".concat(fixedType ? (customHeight > 0 ? customHeight - headerHeight - footerHeight : tableHeight) - (showFooter ? 0 : scrollXHeight) : customHeight - headerHeight - footerHeight, "px");
} else if (maxHeight) {
maxHeight = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toNumber(maxHeight);
style['max-height'] = "".concat(fixedType ? maxHeight - headerHeight - (showFooter ? 0 : scrollXHeight) : maxHeight - headerHeight, "px");
@@ -7435,7 +7435,7 @@ function renderFixed(h, $table, fixedType) {
var isRightFixed = fixedType === 'right';
var fixedColumn = columnStore["".concat(fixedType, "List")];
var style = {
height: "".concat((customHeight ? customHeight - headerHeight - footerHeight : tableHeight) + headerHeight + footerHeight - scrollXHeight * (showFooter ? 2 : 1), "px"),
height: "".concat((customHeight > 0 ? customHeight - headerHeight - footerHeight : tableHeight) + headerHeight + footerHeight - scrollXHeight * (showFooter ? 2 : 1), "px"),
width: "".concat(fixedColumn.reduce(function (previous, column) {
return previous + column.renderWidth;
}, isRightFixed ? scrollYWidth : 0), "px")
@@ -9069,7 +9069,7 @@ function renderFixed(h, $table, fixedType) {
// 如果开启复制功能
if (isX || isC) {
this.handleCopyed(isX, evnt);
} else if (isV) {
} else {
this.handlePaste(evnt);
}
} else if (keyboardConfig.isEdit && !isCtrlKey && (keyCode >= 48 && keyCode <= 57 || keyCode >= 65 && keyCode <= 90 || keyCode >= 96 && keyCode <= 111 || keyCode >= 186 && keyCode <= 192 || keyCode >= 219 && keyCode <= 222 || keyCode === 32)) {
@@ -9868,7 +9868,7 @@ function renderFixed(h, $table, fixedType) {
this.closeFilter();
this.closeContextMenu();
} else if (isRightBtn) {
} else {
// 如果不在所有选中的范围之内则重新选中
var select = dom.getCellIndexs(cell);
@@ -10349,7 +10349,7 @@ function renderFixed(h, $table, fixedType) {
if (row && prop) {
var rowIndex = tableData.indexOf(row);
if (rowIndex > -1 && prop) {
if (rowIndex > -1) {
var column = visibleColumn.find(function (column) {
return column.property === prop;
});

12
lib/index.umd.js
View File

@@ -5795,8 +5795,8 @@ function syncBodyScroll(scrollTop, elem1, elem2) {
var customHeight = height === 'auto' ? containerHeight : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toNumber(height);
var style = {};
if (customHeight) {
style.height = "".concat(fixedType ? (customHeight ? customHeight - headerHeight - footerHeight : tableHeight) - (showFooter ? 0 : scrollXHeight) : customHeight - headerHeight - footerHeight, "px");
if (customHeight > 0) {
style.height = "".concat(fixedType ? (customHeight > 0 ? customHeight - headerHeight - footerHeight : tableHeight) - (showFooter ? 0 : scrollXHeight) : customHeight - headerHeight - footerHeight, "px");
} else if (maxHeight) {
maxHeight = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toNumber(maxHeight);
style['max-height'] = "".concat(fixedType ? maxHeight - headerHeight - (showFooter ? 0 : scrollXHeight) : maxHeight - headerHeight, "px");
@@ -7444,7 +7444,7 @@ function renderFixed(h, $table, fixedType) {
var isRightFixed = fixedType === 'right';
var fixedColumn = columnStore["".concat(fixedType, "List")];
var style = {
height: "".concat((customHeight ? customHeight - headerHeight - footerHeight : tableHeight) + headerHeight + footerHeight - scrollXHeight * (showFooter ? 2 : 1), "px"),
height: "".concat((customHeight > 0 ? customHeight - headerHeight - footerHeight : tableHeight) + headerHeight + footerHeight - scrollXHeight * (showFooter ? 2 : 1), "px"),
width: "".concat(fixedColumn.reduce(function (previous, column) {
return previous + column.renderWidth;
}, isRightFixed ? scrollYWidth : 0), "px")
@@ -9078,7 +9078,7 @@ function renderFixed(h, $table, fixedType) {
// 如果开启复制功能
if (isX || isC) {
this.handleCopyed(isX, evnt);
} else if (isV) {
} else {
this.handlePaste(evnt);
}
} else if (keyboardConfig.isEdit && !isCtrlKey && (keyCode >= 48 && keyCode <= 57 || keyCode >= 65 && keyCode <= 90 || keyCode >= 96 && keyCode <= 111 || keyCode >= 186 && keyCode <= 192 || keyCode >= 219 && keyCode <= 222 || keyCode === 32)) {
@@ -9877,7 +9877,7 @@ function renderFixed(h, $table, fixedType) {
this.closeFilter();
this.closeContextMenu();
} else if (isRightBtn) {
} else {
// 如果不在所有选中的范围之内则重新选中
var select = dom.getCellIndexs(cell);
@@ -10358,7 +10358,7 @@ function renderFixed(h, $table, fixedType) {
if (row && prop) {
var rowIndex = tableData.indexOf(row);
if (rowIndex > -1 && prop) {
if (rowIndex > -1) {
var column = visibleColumn.find(function (column) {
return column.property === prop;
});

2
lib/index.umd.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
src/components/table/src/body.js
View File

@@ -326,8 +326,8 @@ export default {
let { maxHeight, height, containerHeight, loading, tableData, tableColumn, headerHeight, showFooter, showAllOverflow, footerHeight, tableHeight, tableWidth, scrollXStore, scrollXLoad, scrollYStore, scrollYLoad, scrollXHeight } = $table
let customHeight = height === 'auto' ? containerHeight : XEUtils.toNumber(height)
let style = {}
if (customHeight) {
style.height = `${fixedType ? (customHeight ? customHeight - headerHeight - footerHeight : tableHeight) - (showFooter ? 0 : scrollXHeight) : customHeight - headerHeight - footerHeight}px`
if (customHeight > 0) {
style.height = `${fixedType ? (customHeight > 0 ? customHeight - headerHeight - footerHeight : tableHeight) - (showFooter ? 0 : scrollXHeight) : customHeight - headerHeight - footerHeight}px`
} else if (maxHeight) {
maxHeight = XEUtils.toNumber(maxHeight)
style['max-height'] = `${fixedType ? maxHeight - headerHeight - (showFooter ? 0 : scrollXHeight) : maxHeight - headerHeight}px`

8
src/components/table/src/table.js
View File

@@ -46,7 +46,7 @@ function renderFixed (h, $table, fixedType) {
let isRightFixed = fixedType === 'right'
let fixedColumn = columnStore[`${fixedType}List`]
let style = {
height: `${(customHeight ? customHeight - headerHeight - footerHeight : tableHeight) + headerHeight + footerHeight - scrollXHeight * (showFooter ? 2 : 1)}px`,
height: `${(customHeight > 0 ? customHeight - headerHeight - footerHeight : tableHeight) + headerHeight + footerHeight - scrollXHeight * (showFooter ? 2 : 1)}px`,
width: `${fixedColumn.reduce((previous, column) => previous + column.renderWidth, isRightFixed ? scrollYWidth : 0)}px`
}
return h('div', {
@@ -1403,7 +1403,7 @@ export default {
// 如果开启复制功能
if (isX || isC) {
this.handleCopyed(isX, evnt)
} else if (isV) {
} else {
this.handlePaste(evnt)
}
} else if (keyboardConfig.isEdit && !isCtrlKey && ((keyCode >= 48 && keyCode <= 57) || (keyCode >= 65 && keyCode <= 90) || (keyCode >= 96 && keyCode <= 111) || (keyCode >= 186 && keyCode <= 192) || (keyCode >= 219 && keyCode <= 222) || keyCode === 32)) {
@@ -1967,7 +1967,7 @@ export default {
}
this.closeFilter()
this.closeContextMenu()
} else if (isRightBtn) {
} else {
// 如果不在所有选中的范围之内则重新选中
let select = DomTools.getCellIndexs(cell)
if (checked.rows.indexOf(tableData[select.rowIndex]) === -1 || checked.columns.indexOf(visibleColumn[select.columnIndex]) === -1) {
@@ -2338,7 +2338,7 @@ export default {
let { tableData, visibleColumn, handleActived } = this
if (row && prop) {
let rowIndex = tableData.indexOf(row)
if (rowIndex > -1 && prop) {
if (rowIndex > -1) {
let column = visibleColumn.find(column => column.property === prop)
let cell = DomTools.getCell(this, { row, rowIndex, column })
handleActived({ row, column, cell })