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

# Conflicts:
#	sf_base/static/src/scss/test.scss

mrp_workorder/static/src/scss/table_custom.scss

@@ -0,0 +1,28 @@
+.o_form_view.o_xxl_form_view {
+  flex-flow: column !important;
+}
+
+.o_form_view_container {
+  width: 100% !important;
+}
+
+html .o_web_client > .o_action_manager > .o_action {
+  height: unset !important;
+  overflow: scroll !important;
+}
+
+.o_FormRenderer_chatterContainer.o-aside {
+  width: 100% !important;
+  max-width: 1320px !important;
+  background-color: #fff !important;
+  padding-left: 32px !important;
+  padding-right: 32px !important;
+  box-sizing: border-box !important;
+  border: 1px solid #dee2e6;
+  //margin-bottom: 12px;
+}
+
+.o_form_view {
+  background-color: unset !important;
+  min-height: unset !important;
+}

mrp_workorder/static/src/scss/tablet_view.scss

@@ -162,14 +162,17 @@
           > div.o_workorder_lot {
             width: 100%;
             justify-content: center;
+
             > .o_lot_number {
               width: 50%;
+
               &:not(.o_with_button) button.o_external_button {
                 display: block !important;
                 visibility: hidden;
               }
             }
           }
+
           > div {
             display: inline-flex;
             align-items: baseline;
@@ -225,27 +228,4 @@
   }
 }
 
-.o_form_view.o_xxl_form_view {
-    flex-flow:column !important;
-}
 
-.o_form_view_container {
-    width:100% !important;
-}
-
-html .o_web_client > .o_action_manager > .o_action {
-    overflow:scroll !important;
-}
-
-.o_FormRenderer_chatterContainer.o-aside {
-    width:100% !important;
-    max-width: 1320px !important;
-    background-color:#ccc !important;
-}
-
-.o_form_view {
-    background-color:unset !important;
-    border: 1px solid #C9CCD2 !important;
-    border-left-color:unset !important;
-    box-shadow: 0 5px 20px -15px rgb(0 0 0 / 40%) !important;
-}

sf_base/static/src/scss/test.scss

@@ -1,12 +1,14 @@
 .test_model {
   display: flex !important;
 }
+
 .test_model > .o_form_label {
   margin-left: 20px;
   margin-right: 0px !important;
   white-space: nowrap;
 }
-.o_form_label.o_field_invalid::after {
+
+div:has(.o_required_modifier)>label::before {
   content: '*' !important;
   color: red !important;
   padding: 0 4px !important;
@@ -29,4 +31,9 @@
 }
 .o_kanban_renderer .o_kanban_record .o_kanban_record_bottom {
   margin-top: 5px;
+  display: inline !important;
+}
+
+.o_required_modifier {
+  display: flex !important;
 }