tsanie/ui-lib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: grid hover position issue.

Browse Source
This commit is contained in:
Chen Lily 2024-02-23 10:52:30 +08:00
parent dc2b67a33c
commit c21f62b7b8
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/ui/grid/grid.js
View File

@ -691,6 +691,12 @@ export class Grid {
* @private * @private
*/ */
footerOffset: null, footerOffset: null,
/**
* 容器宽度
* @type {number}
* @private
*/
wrapClientWidth: null,
/** /**
* 正文宽度 * 正文宽度
* @type {number} * @type {number}
@ -1369,7 +1375,7 @@ export class Grid {
}); });
holder.addEventListener('dblclick', e => this._onRowDblClicked(e)); holder.addEventListener('dblclick', e => this._onRowDblClicked(e));
wrapper.appendChild(holder); wrapper.appendChild(holder);
wrapper.addEventListener('mousemove', e => throttle(this._onGridMouseMove, HoverInternal, this, e, holder), { passive: true }); grid.addEventListener('mousemove', e => throttle(this._onGridMouseMove, HoverInternal, this, e, holder), { passive: true });
} }
// loading // loading
@ -1437,6 +1443,7 @@ export class Grid {
this.reload(keep); this.reload(keep);
} }
} }
this._var.wrapClientWidth = this._var.refs.wrapper.clientWidth;
this._var.bodyClientWidth = body.clientWidth; this._var.bodyClientWidth = body.clientWidth;
} }
@ -1491,7 +1498,7 @@ export class Grid {
if (!keep) { if (!keep) {
this._var.scrollTop = 0; this._var.scrollTop = 0;
this._var.el.scrollTop = 0; this._var.el.scrollTop = 0;
// this._var.el.scrollLeft = 0; this._var.el.scrollLeft = 0;
this._var.refs.table.style.top = '0px'; this._var.refs.table.style.top = '0px';
} }
this._adjustRows(this._var.refs.body); this._adjustRows(this._var.refs.body);
@ -3597,6 +3604,7 @@ export class Grid {
if (this.onBodyScrolled === 'function') { if (this.onBodyScrolled === 'function') {
this.onBodyScrolled(e); this.onBodyScrolled(e);
} }
this._var.scrollLeft = e.target.scrollLeft;
if (!this.virtual) { if (!this.virtual) {
if (this.total != null) { if (this.total != null) {
this._var.refs.footer.parentElement.style.bottom = `${this._var.footerOffset - e.target.scrollTop}px`; this._var.refs.footer.parentElement.style.bottom = `${this._var.footerOffset - e.target.scrollTop}px`;
@ -3659,15 +3667,15 @@ export class Grid {
const top = (parent.classList.contains('ui-grid-total-row') ? this._var.refs.footer.parentElement.offsetTop + 1 : target.offsetTop) + this._var.refs.table.offsetTop; const top = (parent.classList.contains('ui-grid-total-row') ? this._var.refs.footer.parentElement.offsetTop + 1 : target.offsetTop) + this._var.refs.table.offsetTop;
let left = target.offsetLeft; let left = target.offsetLeft;
let width = holder.offsetWidth; let width = holder.offsetWidth;
if (width > this._var.bodyClientWidth) { if (width > this._var.wrapClientWidth) {
width = this._var.bodyClientWidth; width = this._var.wrapClientWidth;
} }
const maxleft = this._var.bodyClientWidth + this._var.scrollLeft - width; const maxleft = this._var.wrapClientWidth + this._var.scrollLeft - width;
if (left > maxleft) { if (left > maxleft) {
left = maxleft; left = maxleft;
} }
const height = target.offsetHeight; const height = target.offsetHeight;
holder.style.cssText = `top: ${top}px; left: ${left}px; max-width: ${this._var.bodyClientWidth}px; height: ${height - 2}px`; holder.style.cssText = `top: ${top}px; left: ${left}px; max-width: ${this._var.wrapClientWidth}px; height: ${height - 2}px`;
holder.classList.add('active'); holder.classList.add('active');
} else if (holder.classList.contains('active')) { } else if (holder.classList.contains('active')) {
delete holder.dataset.row; delete holder.dataset.row;