From ba5dae717257ed30174a558ed1e819f7cbbf2b0d Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@zdjizhi.com>
Date: Wed, 12 May 2021 17:15:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8DapiKey=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E4=BC=A0=E6=97=B6=E9=97=B4=E5=80=BC=E6=9C=AA=E8=BD=ACutc?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/assets/css/common/tableCommon.scss | 12 +++++++++++-
 .../src/components/page/config/system/apiKeyTab.vue  |  2 +-
 .../components/page/config/system/apiKeyTable.vue    | 10 +++++++---
 .../page/config/system/notifyMethodTable.vue         |  2 +-
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/nezha-fronted/src/assets/css/common/tableCommon.scss b/nezha-fronted/src/assets/css/common/tableCommon.scss
index 5a0395bd9..82b903cf6 100644
--- a/nezha-fronted/src/assets/css/common/tableCommon.scss
+++ b/nezha-fronted/src/assets/css/common/tableCommon.scss
@@ -244,13 +244,23 @@
       .table-operation-items {
         display: flex;
         justify-content: center;
-
         .table-operation-item {
           display: flex;
           height: 22px;
           border-radius: $--button-border-radius;
           outline: none;
         }
+        .table-operation-item.table-operation-item-disable{
+          border: 1px solid $--primary-border-color;
+          outline: none;
+          background-color: $--button-gray-background-color;
+          transition: background-color linear .1s;
+
+          i {
+            font-size: 14px;
+            color: $--button-gray-color;
+          }
+        }
         >.table-operation-item {
           justify-content: center;
           align-items: center;
diff --git a/nezha-fronted/src/components/page/config/system/apiKeyTab.vue b/nezha-fronted/src/components/page/config/system/apiKeyTab.vue
index 9ad697ee1..1ff5b1197 100644
--- a/nezha-fronted/src/components/page/config/system/apiKeyTab.vue
+++ b/nezha-fronted/src/components/page/config/system/apiKeyTab.vue
@@ -11,7 +11,7 @@
 
       </template>
       <template v-slot:top-tool-right>
-        <button id="api-key-add" v-has="'snmp_mibFile_add'" :title="$t('config.system.notification.create')" class="top-tool-btn margin-r-10" type="button" @click="addApiKey">
+        <button id="api-key-add" v-has="'system_apiKey_add'" :title="$t('config.system.notification.create')" class="top-tool-btn margin-r-10" type="button" @click="addApiKey">
           <i class="nz-icon-create-square nz-icon"></i>
         </button>
       </template>
diff --git a/nezha-fronted/src/components/page/config/system/apiKeyTable.vue b/nezha-fronted/src/components/page/config/system/apiKeyTable.vue
index 872ec2ebc..a07c5440a 100644
--- a/nezha-fronted/src/components/page/config/system/apiKeyTable.vue
+++ b/nezha-fronted/src/components/page/config/system/apiKeyTable.vue
@@ -72,7 +72,10 @@
               {{scope.row[item.prop]?scope.row[item.prop].name:'-'}}
             </template>
             <template v-else-if="item.prop == 'expireAt'">
-              {{scope.row[item.prop]?scope.row[item.prop]:$t('config.system.apiKey.noExpire')}}
+              {{scope.row[item.prop]?utcTimeToTimezoneStr(scope.row[item.prop]):$t('config.system.apiKey.noExpire')}}
+            </template>
+            <template v-else-if="item.prop == 'createAt'">
+              {{scope.row[item.prop]?utcTimeToTimezoneStr(scope.row[item.prop]):$t('config.system.apiKey.noExpire')}}
             </template>
             <template v-else-if="scope.row[item.prop]">{{scope.row[item.prop]}}</template>
             <template v-else>-</template>
@@ -86,11 +89,11 @@
         <div slot="header" class="table-operation-title">{{$t('overall.option')}}</div>
         <div slot-scope="scope" class="table-operation-items">
           <template v-if="scope.row.edit">
-            <button type="button" class="nz-btn nz-btn-size-mini-new nz-btn-style-normal-new" :disabled="prevent_opt.save" @click="save(scope.row)"  style="margin-right: 10px"><span>{{$t('overall.save')}}</span></button>
+            <button type="button" class="nz-btn nz-btn-size-mini-new nz-btn-style-normal-new" v-has="'system_apiKey_edit'" :disabled="prevent_opt.save" @click="save(scope.row)"  style="margin-right: 10px"><span>{{$t('overall.save')}}</span></button>
             <button type="button" class="nz-btn nz-btn-size-mini-new nz-btn-style-light-new" @click="cancel(scope.row)" :disabled="prevent_opt.save"><span>{{$t('overall.cancel')}}</span></button>
           </template>
           <template v-else>
-            <button class="table-operation-item" @click="$emit('del',scope.row)" :disabled="isBuiltIn(scope.row)"><i class="nz-icon nz-icon-delete"></i></button>
+            <button class="table-operation-item" @click="$emit('del',scope.row)" v-has="'system_apiKey_delete'" :disabled="isBuiltIn(scope.row)"><i class="nz-icon nz-icon-delete"></i></button>
           </template>
         </div>
       </el-table-column>
@@ -177,6 +180,7 @@ export default {
     },
     save: function (obj) {
       const copy = JSON.parse(JSON.stringify(obj))
+      copy.expireAt = this.timezoneToUtcTimeStr(copy.expireAt);
       if (copy.role) {
         copy.roleId = copy.role.id
       }
diff --git a/nezha-fronted/src/components/page/config/system/notifyMethodTable.vue b/nezha-fronted/src/components/page/config/system/notifyMethodTable.vue
index d72fe0e19..194d6c2c2 100644
--- a/nezha-fronted/src/components/page/config/system/notifyMethodTable.vue
+++ b/nezha-fronted/src/components/page/config/system/notifyMethodTable.vue
@@ -75,7 +75,7 @@
             <button type="button" class="nz-btn nz-btn-size-mini-new nz-btn-style-light-new" @click="cancel(scope.row)" :disabled="prevent_opt.save"><span>{{$t('overall.cancel')}}</span></button>
           </template>
           <template v-else>
-            <button class="table-operation-item" @click="toEdit(scope.row)"><i class="nz-icon nz-icon-edit"></i></button>
+            <button class="table-operation-item" :class="{'table-operation-item-disable':isBuiltIn(scope.row)}" :disabled="isBuiltIn(scope.row)" @click="toEdit(scope.row)"><i class="nz-icon nz-icon-edit"></i></button>
             <el-dropdown size="medium" trigger="hover" @command="tableOperation">
               <div class="table-operation-item table-operation-item--more">
                 <span>…</span><i class="nz-icon nz-icon-arrow-down"></i>