mirror of
https://github.com/continew-org/continew-admin-ui.git
synced 2025-09-09 08:57:14 +08:00
fix: 修复邮箱配置的启用SSL加密开关初始值错误的问题
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
This commit is contained in:
@@ -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())
|
||||
|
||||
|
@@ -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()
|
||||
|
@@ -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([
|
||||
{
|
||||
|
Reference in New Issue
Block a user