From 860e2780837ce088399b5eed3bc1285f0d1d0e4d Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 13 Jan 2025 11:43:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/layout/components/ToolboxCfg.vue      |  2 +-
 .../src/layout/components/TopDocCard.vue      |  7 ++--
 core/core-frontend/src/locales/en.ts          | 15 ++++----
 core/core-frontend/src/locales/tw.ts          |  1 +
 core/core-frontend/src/locales/zh-CN.ts       |  1 +
 .../src/views/share/share/ShareGrid.vue       |  2 +-
 .../src/views/system/font/index.vue           | 34 ++++++++++++++-----
 .../visualized/data/datasource/index.vue      | 15 +++-----
 .../src/views/watermark/index.vue             |  1 -
 .../src/views/workbranch/ShortcutTable.vue    |  2 +-
 10 files changed, 47 insertions(+), 33 deletions(-)

diff --git a/core/core-frontend/src/layout/components/ToolboxCfg.vue b/core/core-frontend/src/layout/components/ToolboxCfg.vue
index 633faac003..40239e5d2d 100644
--- a/core/core-frontend/src/layout/components/ToolboxCfg.vue
+++ b/core/core-frontend/src/layout/components/ToolboxCfg.vue
@@ -55,7 +55,6 @@ onMounted(() => {
     :show-arrow="false"
     popper-class="toolbox-top-popover"
     placement="bottom-end"
-    width="208"
     trigger="hover"
   >
     <top-doc-card
@@ -84,6 +83,7 @@ onMounted(() => {
 <style lang="less">
 .toolbox-top-popover {
   min-width: 208px !important;
+  width: auto !important;
   padding: 8px !important;
   display: flex;
   .doc-card {
diff --git a/core/core-frontend/src/layout/components/TopDocCard.vue b/core/core-frontend/src/layout/components/TopDocCard.vue
index e34d610680..f3a1d32707 100644
--- a/core/core-frontend/src/layout/components/TopDocCard.vue
+++ b/core/core-frontend/src/layout/components/TopDocCard.vue
@@ -36,8 +36,8 @@ const openBlank = () => {
 
 <style lang="less" scoped>
 .doc-card {
-  padding: 8px 0;
-  width: 96px;
+  padding: 8px;
+  min-width: 96px;
   min-height: 66px;
   cursor: pointer;
   display: flex;
@@ -56,8 +56,7 @@ const openBlank = () => {
   line-height: 22px;
   font-weight: 400;
   margin-top: 4px;
-  width: 96px;
-  word-break: break-word;
+  white-space: nowrap;
   text-align: center;
 }
 
diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts
index 93d6b979b4..a9806e26f4 100644
--- a/core/core-frontend/src/locales/en.ts
+++ b/core/core-frontend/src/locales/en.ts
@@ -10,6 +10,7 @@ export default {
       dateRange: 'Date Range Picker',
       add_component_hint: 'Click or drag the component on the left to add a field'
     },
+    watermarkManagement: 'Watermark Management',
     inputText: 'Please enter',
     selectText: 'Please select',
     add: 'Add',
@@ -18,9 +19,9 @@ export default {
     phone: 'Phone',
     pwd: 'Password',
     require: 'Required',
-    personal_info: 'Personal info',
+    personal_info: 'Personal Info',
     about: 'About',
-    exit_system: 'Exit system',
+    exit_system: 'Log Out',
     letter_start: 'Must start with a letter',
     required: 'Required',
     operate: 'Operation',
@@ -702,7 +703,7 @@ export default {
     to_delete_: 'Are you sure you want to delete [{0}]?'
   },
   user: {
-    change_password: 'Change password',
+    change_password: 'Change Password',
     select_users: 'Please select a user',
     account: 'Account',
     name: 'Name',
@@ -2523,7 +2524,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     mobile_phone: 'Please enter your mobile number',
     mobile_phone_number: 'Mobile number',
     role: 'Role',
-    personal_info: 'Personal info',
+    personal_info: 'Personal Info',
     user_center: 'User Center',
     api_keys: 'API Keys',
     quota: 'Quota Management',
@@ -2535,7 +2536,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     system: 'System',
     personal_setting: 'Personal settings',
     test_resource_pool: 'Test resource pool',
-    system_setting: 'System settings',
+    system_setting: 'System Settings',
     input_content: 'Please enter content',
     create: 'Create',
     edit: 'Edit',
@@ -2547,8 +2548,8 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     not_filled: 'Not filled',
     please_select: 'Please select ',
     search_by_name: 'Search by name',
-    personal_information: 'Personal info',
-    exit_system: 'Exit system',
+    personal_information: 'Personal Info',
+    exit_system: 'Exit System',
     verification: 'Verification',
     title: 'Title',
     custom: 'Custom',
diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts
index 17c1193c10..e588bdc30a 100644
--- a/core/core-frontend/src/locales/tw.ts
+++ b/core/core-frontend/src/locales/tw.ts
@@ -10,6 +10,7 @@ export default {
       dateRange: '時間範圍',
       add_component_hint: '點選或拖曳左側元件新增欄位'
     },
+    watermarkManagement: '水印管理',
     inputText: '請輸入',
     selectText: '請選擇',
     add: '新增',
diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts
index 1a8bcc41ef..c56876b2b3 100644
--- a/core/core-frontend/src/locales/zh-CN.ts
+++ b/core/core-frontend/src/locales/zh-CN.ts
@@ -1,6 +1,7 @@
 export default {
   common: {
     timeout_tips: '请求超时，请稍后再试',
+    watermarkManagement: '水印管理',
     component: {
       input: '单行输入',
       textarea: '多行输入',
diff --git a/core/core-frontend/src/views/share/share/ShareGrid.vue b/core/core-frontend/src/views/share/share/ShareGrid.vue
index 2ade366866..0faed0ad3f 100644
--- a/core/core-frontend/src/views/share/share/ShareGrid.vue
+++ b/core/core-frontend/src/views/share/share/ShareGrid.vue
@@ -251,7 +251,7 @@ watch(
 
 <style lang="less" scoped>
 .select-type-list {
-  width: 104px;
+  width: 120px;
   :deep(.ed-input__wrapper) {
     padding-left: 11px;
     padding-right: 11px;
diff --git a/core/core-frontend/src/views/system/font/index.vue b/core/core-frontend/src/views/system/font/index.vue
index fcf53fc148..97d21f2f3f 100644
--- a/core/core-frontend/src/views/system/font/index.vue
+++ b/core/core-frontend/src/views/system/font/index.vue
@@ -146,12 +146,17 @@ onMounted(() => {
         <div class="font-content_item" v-for="ele in fontListComputed" :key="ele">
           <span v-if="ele.isDefault" class="font-default">{{ t('system.default_font') }}</span>
           <div class="font-name">
-            {{ ele.name }}
+            <span :title="ele.name" :class="!ele.isBuiltin && 'font-name_text'">{{
+              ele.name
+            }}</span>
             <span v-if="ele.isBuiltin" class="font-type"> {{ t('system.system_built_in') }} </span>
           </div>
           <div :title="ele.fileName" class="font-update_time">
             {{ t('system.update_time') }} {{ new Date(ele.updateTime).toLocaleString() }}
-            <span class="line"></span> {{ t('system.font_file') }} {{ ele.fileName }}
+            <span class="line"></span>
+            <span :title="ele.fileName" class="font-update_text"
+              >{{ t('system.font_file') }} {{ ele.fileName }}</span
+            >
           </div>
           <div class="font-upload_btn">
             <el-button
@@ -220,7 +225,7 @@ onMounted(() => {
       position: relative;
       padding: 24px;
       .font-default {
-        width: 68px;
+        min-width: 68px;
         height: 24px;
         background: #34c72433;
         position: absolute;
@@ -230,7 +235,7 @@ onMounted(() => {
         font-weight: 400;
         line-height: 22px;
         color: #2ca91f;
-        padding-left: 6px;
+        padding: 0 6px;
         border-bottom-left-radius: 4px;
       }
 
@@ -242,8 +247,15 @@ onMounted(() => {
         align-items: center;
         margin-bottom: 4px;
 
+        .font-name_text {
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          min-width: 250px;
+        }
+
         .font-type {
-          width: 56px;
+          min-width: 56px;
           height: 20px;
           border-radius: 2px;
           background: #3370ff33;
@@ -252,7 +264,7 @@ onMounted(() => {
           line-height: 20px;
           color: #2b5fd9;
           margin-left: 8px;
-          padding-left: 4px;
+          padding: 0 4px;
         }
       }
 
@@ -265,14 +277,20 @@ onMounted(() => {
         display: flex;
         align-items: center;
         white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
+
         .line {
           width: 1px;
           height: 14px;
           background: #1f232926;
           margin: 0 8px;
         }
+
+        .font-update_text {
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          min-width: 30px;
+        }
       }
 
       .font-upload_btn {
diff --git a/core/core-frontend/src/views/visualized/data/datasource/index.vue b/core/core-frontend/src/views/visualized/data/datasource/index.vue
index 7e21468b97..36719ca0c7 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/index.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/index.vue
@@ -1662,14 +1662,9 @@ const getMenuList = (val: boolean) => {
                     </el-button>
                   </el-col>
                 </el-row>
-                <el-row>
-                  <el-col :span="19">
-                    <span
-                      >{{ t('data_source.data_time') }}
-                      {{ timestampFormatDate(api['updateTime']) }}</span
-                    >
-                  </el-col>
-                </el-row>
+                <div>
+                  {{ t('data_source.data_time') }} {{ timestampFormatDate(api['updateTime']) }}
+                </div>
 
                 <div class="req-title">
                   <span>{{ t('datasource.method') }}</span>
@@ -1677,7 +1672,7 @@ const getMenuList = (val: boolean) => {
                 </div>
                 <div class="req-value">
                   <span>{{ api.method }}</span>
-                  <el-tooltip w effect="dark" :content="api.url" placement="top">
+                  <el-tooltip effect="dark" :content="api.url" placement="top">
                     <span>{{ api.url }}</span>
                   </el-tooltip>
                 </div>
@@ -2090,7 +2085,7 @@ const getMenuList = (val: boolean) => {
       font-size: 14px;
       font-weight: 400;
       :nth-child(1) {
-        width: 100px;
+        width: 110px;
       }
 
       :nth-child(2) {
diff --git a/core/core-frontend/src/views/watermark/index.vue b/core/core-frontend/src/views/watermark/index.vue
index 1e03a4774d..cf81d56b04 100644
--- a/core/core-frontend/src/views/watermark/index.vue
+++ b/core/core-frontend/src/views/watermark/index.vue
@@ -1,5 +1,4 @@
 <template xmlns:el-col="http://www.w3.org/1999/html">
-  <p class="router-title">水印管理</p>
   <el-row class="watermark-table__content">
     <el-row class="watermark-main-outer">
       <el-col class="main-col-left" :span="12">
diff --git a/core/core-frontend/src/views/workbranch/ShortcutTable.vue b/core/core-frontend/src/views/workbranch/ShortcutTable.vue
index 1110632f6d..7beef08fd9 100644
--- a/core/core-frontend/src/views/workbranch/ShortcutTable.vue
+++ b/core/core-frontend/src/views/workbranch/ShortcutTable.vue
@@ -491,7 +491,7 @@ const getEmptyDesc = (): string => {
   margin-top: 16px;
 
   .select-type-list {
-    width: 104px;
+    width: 120px;
     :deep(.ed-input__wrapper) {
       padding-left: 11px;
       padding-right: 11px;