From ca304f30dcb7cd70ec06477b33147d4c3a205d7a Mon Sep 17 00:00:00 2001
From: ali_pay <755265191@qq.com>
Date: Tue, 1 Jul 2025 21:29:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=82=AE=E7=AE=B1?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=9A=84=E5=90=AF=E7=94=A8SSL=E5=8A=A0?=
 =?UTF-8?q?=E5=AF=86=E5=BC=80=E5=85=B3=E5=88=9D=E5=A7=8B=E5=80=BC=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: ali_pay<755265191@qq.com>


Co-authored-by: ali_pay<755265191@qq.com>



# message auto-generated for no-merge-commit merge:
merge dev into dev

fix: 修复邮箱配置的启用SSL加密开关初始值错误的问题

Created-by: ali_pay
Commit-by: ali_pay
Merged-by: Charles_7c
Description: <!--
  非常感谢您的 PR！在提交之前，请务必确保您 PR 的代码经过了完整测试，并且通过了代码规范检查。
-->

<!-- 在 [] 中输入 x 来勾选) -->

## PR 类型

<!-- 您的 PR 引入了哪种类型的变更？ -->
<!-- 只支持选择一种类型，如果有多种类型，可以在更新日志中增加 “类型” 列。 -->

- [ ] 新 feature
- [x] Bug 修复
- [ ] 功能增强
- [ ] 文档变更
- [ ] 代码样式变更
- [ ] 重构
- [ ] 性能改进
- [ ] 单元测试
- [ ] CI/CD
- [ ] 其他

## PR 目的

<!-- 描述一下您的 PR 解决了什么问题。如果可以，请链接到相关 issues。 -->

## 解决方案

<!-- 详细描述您是如何解决的问题 -->

## PR 测试

<!-- 如果可以，请为您的 PR 添加或更新单元测试。 -->
<!-- 请描述一下您是如何测试 PR 的。例如：创建/更新单元测试或添加相关的截图。 -->

## Changelog

| 模块  | Changelog | Related issues |
|-----|-----------| -------------- |
|     |           |                |

<!-- 如果有多种类型的变更，可以在变更日志表中增加 “类型” 列，该列的值与上方 “PR 类型” 相同。 -->
<!-- Related issues 格式为 Closes #<issue号>，或者 Fixes #<issue号>，或者 Resolves #<issue号>。 -->

## 其他信息

<!-- 请描述一下还有哪些注意事项。例如：如果引入了一个不向下兼容的变更，请描述其影响。 -->

## 提交前确认

- [ ] PR 代码经过了完整测试，并且通过了代码规范检查
- [ ] 已经完整填写 Changelog，并链接到了相关 issues
- [ ] PR 代码将要提交到 dev 分支

See merge request: continew/continew-admin-ui!4
---
 src/hooks/modules/useResetReactive.ts           | 4 ++--
 src/views/system/config/mail/index.vue          | 8 ++++----
 src/views/user/profile/BasicInfoUpdateModal.vue | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/hooks/modules/useResetReactive.ts b/src/hooks/modules/useResetReactive.ts
index 1ad61e2..bd850fd 100644
--- a/src/hooks/modules/useResetReactive.ts
+++ b/src/hooks/modules/useResetReactive.ts
@@ -1,8 +1,8 @@
 import { reactive } from 'vue'
-import { cloneDeep } from 'lodash-es'
+import { cloneDeep, isFunction } from 'lodash-es'
 
 export function useResetReactive<T extends object>(value: T) {
-  const getInitValue = () => cloneDeep(value)
+  const getInitValue = () => isFunction(value) ? value() : cloneDeep(value)
 
   const state = reactive(getInitValue())
 
diff --git a/src/views/system/config/mail/index.vue b/src/views/system/config/mail/index.vue
index c5821f2..a069bd0 100644
--- a/src/views/system/config/mail/index.vue
+++ b/src/views/system/config/mail/index.vue
@@ -71,7 +71,7 @@
           </a-switch>
         </a-form-item>
         <a-form-item
-          v-if="form.MAIL_SSL_ENABLED === '1'"
+          v-if="form.MAIL_SSL_ENABLED === 1"
           field="MAIL_SSL_PORT"
           :label="mailConfig.MAIL_SSL_PORT.name"
           :help="mailConfig.MAIL_SSL_PORT.description"
@@ -123,7 +123,7 @@ const [form] = useResetReactive({
   MAIL_PORT: 0,
   MAIL_USERNAME: '',
   MAIL_PASSWORD: '',
-  MAIL_SSL_ENABLED: '',
+  MAIL_SSL_ENABLED: 0,
   MAIL_SSL_PORT: 0,
 })
 const rules: FormInstance['rules'] = {
@@ -152,7 +152,7 @@ const reset = () => {
   form.MAIL_PORT = mailConfig.value.MAIL_PORT.value || 0
   form.MAIL_USERNAME = mailConfig.value.MAIL_USERNAME.value || ''
   form.MAIL_PASSWORD = mailConfig.value.MAIL_PASSWORD?.value || ''
-  form.MAIL_SSL_ENABLED = mailConfig.value.MAIL_SSL_ENABLED.value || ''
+  form.MAIL_SSL_ENABLED = mailConfig.value.MAIL_SSL_ENABLED.value || 0
   form.MAIL_SSL_PORT = mailConfig.value.MAIL_SSL_PORT.value || 0
 }
 
@@ -176,7 +176,7 @@ const getDataList = async () => {
   loading.value = true
   const { data } = await listOption(queryForm)
   mailConfig.value = data.reduce((obj: MailConfig, option: OptionResp) => {
-    obj[option.code] = { ...option, value: ['MAIL_PORT', 'MAIL_SSL_PORT'].includes(option.code) ? Number.parseInt(option.value) : option.value }
+    obj[option.code] = { ...option, value: ['MAIL_PORT', 'MAIL_SSL_PORT', 'MAIL_SSL_ENABLED'].includes(option.code) ? Number.parseInt(option.value) : option.value }
     return obj
   }, {})
   handleCancel()
diff --git a/src/views/user/profile/BasicInfoUpdateModal.vue b/src/views/user/profile/BasicInfoUpdateModal.vue
index c9c7e4f..e592f00 100644
--- a/src/views/user/profile/BasicInfoUpdateModal.vue
+++ b/src/views/user/profile/BasicInfoUpdateModal.vue
@@ -28,10 +28,10 @@ const userInfo = computed(() => userStore.userInfo)
 const visible = ref(false)
 const formRef = ref<InstanceType<typeof GiForm>>()
 
-const [form, resetForm] = useResetReactive({
+const [form, resetForm] = useResetReactive(() => ({
   nickname: userInfo.value.nickname,
   gender: userInfo.value.gender,
-})
+}))
 
 const columns: ColumnItem[] = reactive([
   {