From 134dd17f3fee2f6a4d48d85cde195cbf6e5ecdb6 Mon Sep 17 00:00:00 2001
From: fit2bot <68588906+fit2bot@users.noreply.github.com>
Date: Thu, 27 Jul 2023 16:52:58 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E6=B7=BB=E5=8A=A0=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E5=B8=82=E5=9C=BA=E9=93=BE=E6=8E=A5=20(#3292)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* perf: 添加应用市场链接

* perf: 修改版本号

* perf: 修改高度

---------

Co-authored-by: ibuler <ibuler@qq.com>
---
 src/components/Tooltip/index.vue                    |  8 ++++----
 src/i18n/langs/en.json                              |  1 +
 src/i18n/langs/ja.json                              |  1 +
 src/i18n/langs/zh.json                              |  1 +
 .../settings/Applet/Applet/AppletDetail/Detail.vue  |  8 ++++----
 src/views/settings/Applet/Applet/AppletList.vue     | 10 ++++++++++
 .../settings/Applet/Applet/components/CardTable.vue | 13 ++++++++++---
 7 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/src/components/Tooltip/index.vue b/src/components/Tooltip/index.vue
index efeeaaff5..b2e7308dc 100644
--- a/src/components/Tooltip/index.vue
+++ b/src/components/Tooltip/index.vue
@@ -1,10 +1,10 @@
 <template>
   <div ref="boxDom" class="tooltip">
     <el-tooltip
-      :disabled="showTooltip"
       :content="content"
-      :placement="placement"
+      :disabled="showTooltip"
       :effect="effect"
+      :placement="placement"
     >
       <div class="multi-line-limit">{{ content }}</div>
     </el-tooltip>
@@ -56,12 +56,12 @@ export default {
       this.showTooltip = boxWidth * this.line > textWidth
     },
     setUI() {
-      this.$refs.boxDom.style.setProperty('--line', `${this.line * 15}px`)
+      this.$refs.boxDom.style.setProperty('--line', `${this.line * 18}px`)
     }
   }
 }
 </script>
-<style scoped lang="less">
+<style lang="less" scoped>
   .tooltip {
     margin-bottom: 10px;
   }
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index 0463120e4..9a9600225 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -1405,6 +1405,7 @@
     "NoPermission": "No permission"
   },
   "terminal": {
+    "Marketplace": "Marketplace",
     "Author": "Author",
     "Uploading": "File uploading",
     "UploadSucceed": "Upload succeed",
diff --git a/src/i18n/langs/ja.json b/src/i18n/langs/ja.json
index 751d4bc2e..631331cbc 100644
--- a/src/i18n/langs/ja.json
+++ b/src/i18n/langs/ja.json
@@ -1400,6 +1400,7 @@
     "NoPermission": "権限なし"
   },
   "terminal": {
+    "Marketplace": "マーケットプレイス",
     "Author": "作者",
     "Uploading": "ファイルのアップロード",
     "UploadSucceed": "アップロード成功",
diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json
index 70bc026d0..751a92632 100644
--- a/src/i18n/langs/zh.json
+++ b/src/i18n/langs/zh.json
@@ -1390,6 +1390,7 @@
     "NoPermission": "暂无权限"
   },
   "terminal": {
+    "Marketplace": "应用市场",
     "Author": "作者",
     "BasePort": "监听端口",
     "DatabasePort": "数据库协议端口",
diff --git a/src/views/settings/Applet/Applet/AppletDetail/Detail.vue b/src/views/settings/Applet/Applet/AppletDetail/Detail.vue
index 7980c58d0..d927529e7 100644
--- a/src/views/settings/Applet/Applet/AppletDetail/Detail.vue
+++ b/src/views/settings/Applet/Applet/AppletDetail/Detail.vue
@@ -1,14 +1,14 @@
 <template>
   <el-row :gutter="20">
-    <el-col :md="14" :sm="24">
+    <el-col :md="8" :sm="24">
+      <AutoDetailCard :fields="detailFields" :object="object" :url="url" />
+    </el-col>
+    <el-col :md="16" :sm="24">
       <IBox title="README">
         <vue-markdown v-if="object.readme" :source="object.readme" />
         <span v-else>{{ $tc('common.NoData') }}</span>
       </IBox>
     </el-col>
-    <el-col :md="10" :sm="24">
-      <AutoDetailCard :fields="detailFields" :object="object" :url="url" />
-    </el-col>
   </el-row>
 </template>
 
diff --git a/src/views/settings/Applet/Applet/AppletList.vue b/src/views/settings/Applet/Applet/AppletList.vue
index 98465bbbb..7c037c2bd 100644
--- a/src/views/settings/Applet/Applet/AppletList.vue
+++ b/src/views/settings/Applet/Applet/AppletList.vue
@@ -26,10 +26,20 @@ export default {
         onCreate: () => {
           this.uploadDialogVisible = true
         },
+        createTitle: this.$t('common.Upload'),
         searchConfig: {
           getUrlQuery: false,
           exclude: ['version']
         },
+        extraActions: [
+          {
+            title: this.$t('terminal.Marketplace'),
+            icon: 'el-icon-shopping-bag-1',
+            callback: () => {
+              window.open('https://apps.fit2cloud.com/jumpserver')
+            }
+          }
+        ],
         detailRoute: 'AppletDetail',
         hasExport: false,
         hasImport: false,
diff --git a/src/views/settings/Applet/Applet/components/CardTable.vue b/src/views/settings/Applet/Applet/components/CardTable.vue
index 7b252563e..cc69d6573 100644
--- a/src/views/settings/Applet/Applet/components/CardTable.vue
+++ b/src/views/settings/Applet/Applet/components/CardTable.vue
@@ -20,10 +20,15 @@
                 <img :src="d.icon" class="image">
               </el-col>
               <el-col :span="16" style="text-align: left; padding: 5px 0">
-                <div class="one-line"><b>{{ d.display_name }}</b></div>
+                <div class="one-line">
+                  <b>{{ d.display_name }}</b>
+                  <el-tag size="mini" style="margin-left: 5px">{{ d.version }}</el-tag>
+                </div>
                 <el-divider class="my-divider" />
                 <Tooltip :content="d.comment" class="comment" />
-                <el-tag v-for="tag of d.tags" :key="tag" size="mini"> {{ tag }}</el-tag>
+                <el-tag v-for="tag of d.tags" :key="tag" size="mini">
+                  {{ capitalize(tag) }}
+                </el-tag>
               </el-col>
             </el-row>
           </el-card>
@@ -87,11 +92,13 @@ export default {
       return this.tableConfig.url || ''
     }
   },
-  watch: {},
   mounted() {
     this.getList()
   },
   methods: {
+    capitalize(str) {
+      return str.charAt(0).toUpperCase() + str.slice(1)
+    },
     getIcon(status) {
       let iconClass = 'fa-check-circle'
       if (status === false) {