From c1272d9a9f3fa57d8c4f43a670460afdd0ce4a5c Mon Sep 17 00:00:00 2001
From: feng626 <57284900+feng626@users.noreply.github.com>
Date: Mon, 27 Feb 2023 15:56:30 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"perf:=20lina=20=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ListTable/index.vue                   | 12 ------------
 src/i18n/langs/en.json                               |  5 ++---
 src/i18n/langs/ja.json                               |  5 ++---
 src/i18n/langs/zh.json                               |  3 +--
 src/views/assets/Asset/AssetList/WebList.vue         |  3 +--
 .../assets/Asset/AssetList/components/BaseList.vue   |  8 ++------
 6 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/src/components/ListTable/index.vue b/src/components/ListTable/index.vue
index 6938e3ed4..1ce7d4f5b 100644
--- a/src/components/ListTable/index.vue
+++ b/src/components/ListTable/index.vue
@@ -1,11 +1,5 @@
 <template>
   <div>
-    <PageContent>
-      <el-alert v-if="notice" type="success">
-        <span class="announcement-main" v-html="notice" />
-      </el-alert>
-      <slot />
-    </PageContent>
     <TableAction
       v-if="hasActions"
       :date-pick="handleDateChange"
@@ -36,12 +30,10 @@ import TableAction from './TableAction'
 import Emitter from '@/mixins/emitter'
 import AutoDataTable from '../AutoDataTable'
 import { getDayEnd, getDaysAgo } from '@/utils/common'
-import { PageContent } from '@/layout/components/Page'
 
 export default {
   name: 'ListTable',
   components: {
-    PageContent,
     AutoDataTable,
     TableAction,
     IBox
@@ -57,10 +49,6 @@ export default {
     headerActions: {
       type: Object,
       default: () => ({})
-    },
-    notice: {
-      type: String,
-      default: ''
     }
   },
   data() {
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index e171f54be..349e30282 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -290,7 +290,6 @@
     "Domain": "Domain",
     "DomainDetail": "Domain detail",
     "DomainHelpMessage": "The domain function is added to address the fact that some environments (such as the hybrid cloud) cannot be connected directly by jumping on the gateway server.\nJMS => Domain gateway => Target assets",
-    "WebHelpMessage": "Web type assets depend on remote applications. Please go to System Settings to configure the publisher in the remote application.",
     "FullName": "Full name",
     "Gateway": "Gateway",
     "GatewayList": "Gateway",
@@ -1000,7 +999,7 @@
     "ManualInput": "Manual input",
     "SameAccount": "Same account",
     "SpecifyAccounts": "Specify accounts",
-    "AccountsHelp": "All accounts: accounts exists on the asset; specify accounts: Specify the account user name associated with the current system asset；Manual input: username/password; Same account: The account username name same with login user",
+    "AccountsHelp": "All accounts: accounts exists on the asset; Specify accounts: specify accounts by username；Manual input: username/password; Same account: The account username name same with login user",
     "Input": "Input",
     "permAccount": "Accounts",
     "Actions": "Actions",
@@ -2062,4 +2061,4 @@
     "PublishStatus": "Publish status",
     "NoPublished": "Unpublished"
   }
-}
+}
\ No newline at end of file
diff --git a/src/i18n/langs/ja.json b/src/i18n/langs/ja.json
index 13710e92a..18950bb93 100644
--- a/src/i18n/langs/ja.json
+++ b/src/i18n/langs/ja.json
@@ -283,7 +283,6 @@
     "Domain": "ドメイン",
     "DomainDetail": "ドメインの詳細",
     "DomainHelpMessage": "ドメイン機能は、一部の環境 (ハイブリッドクラウドなど) が直接接続できないことを解決するために追加された機能で、ゲートウェイサーバを介してジャンプ登録を行うのが原理です。JMS => ドメインゲートウェイ => ターゲット資産",
-    "WebHelpMessage": "Web タイプ資産はリモートアプリケーションに依存しており、システム設定のリモートアプリケーションでパブリッシャを構成してください。",
     "FullName": "フルネーム",
     "Gateway": "ゲートウェイ",
     "GatewayProtocolHelpText": "SSHゲートウェイ、プロキシSSH、RDP、VNCをサポート",
@@ -998,7 +997,7 @@
     "ManualInput": "手動入力",
     "SameAccount": "同じ名前のアカウント",
     "SpecifyAccounts": "入力の指定",
-    "AccountsHelp": "すべてのアカウント: アカウントはアセットに存在します。 アカウントの指定: 現在のシステム資産に関連付けられているアカウントユーザー名を指定します。手入力: ユーザー名/パスワード; 同一アカウント：ログインユーザーと同じアカウントのユーザー名",
+    "AccountsHelp": "すべてのアカウント: アカウントはアセットに存在します。 アカウントの指定: ユーザー名でアカウントを指定します。手入力: ユーザー名/パスワード; 同一アカウント：ログインユーザーと同じアカウントのユーザー名",
     "Input": "入力",
     "permAccount": "認定アカウント",
     "Actions": "アクション",
@@ -2052,4 +2051,4 @@
     "PublishStatus": "投稿ステータス",
     "NoPublished": "未発表"
   }
-}
+}
\ No newline at end of file
diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json
index 8d82814b3..3114bf88f 100644
--- a/src/i18n/langs/zh.json
+++ b/src/i18n/langs/zh.json
@@ -297,7 +297,6 @@
     "Domain": "网域",
     "DomainDetail": "网域详情",
     "DomainHelpMessage": "网域功能是为了解决部分环境（如：混合云）无法直接连接而新增的功能，原理是通过网关服务器进行跳转登录。JMS => 网域网关 => 目标资产",
-    "WebHelpMessage": "Web 类型资产依赖于远程应用，请前往系统设置在远程应用中配置发布机。",
     "FullName": "全称",
     "Gateway": "网关",
     "GatewayProtocolHelpText": "SSH网关，支持代理SSH,RDP和VNC",
@@ -990,7 +989,7 @@
   },
   "perms": {
     "": "",
-    "AccountsHelp": "所有账号: 资产上添加的账号; 指定账号：指定当前系统资产所关联账号的用户名；手动输入: 用户名/密码 手动输入; 同名账号: 与被授权人用户名相同的账号;",
+    "AccountsHelp": "所有账号: 资产上添加的账号; 指定账号：指定账号的用户名；手动输入: 用户名/密码 手动输入; 同名账号: 与被授权人用户名相同的账号;",
     "AllAccounts": "所有账号",
     "ManualInput": "手动输入",
     "SameAccount": "同名账号",
diff --git a/src/views/assets/Asset/AssetList/WebList.vue b/src/views/assets/Asset/AssetList/WebList.vue
index a41324845..80590ea9d 100644
--- a/src/views/assets/Asset/AssetList/WebList.vue
+++ b/src/views/assets/Asset/AssetList/WebList.vue
@@ -27,8 +27,7 @@ export default {
               width: '100px'
             }
           }
-        },
-        notice: this.$t('assets.WebHelpMessage')
+        }
       }
     }
   }
diff --git a/src/views/assets/Asset/AssetList/components/BaseList.vue b/src/views/assets/Asset/AssetList/components/BaseList.vue
index 9a3a4f4b2..1e63812c2 100644
--- a/src/views/assets/Asset/AssetList/components/BaseList.vue
+++ b/src/views/assets/Asset/AssetList/components/BaseList.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <ListTable ref="ListTable" :header-actions="iHeaderActions" :notice="notice" :table-config="iTableConfig" />
+    <ListTable ref="ListTable" :header-actions="iHeaderActions" :table-config="iTableConfig" />
     <PlatformDialog :category="category" :visible.sync="showPlatform" />
     <AssetBulkUpdateDialog
       :visible.sync="updateSelectedDialogSetting.visible"
@@ -52,10 +52,6 @@ export default {
     addExtraMoreActions: {
       type: Array,
       default: () => []
-    },
-    notice: {
-      type: String,
-      default: ''
     }
   },
   data() {
@@ -259,6 +255,6 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
+<style>
 
 </style>