From d97df0c0ad195142e324ffbd4521174b4688d8eb Mon Sep 17 00:00:00 2001
From: biubug <935613741@qq.com>
Date: Tue, 11 Jun 2024 12:16:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9A=E7=BA=A7=E8=A1=A8?=
 =?UTF-8?q?=E5=A4=B4=E5=AD=97=E5=85=B8=E4=B8=8D=E7=BF=BB=E8=AF=91=E5=92=8C?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E|=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ma-crud/components/form.vue |  9 ++++++++-
 src/components/ma-crud/index.vue           | 18 ++++++++++++++----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/components/ma-crud/components/form.vue b/src/components/ma-crud/components/form.vue
index 940649c..f48cfec 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 7c05e58..eb4be8a 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()
-- 
Gitee