From a1590d9201ac30960e1ed8b77f40704a72ff2ccc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Wed, 2 Jul 2025 22:55:42 +0800 Subject: [PATCH 1/4] 1 --- oo_list_manager/static/src/views/list/list_controller.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/oo_list_manager/static/src/views/list/list_controller.js b/oo_list_manager/static/src/views/list/list_controller.js index 53f1b4429..ebd1ffd53 100644 --- a/oo_list_manager/static/src/views/list/list_controller.js +++ b/oo_list_manager/static/src/views/list/list_controller.js @@ -33,7 +33,7 @@ patch(ListController.prototype, { onWillStart(async () => { const manager_data = await this.orm.call('ir.ui.view', 'get_manager_data', [this.env.config.viewId]); - if (!Object.keys(manager_data).length) { + if (!Object.keys(manager_data).length || !manager_data.columns) { this.ooManager.columns.forEach(val => { val.visibility = !!!val.column_invisible; }) @@ -41,6 +41,7 @@ patch(ListController.prototype, { Object.assign(this.ooManager, manager_data); this.archInfo.advanced_filter = this.ooManager.filter; } + this.ooManager.show = manager_data.show; }) usePosition('ooListRef', () => this.ooManagerRef.el, { From e70294c3887231159141ea83b34844daded2d124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Wed, 2 Jul 2025 22:57:10 +0800 Subject: [PATCH 2/4] 1 --- oo_list_manager/__manifest__.py | 38 ++--- oo_list_manager/models/ir_ui_view.py | 20 +-- .../static/src/views/list/list_controller.js | 30 ++-- .../static/src/views/list/list_controller.xml | 46 +++--- .../static/src/views/list/list_renderer.js | 152 +++++++++++------- tree_view_advanced_filter/__manifest__.py | 3 +- .../js/list_view_sticky_header_and_column.js | 21 ++- .../list_view_sticky_header_and_column.xml | 55 ++++--- .../static/src/web_list_num/list_renderer.js | 12 +- 9 files changed, 216 insertions(+), 161 deletions(-) diff --git a/oo_list_manager/__manifest__.py b/oo_list_manager/__manifest__.py index 2c4de9c41..00233c276 100644 --- a/oo_list_manager/__manifest__.py +++ b/oo_list_manager/__manifest__.py @@ -1,39 +1,31 @@ # -*- coding: utf-8 -*- { - 'name': "oo_list_manager", - - 'summary': "Short (1 phrase/line) summary of the module's purpose", - - 'description': """ -Long description of module's purpose + "name": "oo_list_manager", + "summary": "Short (1 phrase/line) summary of the module's purpose", + "description": """ + Long description of module's purpose """, - - 'author': "My Company", - 'website': "https://www.yourcompany.com", - + "author": "My Company", + "website": "https://www.yourcompany.com", # Categories can be used to filter modules in modules listing # Check https://github.com/odoo/odoo/blob/15.0/odoo/addons/base/data/ir_module_category_data.xml # for the full list - 'category': 'Uncategorized', - 'version': '0.1', - + "category": "Uncategorized", + "version": "0.1", # any module necessary for this one to work correctly - 'depends': ['base', 'web', 'tree_view_advanced_filter'], - + "depends": ["base", "web", "tree_view_advanced_filter"], # always loaded - 'data': [ + "data": [ # 'security/ir.model.access.csv', - 'views/ir_ui_view.xml' ], # only loaded in demonstration mode "application": True, "auto_install": False, - 'license': 'LGPL-3', - 'assets': { - 'web.assets_backend': [ - 'oo_list_manager/static/src/views/list/*', - 'oo_list_manager/static/src/views/auto_hide_list/*', + "license": "LGPL-3", + "assets": { + "web.assets_backend": [ + "oo_list_manager/static/src/views/list/*", + "oo_list_manager/static/src/views/auto_hide_list/*", ] }, } - diff --git a/oo_list_manager/models/ir_ui_view.py b/oo_list_manager/models/ir_ui_view.py index f9355119f..14b516f39 100644 --- a/oo_list_manager/models/ir_ui_view.py +++ b/oo_list_manager/models/ir_ui_view.py @@ -4,27 +4,15 @@ from odoo import models, fields, api class IrUiView(models.Model): - _inherit = 'ir.ui.view' + _inherit = "ir.ui.view" - manager_data = fields.Json(string='data') - group_ids = fields.Many2many('res.groups', string='Groups') + manager_data = fields.Json(string="data") def get_manager_data(self): - if not self: - return {} self.ensure_one() - - resp = self.manager_data or {} - resp.update({ - 'show': self.env.uid in self.group_ids.users.ids - }) - return resp + return self.manager_data or {} def save_manager_data(self, manager_data): - if not self: - return False self.ensure_one() - self.sudo().write({ - 'manager_data': manager_data - }) + self.sudo().write({"manager_data": manager_data}) return True diff --git a/oo_list_manager/static/src/views/list/list_controller.js b/oo_list_manager/static/src/views/list/list_controller.js index ebd1ffd53..b53e82485 100644 --- a/oo_list_manager/static/src/views/list/list_controller.js +++ b/oo_list_manager/static/src/views/list/list_controller.js @@ -1,13 +1,13 @@ /** @odoo-module **/ -import {ListController} from "@web/views/list/list_controller"; -import {patch} from "@web/core/utils/patch"; -import {onWillStart, useState, useRef, useExternalListener} from "@odoo/owl"; -import {Dropdown} from "@web/core/dropdown/dropdown"; -import {CheckBox} from "@web/core/checkbox/checkbox"; -import {useSortable} from "@web/core/utils/sortable_owl"; -import {useService} from "@web/core/utils/hooks"; -import {usePosition} from "@web/core/position_hook"; +import { ListController } from "@web/views/list/list_controller"; +import { patch } from "@web/core/utils/patch"; +import { onWillStart, useState, useRef, useExternalListener } from "@odoo/owl"; +import { Dropdown } from "@web/core/dropdown/dropdown"; +import { CheckBox } from "@web/core/checkbox/checkbox"; +import { useSortable } from "@web/core/utils/sortable_owl"; +import { useService } from "@web/core/utils/hooks"; +import { usePosition } from "@web/core/position_hook"; patch(ListController.prototype, { @@ -24,6 +24,7 @@ patch(ListController.prototype, { key: '', filter: false, serial_num: false, + frozen_columns: 0, // 新增字段 columns: this.archInfo.columns.filter((column) => { if (column.type === "field" && column.widget !== 'handle') { return column @@ -33,7 +34,7 @@ patch(ListController.prototype, { onWillStart(async () => { const manager_data = await this.orm.call('ir.ui.view', 'get_manager_data', [this.env.config.viewId]); - if (!Object.keys(manager_data).length || !manager_data.columns) { + if (!Object.keys(manager_data).length) { this.ooManager.columns.forEach(val => { val.visibility = !!!val.column_invisible; }) @@ -41,7 +42,6 @@ patch(ListController.prototype, { Object.assign(this.ooManager, manager_data); this.archInfo.advanced_filter = this.ooManager.filter; } - this.ooManager.show = manager_data.show; }) usePosition('ooListRef', () => this.ooManagerRef.el, { @@ -106,7 +106,7 @@ patch(ListController.prototype, { * @param params */ sortColumnDrop(params) { - const {element, previous} = params; + const { element, previous } = params; const fromId = element.dataset.id; const toId = previous ? previous.dataset.id : null; @@ -144,10 +144,18 @@ patch(ListController.prototype, { columns: this.ooManager.columns, filter: this.ooManager.filter, serial_num: this.ooManager.serial_num, + frozen_columns: this.ooManager.frozen_columns, // 加入保存 } ] ); }, + onChangeFrozenColumns() { + this.isChange = true; + this.saveManagerData(); + }, + updateForzenColumns(num) { + this.ooManager.frozen_columns = num; + } }) ListController.components = { diff --git a/oo_list_manager/static/src/views/list/list_controller.xml b/oo_list_manager/static/src/views/list/list_controller.xml index 14a6c4de4..c47aae9a2 100644 --- a/oo_list_manager/static/src/views/list/list_controller.xml +++ b/oo_list_manager/static/src/views/list/list_controller.xml @@ -1,32 +1,37 @@ - -
+
-
-
-
-
+
+
+
+
表头查询:
-
- -
-
-
-
+
+ +
+
+
+
行号:
-
- -
-
-
-
+
+ +
+
+ +
+
@@ -43,7 +48,7 @@
-
+
@@ -62,8 +67,9 @@ ooManagerColumns="ooManager.columns" ooManagerFilter="ooManager.filter" ooManagerSerialNum="ooManager.serial_num" + ooManagerFrozenColumns="ooManager.frozen_columns" + updateForzenColumns.bind="updateForzenColumns" /> - \ No newline at end of file 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 e1a1bbc2b..9fbfa564d 100644 --- a/oo_list_manager/static/src/views/list/list_renderer.js +++ b/oo_list_manager/static/src/views/list/list_renderer.js @@ -1,34 +1,88 @@ /** @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 { 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 { onMounted } from "@odoo/owl"; patch(ListRenderer.prototype, { setup() { super.setup(); - if(this.isX2Many) { + if (this.isX2Many) { this.props.ooManagerSerialNum = true; } + + this.frozenColumns = this.props.ooManagerColumns?.length + ? this.props.ooManagerColumns.slice(0, this.props.ooManagerColumns.length) + : []; + + this.frozenColumnCount = Number(this.props.ooManagerFrozenColumns || 0); + + onMounted(() => { + this.applyFrozenColumnsIfNeeded(); + }); + }, + + applyFrozenColumnsIfNeeded() { + const frozenCount = this.frozenColumnCount + (this.props.ooManagerSerialNum ? 1 : 0); + if (frozenCount > 0) { + this.applyFrozenColumns(frozenCount); + } + }, + + applyFrozenColumns(n) { + const parent = this.__owl__.bdom.parentEl; + + // 清除旧样式 + $(parent.querySelectorAll('.sticky-column')).removeClass('sticky-column').css('left', ''); + $(parent.querySelectorAll('.clicked-header')).removeClass('clicked-header'); + + const $tableHeaders = $(parent.querySelectorAll('.o_list_table th')); + const $tableRows = $(parent.querySelectorAll('.o_list_table tr')); + const $tfootRow = $(parent.querySelectorAll('.o_list_table tfoot tr')[0]?.children || []); + const $searchTds = $(parent.querySelectorAll(`.search_td`)); + + const columnsToAdjust = n; + + $tableHeaders.each((i, el) => { + if (i < columnsToAdjust) { + $(el).addClass('sticky-column').css('left', `${$(el).position().left}px`); + } + }); + + $searchTds.each((i, el) => { + if (i < columnsToAdjust) { + $(el).addClass('sticky-column').css('left', `${$(el).position().left}px`); + } + }); + + $tableRows.each((_, row) => { + const $cells = $(row).find('td'); + $cells.each((i, el) => { + if (i < columnsToAdjust) { + $(el).addClass('sticky-column').css('left', `${$(el).position().left}px`); + } + }); + }); + + $($tfootRow).each((i, el) => { + if (i < columnsToAdjust) { + $(el).addClass('sticky-column').css('left', `${$(el).position().left}px`); + } + }); }, getActiveColumns(list) { if (this.props.ooManagerColumns) { const columns = this.allColumns.filter((col) => { if (list.isGrouped && col.widget === "handle") { - return false; // no handle column if the list is grouped - } - const mColumn = this.props.ooManagerColumns.find(item => item.id === col.id) - if (mColumn) { - return mColumn.visibility; - } - if (col.optional && !this.optionalActiveFields[col.name]) { - return false; - } - if (this.evalColumnInvisible(col.column_invisible)) { return false; } + const mColumn = this.props.ooManagerColumns.find(item => item.id === col.id); + if (mColumn) return mColumn.visibility; + if (col.optional && !this.optionalActiveFields[col.name]) return false; + if (this.evalColumnInvisible(col.column_invisible)) return false; return true; }); @@ -38,8 +92,7 @@ patch(ListRenderer.prototype, { return seqX - seqY; }); - return columns - + return columns; } else { return super.getActiveColumns(list); } @@ -55,83 +108,65 @@ patch(ListRenderer.prototype, { }); }, - /** - * 宽度 - * @param allowedWidth - * @returns {*} - */ computeColumnWidthsFromContent(allowedWidth) { const columnWidths = super.computeColumnWidthsFromContent(allowedWidth); if (!this.props.ooManagerColumns) return columnWidths; - const table = this.tableRef.el; - // Toggle a className used to remove style that could interfere with the ideal width - // computation algorithm (e.g. prevent text fields from being wrapped during the - // computation, to prevent them from being completely crushed) + const table = this.tableRef.el; table.classList.add("o_list_computing_widths"); const headers = [...table.querySelectorAll("thead th")]; - headers.forEach((th, index) => { const id = th.getAttribute('data-id'); - const mColumn = this.props.ooManagerColumns.find(item => item.id === id) - if (mColumn && mColumn.width) { + const mColumn = this.props.ooManagerColumns.find(item => item.id === id); + if (mColumn?.width) { columnWidths[index] = mColumn.width; } }); - // We are no longer computing widths, so restore the normal style table.classList.remove("o_list_computing_widths"); return columnWidths; }, - /** - * 样式 - * @param column - * @returns {string} - */ 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; - } else { - return ''; - } + return mColumn?.color ? `color: ${mColumn.color}` : ''; }, - _renderSearchPanel: async function () { + async _renderSearchPanel() { if (this.isX2Many) { return ListRendererCust._renderSearchPanel.call(this); } + if (!this.props.archInfo.advanced_filter) { $('.o_filter_box').remove(); } else { 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"); - var List = this.props.list; - const bm_params = List.model.__bm_load_params__; - const rootRef = this.rootRef.el - const tableRef = this.tableRef.el; - tableRef.removeAttribute('style') - const columns = this.getActiveColumns(this.props.list); - var $tr1 = $('', {class: 'o_filter_box'}).append(columns.map(columns => this._renderHeaderCellSearch(columns))); + const List = this.props.list; + const rootRef = this.rootRef.el; + const tableRef = this.tableRef.el; + tableRef.removeAttribute('style'); + + const columns = this.getActiveColumns(List); + const $tr1 = $('', { class: 'o_filter_box' }).append(columns.map(c => this._renderHeaderCellSearch(c))); + if (this.props.ooManagerSerialNum) { - // 添加行号占位td $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')); } - if ($(tableRef).find('.search_td').length) { - $(tableRef).find('.search_td').parent().replaceWith($tr1) + const $existing = $(tableRef).find('.search_td'); + if ($existing.length) { + $existing.parent().replaceWith($tr1); } else { $tr1.insertAfter($(tableRef).find('tr')[0]); } @@ -140,10 +175,15 @@ patch(ListRenderer.prototype, { 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))); rootRef.querySelectorAll('thead tr td').forEach((a) => a.addEventListener('keypress', this._onKeyPress.bind(this))); + + // ✅ 插入搜索框后执行冻结逻辑 + this.applyFrozenColumnsIfNeeded(); } } -}) +}); -ListRenderer.props.push('ooManagerColumns?') -ListRenderer.props.push('ooManagerFilter?') -ListRenderer.props.push('ooManagerSerialNum?') +// 注入 Props +ListRenderer.props.push('ooManagerColumns?'); +ListRenderer.props.push('ooManagerFilter?'); +ListRenderer.props.push('ooManagerSerialNum?'); +ListRenderer.props.push('ooManagerFrozenColumns?'); diff --git a/tree_view_advanced_filter/__manifest__.py b/tree_view_advanced_filter/__manifest__.py index 6ecbf76cc..3957243d2 100644 --- a/tree_view_advanced_filter/__manifest__.py +++ b/tree_view_advanced_filter/__manifest__.py @@ -67,10 +67,9 @@ "tree_view_advanced_filter/static/src/web_list_num/**/*", "tree_view_advanced_filter/static/src/list_view_sticky_header_and_column/js/*", "tree_view_advanced_filter/static/src/list_view_sticky_header_and_column/xml/*", - "tree_view_advanced_filter/static/src/list_view_sticky_header_and_column/scss/*" + "tree_view_advanced_filter/static/src/list_view_sticky_header_and_column/scss/*", ] }, - "images": ["static/description/banner.jpg"], "installable": True, "auto_install": False, diff --git a/tree_view_advanced_filter/static/src/list_view_sticky_header_and_column/js/list_view_sticky_header_and_column.js b/tree_view_advanced_filter/static/src/list_view_sticky_header_and_column/js/list_view_sticky_header_and_column.js index 0930bfa4b..05f3d1f1f 100644 --- a/tree_view_advanced_filter/static/src/list_view_sticky_header_and_column/js/list_view_sticky_header_and_column.js +++ b/tree_view_advanced_filter/static/src/list_view_sticky_header_and_column/js/list_view_sticky_header_and_column.js @@ -2,11 +2,12 @@ /** This file will used to stick the selected header and column in the list view **/ import { patch } from "@web/core/utils/patch"; import { ListRenderer } from "@web/views/list/list_renderer"; +import { useService } from "@web/core/utils/hooks"; patch(ListRenderer.prototype, { /** super the setup function **/ setup() { super.setup(); - + this.orm = useService('orm'); }, /** * function defining the button having t-on-click _onClick @@ -51,6 +52,9 @@ patch(ListRenderer.prototype, { } } }); + // debugger + // this.props.updateForzenColumns(columnIndex); + this.saveManagerData(columnIndex); }, /** * super onClickSortColumn function and remove the icon and element having the class sticky-column @@ -61,5 +65,20 @@ patch(ListRenderer.prototype, { $(this.__owl__.bdom.parentEl.querySelectorAll('.clicked-header')).removeClass('clicked-header'); const $tableHeaders = $(this.__owl__.bdom.parentEl.querySelectorAll('.o_list_table th')); $tableHeaders.removeClass('sticky-column').css('left', ''); + }, + saveManagerData(num) { + return this.env.model.orm.call( + 'ir.ui.view', + 'save_manager_data', + [ + this.env.config.viewId, + { + columns: this.props.ooManagerColumns, + filter: this.props.ooManagerFilter, + serial_num: this.props.ooManagerSerialNum, + frozen_columns: num, // 加入保存 + } + ] + ); } }); diff --git a/tree_view_advanced_filter/static/src/list_view_sticky_header_and_column/xml/list_view_sticky_header_and_column.xml b/tree_view_advanced_filter/static/src/list_view_sticky_header_and_column/xml/list_view_sticky_header_and_column.xml index 82d9ff4d7..31d120867 100644 --- a/tree_view_advanced_filter/static/src/list_view_sticky_header_and_column/xml/list_view_sticky_header_and_column.xml +++ b/tree_view_advanced_filter/static/src/list_view_sticky_header_and_column/xml/list_view_sticky_header_and_column.xml @@ -1,49 +1,52 @@ - - + - - - - - - - + + + - - - - - - + + + - - - - - - + + + - - - - - + + + \ No newline at end of file diff --git a/tree_view_advanced_filter/static/src/web_list_num/list_renderer.js b/tree_view_advanced_filter/static/src/web_list_num/list_renderer.js index 88b335904..b5986ab20 100644 --- a/tree_view_advanced_filter/static/src/web_list_num/list_renderer.js +++ b/tree_view_advanced_filter/static/src/web_list_num/list_renderer.js @@ -1,12 +1,12 @@ /** @odoo-module **/ -import {patch} from "@web/core/utils/patch"; -import {ListRenderer} from "@web/views/list/list_renderer"; +import { patch } from "@web/core/utils/patch"; +import { ListRenderer } from "@web/views/list/list_renderer"; patch(ListRenderer.prototype, { - setup(){ - super.setup(); - this.numSwitch = this.constructor.name === 'ListRenderer'; + setup() { + super.setup(); + this.numSwitch = this.constructor.name === 'ListRenderer'; }, // The following code manipulates the DOM directly to avoid having to wait for a @@ -43,7 +43,7 @@ patch(ListRenderer.prototype, { if (!th.style.width) { th.style.width = `${Math.floor(this.columnWidths[index])}px`; } - if (Array.from(th.classList).includes('list-number')){ + if (Array.from(th.classList).includes('list-number')) { th.style.width = `${String(this.props.list.offset || this.props.list.limit).length * 20}px`; } }); From 0767df8158f2a37d551e90513ea33928001ada95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Thu, 3 Jul 2025 00:10:01 +0800 Subject: [PATCH 3/4] 1 --- oo_list_manager/__manifest__.py | 38 +++-- oo_list_manager/models/ir_ui_view.py | 20 ++- .../static/src/views/list/list_controller.js | 30 ++-- .../static/src/views/list/list_controller.xml | 46 +++--- .../static/src/views/list/list_renderer.js | 150 +++++++----------- 5 files changed, 125 insertions(+), 159 deletions(-) diff --git a/oo_list_manager/__manifest__.py b/oo_list_manager/__manifest__.py index 00233c276..2c4de9c41 100644 --- a/oo_list_manager/__manifest__.py +++ b/oo_list_manager/__manifest__.py @@ -1,31 +1,39 @@ # -*- coding: utf-8 -*- { - "name": "oo_list_manager", - "summary": "Short (1 phrase/line) summary of the module's purpose", - "description": """ - Long description of module's purpose + 'name': "oo_list_manager", + + 'summary': "Short (1 phrase/line) summary of the module's purpose", + + 'description': """ +Long description of module's purpose """, - "author": "My Company", - "website": "https://www.yourcompany.com", + + 'author': "My Company", + 'website': "https://www.yourcompany.com", + # Categories can be used to filter modules in modules listing # Check https://github.com/odoo/odoo/blob/15.0/odoo/addons/base/data/ir_module_category_data.xml # for the full list - "category": "Uncategorized", - "version": "0.1", + 'category': 'Uncategorized', + 'version': '0.1', + # any module necessary for this one to work correctly - "depends": ["base", "web", "tree_view_advanced_filter"], + 'depends': ['base', 'web', 'tree_view_advanced_filter'], + # always loaded - "data": [ + 'data': [ # 'security/ir.model.access.csv', + 'views/ir_ui_view.xml' ], # only loaded in demonstration mode "application": True, "auto_install": False, - "license": "LGPL-3", - "assets": { - "web.assets_backend": [ - "oo_list_manager/static/src/views/list/*", - "oo_list_manager/static/src/views/auto_hide_list/*", + 'license': 'LGPL-3', + 'assets': { + 'web.assets_backend': [ + 'oo_list_manager/static/src/views/list/*', + 'oo_list_manager/static/src/views/auto_hide_list/*', ] }, } + diff --git a/oo_list_manager/models/ir_ui_view.py b/oo_list_manager/models/ir_ui_view.py index 14b516f39..f9355119f 100644 --- a/oo_list_manager/models/ir_ui_view.py +++ b/oo_list_manager/models/ir_ui_view.py @@ -4,15 +4,27 @@ from odoo import models, fields, api class IrUiView(models.Model): - _inherit = "ir.ui.view" + _inherit = 'ir.ui.view' - manager_data = fields.Json(string="data") + manager_data = fields.Json(string='data') + group_ids = fields.Many2many('res.groups', string='Groups') def get_manager_data(self): + if not self: + return {} self.ensure_one() - return self.manager_data or {} + + resp = self.manager_data or {} + resp.update({ + 'show': self.env.uid in self.group_ids.users.ids + }) + return resp def save_manager_data(self, manager_data): + if not self: + return False self.ensure_one() - self.sudo().write({"manager_data": manager_data}) + self.sudo().write({ + 'manager_data': manager_data + }) return True diff --git a/oo_list_manager/static/src/views/list/list_controller.js b/oo_list_manager/static/src/views/list/list_controller.js index b53e82485..ebd1ffd53 100644 --- a/oo_list_manager/static/src/views/list/list_controller.js +++ b/oo_list_manager/static/src/views/list/list_controller.js @@ -1,13 +1,13 @@ /** @odoo-module **/ -import { ListController } from "@web/views/list/list_controller"; -import { patch } from "@web/core/utils/patch"; -import { onWillStart, useState, useRef, useExternalListener } from "@odoo/owl"; -import { Dropdown } from "@web/core/dropdown/dropdown"; -import { CheckBox } from "@web/core/checkbox/checkbox"; -import { useSortable } from "@web/core/utils/sortable_owl"; -import { useService } from "@web/core/utils/hooks"; -import { usePosition } from "@web/core/position_hook"; +import {ListController} from "@web/views/list/list_controller"; +import {patch} from "@web/core/utils/patch"; +import {onWillStart, useState, useRef, useExternalListener} from "@odoo/owl"; +import {Dropdown} from "@web/core/dropdown/dropdown"; +import {CheckBox} from "@web/core/checkbox/checkbox"; +import {useSortable} from "@web/core/utils/sortable_owl"; +import {useService} from "@web/core/utils/hooks"; +import {usePosition} from "@web/core/position_hook"; patch(ListController.prototype, { @@ -24,7 +24,6 @@ patch(ListController.prototype, { key: '', filter: false, serial_num: false, - frozen_columns: 0, // 新增字段 columns: this.archInfo.columns.filter((column) => { if (column.type === "field" && column.widget !== 'handle') { return column @@ -34,7 +33,7 @@ patch(ListController.prototype, { onWillStart(async () => { const manager_data = await this.orm.call('ir.ui.view', 'get_manager_data', [this.env.config.viewId]); - if (!Object.keys(manager_data).length) { + if (!Object.keys(manager_data).length || !manager_data.columns) { this.ooManager.columns.forEach(val => { val.visibility = !!!val.column_invisible; }) @@ -42,6 +41,7 @@ patch(ListController.prototype, { Object.assign(this.ooManager, manager_data); this.archInfo.advanced_filter = this.ooManager.filter; } + this.ooManager.show = manager_data.show; }) usePosition('ooListRef', () => this.ooManagerRef.el, { @@ -106,7 +106,7 @@ patch(ListController.prototype, { * @param params */ sortColumnDrop(params) { - const { element, previous } = params; + const {element, previous} = params; const fromId = element.dataset.id; const toId = previous ? previous.dataset.id : null; @@ -144,18 +144,10 @@ patch(ListController.prototype, { columns: this.ooManager.columns, filter: this.ooManager.filter, serial_num: this.ooManager.serial_num, - frozen_columns: this.ooManager.frozen_columns, // 加入保存 } ] ); }, - onChangeFrozenColumns() { - this.isChange = true; - this.saveManagerData(); - }, - updateForzenColumns(num) { - this.ooManager.frozen_columns = num; - } }) ListController.components = { diff --git a/oo_list_manager/static/src/views/list/list_controller.xml b/oo_list_manager/static/src/views/list/list_controller.xml index c47aae9a2..14a6c4de4 100644 --- a/oo_list_manager/static/src/views/list/list_controller.xml +++ b/oo_list_manager/static/src/views/list/list_controller.xml @@ -1,37 +1,32 @@ + -
+
-
-
-
-
+
+
+
+
表头查询:
-
- -
-
-
-
+
+ +
+
+
+
行号:
-
- -
-
- -
-
+
+ +
+
+
+
@@ -48,7 +43,7 @@
-
+
@@ -67,9 +62,8 @@ ooManagerColumns="ooManager.columns" ooManagerFilter="ooManager.filter" ooManagerSerialNum="ooManager.serial_num" - ooManagerFrozenColumns="ooManager.frozen_columns" - updateForzenColumns.bind="updateForzenColumns" /> + \ No newline at end of file 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 9fbfa564d..e1a1bbc2b 100644 --- a/oo_list_manager/static/src/views/list/list_renderer.js +++ b/oo_list_manager/static/src/views/list/list_renderer.js @@ -1,88 +1,34 @@ /** @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 { onMounted } from "@odoo/owl"; +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" patch(ListRenderer.prototype, { setup() { super.setup(); - if (this.isX2Many) { + if(this.isX2Many) { this.props.ooManagerSerialNum = true; } - - this.frozenColumns = this.props.ooManagerColumns?.length - ? this.props.ooManagerColumns.slice(0, this.props.ooManagerColumns.length) - : []; - - this.frozenColumnCount = Number(this.props.ooManagerFrozenColumns || 0); - - onMounted(() => { - this.applyFrozenColumnsIfNeeded(); - }); - }, - - applyFrozenColumnsIfNeeded() { - const frozenCount = this.frozenColumnCount + (this.props.ooManagerSerialNum ? 1 : 0); - if (frozenCount > 0) { - this.applyFrozenColumns(frozenCount); - } - }, - - applyFrozenColumns(n) { - const parent = this.__owl__.bdom.parentEl; - - // 清除旧样式 - $(parent.querySelectorAll('.sticky-column')).removeClass('sticky-column').css('left', ''); - $(parent.querySelectorAll('.clicked-header')).removeClass('clicked-header'); - - const $tableHeaders = $(parent.querySelectorAll('.o_list_table th')); - const $tableRows = $(parent.querySelectorAll('.o_list_table tr')); - const $tfootRow = $(parent.querySelectorAll('.o_list_table tfoot tr')[0]?.children || []); - const $searchTds = $(parent.querySelectorAll(`.search_td`)); - - const columnsToAdjust = n; - - $tableHeaders.each((i, el) => { - if (i < columnsToAdjust) { - $(el).addClass('sticky-column').css('left', `${$(el).position().left}px`); - } - }); - - $searchTds.each((i, el) => { - if (i < columnsToAdjust) { - $(el).addClass('sticky-column').css('left', `${$(el).position().left}px`); - } - }); - - $tableRows.each((_, row) => { - const $cells = $(row).find('td'); - $cells.each((i, el) => { - if (i < columnsToAdjust) { - $(el).addClass('sticky-column').css('left', `${$(el).position().left}px`); - } - }); - }); - - $($tfootRow).each((i, el) => { - if (i < columnsToAdjust) { - $(el).addClass('sticky-column').css('left', `${$(el).position().left}px`); - } - }); }, getActiveColumns(list) { if (this.props.ooManagerColumns) { const columns = this.allColumns.filter((col) => { if (list.isGrouped && col.widget === "handle") { + return false; // no handle column if the list is grouped + } + const mColumn = this.props.ooManagerColumns.find(item => item.id === col.id) + if (mColumn) { + return mColumn.visibility; + } + if (col.optional && !this.optionalActiveFields[col.name]) { + return false; + } + if (this.evalColumnInvisible(col.column_invisible)) { return false; } - const mColumn = this.props.ooManagerColumns.find(item => item.id === col.id); - if (mColumn) return mColumn.visibility; - if (col.optional && !this.optionalActiveFields[col.name]) return false; - if (this.evalColumnInvisible(col.column_invisible)) return false; return true; }); @@ -92,7 +38,8 @@ patch(ListRenderer.prototype, { return seqX - seqY; }); - return columns; + return columns + } else { return super.getActiveColumns(list); } @@ -108,65 +55,83 @@ patch(ListRenderer.prototype, { }); }, + /** + * 宽度 + * @param allowedWidth + * @returns {*} + */ computeColumnWidthsFromContent(allowedWidth) { const columnWidths = super.computeColumnWidthsFromContent(allowedWidth); if (!this.props.ooManagerColumns) return columnWidths; - const table = this.tableRef.el; + + // Toggle a className used to remove style that could interfere with the ideal width + // computation algorithm (e.g. prevent text fields from being wrapped during the + // computation, to prevent them from being completely crushed) table.classList.add("o_list_computing_widths"); const headers = [...table.querySelectorAll("thead th")]; + headers.forEach((th, index) => { const id = th.getAttribute('data-id'); - const mColumn = this.props.ooManagerColumns.find(item => item.id === id); - if (mColumn?.width) { + const mColumn = this.props.ooManagerColumns.find(item => item.id === id) + if (mColumn && mColumn.width) { columnWidths[index] = mColumn.width; } }); + // We are no longer computing widths, so restore the normal style table.classList.remove("o_list_computing_widths"); return columnWidths; }, + /** + * 样式 + * @param column + * @returns {string} + */ getColumnStyle(column) { if (!this.props.ooManagerColumns) return ''; const mColumn = this.props.ooManagerColumns.find(item => item.id === column.id); - return mColumn?.color ? `color: ${mColumn.color}` : ''; + if (mColumn && mColumn.color) { + return 'color: ' + mColumn.color; + } else { + return ''; + } }, - async _renderSearchPanel() { + _renderSearchPanel: async function () { if (this.isX2Many) { return ListRendererCust._renderSearchPanel.call(this); } - if (!this.props.archInfo.advanced_filter) { $('.o_filter_box').remove(); } else { 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; + var List = this.props.list; + const bm_params = List.model.__bm_load_params__; + const rootRef = this.rootRef.el const tableRef = this.tableRef.el; - tableRef.removeAttribute('style'); - - const columns = this.getActiveColumns(List); - const $tr1 = $('', { class: 'o_filter_box' }).append(columns.map(c => this._renderHeaderCellSearch(c))); + tableRef.removeAttribute('style') + const columns = this.getActiveColumns(this.props.list); + var $tr1 = $('', {class: 'o_filter_box'}).append(columns.map(columns => this._renderHeaderCellSearch(columns))); if (this.props.ooManagerSerialNum) { + // 添加行号占位td $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')); } - const $existing = $(tableRef).find('.search_td'); - if ($existing.length) { - $existing.parent().replaceWith($tr1); + if ($(tableRef).find('.search_td').length) { + $(tableRef).find('.search_td').parent().replaceWith($tr1) } else { $tr1.insertAfter($(tableRef).find('tr')[0]); } @@ -175,15 +140,10 @@ patch(ListRenderer.prototype, { 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))); rootRef.querySelectorAll('thead tr td').forEach((a) => a.addEventListener('keypress', this._onKeyPress.bind(this))); - - // ✅ 插入搜索框后执行冻结逻辑 - this.applyFrozenColumnsIfNeeded(); } } -}); +}) -// 注入 Props -ListRenderer.props.push('ooManagerColumns?'); -ListRenderer.props.push('ooManagerFilter?'); -ListRenderer.props.push('ooManagerSerialNum?'); -ListRenderer.props.push('ooManagerFrozenColumns?'); +ListRenderer.props.push('ooManagerColumns?') +ListRenderer.props.push('ooManagerFilter?') +ListRenderer.props.push('ooManagerSerialNum?') From b7e54d8dd8e3bf813cce6bedaf730f520c4eaceb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Thu, 3 Jul 2025 00:13:53 +0800 Subject: [PATCH 4/4] 1 --- tree_view_advanced_filter/__manifest__.py | 3 +- .../js/list_view_sticky_header_and_column.js | 21 +------ .../list_view_sticky_header_and_column.xml | 55 +++++++++---------- .../static/src/web_list_num/list_renderer.js | 12 ++-- 4 files changed, 35 insertions(+), 56 deletions(-) diff --git a/tree_view_advanced_filter/__manifest__.py b/tree_view_advanced_filter/__manifest__.py index 3957243d2..6ecbf76cc 100644 --- a/tree_view_advanced_filter/__manifest__.py +++ b/tree_view_advanced_filter/__manifest__.py @@ -67,9 +67,10 @@ "tree_view_advanced_filter/static/src/web_list_num/**/*", "tree_view_advanced_filter/static/src/list_view_sticky_header_and_column/js/*", "tree_view_advanced_filter/static/src/list_view_sticky_header_and_column/xml/*", - "tree_view_advanced_filter/static/src/list_view_sticky_header_and_column/scss/*", + "tree_view_advanced_filter/static/src/list_view_sticky_header_and_column/scss/*" ] }, + "images": ["static/description/banner.jpg"], "installable": True, "auto_install": False, diff --git a/tree_view_advanced_filter/static/src/list_view_sticky_header_and_column/js/list_view_sticky_header_and_column.js b/tree_view_advanced_filter/static/src/list_view_sticky_header_and_column/js/list_view_sticky_header_and_column.js index 05f3d1f1f..0930bfa4b 100644 --- a/tree_view_advanced_filter/static/src/list_view_sticky_header_and_column/js/list_view_sticky_header_and_column.js +++ b/tree_view_advanced_filter/static/src/list_view_sticky_header_and_column/js/list_view_sticky_header_and_column.js @@ -2,12 +2,11 @@ /** This file will used to stick the selected header and column in the list view **/ import { patch } from "@web/core/utils/patch"; import { ListRenderer } from "@web/views/list/list_renderer"; -import { useService } from "@web/core/utils/hooks"; patch(ListRenderer.prototype, { /** super the setup function **/ setup() { super.setup(); - this.orm = useService('orm'); + }, /** * function defining the button having t-on-click _onClick @@ -52,9 +51,6 @@ patch(ListRenderer.prototype, { } } }); - // debugger - // this.props.updateForzenColumns(columnIndex); - this.saveManagerData(columnIndex); }, /** * super onClickSortColumn function and remove the icon and element having the class sticky-column @@ -65,20 +61,5 @@ patch(ListRenderer.prototype, { $(this.__owl__.bdom.parentEl.querySelectorAll('.clicked-header')).removeClass('clicked-header'); const $tableHeaders = $(this.__owl__.bdom.parentEl.querySelectorAll('.o_list_table th')); $tableHeaders.removeClass('sticky-column').css('left', ''); - }, - saveManagerData(num) { - return this.env.model.orm.call( - 'ir.ui.view', - 'save_manager_data', - [ - this.env.config.viewId, - { - columns: this.props.ooManagerColumns, - filter: this.props.ooManagerFilter, - serial_num: this.props.ooManagerSerialNum, - frozen_columns: num, // 加入保存 - } - ] - ); } }); diff --git a/tree_view_advanced_filter/static/src/list_view_sticky_header_and_column/xml/list_view_sticky_header_and_column.xml b/tree_view_advanced_filter/static/src/list_view_sticky_header_and_column/xml/list_view_sticky_header_and_column.xml index 31d120867..82d9ff4d7 100644 --- a/tree_view_advanced_filter/static/src/list_view_sticky_header_and_column/xml/list_view_sticky_header_and_column.xml +++ b/tree_view_advanced_filter/static/src/list_view_sticky_header_and_column/xml/list_view_sticky_header_and_column.xml @@ -1,52 +1,49 @@ - - + - - - - - - + + + + - - - - - - + + + - - - - - - + + + - - - - - \ No newline at end of file + + + diff --git a/tree_view_advanced_filter/static/src/web_list_num/list_renderer.js b/tree_view_advanced_filter/static/src/web_list_num/list_renderer.js index b5986ab20..88b335904 100644 --- a/tree_view_advanced_filter/static/src/web_list_num/list_renderer.js +++ b/tree_view_advanced_filter/static/src/web_list_num/list_renderer.js @@ -1,12 +1,12 @@ /** @odoo-module **/ -import { patch } from "@web/core/utils/patch"; -import { ListRenderer } from "@web/views/list/list_renderer"; +import {patch} from "@web/core/utils/patch"; +import {ListRenderer} from "@web/views/list/list_renderer"; patch(ListRenderer.prototype, { - setup() { - super.setup(); - this.numSwitch = this.constructor.name === 'ListRenderer'; + setup(){ + super.setup(); + this.numSwitch = this.constructor.name === 'ListRenderer'; }, // The following code manipulates the DOM directly to avoid having to wait for a @@ -43,7 +43,7 @@ patch(ListRenderer.prototype, { if (!th.style.width) { th.style.width = `${Math.floor(this.columnWidths[index])}px`; } - if (Array.from(th.classList).includes('list-number')) { + if (Array.from(th.classList).includes('list-number')){ th.style.width = `${String(this.props.list.offset || this.props.list.limit).length * 20}px`; } });