admin/gr_report_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

解决冲突

Browse Source
This commit is contained in:
chy
2026-02-12 09:32:15 +08:00
parent e7dd16454c
commit aa853f539b
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/LowDesign/src/LowReport/index.vue
View File

@@ -191,10 +191,7 @@ const initTable = async () => {
border: reportVo.tableConfig.includes('border'), border: reportVo.tableConfig.includes('border'),
stripe: reportVo.tableConfig.includes('stripe'), stripe: reportVo.tableConfig.includes('stripe'),
showSummary:false, showSummary:false,
<<<<<<< HEAD
stripe:true, stripe:true,
=======
>>>>>>> zh
column: {} column: {}
} }

8
src/views/lowdesign/reportDesign/designData.ts
View File

@@ -196,11 +196,11 @@ for (const key in infoColumn) {
//默认值 //默认值
const infoDefaultData = { const infoDefaultData = {
basics: { basics: {
<<<<<<< HEAD
fieldCode: '', fieldName: '', parentFieldName: '', labelI18n: '', fieldType: 'String', queryIsDb: 'N', queryIsWeb: 'N', queryMode: 'LIKE', dictCode: '',isHideCol:'N', isExport: 'Y', isShowSort: 'N', isAmount: '', isDimension: '',isHideDimension:'', hasChildren: 'N', isSubField: false, parentFieldId: '', parentFieldCode: '', // fieldCode: '', fieldName: '', parentFieldName: '', labelI18n: '', fieldType: 'String', queryIsDb: 'N', queryIsWeb: 'N', queryMode: 'LIKE', dictCode: '',isHideCol:'N', isExport: 'Y', isShowSort: 'N', isAmount: '', isDimension: '',isHideDimension:'', hasChildren: 'N', isSubField: false, parentFieldId: '', parentFieldCode: '',
=======
fieldCode: '', fieldName: '', parentFieldName: '', labelI18n: '', fieldType: 'String', isFixedColumn: 'N', fixedColumnValue: '', queryIsDb: 'N', queryIsWeb: 'N', queryMode: 'LIKE', dictCode: '', isExport: 'Y', isShowSort: 'N', isAmount: '', isDimension: '', isDynamicGroup: 'N', hasChildren: 'N', isSubField: false, parentFieldId: '', parentFieldCode: '', fieldCode: '', fieldName: '', parentFieldName: '', labelI18n: '', fieldType: 'String', isFixedColumn: 'N', fixedColumnValue: '', queryIsDb: 'N', queryIsWeb: 'N', queryMode: 'LIKE', dictCode: '', isExport: 'Y', isShowSort: 'N', isAmount: '', isDimension: '', isDynamicGroup: 'N', hasChildren: 'N', isSubField: false, parentFieldId: '', parentFieldCode: '',
>>>>>>> zh
}, },
} }