From 67428f606aa0be17b5e140e27f65fb0da56f538e Mon Sep 17 00:00:00 2001
From: parisma <parisma@tencent.com>
Date: Fri, 10 Mar 2023 12:59:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8A=A8=E6=80=81tab?=
 =?UTF-8?q?=E6=B8=B2=E6=9F=93=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/form/src/containers/Tabs.vue | 37 +++++++++++++++------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/packages/form/src/containers/Tabs.vue b/packages/form/src/containers/Tabs.vue
index 914cc329..3bd34d44 100644
--- a/packages/form/src/containers/Tabs.vue
+++ b/packages/form/src/containers/Tabs.vue
@@ -15,7 +15,6 @@
         :is="uiComponent.component"
         :key="tab[mForm?.keyProp || '__key'] ?? tabIndex"
         :name="filter(tab.status) || tabIndex.toString()"
-        :label="filter(tab.title)"
         :lazy="tab.lazy || false"
       >
         <template #label>
@@ -29,8 +28,26 @@
           :key="item[mForm?.keyProp || '__key']"
           :config="item"
           :disabled="disabled"
-          :model="getValues(model, tabIndex, tab)"
-          :last-values="getValues(lastValues, tabIndex, tab)"
+          :model="
+            config.dynamic
+              ? (name ? model[name] : model)[tabIndex]
+              : tab.name
+              ? (name ? model[name] : model)[tab.name]
+              : name
+              ? model[name]
+              : model
+          "
+          :last-values="
+            isEmpty(lastValues)
+              ? {}
+              : config.dynamic
+              ? (name ? lastValues[name] : lastValues)[tabIndex]
+              : tab.name
+              ? (name ? lastValues[name] : lastValues)[tab.name]
+              : name
+              ? lastValues[name]
+              : lastValues
+          "
           :is-compare="isCompare"
           :prop="config.dynamic ? `${prop}${prop ? '.' : ''}${String(tabIndex)}` : prop"
           :size="size"
@@ -46,7 +63,7 @@
 
 <script setup lang="ts" name="MFormTabs">
 import { computed, inject, ref, watchEffect } from 'vue';
-import { cloneDeep } from 'lodash-es';
+import { cloneDeep, isEmpty } from 'lodash-es';
 
 import { getConfig, TMagicTabs } from '@tmagic/design';
 
@@ -185,18 +202,6 @@ const changeHandler = () => {
   }
 };
 
-const getValues = (model: any, tabIndex: number, tab: any) => {
-  const tabName = props.config.dynamic ? (model[props?.name] || model)[tabIndex] : tab.name;
-  let propName = props.name;
-  if (tabName) {
-    propName = (model[props?.name] || model)[tab.name];
-  }
-  if (propName) {
-    return model[props.name];
-  }
-  return model;
-};
-
 // 在tabs组件中收集事件触发次数，即该tab下的差异数
 const onAddDiffCount = (tabIndex: number) => {
   if (!diffCount.value[tabIndex]) {