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

jikimo_frontend/static/src/scss/custom_style.scss

@@ -132,11 +132,11 @@ td.o_required_modifier {
   //font-weight: bold;
 }
 
-//.text-truncate {
-//  overflow: unset !important;
-//  text-overflow: unset !important;
-//  white-space: nowrap!important;
-//}
+.text-truncate {
+  overflow: unset !important;
+  text-overflow: unset !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) {
   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 {
   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 {
   flex-direction: unset!important;
+}
+
+.o_list_renderer .flex-row-reverse > .text-end {
+  text-align: left!important;
 }

sf_sale/static/js/setTableWidth.js

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

sf_tool_management/static/src/change.scss

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