From f5bc2842eceb672c3fb976cdd6527ba8f21034bd Mon Sep 17 00:00:00 2001
From: Orange <orangemtony@gmail.com>
Date: Fri, 11 Dec 2020 17:51:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E5=8F=8A=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8=E6=8E=88=E6=9D=83=E6=9B=B4=E6=96=B0=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/common.js                                           | 3 +++
 .../users/User/UserDetail/UserApplicationsPermissionRules.vue | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/utils/common.js b/src/utils/common.js
index b8f5a7bb1..c09b6b1dd 100644
--- a/src/utils/common.js
+++ b/src/utils/common.js
@@ -73,6 +73,9 @@ function cleanDateStr(d) {
 }
 
 export function toSafeLocalDateStr(d) {
+  if (d === '') {
+    return ''
+  }
   const date = safeDate(d)
   // let date_s = date.toLocaleString(getUserLang(), {hour12: false});
   const date_s = date.toLocaleString(getUserLang(), { hourCycle: 'h23' })
diff --git a/src/views/users/User/UserDetail/UserApplicationsPermissionRules.vue b/src/views/users/User/UserDetail/UserApplicationsPermissionRules.vue
index 2862d9de0..e4c601b2d 100644
--- a/src/views/users/User/UserDetail/UserApplicationsPermissionRules.vue
+++ b/src/views/users/User/UserDetail/UserApplicationsPermissionRules.vue
@@ -49,7 +49,9 @@ export default {
           },
           actions: {
             formatterArgs: {
-              updateRoute: 'RemoteAppPermissionUpdate',
+              onUpdate: ({ row, col, cellValue }) => {
+                this.$router.push({ name: 'ApplicationPermissionUpdate', params: { id: cellValue }})
+              },
               performDelete: ({ row, col }) => {
                 const id = row.id
                 const url = `/api/v1/perms/application-permissions/${id}/?user_id=${this.object.id}&draw=1`