From fa6831b743f21c609a0491950e94e7d31e9b7dbb Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Wed, 19 May 2021 16:44:39 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E9=92=89=E9=92=89?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=BE=AE=E4=BF=A1=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../users/UserProfile/PasswordUpdate.vue      |  5 +++--
 src/views/settings/DingTalk.vue               |  8 ++++++++
 src/views/settings/Email.vue                  | 19 +++++++------------
 src/views/settings/WeCom.vue                  |  8 ++++++++
 4 files changed, 26 insertions(+), 14 deletions(-)

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"
     />
   </IBox>
 </template>
@@ -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 @@
     <GenericCreateUpdateForm
       :fields="fields"
       :url="url"
-      :perform-submit="performSubmit"
+      :clean-form-value="cleanFormValue"
       :get-method="getMethod"
       :fields-meta="fieldsMeta"
       :more-buttons="moreButtons"
@@ -94,18 +94,13 @@ export default {
     getMethod() {
       return 'put'
     },
-    performSubmit(validValues) {
-      Object.keys(validValues).forEach(
-        function(key) {
-          if (validValues[key] === null) {
-            delete validValues[key]
-          }
-        }
-      )
-
-      return this.$axios['put'](`/api/v1/settings/setting/?category=email`, validValues)
+    // 不清理的话，编辑secret，在删除提交会报错
+    cleanFormValue(data) {
+      if (!data['EMAIL_HOST_PASSWORD']) {
+        delete data['EMAIL_HOST_PASSWORD']
+      }
+      return data
     }
-
   }
 
 }
diff --git a/src/views/settings/WeCom.vue b/src/views/settings/WeCom.vue
index 27326a1f8..8becb87cd 100644
--- a/src/views/settings/WeCom.vue
+++ b/src/views/settings/WeCom.vue
@@ -7,6 +7,7 @@
       :fields-meta="fieldsMeta"
       :more-buttons="moreButtons"
       :has-detail-in-msg="false"
+      :clean-form-value="cleanFormValue"
     />
   </IBox>
 </template>
@@ -56,6 +57,13 @@ export default {
   methods: {
     getMethod() {
       return 'put'
+    },
+    // 不清理的话，编辑secret，在删除提交会报错
+    cleanFormValue(data) {
+      if (!data['WECOM_SECRET']) {
+        delete data['WECOM_SECRET']
+      }
+      return data
     }
   }
 }