From 804d47df3b7f5b200ea084310657db1a4f8a1d5e Mon Sep 17 00:00:00 2001
From: "gary.fu" <xuebaiyouling@gmail.com>
Date: Wed, 10 Jan 2024 16:13:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E8=BF=9B=E5=85=A5=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E6=B2=A1=E6=9C=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common-form/index.vue | 20 +++++++++++++-------
 src/services/menu/MenuService.js     |  2 +-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/components/common-form/index.vue b/src/components/common-form/index.vue
index 9205d60..63f7828 100644
--- a/src/components/common-form/index.vue
+++ b/src/components/common-form/index.vue
@@ -95,14 +95,20 @@ const emit = defineEmits(['submitForm', 'update:model'])
 
 const formModel = useVModel(props, 'model', emit)
 
-watch(() => props.options, (options) => {
-  options.forEach(option => {
-    if (formModel.value) {
-      formModel.value[option.prop] = option.value || undefined
-    }
-  })
+const initFormModel = () => {
+  if (formModel.value) {
+    props.options.forEach(option => {
+      if (option.prop) {
+        formModel.value[option.prop] = option.value || undefined
+      }
+    })
+  }
   rules.value = initRules()
-}, { deep: true })
+}
+
+initFormModel()
+
+watch(() => props.options, initFormModel, { deep: true })
 
 //= ============form暴露============//
 
diff --git a/src/services/menu/MenuService.js b/src/services/menu/MenuService.js
index ae932bb..20ed726 100644
--- a/src/services/menu/MenuService.js
+++ b/src/services/menu/MenuService.js
@@ -177,7 +177,7 @@ export const useBaseTopMenus = () => {
     {
       icon: 'user',
       isDropdown: true,
-      label: $i18nMsg(loginConfigStore.accountInfo.userNameCN, loginConfigStore.accountInfo.userNameEN),
+      label: loginConfigStore.accountInfo ? $i18nMsg(loginConfigStore.accountInfo.userNameCN, loginConfigStore.accountInfo.userNameEN) : '',
       children: [
         {
           labelKey: 'common.label.personalInfo',