From bb6be97beea2133a6337f5eb3c5ddd5804eb0a8e Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Sun, 7 Apr 2024 18:06:07 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E5=85=BC=E5=AE=B9=E4=B9=8B=E5=89=8D?=
 =?UTF-8?q?=E7=9A=84=20help=20message=EF=BC=8C=E6=9B=B4=E5=90=8D=20help=20?=
 =?UTF-8?q?tip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Page/index.vue               | 11 +++++++++--
 src/layout/components/TabPage/index.vue            | 14 ++++++++++----
 src/views/accounts/Account/index.vue               |  2 +-
 src/views/acl/AssetLoginAcl/AssetLoginAclList.vue  |  2 +-
 .../acl/ConnectMethodAcl/ConnectMethodAclList.vue  |  2 +-
 src/views/acl/UserLoginACL/UserLoginACLList.vue    |  2 +-
 src/views/assets/Asset/AssetList/AllList.vue       |  2 +-
 src/views/assets/Domain/DomainList.vue             |  2 +-
 src/views/assets/Platform/PlatformList.vue         |  2 +-
 .../perms/AssetPermission/AssetPermissionList.vue  |  2 +-
 src/views/profile/ApiKey.vue                       |  2 +-
 src/views/profile/ConnectionToken.vue              |  2 +-
 src/views/profile/TempPassword.vue                 |  2 +-
 .../sessions/OnlineSession/OnlineSessionList.vue   |  2 +-
 .../settings/Storage/ReplayStorageCreateUpdate.vue |  2 +-
 src/views/users/Role/RoleList/index.vue            |  4 ++--
 16 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/src/layout/components/Page/index.vue b/src/layout/components/Page/index.vue
index d8ecafd39..0e56cca93 100644
--- a/src/layout/components/Page/index.vue
+++ b/src/layout/components/Page/index.vue
@@ -5,8 +5,8 @@
       <slot name="title">
         <span style="padding-left: 10px">
           {{ iTitle }}
-          <el-tooltip v-if="helpMessage" effect="light" placement="right" popper-class="help-tips">
-            <div slot="content" class="page-help-content" v-html="helpMessage" />
+          <el-tooltip v-if="helpTip" effect="light" placement="right" popper-class="help-tips">
+            <div slot="content" class="page-help-content" v-html="helpTip" />
             <span>
               <el-button class="help-msg-btn">
                 <i class="el-icon-info" />
@@ -20,6 +20,9 @@
       </template>
     </PageHeading>
     <PageContent class="page-content">
+      <el-alert v-if="helpMessage" type="success">
+        <span class="announcement-main" v-html="helpMessage" />
+      </el-alert>
       <slot />
     </PageContent>
     <UserConfirmDialog />
@@ -48,6 +51,10 @@ export default {
       type: String,
       default: ''
     },
+    helpTip: {
+      type: String,
+      default: ''
+    },
     goBack: {
       type: Function,
       default: function(obj) {
diff --git a/src/layout/components/TabPage/index.vue b/src/layout/components/TabPage/index.vue
index 9065acaf5..58357e500 100644
--- a/src/layout/components/TabPage/index.vue
+++ b/src/layout/components/TabPage/index.vue
@@ -23,8 +23,8 @@
               <i v-if="item.icon" :class="item.icon" class="fa pre-icon " />
               {{ toSentenceCase(item.title) }}
               <slot :tab="item.name" name="badge" />
-              <el-tooltip v-if="item.helpMessage" effect="light" placement="bottom" popper-class="help-tips">
-                <div slot="content" class="page-help-content" v-html="item.helpMessage" />
+              <el-tooltip v-if="item.helpTip" effect="light" placement="bottom" popper-class="help-tips">
+                <div slot="content" class="page-help-content" v-html="item.helpTip" />
                 <span>
                   <el-button class="help-msg-btn">
                     <i class="el-icon-info" />
@@ -37,6 +37,9 @@
       </el-tabs>
 
       <div class="tab-page-content">
+        <el-alert v-if="helpMessage" type="success">
+          <span class="announcement-main" v-html="helpMessage" />
+        </el-alert>
         <transition v-if="loading" appear mode="out-in" name="fade-transform">
           <slot>
             <keep-alive>
@@ -51,7 +54,6 @@
 
 <script>
 import Page from '../Page/'
-import merge from 'webpack-merge'
 import { toSentenceCase } from '@/utils/common'
 
 const ACTIVE_TAB_KEY = 'tab'
@@ -69,6 +71,10 @@ export default {
     activeMenu: {
       type: String,
       required: true
+    },
+    helpMessage: {
+      type: String,
+      default: ''
     }
   },
   data() {
@@ -130,7 +136,7 @@ export default {
 
       if (this.$router.currentRoute.query[ACTIVE_TAB_KEY]) {
         this.$router.push({
-          query: merge(this.$route.query, { [ACTIVE_TAB_KEY]: '' })
+          query: { ...this.$route.query, [ACTIVE_TAB_KEY]: '' }
         })
       }
     },
diff --git a/src/views/accounts/Account/index.vue b/src/views/accounts/Account/index.vue
index fb281896f..948b24f57 100644
--- a/src/views/accounts/Account/index.vue
+++ b/src/views/accounts/Account/index.vue
@@ -24,7 +24,7 @@ export default {
             title: this.$t('VirtualAccounts'),
             name: 'VirtualAccountList',
             component: () => import('@/views/accounts/VirtualAccount/VirtualList.vue'),
-            helpMessage: this.$t('VirtualAccountHelpMsg')
+            helpTip: this.$t('VirtualAccountHelpMsg')
           }
         ]
       }
diff --git a/src/views/acl/AssetLoginAcl/AssetLoginAclList.vue b/src/views/acl/AssetLoginAcl/AssetLoginAclList.vue
index 25d529cfe..28518634d 100644
--- a/src/views/acl/AssetLoginAcl/AssetLoginAclList.vue
+++ b/src/views/acl/AssetLoginAcl/AssetLoginAclList.vue
@@ -1,5 +1,5 @@
 <template>
-  <GenericListPage :header-actions="headerActions" :help-message="helpMsg" :table-config="tableConfig" />
+  <GenericListPage :header-actions="headerActions" :help-tip="helpMsg" :table-config="tableConfig" />
 </template>
 
 <script>
diff --git a/src/views/acl/ConnectMethodAcl/ConnectMethodAclList.vue b/src/views/acl/ConnectMethodAcl/ConnectMethodAclList.vue
index 1c0bcd84c..c616f6a09 100644
--- a/src/views/acl/ConnectMethodAcl/ConnectMethodAclList.vue
+++ b/src/views/acl/ConnectMethodAcl/ConnectMethodAclList.vue
@@ -1,5 +1,5 @@
 <template>
-  <GenericListPage :header-actions="headerActions" :help-message="helpText" :table-config="tableConfig" />
+  <GenericListPage :header-actions="headerActions" :help-tip="helpText" :table-config="tableConfig" />
 </template>
 
 <script>
diff --git a/src/views/acl/UserLoginACL/UserLoginACLList.vue b/src/views/acl/UserLoginACL/UserLoginACLList.vue
index a96474a84..a6e553cd0 100644
--- a/src/views/acl/UserLoginACL/UserLoginACLList.vue
+++ b/src/views/acl/UserLoginACL/UserLoginACLList.vue
@@ -1,5 +1,5 @@
 <template>
-  <Page :help-message="helpMsg">
+  <Page :help-tip="helpMsg">
     <UserLoginACLTable />
   </Page>
 
diff --git a/src/views/assets/Asset/AssetList/AllList.vue b/src/views/assets/Asset/AssetList/AllList.vue
index ed614f952..b7b78a81d 100644
--- a/src/views/assets/Asset/AssetList/AllList.vue
+++ b/src/views/assets/Asset/AssetList/AllList.vue
@@ -2,7 +2,7 @@
   <div>
     <AssetTreeTable
       ref="AssetTreeTable"
-      :help-message="helpMessage"
+      :help-tip="helpMessage"
       :table-config="tableConfig"
       :tree-setting="treeSetting"
     >
diff --git a/src/views/assets/Domain/DomainList.vue b/src/views/assets/Domain/DomainList.vue
index 155d5c951..576001ec8 100644
--- a/src/views/assets/Domain/DomainList.vue
+++ b/src/views/assets/Domain/DomainList.vue
@@ -1,5 +1,5 @@
 <template>
-  <GenericListPage :header-actions="headerActions" :help-message="notice" :table-config="tableConfig" />
+  <GenericListPage :header-actions="headerActions" :help-tip="notice" :table-config="tableConfig" />
 </template>
 
 <script>
diff --git a/src/views/assets/Platform/PlatformList.vue b/src/views/assets/Platform/PlatformList.vue
index 86368cf87..dd346f685 100644
--- a/src/views/assets/Platform/PlatformList.vue
+++ b/src/views/assets/Platform/PlatformList.vue
@@ -2,7 +2,7 @@
   <TabPage
     v-if="!loading"
     :active-menu.sync="tab.activeMenu"
-    :help-message="platformPageHelpMsg"
+    :help-tip="platformPageHelpMsg"
     :submenu="tab.submenu"
     @tab-click="changeMoreCreates"
   >
diff --git a/src/views/perms/AssetPermission/AssetPermissionList.vue b/src/views/perms/AssetPermission/AssetPermissionList.vue
index c0016f396..38277663c 100644
--- a/src/views/perms/AssetPermission/AssetPermissionList.vue
+++ b/src/views/perms/AssetPermission/AssetPermissionList.vue
@@ -1,5 +1,5 @@
 <template>
-  <Page :help-message="helpMsg" v-bind="$attrs">
+  <Page :help-tip="helpMsg" v-bind="$attrs">
     <AssetTreeTable
       ref="AssetTreeTable"
       :header-actions="headerActions"
diff --git a/src/views/profile/ApiKey.vue b/src/views/profile/ApiKey.vue
index f7f9a3e8f..b22bd58f8 100644
--- a/src/views/profile/ApiKey.vue
+++ b/src/views/profile/ApiKey.vue
@@ -3,7 +3,7 @@
     <GenericListPage
       ref="GenericListTable"
       :header-actions="headerActions"
-      :help-message="helpMessage"
+      :help-tip="helpMessage"
       :table-config="tableConfig"
     />
     <Dialog
diff --git a/src/views/profile/ConnectionToken.vue b/src/views/profile/ConnectionToken.vue
index 8b6a7d69f..69364ddbf 100644
--- a/src/views/profile/ConnectionToken.vue
+++ b/src/views/profile/ConnectionToken.vue
@@ -2,7 +2,7 @@
   <GenericListPage
     ref="GenericListTable"
     :header-actions="headerActions"
-    :help-message="helpMessage"
+    :help-tip="helpMessage"
     :table-config="tableConfig"
   />
 </template>
diff --git a/src/views/profile/TempPassword.vue b/src/views/profile/TempPassword.vue
index 616a833fe..15e28cb74 100644
--- a/src/views/profile/TempPassword.vue
+++ b/src/views/profile/TempPassword.vue
@@ -2,7 +2,7 @@
   <GenericListPage
     ref="GenericListTable"
     :header-actions="headerActions"
-    :help-message="helpMessage"
+    :help-tip="helpMessage"
     :table-config="tableConfig"
   />
 </template>
diff --git a/src/views/sessions/OnlineSession/OnlineSessionList.vue b/src/views/sessions/OnlineSession/OnlineSessionList.vue
index cd8100f33..5910b0a45 100644
--- a/src/views/sessions/OnlineSession/OnlineSessionList.vue
+++ b/src/views/sessions/OnlineSession/OnlineSessionList.vue
@@ -2,7 +2,7 @@
   <GenericListPage
     ref="GenericListPage"
     :header-actions="headerActions"
-    :help-message="helpMsg"
+    :help-tip="helpMsg"
     :table-config="tableConfig"
     :title="this.$t('OnlineUserDevices')"
   />
diff --git a/src/views/settings/Storage/ReplayStorageCreateUpdate.vue b/src/views/settings/Storage/ReplayStorageCreateUpdate.vue
index e29aa40b5..8d6fd524c 100644
--- a/src/views/settings/Storage/ReplayStorageCreateUpdate.vue
+++ b/src/views/settings/Storage/ReplayStorageCreateUpdate.vue
@@ -1,7 +1,7 @@
 <template>
   <GenericCreateUpdatePage
     :create-success-next-route="successUrl"
-    :help-message="getHelpMessage()"
+    :help-tip="getHelpMessage()"
     :update-success-next-route="successUrl"
     v-bind="$data"
   />
diff --git a/src/views/users/Role/RoleList/index.vue b/src/views/users/Role/RoleList/index.vue
index 67c3b2895..607a549d5 100644
--- a/src/views/users/Role/RoleList/index.vue
+++ b/src/views/users/Role/RoleList/index.vue
@@ -25,7 +25,7 @@ export default {
             icon: 'fa-globe',
             hidden: () => !this.$hasPerm('rbac.view_systemrole'),
             component: () => import('@/views/users/Role/RoleList/SysRoleList.vue'),
-            helpMessage: this.$t('SystemRoleHelpMsg')
+            helpTip: this.$t('SystemRoleHelpMsg')
           },
           {
             title: this.$t('OrgRole'),
@@ -33,7 +33,7 @@ export default {
             icon: 'fa-sitemap',
             hidden: () => !this.$store.getters.hasValidLicense || !this.$hasPerm('rbac.view_orgrole'),
             component: () => import('@/views/users/Role/RoleList/OrgRoleList.vue'),
-            helpMessage: this.$t('OrgRoleHelpMsg')
+            helpTip: this.$t('OrgRoleHelpMsg')
           }
         ]
       }