diff --git a/oo_list_manager/__manifest__.py b/oo_list_manager/__manifest__.py index 2f43ab785..009e97d58 100644 --- a/oo_list_manager/__manifest__.py +++ b/oo_list_manager/__manifest__.py @@ -31,7 +31,6 @@ Long description of module's purpose 'license': 'LGPL-3', 'assets': { 'web.assets_backend': [ - 'oo_list_manager/static/src/core/ensure_jquery.js', 'oo_list_manager/static/src/views/list/*', 'oo_list_manager/static/src/views/auto_hide_list/*', ] diff --git a/oo_list_manager/static/src/views/list/list_renderer.js b/oo_list_manager/static/src/views/list/list_renderer.js index 02710d24a..bbdb1e22a 100644 --- a/oo_list_manager/static/src/views/list/list_renderer.js +++ b/oo_list_manager/static/src/views/list/list_renderer.js @@ -1,26 +1,24 @@ /** @odoo-module **/ -import {ListRenderer} from "@web/views/list/list_renderer"; -import {patch} from "@web/core/utils/patch"; -import {loadJS, loadCSS} from "@web/core/assets"; -import {ListRendererCust} from "@tree_view_advanced_filter/tree_view_advanced_filter/tree" -import {onWillDestroy, useEffect} from "@odoo/owl"; -import { ensureJQuery } from '../../core/ensure_jquery'; +import { ListRenderer } from "@web/views/list/list_renderer"; +import { patch } from "@web/core/utils/patch"; +import { loadJS, loadCSS } from "@web/core/assets"; +import { ListRendererCust } from "@tree_view_advanced_filter/tree_view_advanced_filter/tree" +import { onWillDestroy, useEffect } from "@odoo/owl"; patch(ListRenderer.prototype, { setup() { super.setup(); - // 注释掉 X2Many 自动启用序号，避免布局错位 - // if (this.isX2Many) { - // this.props.ooManagerSerialNum = true; - // } + if (this.isX2Many) { + this.props.ooManagerSerialNum = true; + } const computeFunction = this.computeFreeze.bind(this); const resizeObserver = new ResizeObserver(computeFunction); - - useEffect( (tableEl) => { if (tableEl) { + // Lucky by 2025/08/08添加此行：设置 table-layout: fixed,先注释反馈有Bug + // tableEl.style.setProperty('table-layout', 'fixed', 'important'); resizeObserver.observe(tableEl); return () => resizeObserver.unobserve(tableEl); } @@ -36,15 +34,10 @@ patch(ListRenderer.prototype, { freezeColumnWidths() { super.freezeColumnWidths(); const table = this.tableRef.el; - if (!table) return; - const headers = [...table.querySelectorAll("thead th:not(.o_list_actions_header)")]; headers.forEach((th, index) => { - // 只有在自定义列宽存在时才设置 minWidth - if (this.columnWidths[index]) { - th.style.minWidth = `${Math.floor(this.columnWidths[index])}px`; - } + th.style.minWidth = `${Math.floor(this.columnWidths[index])}px`; }); this._computeLock(); }, @@ -60,63 +53,10 @@ patch(ListRenderer.prototype, { setTimeout(computeFunction, 200); }); }, - - // _computeLock() { - // const table = this.tableRef.el; - // if (!table) return; - - // const thead = [...table.querySelectorAll('thead tr:first-child th')]; - // const filterBox = [...table.querySelectorAll('thead .o_filter_box td')]; - // const tbody = [...table.querySelectorAll('tbody tr')]; - // const tfoot = [...table.querySelectorAll('tfoot tr')]; - - // const setStyle = (element, left, z = 10) => { - // element.classList.add('position-sticky', 'o_column_freeze'); - // Object.assign(element.style, { - // left: `${left}px`, - // zIndex: `${z}`, - // }); - // }; - - // const removeStyle = (element) => { - // element.classList.remove('position-sticky', 'o_column_freeze'); - // element.style.left = ''; - // element.style.zIndex = ''; - // }; - - // for (let i = 0; i < thead.length; i++) { - // const th = thead[i]; - // const shouldFreeze = th.classList.contains('o_column_freeze') || - // th.classList.contains('o_list_record_selector') || - // th.classList.contains('list-number'); - - // if (shouldFreeze) { - // let left = 0; - // for (let j = 0; j < i; j++) { - // left += thead[j].getBoundingClientRect().width; - // } - - // setStyle(th, left, 20); - // if (filterBox[i]) setStyle(filterBox[i], left, 30); - // tbody.forEach(tr => tr.classList.contains('o_data_row') && setStyle(tr.children[i], left, 10)); - // tfoot.forEach(tr => setStyle(tr.children[i], left, 10)); - // } else { - // removeStyle(th); - // if (filterBox[i]) removeStyle(filterBox[i]); - // tbody.forEach(tr => tr.classList.contains('o_data_row') && removeStyle(tr.children[i])); - // tfoot.forEach(tr => removeStyle(tr.children[i])); - // } - // } - // }, _computeLock() { const table = this.tableRef.el; if (!table) return; - // 对于 X2Many 字段，如果没有启用列管理功能，则不应用列冻结 - if (this.isX2Many && !this.props.ooManagerColumns) { - return; - } - const thead = [...table.querySelectorAll('thead tr:first-child th')]; const filterBox = [...table.querySelectorAll('thead .o_filter_box td')]; const tbody = [...table.querySelectorAll('tbody tr')]; @@ -170,11 +110,14 @@ patch(ListRenderer.prototype, { const cell = tr.children[i]; if (cell) setStyle(cell, left, 10); }); - + console.log('groupHeaders',groupHeaders) // 冻结分组行 groupHeaders.forEach(tr => { const cell = tr.children[i]; - if (cell) setStyle(cell, left, 15); // 比 body 高，比 header 低 + + //if (cell) setStyle(cell, left, 4); // 比 body 高，比 header 低 + // 分组头部是不是 left= 0 就行. 头部都固定左侧. + if(cell) setStyle(cell, 0, 4); }); } else { @@ -205,7 +148,6 @@ patch(ListRenderer.prototype, { // 针对右侧的(尾列的数据冻结功能) // 样式增加 hover const setRightStyle = (element, right) => { - if (!element) return; element.classList.add('position-sticky', 'position-sticky-right'); Object.assign(element.style, { right: `${right}px`, @@ -215,15 +157,12 @@ patch(ListRenderer.prototype, { } const resetRightStyle = (element) => { - if (!element) return; - element.classList.remove('position-sticky', 'position-sticky-right'); - element.style.right = ''; - element.style.backgroundColor = ''; + element.classList.remove('position-sticky'); + element.style.right = 'auto'; element.style.zIndex = ''; } if (this.props.ooManagerStickyEnd) { - console.log('ooManagerStickyEnd') let rightOffset = 0; const rightStickyIndices = []; @@ -279,7 +218,6 @@ patch(ListRenderer.prototype, { * @returns {boolean} */ get hasOptionalFields() { - console.log('hasOptionalFields') return false }, get displayOptionalFields() { @@ -289,7 +227,6 @@ patch(ListRenderer.prototype, { getActiveColumns(list) { if (this.props.ooManagerColumns) { - // console.log(this.allColumns) const columns = this.allColumns.filter((col) => { if (list.isGrouped && col.widget === "handle") return false; const mColumn = this.props.ooManagerColumns.find(item => item.id === col.id); @@ -334,20 +271,16 @@ patch(ListRenderer.prototype, { computeColumnWidthsFromContent(allowedWidth) { const columnWidths = super.computeColumnWidthsFromContent(allowedWidth); if (!this.props.ooManagerColumns) return columnWidths; - const table = this.tableRef.el; - if (!table) return columnWidths; table.classList.add("o_list_computing_widths"); const headers = [...table.querySelectorAll("thead th")]; headers.forEach((th, index) => { const id = th.getAttribute('data-id'); - if (id) { - const mColumn = this.props.ooManagerColumns.find(item => item.id === id); - if (mColumn && mColumn.width && mColumn.width > 0) { - columnWidths[index] = mColumn.width; - } + const mColumn = this.props.ooManagerColumns.find(item => item.id === id); + if (mColumn && mColumn.width) { + columnWidths[index] = mColumn.width; } }); @@ -358,31 +291,38 @@ patch(ListRenderer.prototype, { getColumnStyle(column) { if (!this.props.ooManagerColumns) return ''; const mColumn = this.props.ooManagerColumns.find(item => item.id === column.id); - if (mColumn && mColumn.color) { - return `color: ${mColumn.color};`; + const styles = []; + if (mColumn?.width) { + styles.push(`width: ${mColumn.width}px`); + styles.push(`min-width: ${mColumn.width}px`); + styles.push(`max-width: ${mColumn.width}px`); } - return ''; + + if (mColumn?.color) { + styles.push(`color: ${mColumn.color}`); + } + + return styles.join('; '); }, _renderSearchPanel: async function () { - await ensureJQuery(); if (this.isX2Many) { return ListRendererCust._renderSearchPanel.call(this); } if (!this.props.archInfo.advanced_filter) { - $('.o_filter_box').remove(); // $ is not defined - // document.querySelectorAll('.o_filter_box').forEach(el => el.remove()); + $('.o_filter_box').remove(); } else { - await loadJS("/tree_view_advanced_filter/static/src/libs/moment/moment.min.js"); await loadJS("/tree_view_advanced_filter/static/src/libs/daterangepicker.min.js"); await loadCSS("/tree_view_advanced_filter/static/src/libs/daterangepicker.css"); + await loadJS("/tree_view_advanced_filter/static/src/libs/moment/moment.min.js"); + const List = this.props.list; const rootRef = this.rootRef.el; const tableRef = this.tableRef.el; tableRef.removeAttribute('style'); const columns = this.getActiveColumns(this.props.list); - const $tr1 = $('', {class: 'o_filter_box'}).append(columns.map(col => this._renderHeaderCellSearch(col))); + const $tr1 = $('', { class: 'o_filter_box' }).append(columns.map(col => this._renderHeaderCellSearch(col))); if (this.props.ooManagerSerialNum) $tr1.prepend($('').addClass('web_list_num')); if (this.hasSelectors) $tr1.prepend($('').addClass('o_list_record_selector')); if (this.isStudioEditable || this.displayOptionalFields) $tr1.append($('').addClass('o_list_record_selector')); @@ -392,6 +332,7 @@ patch(ListRenderer.prototype, { } else { $tr1.insertAfter($(tableRef).find('tr')[0]); } + rootRef.querySelectorAll('thead tr td.search_td input').forEach((a) => a.addEventListener('keyup', this._onfilter.bind(this))); rootRef.querySelectorAll('.search_button').forEach((a) => a.addEventListener('click', this._onSearch.bind(this))); rootRef.querySelectorAll('.remove_button').forEach((a) => a.addEventListener('click', this._onRemove.bind(this))); @@ -403,4 +344,4 @@ patch(ListRenderer.prototype, { ListRenderer.props.push('ooManagerColumns?'); ListRenderer.props.push('ooManagerFilter?'); ListRenderer.props.push('ooManagerSerialNum?'); -ListRenderer.props.push('ooManagerStickyEnd?'); \ No newline at end of file +ListRenderer.props.push('ooManagerStickyEnd?');