Merge remote-tracking branch 'origin/master' into dev

This commit is contained in:
xingyu4j
2022-11-01 09:25:02 +08:00
6 changed files with 227 additions and 221 deletions

View File

@ -38,15 +38,15 @@ const submitForm = async () => {
if (basicForm && genForm) {
const basicInfoData = (await basicInfo?.getFormData()) as CodegenTableVO
const genInfoData = (await genInfo?.getFormData()) as CodegenTableVO
const genTable: CodegenUpdateReqVO = {
table: Object.assign({}, basicInfoData, genInfoData),
columns: cloumCurrentRow.value
}
if (parentMenuId.value) {
genInfoData.parentMenuId = parentMenuId.value
} else {
genInfoData.parentMenuId = 0
}
const genTable: CodegenUpdateReqVO = {
table: Object.assign({}, basicInfoData, genInfoData),
columns: cloumCurrentRow.value
}
await updateCodegenTableApi(genTable)
ElMessage.success(t('common.updateSuccess'))
push('/infra/codegen')

View File

@ -150,7 +150,7 @@ defineExpose({
:props="menuProps"
:data="menuOptions"
check-strictly
@node-click="handleNodeClick"
@change="handleNodeClick"
/>
</template>
</Form>