perf: 兼容之前的 help message，更名 help tip

2026-01-15 14:24:39 +00:00 · 2024-04-07 18:06:07 +08:00
parent cb454d83a1
commit bb6be97bee
16 changed files with 34 additions and 21 deletions
--- 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) {
--- 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]: '' }
        })
      }
    },
--- 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')
          }
        ]
      }
--- 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>
--- 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>
--- 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>

--- 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"
    >
--- 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>
--- 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"
  >
--- 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"
--- 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
--- 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>
--- 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>
--- 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')"
  />
--- 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"
  />
--- 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')
          }
        ]
      }