diff --git a/src/components/LowDesign/src/LowReport/index.vue b/src/components/LowDesign/src/LowReport/index.vue index 6f556dc..2eb7dba 100644 --- a/src/components/LowDesign/src/LowReport/index.vue +++ b/src/components/LowDesign/src/LowReport/index.vue @@ -128,6 +128,7 @@ const tableInfo = ref({}) const timerObj = ref({}) const numberRange = ref([]) const dateRange=ref([]) +const hideColumns=ref([]) const dateTimeRange=ref([]) const timeRange=ref([]) const amountFieds=ref({}) @@ -178,6 +179,7 @@ const initTable = async () => { const isPage = reportVo.dataConfig?.includes('page') const isPermi = reportVo.dataConfig?.includes('authTrue') const isHideExport = reportVo.tableConfig?.includes('hideExport') + hideColumns.value=[] tableInfo.value = { ...reportVo, isPage, isHeight, isPermi, isHideExport } tableOption.value = { selection: !isHideExport, @@ -260,9 +262,11 @@ const initTable = async () => { if(item.isDimension=='Y'){ dimensionFields.value[config.prop]=config hideFeilds.value[config.prop]=item.isHideDimension - } - + if(item.isHideCol == 'Y') { + config.hide = true + hideColumns.value.push( config.prop ) + } if (item.queryMode == 'RANGE') config.searchRange = true if (['Integer', 'BigInt', 'BigDecimal'].includes(item.fieldType)) config.type = 'number' else if (item.fieldType == 'Date') { @@ -478,7 +482,7 @@ const searchChange = (params?, done?) => { } Object.keys(tableOption.value.column).forEach(key=>{ let item=tableOption.value.column[key] - item.hide=hides.includes(item.prop) + item.hide=hides.includes(item.prop)||hideColumns.value.includes(item.prop) }) if (done) done() }) diff --git a/src/views/lowdesign/reportDesign/designData.ts b/src/views/lowdesign/reportDesign/designData.ts index bed1b87..f03fc5c 100644 --- a/src/views/lowdesign/reportDesign/designData.ts +++ b/src/views/lowdesign/reportDesign/designData.ts @@ -157,6 +157,7 @@ const infoColumn = { queryMode: { title: '查询模式', width: 130, editRender: { name: 'LowSelect', verifyEdit: true, dicData: dicObj.queryMode, dicObj: getDicObj('queryMode') } }, dictCode: { title: '字典Code', width: 180, editRender: { name: 'LowSelect', verifyEdit: true, filterable: true, noStop: true, dicData: [] } }, isExport: { title: '是否可导出', width: 90, align: "center", editRender: { name: 'LowCheckbox' } }, + isHideCol: { title: '隐藏列', width: 90, align: "center", editRender: { name: 'LowCheckbox' } }, isAmount: { title: '是否合计', width: 75, align: "center", editRender: { name: 'LowCheckboxSum' } }, isDimension: { title: '是否维度', width: 75, align: "center", editRender: { name: 'LowCheckbox' } }, @@ -188,7 +189,7 @@ for (const key in infoColumn) { //默认值 const infoDefaultData = { basics: { - fieldCode: '', fieldName: '', parentFieldName: '', labelI18n: '', fieldType: 'String', queryIsDb: 'N', queryIsWeb: 'N', queryMode: 'LIKE', dictCode: '', 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: '', }, }