jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug

Browse Source
This commit is contained in:
qihao.gong@jikimo.com
2024-01-08 16:39:15 +08:00
parent 631d59f95e 3c65b3e3df
commit 317b5d4ced
3 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
jikimo_frontend/static/src/scss/custom_style.scss
View File

@@ -132,11 +132,11 @@ td.o_required_modifier {
//font-weight: bold; //font-weight: bold;
} }
//.text-truncate { .text-truncate {
// overflow: unset !important; overflow: unset !important;
// text-overflow: unset !important; text-overflow: unset !important;
// white-space: nowrap!important; //white-space: nowrap!important;
//} }
.o_list_renderer .o_list_table tbody > tr > td:not(.o_list_record_selector):not(.o_handle_cell):not(.o_list_button):not(.o_list_record_remove) { .o_list_renderer .o_list_table tbody > tr > td:not(.o_list_record_selector):not(.o_handle_cell):not(.o_list_button):not(.o_list_record_remove) {
white-space: nowrap !important; white-space: nowrap !important;
@@ -425,7 +425,13 @@ div:has(.o_required_modifier) > label::before {
.o_list_renderer .o_list_table thead .o_list_number_th { .o_list_renderer .o_list_table thead .o_list_number_th {
text-align:left; text-align:left;
} }
.o_list_renderer .o_list_table tbody > tr > td:not(.o_list_record_selector).o_list_number {
text-align: left;
}
.o_list_renderer .flex-row-reverse { .o_list_renderer .flex-row-reverse {
flex-direction: unset!important; flex-direction: unset!important;
}
.o_list_renderer .flex-row-reverse > .text-end {
text-align: left!important;
} }

5
sf_sale/static/js/setTableWidth.js
View File

@@ -11,15 +11,16 @@ function setTableWidth() {
const tbody_tr = dom.find('tbody').children('tr') const tbody_tr = dom.find('tbody').children('tr')
dom.find('thead').children('tr').children().each(function () { dom.find('thead').children('tr').children().each(function () {
$('#widthTest').text($(this).text()) $('#widthTest').text($(this).text())
const width = $('#widthTest').width() const width = $('#widthTest').width() + 10
const i = $(this).index() const i = $(this).index()
console.log(111)
tbody_tr.each(function () { tbody_tr.each(function () {
if($(this).children().length > 2) { if($(this).children().length > 2) {
$(this).children().eq(i).css('min-width', width + 'px') $(this).children().eq(i).css('min-width', width + 'px')
} }
}) })
}) })
const resizeEvent = new Event('resize');
window.dispatchEvent(resizeEvent);
} }
$(function () { $(function () {

6
sf_tool_management/static/src/change.scss
View File

@@ -11,11 +11,7 @@
} }
.o_form_view .o_field_widget .o_list_renderer { .o_form_view .o_field_widget .o_list_renderer {
width: calc(100% - 64px) !important; width: 100%!important;
margin:0 auto; margin:0 auto;
overflow: auto; overflow: auto;
} }
.o_list_renderer .o_list_table tbody > tr > td:not(.o_list_record_selector).o_list_number {
text-align: left;
}