Merge pull request #2175 from jumpserver/pr@v2.27@fix_reload_function

fix: 恢复刷新方法

src/App.vue

@@ -1,19 +1,12 @@
 <template>
   <div id="app">
-    <router-view v-if="isRouterAlive" />
+    <router-view />
   </div>
 </template>
 
 <script>
-import { mapState } from 'vuex'
-
 export default {
-  name: 'App',
-  computed: {
-    ...mapState({
-      isRouterAlive: state => state.common.isRouterAlive
-    })
-  }
+  name: 'App'
 }
 </script>
 

src/store/modules/common.js

@@ -2,8 +2,7 @@ import { optionUrlMeta } from '@/api/common'
 
 const getDefaultState = () => {
   return {
-    metaMap: {},
-    isRouterAlive: true
+    metaMap: {}
   }
 }
 
@@ -12,12 +11,6 @@ const state = getDefaultState()
 const mutations = {
   SET_URL_META: (state, { url, meta }) => {
     state.metaMap[url] = meta
-  },
-  reload: (state) => {
-    state.isRouterAlive = false
-    setTimeout(() => {
-      state.isRouterAlive = true
-    }, 0)
   }
 }
 

src/utils/org.js

@@ -30,7 +30,7 @@ async function changeOrg(org) {
     if (index !== -1) {
       location.href = path.substring(0, index)
     }
-    setTimeout(() => store.commit('common/reload'), 400)
+    setTimeout(() => location.reload(), 400)
   }
 }
 

src/views/accounts/ChangeAuthPlan/AppChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanApp/index.vue

@@ -98,7 +98,7 @@ export default {
           that.iHasObjects = [...that.iHasObjects, ...objects]
           that.$refs.select2.clearSelected()
           this.$message.success(this.$t('common.updateSuccessMsg'))
-          this.$store.commit('common/reload')
+          window.location.reload()
           this.$refs.listTable.$refs.ListTable.reloadTable()
         }
       }

src/views/accounts/ChangeAuthPlan/AssetChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanAsset/index.vue

@@ -93,7 +93,7 @@ export default {
         onAddSuccess: (items, that) => {
           this.$log.debug('AssetSelect value', that.assets)
           this.$message.success(this.$t('common.updateSuccessMsg'))
-          this.$store.commit('common/reload')
+          window.location.reload()
         }
       },
       nodeRelationConfig: {
@@ -120,7 +120,7 @@ export default {
           that.iHasObjects = [...that.iHasObjects, ...objects]
           that.$refs.select2.clearSelected()
           this.$message.success(this.$t('common.updateSuccessMsg'))
-          this.$store.commit('common/reload')
+          window.location.reload()
         },
         performDelete: (item) => {
           const data = {

src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionAsset.vue

@@ -93,7 +93,7 @@ export default {
           this.$message.success(this.$t('common.updateSuccessMsg'))
           this.$refs.ListTable.reloadTable()
           that.$refs.assetSelect.$refs.select2.clearSelected()
-          this.$store.commit('common/reload')
+          window.location.reload()
         }
       },
       nodeRelationConfig: {

src/views/profile/ProfileInfo.vue

@@ -37,8 +37,7 @@ import DetailCard from '@/components/DetailCard'
 import QuickActions from '@/components/QuickActions'
 import UserConfirmDialog from '@/components/UserConfirmDialog'
 import { toSafeLocalDateStr } from '@/utils/common'
-import { getProfile } from '@/api/users'
-import { mapState } from 'vuex'
+import store from '@/store'
 
 export default {
   name: 'ProfileInfo',
@@ -48,9 +47,14 @@ export default {
     QuickActions,
     UserConfirmDialog
   },
+  props: {
+    object: {
+      type: Object,
+      default: () => store.state.users.profile
+    }
+  },
   data() {
     return {
-      object: this.userProfile || {},
       url: `/api/v1/users/profile/`,
       showPasswordDialog: false,
       currentEdit: '',
@@ -213,9 +217,6 @@ export default {
     }
   },
   computed: {
-    ...mapState({
-      userProfile: state => state.users.profile
-    }),
     detailCardItems() {
       return [
         {
@@ -298,12 +299,6 @@ export default {
       return url
     }
   },
-  created() {
-    getProfile().then(res => {
-      this.object = res
-      this.$store.commit('users/SET_PROFILE', res)
-    })
-  },
   methods: {
     updateUserReceiveBackends(val) {
       this.$axios.patch(
@@ -311,6 +306,7 @@ export default {
         { 'receive_backends': this.getReceiveBackendList() }
       ).then(res => {
         this.$message.success(this.$t('common.updateSuccessMsg'))
+        this.$store.dispatch('users/getProfile', true)
       }).catch(err => {
         this.$message.error(this.$t('common.updateErrorMsg' + ' ' + err))
       })

src/views/sessions/SessionDetail/SessionDetailInfo.vue

@@ -49,7 +49,7 @@ export default {
                 const msg = vm.$t('sessions.TerminateTaskSendSuccessMsg')
                 vm.$message.success(msg)
                 window.setTimeout(function() {
-                  this.$store.commit('common/reload')
+                  window.location.reload()
                 }, 50000)
               })
             }

src/views/settings/Interface.vue

@@ -175,7 +175,7 @@ export default {
               }).then(() => {
               restoreInterface().then(res => {
                 this.$message.success(res.success)
-                this.$store.commit('common/reload')
+                location.reload()
               })
             })
           }.bind(this)
@@ -221,7 +221,7 @@ export default {
         }
       }
       updateInterface(form).then(res => {
-        this.$store.commit('common/reload')
+        location.reload()
       })
     }
   }

src/views/settings/License.vue

@@ -140,7 +140,6 @@ export default {
       window.open(url, '_blank')
     },
     importLicense() {
-      const vm = this
       if (this.licenseFile['file'] === undefined) {
         return
       }
@@ -149,7 +148,7 @@ export default {
       importLicense(formData).then(res => {
         if (res.status) {
           this.$message.success(res.msg)
-          setTimeout(() => vm.$store.commit('common/reload'), 500)
+          setTimeout(() => location.reload(), 500)
         } else {
           this.$message.error(res.msg)
         }

src/views/tickets/RequestApplicationPerm/Detail/TicketDetail.vue

@@ -236,7 +236,7 @@ export default {
       return toSafeLocalDateStr(dataStr)
     },
     reloadPage() {
-      this.$store.commit('common/reload')
+      window.location.reload()
     },
     handleApprove() {
       if (this.object.approval_step === this.object.process_map.length) {

src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue

@@ -244,7 +244,7 @@ export default {
       return toSafeLocalDateStr(dataStr)
     },
     reloadPage() {
-      this.$store.commit('common/reload')
+      window.location.reload()
     },
     handleApprove() {
       if (this.object.approval_step === this.object.process_map.length) {

src/views/tickets/TicketFlow/Detail/TicketDetail.vue

@@ -88,7 +88,7 @@ export default {
       return toSafeLocalDateStr(dataStr)
     },
     reloadPage() {
-      this.$store.commit('common/reload')
+      window.location.reload()
     }
   }
 }

src/views/tickets/components/Comments.vue

@@ -199,7 +199,7 @@ export default {
       )
     },
     reloadPage() {
-      this.$store.commit('common/reload')
+      window.location.reload()
     }
   }
 

src/views/users/User/UserCreateUpdate.vue

@@ -171,6 +171,9 @@ export default {
         if (value.update_password !== undefined) {
           delete value.update_password
         }
+        if (value.source !== 'local') {
+          delete value.need_update_password
+        }
         return value
       }
     }