From ec89aaae888a7fd8d090e4b468fe7f50d997b657 Mon Sep 17 00:00:00 2001
From: jackhoo_98 <jackhoo_98@foxmail.com>
Date: Wed, 1 Mar 2023 11:37:26 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AF=81=E4=B9=A6=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Log/Access/index.vue       |  2 +-
 src/views/link/Certificate/index.vue | 74 +++++++++++++---------------
 2 files changed, 34 insertions(+), 42 deletions(-)

diff --git a/src/views/Log/Access/index.vue b/src/views/Log/Access/index.vue
index 48679537..d8d80a1a 100644
--- a/src/views/Log/Access/index.vue
+++ b/src/views/Log/Access/index.vue
@@ -144,7 +144,7 @@ const columns = [
         search: {
             type: 'string',
         },
-        // width: 200,
+        ellipsis: true,
     },
     {
         title: '请求方法',
diff --git a/src/views/link/Certificate/index.vue b/src/views/link/Certificate/index.vue
index e4474b35..00d723de 100644
--- a/src/views/link/Certificate/index.vue
+++ b/src/views/link/Certificate/index.vue
@@ -13,45 +13,40 @@
                 :params="params"
             >
                 <template #headerTitle>
-                    <a-button type="primary" @click="handlAdd"
-                        ><AIcon type="PlusOutlined" />新增</a-button
+                    <PermissionButton
+                        type="primary"
+                        @click="handlAdd"
+                        hasPermission="link/Certificate:add"
                     >
+                        <template #icon><AIcon type="PlusOutlined" /></template>
+                        新增
+                    </PermissionButton>
                 </template>
                 <template #type="slotProps">
                     <span>{{ slotProps.type.text }}</span>
                 </template>
                 <template #action="slotProps">
-                    <a-space :size="16">
-                        <a-tooltip
+                    <a-space>
+                        <template
                             v-for="i in getActions(slotProps)"
                             :key="i.key"
-                            v-bind="i.tooltip"
                         >
-                            <a-popconfirm
-                                v-if="i.popConfirm"
-                                v-bind="i.popConfirm"
-                            >
-                                <a-button
-                                    :disabled="i.disabled"
-                                    style="padding: 0"
-                                    type="link"
-                                    ><AIcon :type="i.icon"
-                                /></a-button>
-                            </a-popconfirm>
-                            <a-button
-                                style="padding: 0"
+                            <PermissionButton
+                                :disabled="i.disabled"
+                                :popConfirm="i.popConfirm"
+                                :tooltip="{
+                                    ...i.tooltip,
+                                }"
+                                style="padding: 0px"
+                                @click="i.onClick"
                                 type="link"
-                                v-else
-                                @click="i.onClick && i.onClick(slotProps)"
+                                :hasPermission="'link/Certificate:' + i.key"
                             >
-                                <a-button
-                                    :disabled="i.disabled"
-                                    style="padding: 0"
-                                    type="link"
+                                <template #icon
                                     ><AIcon :type="i.icon"
-                                /></a-button>
-                            </a-button>
-                        </a-tooltip>
+                                /></template>
+                            </PermissionButton>
+                        </template>
                     </a-space>
                 </template>
             </JTable>
@@ -62,7 +57,9 @@
 import type { ActionsType } from '@/components/Table/index';
 import { query, remove } from '@/api/link/certificate';
 import { message } from 'ant-design-vue';
+import { useMenuStore } from 'store/menu';
 
+const menuStory = useMenuStore();
 const tableRef = ref<Record<string, any>>({});
 const router = useRouter();
 const params = ref<Record<string, any>>({});
@@ -119,7 +116,7 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
     }
     return [
         {
-            key: 'eye',
+            key: 'view',
             text: '查看',
             tooltip: {
                 title: '查看',
@@ -130,7 +127,7 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
             },
         },
         {
-            key: 'edit',
+            key: 'update',
             text: '编辑',
             tooltip: {
                 title: '编辑',
@@ -157,24 +154,19 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
 };
 
 const handlAdd = () => {
-    router.push({
-        path: `/iot/link/certificate/detail/:id`,
-        query: { view: false },
-    });
+    menuStory.jumpPage(
+        `link/Certificate/Detail`,
+        { id: ':id' },
+        { view: false },
+    );
 };
 
 const handlEye = (id: string) => {
-    router.push({
-        path: `/iot/link/certificate/detail/${id}`,
-        query: { view: true },
-    });
+    menuStory.jumpPage(`link/Certificate/Detail`, { id }, { view: true });
 };
 
 const handlEdit = (id: string) => {
-    router.push({
-        path: `/iot/link/certificate/detail/${id}`,
-        query: { view: false },
-    });
+    menuStory.jumpPage(`link/Certificate/Detail`, { id }, { view: false });
 };
 
 const handlDelete = async (id: string) => {