Accept Merge Request #727: (feature/前端样式修改 -> develop)

Merge Request: sf样式修改,保存,返回按钮修改

Created By: @黄焱
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/727?initial=true
This commit is contained in:
黄焱
2023-12-21 17:57:18 +08:00
committed by Coding
3 changed files with 51 additions and 15 deletions

View File

@@ -47,4 +47,16 @@ patch(FormStatusIndicator.prototype, 'jikimo_frontend.FormStatusIndicator', {
} }
); );
$(function (){
document.addEventListener('click', function () {
const dom = $('.o_form_status_indicator_buttons ')
if(dom) {
const dom1 = dom.children().eq(0)
const dom2 = dom.children().eq(1)
if(!dom1.text()) {
dom1.append('保存')
dom2.append('取消')
}
}
})
})

View File

@@ -328,19 +328,19 @@ div:has(.o_required_modifier) > label::before {
left: -3px; left: -3px;
} }
.o_form_view .o_form_label { //.o_form_view .o_form_label {
position: relative; // position: relative;
width: 9rem; // width: 9rem;
overflow: hidden; // overflow: hidden;
text-overflow: ellipsis; // text-overflow: ellipsis;
white-space: nowrap; // white-space: nowrap;
padding-left: 1rem; // padding-left: 1rem;
} //}
//
.o_form_view .o_form_label:hover { //.o_form_view .o_form_label:hover {
white-space: normal; // white-space: normal;
overflow: visible; // overflow: visible;
} //}
.o_form_view { .o_form_view {
.o_form_sheet_bg .o_form_sheet { .o_form_sheet_bg .o_form_sheet {
@@ -382,4 +382,22 @@ div:has(.o_required_modifier) > label::before {
margin-right: 10px; margin-right: 10px;
} }
} }
}
.o_stock_kanban .o_kanban_card_content {
.row {
align-items: center;
.o_kanban_primary_left, .o_kanban_primary_right {
display: block;
}
.o_kanban_primary_right {
position: unset;
}
}
}
// 机床换刀申请表格宽度设置
.o_list_table_ungrouped {
min-width: 1089px;
} }

View File

@@ -34,8 +34,14 @@ div:has(.o_required_modifier) > label::before {
.o_kanban_renderer .o_kanban_record .o_kanban_record_has_image_fill .o_kanban_image_fill_left { .o_kanban_renderer .o_kanban_record .o_kanban_record_has_image_fill .o_kanban_image_fill_left {
flex: unset !important; flex: unset !important;
min-width: 100px;
}
.o_kanban_renderer .o_kanban_record .o_kanban_record_title {
font-weight: bold;
}
.o_kanban_renderer .o_kanban_record .oe_kanban_details ul {
margin-top: calc(var(--KanbanRecord-gap-v) * 0.5);
} }
.o_kanban_renderer .o_kanban_record .o_kanban_record_bottom { .o_kanban_renderer .o_kanban_record .o_kanban_record_bottom {
margin-top: 5px; margin-top: 5px;
display: inline !important; display: inline !important;