Accept Merge Request #2149: (feature/前端样式修改 -> develop)
Merge Request: 修复出厂检验质检单详情手动新增明细行后右边的【删除】按钮显示不全 Created By: @黄焱 Reviewed By: @胡尧 Approved By: @胡尧 Accepted By: @黄焱 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2149?initial=true
This commit is contained in:
@@ -119,7 +119,9 @@ patch(ListRenderer.prototype, 'jikimo_frontend.ListRenderer', {
|
|||||||
this.listherHeaderBodyNum()
|
this.listherHeaderBodyNum()
|
||||||
})
|
})
|
||||||
const treeModifiers = this.getFieldModifiers(this.props.archInfo.__rawArch);
|
const treeModifiers = this.getFieldModifiers(this.props.archInfo.__rawArch);
|
||||||
|
|
||||||
if(treeModifiers) {
|
if(treeModifiers) {
|
||||||
|
if(treeModifiers.merge_fields) {
|
||||||
this.props.merge_key = treeModifiers.merge_key;
|
this.props.merge_key = treeModifiers.merge_key;
|
||||||
this.props.merge_fields = treeModifiers.merge_fields.split(',');
|
this.props.merge_fields = treeModifiers.merge_fields.split(',');
|
||||||
const data = this.setColumns(this.props.merge_key);
|
const data = this.setColumns(this.props.merge_key);
|
||||||
@@ -127,6 +129,15 @@ patch(ListRenderer.prototype, 'jikimo_frontend.ListRenderer', {
|
|||||||
this.mergeColumns(this.props.merge_fields, data)
|
this.mergeColumns(this.props.merge_fields, data)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
if(treeModifiers.pacthResize) {
|
||||||
|
|
||||||
|
owl.onPatched(() => {
|
||||||
|
this.columnWidths = null;
|
||||||
|
this.freezeColumnWidths();
|
||||||
|
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
return this._super(...arguments);
|
return this._super(...arguments);
|
||||||
},
|
},
|
||||||
setRequired() {
|
setRequired() {
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<field name="name">quality.check.measure.line.tree</field>
|
<field name="name">quality.check.measure.line.tree</field>
|
||||||
<field name="model">quality.check.measure.line</field>
|
<field name="model">quality.check.measure.line</field>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<tree editable="bottom" class="measureTable">
|
<tree editable="bottom" class="measureTable" attrs="{ 'pacthResize': True }">
|
||||||
<!-- <field name="sequence" class="measureTableSequence"/> -->
|
<!-- <field name="sequence" class="measureTableSequence"/> -->
|
||||||
<!-- <field name="column_nums"/> -->
|
<!-- <field name="column_nums"/> -->
|
||||||
<field name="measure_item"/>
|
<field name="measure_item"/>
|
||||||
|
|||||||
Reference in New Issue
Block a user