diff --git a/src/components/ma-crud/components/form.vue b/src/components/ma-crud/components/form.vue index 940649cd2ab101a91218db2f5d3c5f16b22e2d99..f48cfecbd15db97dff2e45ed245cc338b0a82c31 100644 --- a/src/components/ma-crud/components/form.vue +++ b/src/components/ma-crud/components/form.vue @@ -162,7 +162,14 @@ const init = () => { const layout = JSON.parse(JSON.stringify(options?.formOption?.layout ?? [])) columns.map(async item => { - await columnItemHandle(item) + //存在子表头则优先读取子表头 + if (item.children && item.children.length > 0){ + await item.children.map(async (childItem) => { + await columnItemHandle(childItem) + }) + }else { + await columnItemHandle(item) + } }) // 设置表单布局 settingFormLayout(layout) diff --git a/src/components/ma-crud/index.vue b/src/components/ma-crud/index.vue index 7c05e581802ff831abd12d3e56bc1a9a1604055d..eb4be8a06f528f7ee7150dba8c728cf792427631 100644 --- a/src/components/ma-crud/index.vue +++ b/src/components/ma-crud/index.vue @@ -305,10 +305,20 @@ const init = async () => { }) await props.columns.map(async (item) => { - // 字典 - if (!cascaders.value.includes(item.dataIndex) && item.dict) { - await loadDict(dicts.value, item) - } + //存在子表头则优先读取子表头 + if (item.children && item.children.length > 0){ + await item.children.map(async (childItem) => { + // 字典,非数据联动并且存在字典翻译 + if (!cascaders.value.includes(childItem.dataIndex) && childItem.dict) { + await loadDict(dicts.value, childItem) + } + }) + }else{ + // 字典,非数据联动并且存在字典翻译 + if (!cascaders.value.includes(item.dataIndex) && item.dict) { + await loadDict(dicts.value, item) + } + } }) setTimeout(async () => { await tabsHandler()