diff --git a/src/components/LowDesign/src/LowReport/index.vue b/src/components/LowDesign/src/LowReport/index.vue index cd766b9..1a51d38 100644 --- a/src/components/LowDesign/src/LowReport/index.vue +++ b/src/components/LowDesign/src/LowReport/index.vue @@ -282,7 +282,19 @@ const initTable = async () => { config.searchType = 'tag' } if (item.queryMode == 'NE') config.searchLabel = `${config.label} !=` - tableOption.value.column[item.fieldCode] = config + if(!item.parentFieldCode&&!!item.parentFieldName){ + if(tableOption.value.column[item.parentFieldName]){ + tableOption.value.column[item.parentFieldName].children.push(config) + }else{ + tableOption.value.column[item.parentFieldName]={ + children:[config], + label:item.parentFieldName + } + } + }else{ + tableOption.value.column[item.fieldCode] = config + } + }) isInit.value = true diff --git a/src/views/lowdesign/reportDesign/components/TableInfo.vue b/src/views/lowdesign/reportDesign/components/TableInfo.vue index d858d3f..b56fd5e 100644 --- a/src/views/lowdesign/reportDesign/components/TableInfo.vue +++ b/src/views/lowdesign/reportDesign/components/TableInfo.vue @@ -460,11 +460,12 @@ onMounted(() => { row.isSubField = false; _lastSelectedValue = ''; } - } else { - // 清空选择 - handleParentFieldClear(row); - _lastSelectedValue = ''; } + // else { + // // 清空选择 + // handleParentFieldClear(row); + // _lastSelectedValue = ''; + //} // 更新父字段选项 updateParentFieldOptions(); }, diff --git a/src/views/lowdesign/reportDesign/designData.ts b/src/views/lowdesign/reportDesign/designData.ts index 43a9e61..b909952 100644 --- a/src/views/lowdesign/reportDesign/designData.ts +++ b/src/views/lowdesign/reportDesign/designData.ts @@ -149,7 +149,7 @@ const infoColumn = { fieldColumn: { fieldCode: { title: '字段编码', minWidth: 120, editRender: { name: 'LowInput', verifyEdit: true } }, fieldName: { title: '字段名称', minWidth: 120, editRender: { name: 'LowInput' } }, - parentFieldName: { title: '父字段名称', width: 120, editRender: { name: 'LowSelect', dicData: [], filterable: true, clearable: true } }, + parentFieldName: { title: '父字段名称', width: 120, editRender: { name: 'LowSelect', dicData: [], filterable: true,allowCreate:true, clearable: true } }, labelI18n: { title: '国际化配置', width: 140, editRender: { name: 'LowMonacoEditorInput', events: {} } }, fieldType: { title: '字段类型', minWidth: 100, editRender: { name: 'LowSelect', verifyEdit: true, dicData: dicObj.fieldType, dicObj: getDicObj('fieldType') } }, isFixedColumn: { title: '固定列', width: 75, align: "center", editRender: { name: 'LowCheckbox' } },