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

Merge branch 'develop' into feature/sf看板样式统一

Browse Source 
# Conflicts:
#	jikimo_frontend/static/src/scss/custom_style.scss
This commit is contained in:
WEB许何哲\xuhez
2023-10-20 16:31:40 +08:00
parent a109c0fb39 9b5a0162ff
commit d023848c70
39 changed files with 2476 additions and 1759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jikimo_frontend/__manifest__.py
View File

@@ -10,7 +10,7 @@
""",
'category': 'sf',
'website': 'https://www.sf.jikimo.com',
'depends': [],
'depends': ['web'],
'data': [
],
@@ -23,6 +23,10 @@
'web.assets_backend': [
'jikimo_frontend/static/src/fields/custom_many2many_checkboxes/*',
'jikimo_frontend/static/src/scss/custom_style.scss',
# 'jikimo_frontend/static/src/views/list_nums/list_nbCols.js',
'jikimo_frontend/static/src/views/list_nums/list_nums.xml',
'jikimo_frontend/static/src/views/list_nums/list_nums2.xml',
'jikimo_frontend/static/src/views/list_nums/list_nums3.xml',
],
},

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

@@ -3,7 +3,7 @@
}
.test_model > .o_form_label {
margin-left: 20px;
margin-left: 0px !important;
margin-right: 0px !important;
white-space: nowrap;
}
@@ -251,6 +251,12 @@ div[class="o_content o_component_with_search_panel"] .o_kanban_primary_right > .
top: 55px;
right: 43.5%;
}
//------------------------------------------
.test_model > .o_form_label {
margin-left: 4px !important;
line-height: 0 !important;
}
@media screen and (min-width: 1200px) {
div[class="o_content o_component_with_search_panel"] .o_kanban_primary_right > .row {
@@ -284,3 +290,51 @@ div[class="o_content o_component_with_search_panel"] .o_kanban_primary_right > .
.text-bg-warning {
background-color: #FED300 !important;
}
<<<<<<< HEAD
=======
.test_model>div {
display: flex;
width: 40%;
}
.test_model>div .o_field_widget {
width: 40% !important;
}
.o_form_label {
font-weight: 700 !important;
}
.bigger .o_horizontal_separator {
font-size: 1.5rem;
}
.o_horizontal_separator {
font-size: 1.5rem;
}
.o_field_widget input[class='o_input'] {
text-align: center
}
div:has(.o_required_modifier) > label::before {
position: absolute;
left: -3px;
}
.o_form_view .o_form_label {
position: relative;
width: 9rem;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
padding-left: 1rem;
}
.o_form_view .o_form_label:hover {
white-space: normal;
overflow: visible;
}
>>>>>>> develop

11
jikimo_frontend/static/src/views/list_nums/list_nbCols.js Normal file
View File

@@ -0,0 +1,11 @@
/** @odoo-module **/
import { patch } from "@web/core/utils/patch";
import { ListRenderer } from "@web/views/list/list_renderer";
patch(ListRenderer.prototype, '/jikimo_frontend/static/src/views/list_nums/list_nbCols.js', {
get nbCols() {
const nbCols = this._super(...arguments);
return nbCols + 1;
}
});

74
jikimo_frontend/static/src/views/list_nums/list_nums.xml Normal file
View File

@@ -0,0 +1,74 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- <odoo> -->
<!-- <data> -->
<!-- <templates xml:space="preserve"> -->
<t t-name="og.web.ListRenderer" t-inherit="web.ListRenderer" t-inherit-mode="extension">
<xpath expr="//table/thead/tr/th[@t-if='hasSelectors']" position="before">
<th><i class="fa fa-list-ol"/></th>
</xpath>
</t>
<!-- 暂存，同一份文件中有问题，拆分后正常工作 -->
<!-- <t t-name="og.web.ListRenderer.Rows" t-inherit="web.ListRenderer.Rows" t-inherit-mode="extension"> -->
<!-- <xpath expr="//t[@t-key='record.id']/t[last()]" position="inside"> -->
<!-- <t t-set="recordSeq" t-value="record_index + 1"/> -->
<!-- <t t-set="recordOffset" t-value="list.offset"/> -->
<!-- </xpath> -->
<!-- </t> -->
<!-- <t t-name="og.web.ListRenderer.RecordRow" t-inherit="web.ListRenderer.RecordRow" t-inherit-mode="extension"> -->
<!-- <xpath expr="//tr/td[1]" position="before"> -->
<!-- <td> -->
<!-- <t t-esc="222"/> -->
<!-- </td> -->
<!-- </xpath> -->
<!-- </t> -->
<!-- <t t-set="recordlimit" t-value="list.limit"/> -->
<!-- <t t-set="recordpage" t-value="list.page"/> -->
<!-- <t t-set="recordpages" t-value="list.pages"/> -->
<!-- <t t-set="recordcount" t-value="list.count"/> -->
<!-- <t t-set="recordids" t-value="list.ids"/> -->
<!-- <t t-set="recordid" t-value="record.id"/> -->
<!-- <t t-set="recordindex" t-value="record.index"/> -->
<!-- <t t-set="recorddata" t-value="record.data"/> -->
<!-- <t t-set="recordstate" t-value="record.state"/> -->
<!-- <t t-set="recordres_id" t-value="record.res_id"/> -->
<!-- <t t-set="recordcontext" t-value="record.context"/> -->
<!-- <t t-set="recordmodel" t-value="record.model"/> -->
<!-- <t t-set="recordfields" t-value="record.fields"/> -->
<!-- <t t-set="recordfields_view" t-value="record.fields_view"/> -->
<!-- <t t-set="recordfields_keys" t-value="record.fields_keys"/> -->
<!-- <t t-set="recordfields_get" t-value="record.fields_get"/> -->
<!-- <t t-set="recordfields_raw" t-value="record.fields_raw"/> -->
<!-- <t t-set="recordfields_view_get" t-value="record.fields_view_get"/> -->
<!-- <t t-set="recordfields_view_raw" t-value="record.fields_view_raw"/> -->
<!-- <t t-set="recordfields_view_fields" t-value="record.fields_view_fields"/> -->
<!-- <t t-set="recordfields_view_arch" t-value="record.fields_view_arch"/> -->
<!-- <t t-set="recordfields_view_type" t-value="record.fields_view_type"/> -->
<!-- <t t-set="recordfields_view_inherit" t-value="record.fields_view_inherit"/> -->
<!-- <t t-set="recordfields_view_parent" t-value="record.fields_view_parent"/> -->
<!-- <t t-set="recordfields_view_id" t-value="record.fields_view_id"/> -->
<!-- <t t-set="recordfields_view_name" t-value="record.fields_view_name"/> -->
<!-- <t t-set="recordfields_view_mode" t-value="record.fields_view_mode"/> -->
<!-- <t t-set="recordfields_view_type" t-value="record.fields_view_type"/> -->
<!-- <t t-set="recordfields_view_arch" t-value="record.fields_view_arch"/> -->
<!-- <t t-set="recordfields_view_inherit" t-value="record.fields_view_inherit"/> -->
<!-- <t t-set="recordfields_view_parent" t-value="record.fields_view_parent"/> -->
<!-- <t t-set="recordfields_view_id" t-value="record.fields_view_id"/> -->
<!-- </templates> -->
<!-- <templates xml:space="preserve"> -->
<!-- </templates> -->
<!-- </data> -->
<!-- </odoo> -->

7
jikimo_frontend/static/src/views/list_nums/list_nums2.xml Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<t t-name="og.web.ListRenderer.Rows" t-inherit="web.ListRenderer.Rows" t-inherit-mode="extension">
<xpath expr="//t[@t-key='record.id']/t[last()]" position="inside">
<t t-set="recordSeq" t-value="record_index + 1"/>
<t t-set="recordOffset" t-value="list.offset"/>
</xpath>
</t>

8
jikimo_frontend/static/src/views/list_nums/list_nums3.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<t t-name="og.web.ListRenderer.RecordRow" t-inherit="web.ListRenderer.RecordRow" t-inherit-mode="extension">
<xpath expr="//tr/td[1]" position="before">
<td>
<t t-esc="recordOffset + recordSeq"/>
</td>
</xpath>
</t>