From aa853f539bc9d99ec03946dac67dfc70c524be7b Mon Sep 17 00:00:00 2001 From: chy Date: Thu, 12 Feb 2026 09:32:15 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/LowDesign/src/LowReport/index.vue | 3 --- src/views/lowdesign/reportDesign/designData.ts | 8 ++++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/components/LowDesign/src/LowReport/index.vue b/src/components/LowDesign/src/LowReport/index.vue index 9bc3347..cd766b9 100644 --- a/src/components/LowDesign/src/LowReport/index.vue +++ b/src/components/LowDesign/src/LowReport/index.vue @@ -191,10 +191,7 @@ const initTable = async () => { border: reportVo.tableConfig.includes('border'), stripe: reportVo.tableConfig.includes('stripe'), showSummary:false, -<<<<<<< HEAD stripe:true, -======= ->>>>>>> zh column: {} } diff --git a/src/views/lowdesign/reportDesign/designData.ts b/src/views/lowdesign/reportDesign/designData.ts index be077b0..43a9e61 100644 --- a/src/views/lowdesign/reportDesign/designData.ts +++ b/src/views/lowdesign/reportDesign/designData.ts @@ -196,11 +196,11 @@ for (const key in infoColumn) { //默认值 const infoDefaultData = { 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: '', ->>>>>>> zh + }, }