diff --git a/src/userviews/users/UserProfile/PasswordUpdate.vue b/src/userviews/users/UserProfile/PasswordUpdate.vue index 8f4f5d138..9a5440580 100644 --- a/src/userviews/users/UserProfile/PasswordUpdate.vue +++ b/src/userviews/users/UserProfile/PasswordUpdate.vue @@ -16,6 +16,7 @@ import GenericCreateUpdateForm from '@/layout/components/GenericCreateUpdateForm' import UserPassword from '@/components/FormFields/UserPassword' import { IBox } from '@/components' +import rules from '@/components/DataForm/rules' export default { name: 'PasswordUpdate', @@ -42,8 +43,8 @@ export default { }, new_password: { label: this.$t('users.NewPassword'), - component: UserPassword, - rules: [] + rules: [rules.RequiredChange], + component: UserPassword }, new_password_again: { label: this.$t('users.ConfirmPassword'), diff --git a/src/views/settings/DingTalk.vue b/src/views/settings/DingTalk.vue index 805140ddb..5b047476d 100644 --- a/src/views/settings/DingTalk.vue +++ b/src/views/settings/DingTalk.vue @@ -7,6 +7,7 @@ :fields-meta="fieldsMeta" :more-buttons="moreButtons" :has-detail-in-msg="false" + :clean-form-value="cleanFormValue" /> @@ -56,6 +57,13 @@ export default { methods: { getMethod() { return 'put' + }, + // 不清理的话,编辑secret,在删除提交会报错 + cleanFormValue(data) { + if (!data['DINGTALK_APPSECRET']) { + delete data['DINGTALK_APPSECRET'] + } + return data } } } diff --git a/src/views/settings/Email.vue b/src/views/settings/Email.vue index 41fad0cc5..d5cde7f27 100644 --- a/src/views/settings/Email.vue +++ b/src/views/settings/Email.vue @@ -3,7 +3,7 @@ @@ -56,6 +57,13 @@ export default { methods: { getMethod() { return 'put' + }, + // 不清理的话,编辑secret,在删除提交会报错 + cleanFormValue(data) { + if (!data['WECOM_SECRET']) { + delete data['WECOM_SECRET'] + } + return data } } }