From 4ce725c77fb8d94660ff30da8908ce249844d37e Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 26 Nov 2024 12:30:48 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=9B=BD=E9=99=85=E5=8C=96?=
 =?UTF-8?q?=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datasource/provider/CalciteProvider.java  |   6 +-
 .../src/components/de-app/AppExportForm.vue   |  24 +-
 core/core-frontend/src/locales/en.ts          | 228 +++++++++---------
 core/core-frontend/src/locales/tw.ts          |  13 +-
 core/core-frontend/src/locales/zh-CN.ts       |  12 +-
 .../modules/data-visualization/dvMain.ts      |   5 +-
 .../editor/dataset-select/DatasetSelect.vue   |  18 +-
 .../chart/components/editor/util/chart.ts     |   4 +-
 .../src/views/common/DeResourceTree.vue       |   3 +-
 .../src/views/workbranch/index.vue            |   4 +-
 10 files changed, 179 insertions(+), 138 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java b/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java
index 2024851bde..3d44ece15d 100644
--- a/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java
+++ b/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java
@@ -432,7 +432,7 @@ public class CalciteProvider extends Provider {
         } catch (SQLException e) {
             DEException.throwException("SQL ERROR: " + e.getMessage());
         } catch (Exception e) {
-            DEException.throwException("Data source connection exception: " + e.getMessage());
+            DEException.throwException("Datasource connection exception: " + e.getMessage());
         } finally {
             if (resultSet != null) {
                 try {
@@ -473,7 +473,7 @@ public class CalciteProvider extends Provider {
         } catch (SQLException e) {
             DEException.throwException("SQL ERROR: " + e.getMessage());
         } catch (Exception e) {
-            DEException.throwException("Data source connection exception: " + e.getMessage());
+            DEException.throwException("Datasource connection exception: " + e.getMessage());
         } finally {
             if (resultSet != null) {
                 try {
@@ -511,7 +511,7 @@ public class CalciteProvider extends Provider {
         } catch (SQLException e) {
             DEException.throwException("SQL ERROR: " + e.getMessage());
         } catch (Exception e) {
-            DEException.throwException("Data source connection exception: " + e.getMessage());
+            DEException.throwException("Datasource connection exception: " + e.getMessage());
         } finally {
             if (resultSet != null) {
                 try {
diff --git a/core/core-frontend/src/components/de-app/AppExportForm.vue b/core/core-frontend/src/components/de-app/AppExportForm.vue
index deef73e560..313855eadb 100644
--- a/core/core-frontend/src/components/de-app/AppExportForm.vue
+++ b/core/core-frontend/src/components/de-app/AppExportForm.vue
@@ -1,6 +1,6 @@
 <template>
   <el-drawer
-    :title="'应用导出'"
+    :title="t('visualization.app_export')"
     v-model="state.applyDownloadDrawer"
     custom-class="de-user-drawer"
     size="600px"
@@ -15,21 +15,25 @@
         label-width="180px"
         label-position="top"
       >
-        <el-form-item :label="'应用名称'" prop="appName">
-          <el-input v-model="state.form.appName" autocomplete="off" :placeholder="'请输入名称'" />
+        <el-form-item :label="t('visualization.app_name')" prop="appName">
+          <el-input
+            v-model="state.form.appName"
+            autocomplete="off"
+            :placeholder="t('visualization.input_name')"
+          />
         </el-form-item>
-        <el-form-item :label="'应用版本号'" prop="version">
+        <el-form-item :label="t('visualization.app_version')" prop="version">
           <el-input v-model="state.form.version" autocomplete="off" />
         </el-form-item>
-        <el-form-item :label="'DataEase最低版本号'" prop="required">
+        <el-form-item :label="t('visualization.app_export')" prop="required">
           <el-input v-model="state.form.required" autocomplete="off" />
         </el-form-item>
-        <el-form-item :label="'作者'" prop="creator">
+        <el-form-item :label="t('visualization.creator')" prop="creator">
           <el-input v-model="state.form.creator" autocomplete="off" />
         </el-form-item>
-        <el-form-item :label="'描述'" prop="description">
+        <el-form-item :label="t('visualization.description')" prop="description">
           <el-input
-            :placeholder="'请输入内容'"
+            :placeholder="t('visualization.input_content')"
             show-word-limit
             v-model="state.form.description"
             type="textarea"
@@ -39,8 +43,8 @@
     </div>
     <template #footer>
       <div class="apply" style="width: 100%">
-        <el-button secondary @click="close">{{ $t('commons.cancel') }} </el-button>
-        <el-button type="primary" @click="downloadApp">导出</el-button>
+        <el-button secondary @click="close">{{ t('commons.cancel') }} </el-button>
+        <el-button type="primary" @click="downloadApp">{{ t('visualization.export') }}</el-button>
       </div>
     </template>
   </el-drawer>
diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts
index 2d592f6fd4..50343ad527 100644
--- a/core/core-frontend/src/locales/en.ts
+++ b/core/core-frontend/src/locales/en.ts
@@ -162,7 +162,7 @@ export default {
     run: 'Run',
     parameter_settings: 'Parameter settings',
     save: 'Save',
-    current_data_source: 'Current data source',
+    current_data_source: 'Current Datasource',
     relevant_content_found: 'No relevant content found',
     physical_field_name: 'Physical field name',
     click_above: 'Click above',
@@ -179,7 +179,7 @@ export default {
     edit_sql: 'Edit SQL',
     custom_sql_here: 'Drag table or custom SQL here',
     on_the_left: 'Drag the data table and custom SQL on the left',
-    a_data_set: 'Drag here to create a data set',
+    a_data_set: 'Drag here to create a Dataset',
     rename_table: 'Rename table',
     table_name: 'Table name',
     table_name_de: 'Table name',
@@ -204,8 +204,8 @@ export default {
     cannot_be_empty_de_field: 'Related field cannot be empty!',
     dataset_cannot_be: 'Dataset cannot be empty',
     save_and_return: 'Save and return',
-    select_data_source: 'Select data source',
-    invalid_data_source: 'Invalid data source',
+    select_data_source: 'Select Datasource',
+    invalid_data_source: 'Invalid Datasource',
     be_reported_incorrectly:
       "You are doing cross-data source table association, please make sure to use calcite's standard syntax and functions,otherwise it will cause dataset errors",
     refresh_data: 'Refresh data',
@@ -221,7 +221,7 @@ export default {
   data_source: {
     successfully_created: 'Created successfully',
     continue_to_create: 'Continue to create',
-    data_source_list: 'Return to data source list',
+    data_source_list: 'Return to Datasource list',
     prompts_next_time: "Don't prompt next time",
     also_want_to: 'You may also want',
     or_large_screen: 'Prepare for the next dashboard or large screen',
@@ -236,16 +236,16 @@ export default {
     operate_with_caution:
       'After deletion, all resources under this folder will be deleted. Please operate with caution.',
     confirm_to_delete:
-      'A dataset is using this data source. After deletion, the dataset will be unavailable. Confirm the deletion? ',
+      'A dataset is using this Datasource. After deletion, the dataset will be unavailable. Confirm the deletion? ',
     view_blood_relationship: 'View blood relationship',
-    no_data_source: 'No data source',
+    no_data_source: 'No Datasource',
     replace_data: 'Replace data',
     append_data: 'Append data',
     latest_update_status: 'Latest update status',
     latest_update_time: 'Latest update time',
     data_time: 'Data time:',
     update_all: 'Update all',
-    on_the_left: 'Please select a data source on the left',
+    on_the_left: 'Please select a Datasource on the left',
     update_result: 'Update result',
     failure_details: 'Failure details',
     the_request_address: 'Please enter the request address',
@@ -263,10 +263,10 @@ export default {
     value: 'Value',
     name_use_parameters: 'You can use ${parameter name}, use parameters',
     add_parameters: 'Add parameters',
-    data_source_name: 'Data source name',
-    data_source_name_de: 'Please enter the data source name',
+    data_source_name: 'Datasource name',
+    data_source_name_de: 'Please enter the Datasource name',
     a_folder_name: 'Please enter the folder name',
-    data_source: 'Data source',
+    data_source: 'Datasource',
     the_destination_folder: 'Please select the destination folder',
     relevant_content_found: 'No relevant content found',
     cannot_be_empty: 'SSH host cannot be empty',
@@ -278,7 +278,7 @@ export default {
     to_64_characters_de: 'Interface name limit 2 to 64 characters',
     sure_to_delete: 'Are you sure you want to delete?',
     delete: 'Delete',
-    source_configuration_information: 'Data source configuration information',
+    source_configuration_information: 'Datasource configuration information',
     data_update_settings: 'Data update settings',
     connection_method: 'Connection method',
     hostname: 'Host name',
@@ -312,9 +312,9 @@ export default {
     the_previous_step:
       'The information you filled in will be cleared. Are you sure you want to return to the previous step? ',
     add_data_table: 'Need to add a data table',
-    source_saved_successfully: 'Save data source successfully',
-    copy_data_source: 'Copy data source',
-    create_data_source: 'Create data source',
+    source_saved_successfully: 'Save Datasource successfully',
+    copy_data_source: 'Copy Datasource',
+    create_data_source: 'Create Datasource',
     want_to_exit: 'Current changes have not been saved, are you sure you want to exit?',
     configuration_information: 'Configuration information',
     recently_created: 'Recently created',
@@ -834,8 +834,8 @@ export default {
     menu: 'Menu permissions',
     panel: 'Dashboard',
     screen: 'Data screen',
-    dataset: 'Data set',
-    datasource: 'Data source',
+    dataset: 'Dataset',
+    datasource: 'Datasource',
     all_types: 'All types',
     empty_desc: 'Please select user/role and resource type',
     row_column: 'Row and column permission settings',
@@ -883,10 +883,10 @@ export default {
     inner_role_tips: 'System built-in role, permissions cannot be edited'
   },
   datasource: {
-    datasource: 'Data source',
-    create: 'Create a new data source',
-    config: 'Data source configuration',
-    table: 'Data source table',
+    datasource: 'Datasource',
+    create: 'Create a new Datasource',
+    config: 'Datasource configuration',
+    table: 'Datasource table',
     table_name: 'table name',
     remark: 'remark',
     column_name: 'field name',
@@ -895,17 +895,17 @@ export default {
     dl: 'data lake',
     other: 'other',
     local_file: 'local file',
-    select_ds_type: 'select data source type',
-    select_ds: 'select data source',
-    ds_info: 'enter data source information',
+    select_ds_type: 'select Datasource type',
+    select_ds: 'select Datasource',
+    ds_info: 'enter Datasource information',
     sync_info: 'data synchronization settings',
     input_name: 'please enter a name',
     input_limit_2_25: '{0}-{1} characters',
     input_limit_2_50: '2-50 characters',
     input_limit_2_64: '2-64 characters',
     input_limit_1_64: '1-64 characters',
-    data_source_configuration: 'data source configuration',
-    data_source_table: 'Data Source Table',
+    data_source_configuration: 'Datasource configuration',
+    data_source_table: 'Datasource Table',
     auth_method: 'Authentication Method',
     passwd: 'Username and Password',
     kerbers_info:
@@ -913,9 +913,9 @@ export default {
     client_principal: 'Client Principal',
     keytab_Key_path: 'Keytab Key Path',
     please_select_left: 'Please select from the left',
-    show_info: 'Data Source Information',
+    show_info: 'Datasource Information',
     type: 'Type',
-    please_choose_type: 'Please select the data source type',
+    please_choose_type: 'Please select the Datasource type',
     please_choose_data_type: 'Please select the calculation mode',
     data_base: 'Database Name',
     user_name: 'User Name',
@@ -937,8 +937,8 @@ export default {
     please_input_url: 'Please enter the URL address',
     please_input_port: 'Please enter the port',
     please_input_be_port: 'Please enter the BE port',
-    modify: 'Edit data source',
-    copy: 'Copy data source',
+    modify: 'Edit Datasource',
+    copy: 'Copy Datasource',
     validate_success: 'Validation successful',
     validate_failed: 'Validation failed',
     validate: 'Validation',
@@ -956,10 +956,10 @@ export default {
     please_choose_charset: 'Please select database character set',
     please_choose_targetCharset: 'Please select target character set',
     edit_datasource_msg:
-      'Modifying the data source information may make the data set under the data source unavailable. Confirm the modification? ',
-    repeat_datasource_msg: 'Data source information with the same configuration already exists, ',
+      'Modifying the Datasource information may make the Dataset under the Datasource unavailable. Confirm the modification? ',
+    repeat_datasource_msg: 'Datasource information with the same configuration already exists, ',
     confirm_save: 'Confirm to save?',
-    in_valid: 'Invalid data source',
+    in_valid: 'Invalid Datasource',
     initial_pool_size: 'Initial number of connections',
     min_pool_size: 'Minimum number of connections',
     max_pool_size: 'Maximum number of connections',
@@ -1040,14 +1040,14 @@ export default {
     add_driver: 'Add driver',
     diver_on_the_left: 'Please select a driver on the left',
     no_data_table: 'No data table yet',
-    on_the_left: 'Please select a data source on the left',
+    on_the_left: 'Please select a Datasource on the left',
     create_dataset: 'Create a dataset',
     table_description: 'Table notes',
     relational_database: 'Relational database',
     data_warehouse_lake: 'Data warehouse/data lake',
     non_relational_database: 'Non-relational database',
     all: 'All',
-    this_data_source: 'Are you sure you want to delete this data source? ',
+    this_data_source: 'Are you sure you want to delete this Datasource? ',
     delete_this_dataset: 'Are you sure you want to delete this dataset? ',
     edit_folder: 'Edit folder',
     click_to_check: 'Click to view blood relationship',
@@ -1055,7 +1055,7 @@ export default {
     delete_this_item: 'Do you want to delete this item? ',
     can_be_uploaded: 'Only supports uploading JAR format files',
     query_timeout: 'Query timeout',
-    add_data_source: 'Add data source',
+    add_data_source: 'Add Datasource',
     delete_this_driver: 'Are you sure you want to delete this driver? ',
     basic_info: 'Basic information',
     data_preview: 'Preview data',
@@ -1076,11 +1076,11 @@ export default {
     parse_filed: 'Parse field',
     set_key: 'Set as primary key',
     field_rename: 'Rename',
-    select_type: 'Select data source type',
+    select_type: 'Select Datasource type',
     sync_table: 'Synchronize the specified table',
     req_completed: 'Request successful',
     sync_rate: 'Update frequency',
-    has_same_ds: 'There is a data source with the same configuration, confirm to save? '
+    has_same_ds: 'There is a Datasource with the same configuration, confirm to save? '
   },
   chart: {
     align: 'alignment',
@@ -1139,17 +1139,17 @@ export default {
     cancel: 'Cancel',
     search: 'Search',
     back: 'Return',
-    add_table: 'Add data set',
+    add_table: 'Add Dataset',
     process: 'Progress',
     add_chart: 'Add chart',
-    db_data: 'Database data set',
-    sql_data: 'SQL data set',
+    db_data: 'Database Dataset',
+    sql_data: 'SQL Dataset',
     excel_data: 'Excel dataset',
     custom_data: 'Custom dataset',
     pls_slc_tbl_left: 'Please select a chart from the left',
     add_db_table: 'Add a database dataset',
     add_api_table: 'Add an API dataset',
-    pls_slc_data_source: 'Please select a data source',
+    pls_slc_data_source: 'Please select a Datasource',
     table: 'Table',
     edit: 'Edit',
     create_view: 'Create a view',
@@ -1400,7 +1400,7 @@ export default {
     axis_label_fontsize: 'Label size',
     text_style: 'Font style',
     bolder: 'Bold',
-    change_ds: 'Change data set',
+    change_ds: 'Change Dataset',
     change_ds_tip:
       'Tip: Changing data sets will cause fields to change, and charts need to be recreated',
     axis_name_color: 'Name color',
@@ -1902,7 +1902,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     pls_slc_tbl_left: 'Please select a table from the left',
     add_db_table: 'Add database dataset',
     add_api_table: 'Add API dataset',
-    pls_slc_data_source: 'Please select a data source',
+    pls_slc_data_source: 'Please select a Datasource',
     table: 'Table',
     edit: 'Edit',
     create_view: 'Create a chart',
@@ -1947,7 +1947,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     close: 'Close',
     required: 'Required',
     input_content: 'Please enter content',
-    add_sql_table: 'Add SQL data set',
+    add_sql_table: 'Add SQL Dataset',
     preview: 'Preview',
     pls_input_name: 'Please enter a name',
     connect_mode: 'Connection mode',
@@ -1957,10 +1957,10 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     last_update_time: 'Last update time',
     current_update_time: 'Current update time',
     param: 'Parameter',
-    edit_sql: 'Edit SQL data set',
+    edit_sql: 'Edit SQL Dataset',
     showRow: 'Show row',
-    add_excel_table: 'Add Excel data set',
-    add_custom_table: 'Add custom data set',
+    add_excel_table: 'Add Excel Dataset',
+    add_custom_table: 'Add custom Dataset',
     upload_file: 'Upload file',
     detail: 'Details',
     type: 'Type',
@@ -2034,7 +2034,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     inner_join: 'Inner join',
     full_join: 'Full join',
     can_not_union_diff_datasource:
-      'The associated dataset must be consistent with the data source of the current dataset',
+      'The associated dataset must be consistent with the Datasource of the current dataset',
     operator: 'Operation',
     d_q_trans: 'Dimension/metric conversion',
     add_calc_field: 'Create a new calculated field',
@@ -2051,7 +2051,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     merge: 'Merge',
     no_merge: 'Do not merge',
     merge_msg:
-      'There are fields that are consistent in the data table. Do you want to merge them into one data set?',
+      'There are fields that are consistent in the data table. Do you want to merge them into one Dataset?',
     merge_title: 'Merge data',
     field_name_less_50: 'Field name cannot exceed 50 characters',
     field_name_less_2_64: '2-64 characters',
@@ -2064,7 +2064,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     confirm_sync_field_tips: 'Synchronize field may cause edited field to change, please confirm',
     sync_success: 'Synchronize successfully',
     sync_success_1:
-      'Synchronize successfully, please re-execute data synchronization operation on current data set',
+      'Synchronize successfully, please re-execute data synchronization operation on current Dataset',
     row_permission: {
       type: 'Type',
       name: 'Name',
@@ -2101,19 +2101,19 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     row_permissions: 'Row permissions',
     column_permissions: 'Column permissions',
     row_column_permissions: 'Row and column permissions',
-    union_data: 'Associated data set',
-    add_union_table: 'Add associated data set',
-    edit_union: 'Edit associated data set',
+    union_data: 'Associated Dataset',
+    add_union_table: 'Add associated Dataset',
+    edit_union: 'Edit associated Dataset',
     union: 'Associate',
     edit_union_relation: 'Edit associated relationship',
     add_union_relation: 'Create a new associated relationship',
     field_select: 'Field selection',
     add_union_field: 'Add associated field',
     union_error: 'Associated relationship and associated field cannot be empty',
-    union_repeat: 'The current data set has been associated, please do not associate again',
+    union_repeat: 'The current Dataset has been associated, please do not associate again',
     preview_result: 'Preview results',
-    sql_ds_union_error: 'SQL data set in direct connection mode, does not support association',
-    api_data: 'API data set',
+    sql_ds_union_error: 'SQL Dataset in direct connection mode, does not support association',
+    api_data: 'API Dataset',
     copy: 'Copy',
     sync_log: 'Synchronize logs',
     field_edit_name: 'Field name',
@@ -2128,13 +2128,13 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     calc_tips: {
       tip1: 'The expression syntax should follow the calcite syntax. ',
       tip1_1:
-        'The expression syntax should follow the database syntax corresponding to the data source. ',
+        'The expression syntax should follow the database syntax corresponding to the Datasource. ',
       tip2: 'Aggregation operations are only valid in charts. Displayed as "-" during preview',
       tip3: 'The reference field starts with "[" and ends with "]"',
       tip4: 'Do not modify the reference content, otherwise the reference will fail',
       tip5: 'If you enter content in the same format as the reference field, it will be treated as the reference field',
       tip6: 'Please use the functions supported by Calcite to edit the expression',
-      tip7: 'Please use the database function corresponding to the current data source to edit the expression',
+      tip7: 'Please use the database function corresponding to the current Datasource to edit the expression',
       tip8: 'For Calcite functions, please refer to the documentation:'
     },
     batch_manage: 'Batch management',
@@ -2149,7 +2149,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     display: 'Show',
     row: 'Row',
     restricted_objects: 'Restricted objects',
-    select_data_source: 'Select data source',
+    select_data_source: 'Select Datasource',
     by_table_name: 'Search by table name',
     run_a_query: 'Run query',
     running_results: 'Run results',
@@ -2505,7 +2505,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
       select_module: 'select module',
       default_module: 'default module'
     },
-    datasource: 'data source',
+    datasource: 'Datasource',
     char_can_not_more_50: 'cannot exceed 50 characters',
     char_2_64: '2-64 characters',
     char_1_64: '1-64 characters',
@@ -2564,13 +2564,13 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     cannot_be_empty: 'The query condition or field cannot be empty',
     the_first_level: 'No need to configure the cascaded fields at the first level',
     configure_cascaded_fields:
-      'Use the same data set as the previous level, no need to configure the cascaded fields',
+      'Use the same Dataset as the previous level, no need to configure the cascaded fields',
     condition_cascade_configuration: 'Query condition cascade configuration',
     not_reverse_cascade: '(Only the upper level can cascade the lower level, not reverse cascade)',
     must_be_met:
       'Based on the query condition of the current query component, if cascade configuration is required, the following conditions must be met:',
     select_data_set:
-      '1. Display type: text drop-down component and number drop-down component; 2. Option value source: select data set',
+      '1. Display type: text drop-down component and number drop-down component; 2. Option value source: select Dataset',
     add_cascade_configuration: 'Add cascade configuration',
     add_cascade_condition: 'Add cascade condition',
     query_condition_level: 'Query condition level',
@@ -2591,14 +2591,14 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     cannot_be_empty_time: 'The default time cannot be empty!',
     range_please_reset: 'The default value exceeds the date filter range, please reset it! ',
     cannot_be_empty_input: 'Manual input - option value cannot be empty',
-    option_value_field: 'Please select the data set and option value field',
-    the_data_set: 'Please select the option value field of the data set',
+    option_value_field: 'Please select the Dataset and option value field',
+    the_data_set: 'Please select the option value field of the Dataset',
     cannot_be_empty_name: 'Field name cannot be empty',
     query_condition_setting: 'Query condition setting',
     query_condition: 'Query condition',
     chart_and_field: 'Select the associated chart and field',
     be_switched_to:
-      'Note: Automatic mode supports automatic association of fields with the same data set, which can be switched to',
+      'Note: Automatic mode supports automatic association of fields with the same Dataset, which can be switched to',
     to_automatic_again:
       'Custom mode. After switching to custom mode, it cannot be switched to automatic again! ',
     as_query_conditions: 'Anonymous field, cannot be set as a query condition',
@@ -2626,7 +2626,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     or_condition: 'Or condition',
     hide_condition_switch: 'Hide condition switch',
     cannot_be_displayed:
-      'The chart uses a different data set, Unable to display configuration items',
+      'The chart uses a different Dataset, Unable to display configuration items',
     component_cascade_configuration: 'Query component cascade configuration',
     time_type: 'Time type',
     start_at: 'Start at',
@@ -2647,6 +2647,16 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     column_name: 'Field name'
   },
   visualization: {
+    app_export: 'App Export',
+    app_name: 'App Name',
+    app_version: 'App Version',
+    app_required_version: 'Minimum DataEase Version',
+    description: 'Description',
+    new_dataset: 'New Dataset',
+    new_datasource: 'New Datasource',
+    select_dataset: 'Select Dataset',
+    select_datasource: 'Select Datasource',
+    picture_group: 'Picture Group',
     new: 'New',
     new_folder: 'New Folder',
     new_screen: 'New Data Screen',
@@ -2775,7 +2785,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     button_tips: 'Display zoom, export, and other floating buttons',
     display_auxiliary_grid: 'Display Auxiliary Grid',
     show_pop_button: 'Show Pop-up Area Query Button',
-    show_zoom_button: 'Show zoom, export, and other floating buttons',
+    show_zoom_button: 'Show floating buttons',
     keep_ratio: 'Keep Aspect Ratio',
     rotation_3d: '3D Rotation',
     keep_size: 'Adjust size while keeping internal component size',
@@ -2783,7 +2793,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     no_save_tips2: 'There are unsaved changes, restore now?',
     locate_tips: 'Locate to Center',
     new_tab: 'New Tab',
-    pop_area: 'Pop-up Area',
+    pop_area: 'Pop Up Area',
     refresh_view: 'Refresh View',
     view_group: 'Group',
     video: 'Video',
@@ -2950,7 +2960,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     market_network_tips:
       'To view templates from the template market, your server must be connected to the template market (https://templates.dataease.cn). Please check your network connection...',
     enter_name_tips: 'Please enter the dashboard name.',
-    apply_template: 'Apply Template',
+    apply_template: 'App Template',
     style_template: 'Style Template',
     all_type: 'All Categories',
     enter_template_name_tips: 'Search template name',
@@ -3306,17 +3316,17 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
       'For template download link, please contact the official template market',
     create_quickly: 'Quick Create',
     permission_to_create: 'Lack of creation permission',
-    new_using_template: 'Create Using Template',
+    new_using_template: 'Use Template',
     template_center: 'Template Center',
     view_all: 'View All',
     relevant_templates_found: 'No relevant templates found',
     last_edited_by: 'Last Edited By',
     last_edit_time: 'Last Edit Time',
-    big_data_screen: 'Big Data Screen',
+    big_data_screen: 'Data Screen',
     big_screen: 'Large Screen',
     dashboard: 'Dashboard',
     data_set: 'Dataset',
-    data_source: 'Data Source',
+    data_source: 'Datasource',
     recently_used: 'Recently Used',
     my_collection: 'My Favorites',
     relevant_content_found: 'No relevant content found',
@@ -3366,7 +3376,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
   },
   plugin: {
     'flag-all': 'All',
-    'flag-ds': 'Data source plug-in',
+    'flag-ds': 'Datasource plug-in',
     'flag-view': 'Chart plug-in',
     'flag-df': 'Data reporting plug-in'
   },
@@ -3377,8 +3387,8 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
   },
   setting_basic: {
     autoCreateUser: 'Third party automatically creates users',
-    dsIntervalTime: 'Data source detection time interval',
-    dsExecuteTime: 'Data source detection frequency',
+    dsIntervalTime: 'Datasource detection time interval',
+    dsExecuteTime: 'Datasource detection frequency',
     frontTimeOut: 'Request timeout (seconds)',
     logLiveTime: 'Operation log retention time (days)',
     thresholdLogLiveTime: 'Threshold alarm record retention time (days)',
@@ -3423,8 +3433,8 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
   },
   sync_datasource: {
     title: 'Data Connection Management',
-    source_ds: 'Source Data Source',
-    target_ds: 'Target Data Source',
+    source_ds: 'Source Datasource',
+    target_ds: 'Target Datasource',
     add_source_ds: '@:common.add@:sync_datasource.source_ds',
     add_target_ds: '@:common.add@:sync_datasource.target_ds',
     name: 'Name',
@@ -3436,25 +3446,25 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     operation: 'Operation',
     edit: 'Edit',
     delete: 'Delete',
-    confirm_batch_delete_target_ds: 'Are you sure you want to delete {0} target data sources? ',
-    confirm_batch_delete_source_ds: 'Are you sure you want to delete {0} source data sources? ',
+    confirm_batch_delete_target_ds: 'Are you sure you want to delete {0} target Datasources? ',
+    confirm_batch_delete_source_ds: 'Are you sure you want to delete {0} source Datasources? ',
     recently_created: 'Recently created',
     has_running_task_msg:
       'After the task in progress is completed, the configuration before the modification will continue to be used for synchronization, and the task needs to be manually saved again. ',
-    edit_datasource: 'Edit data source',
-    add_datasource: 'Create a new data source',
+    edit_datasource: 'Edit Datasource',
+    add_datasource: 'Create a new Datasource',
     config_info: 'Configuration information',
-    ds_type: 'Data source type',
+    ds_type: 'Datasource type',
     valid: 'Valid',
     invalid: 'Invalid',
     start_time: 'Start time',
     end_time: 'End time',
-    ds_delete_confirm: 'Are you sure you want to delete this data source? ',
-    datasource: 'Data source',
+    ds_delete_confirm: 'Are you sure you want to delete this Datasource? ',
+    datasource: 'Datasource',
     select_folder: 'Please select a folder',
-    sync_ds: 'Synchronize data source',
-    sync_to_datasource: 'Will be synchronized to the data source list for data preparation',
-    input_ds_name: 'Please enter the data source name',
+    sync_ds: 'Synchronize Datasource',
+    sync_to_datasource: 'Will be synchronized to the Datasource list for data preparation',
+    input_ds_name: 'Please enter the Datasource name',
     folder: 'The folder to which it belongs',
     cancel: 'Cancel',
     save: 'Save',
@@ -3462,7 +3472,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     prev: 'Previous step',
     validate: 'Validation',
     validate_success: 'Validation success',
-    select_type: 'Please select the data source type',
+    select_type: 'Please select the Datasource type',
     extra_params: 'Additional JDBC connection string',
     remark: 'Remarks',
     input_name: 'Please enter a name',
@@ -3470,8 +3480,8 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     input_limit_2_50: '2-50 characters',
     input_limit_2_64: '2-64 characters',
     input_limit_1_64: '1-64 characters',
-    data_source_configuration: 'Data source configuration',
-    data_source_table: 'Data source table',
+    data_source_configuration: 'Datasource configuration',
+    data_source_table: 'Datasource table',
     auth_method: 'Authentication method',
     passwd: 'Username and password',
     kerbers_info:
@@ -3500,7 +3510,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     please_input_be_port: 'Please enter BE HTTP port',
     please_input_be_ip: 'Please enter BE IP address',
     please_input_fe_port: 'Please enter FE HTTP port',
-    modify: 'Edit data source',
+    modify: 'Edit Datasource',
     validate_failed: 'Validation failed',
     oracle_connection_type: 'Service name/SID',
     oracle_sid: 'SID',
@@ -3513,9 +3523,9 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     please_choose_charset: 'Please select database character set',
     please_choose_targetCharset: 'Please select target character set',
     edit_datasource_msg:
-      'Modifying the data source information may make the data set under the data source unavailable. Confirm the modification? ',
-    repeat_datasource_msg: 'Data source information with the same configuration already exists, ',
-    in_valid: 'Invalid data source',
+      'Modifying the Datasource information may make the Dataset under the Datasource unavailable. Confirm the modification? ',
+    repeat_datasource_msg: 'Datasource information with the same configuration already exists, ',
+    in_valid: 'Invalid Datasource',
     initial_pool_size: 'Initial number of connections',
     min_pool_size: 'Minimum number of connections',
     max_pool_size: 'Maximum number of connections',
@@ -3547,7 +3557,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
   },
   sync_summary: {
     summary: 'Overview',
-    data_source_number: 'Number of data sources',
+    data_source_number: 'Number of Datasources',
     task_number: 'Number of tasks',
     execution_count: 'Number of executions',
     execution_results_in_the_past_7_days: 'Executions in the past 7 days',
@@ -3815,14 +3825,14 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     permission: 'Filling permission',
     enable: 'Enable',
     enable_hint:
-      'After data filling is enabled, the form data can be stored in the data source. Once enabled, it is not allowed to be closed later. ',
+      'After data filling is enabled, the form data can be stored in the Datasource. Once enabled, it is not allowed to be closed later. ',
     new_folder: 'New folder',
     form_manage: 'Form management',
     my_job: 'My report',
     disable_data_fill_hint:
       'After closing data filling, the form data will fail to submit. Are you sure you want to close it? ',
     enable_data_fill_hint:
-      'After enabling, it is allowed to create a new table in the data source database and store the form data in the table',
+      'After enabling, it is allowed to create a new table in the Datasource database and store the form data in the table',
     todo: 'To be filled',
     finished: 'Filled',
     expired: 'Expired',
@@ -3891,7 +3901,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
       commit_rule_settings: 'Update rule settings',
       commit_rule_set: 'Set',
       folder: 'Folder',
-      datasource: 'Data source',
+      datasource: 'Datasource',
       table: 'Database table',
       creator: 'Creator',
       createTime: 'Creation time',
@@ -3919,7 +3929,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
       set_multiple: 'Allow multiple selections',
       use_datetime: 'Use date and time',
       custom: 'Custom',
-      use_datasource: 'Bind data source',
+      use_datasource: 'Bind Datasource',
       bind_column: 'Bind field',
       bind_complete: 'Already bound',
       option_value: 'Option value',
@@ -3929,7 +3939,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
       form_components_cannot_null: 'Please add form components',
       option_list_cannot_empty: 'Option value cannot be empty',
       option_list_datasource_cannot_empty:
-        'Option value binding data source configuration cannot be empty',
+        'Option value binding Datasource configuration cannot be empty',
       component_setting_error: 'Component setting error',
       table_name: 'Database table name',
       form_column: 'Form field',
@@ -4081,8 +4091,8 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
   },
   relation: {
     no_permission: 'No view permission',
-    datasource: 'Data source',
-    dataset: 'Data set',
+    datasource: 'Datasource',
+    dataset: 'Dataset',
     dashboard: 'Dashboard',
     dataV: 'Data screen',
     analysis: 'Lineage analysis',
@@ -4092,8 +4102,8 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     list_chart: 'List view',
     mind_map: 'Mind map',
     index: 'Serial number',
-    datasource_name: 'Data source name',
-    dataset_name: 'Data source set name',
+    datasource_name: 'Datasource name',
+    dataset_name: 'Datasource set name',
     dashboard_name: 'Dashboard name',
     dataV_name: 'Data dashboard name',
     retract: 'Collapse',
@@ -4169,9 +4179,9 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     resource: 'Resource',
     view_association: 'View blood relationship',
     quick_sync_tips:
-      'All dashboards, data screens, data sets, and data sources will be migrated to the [Migrate Resources] folder. ',
+      'All dashboards, data screens, data sets, and Datasources will be migrated to the [Migrate Resources] folder. ',
     batch_sync_tips:
-      '1. Dashboards, data screens, data sets, and data sources related to the selected resources will also be migrated to the [Migrate Resources] folder of the corresponding resources;',
+      '1. Dashboards, data screens, data sets, and Datasources related to the selected resources will also be migrated to the [Migrate Resources] folder of the corresponding resources;',
     batch_sync_tips1:
       '2. Migrating a folder will also migrate the subfolders and resources under the folder. ',
     quick_del_confirm: 'Are you sure you want to delete all free resources? ',
@@ -4188,12 +4198,12 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     del_tips_dataset:
       'Deleting a dataset will cause the related datasets to become invalid. Are you sure you want to delete it? ',
     del_tips_datasource:
-      'Some datasets are using these data sources. After deletion, the datasets will be unavailable. Are you sure you want to delete it? ',
+      'Some datasets are using these Datasources. After deletion, the datasets will be unavailable. Are you sure you want to delete it? ',
     single_del_confirm: 'Are you sure you want to delete this {0}? ',
     single_del_tips_dataset:
       'This dataset has the following blood relationship. Deleting it will cause the related views to become invalid. Are you sure you want to delete it? ',
     single_del_tips_datasource:
-      'There are {0} datasets using this data source. After deletion, the dataset will be unavailable. Are you sure you want to delete it? ',
+      'There are {0} datasets using this Datasource. After deletion, the dataset will be unavailable. Are you sure you want to delete it? ',
     folder: 'Folder',
     del_folder_tips:
       'After deletion, all resources under this folder will be deleted. Please operate with caution. '
diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts
index 9ec10d0581..ccb1530fd6 100644
--- a/core/core-frontend/src/locales/tw.ts
+++ b/core/core-frontend/src/locales/tw.ts
@@ -2585,6 +2585,16 @@ export default {
     column_name: '欄位名稱'
   },
   visualization: {
+    app_export: '應用導出',
+    app_name: '應用名稱',
+    app_version: '應用版本號',
+    app_required_version: 'DataEase最低版本號',
+    description: '描述',
+    new_dataset: '新建數據集',
+    new_datasource: '新建數據源',
+    select_dataset: '選擇數據集',
+    select_datasource: '選擇數據源',
+    picture_group: '圖片組',
     new: '新建',
     new_folder: '新建文件夾',
     new_screen: '新建數據大屏',
@@ -2774,7 +2784,6 @@ export default {
     selected_view: '已選圖表',
     used_dataset: '所用數據集',
     to_select_view: '選擇圖表',
-    show_selected_only: '僅看已選',
     same_dataset: '同數據集',
     diff_dataset: '不同數據集',
     no_available_view: '暫無可用圖表',
@@ -2830,7 +2839,6 @@ export default {
     border_color_setting: '邊框配色',
     unpublished_tips: '取消發佈後，該儀表板不能被查看。確定要取消發佈？',
     position_adjust_component: '位置調整',
-    active_font_size: '選中字體大小',
     enable_carousel: '啟用輪播',
     switch_time: '切換時間',
     position_adjust: '位置',
@@ -2902,7 +2910,6 @@ export default {
     refresh_frequency: '刷新頻率',
     card_color_matching: '卡片配色',
     table_color_matching: '表格配色',
-    background_color: '背景顏色',
     level: '層級',
     enlarge: '放大',
     panel_style: '儀表板樣式',
diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts
index c8742a1064..508b17aede 100644
--- a/core/core-frontend/src/locales/zh-CN.ts
+++ b/core/core-frontend/src/locales/zh-CN.ts
@@ -2587,6 +2587,16 @@ export default {
     column_name: '字段名称'
   },
   visualization: {
+    app_export: '应用导出',
+    app_name: '应用名称',
+    app_version: '应用版本号',
+    app_required_version: 'DataEase最低版本号',
+    description: '描述',
+    new_dataset: '新建数据集',
+    new_datasource: '新建数据源',
+    select_dataset: '选择数据集',
+    select_datasource: '选择数据源',
+    picture_group: '图片组',
     new: '新建',
     new_folder: '新建文件夹',
     new_screen: '新建数据大屏',
@@ -2776,7 +2786,6 @@ export default {
     selected_view: '已选图表',
     used_dataset: '所用数据集',
     to_select_view: '选择图表',
-    show_selected_only: '仅看已选',
     same_dataset: '同数据集',
     diff_dataset: '不同数据集',
     no_available_view: '暂无可用图表',
@@ -2832,7 +2841,6 @@ export default {
     border_color_setting: '边框配色',
     unpublished_tips: '取消发布后，该仪表板不能被查看。确定要取消发布？',
     position_adjust_component: '位置调整',
-    active_font_size: '选中字体大小',
     enable_carousel: '启用轮播',
     switch_time: '切换时间',
     position_adjust: '位置',
diff --git a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts
index 6ff60705e8..acf9e7ad74 100644
--- a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts
+++ b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts
@@ -25,6 +25,8 @@ import { get, set } from 'lodash-es'
 import { viewFieldTimeTrans } from '@/utils/viewUtils'
 import { useAppearanceStoreWithOut } from '@/store/modules/appearance'
 import { ElMessage } from 'element-plus-secondary'
+import { useI18n } from '@/hooks/web/useI18n'
+const { t } = useI18n()
 
 export const dvMainStore = defineStore('dataVisualization', {
   state: () => {
@@ -1422,7 +1424,8 @@ export const dvMainStore = defineStore('dataVisualization', {
       }
     },
     createInit(dvType, resourceId?, pid?, watermarkInfo?, preName) {
-      const optName = dvType === 'dashboard' ? '新建仪表板' : '新建数据大屏'
+      const optName =
+        dvType === 'dashboard' ? t('visualization.new_dashboard') : t('visualization.new_screen')
       const name = preName ? preName : optName
       this.dvInfo = {
         dataState: 'prepare',
diff --git a/core/core-frontend/src/views/chart/components/editor/dataset-select/DatasetSelect.vue b/core/core-frontend/src/views/chart/components/editor/dataset-select/DatasetSelect.vue
index 6148b9d127..2aee5713cc 100644
--- a/core/core-frontend/src/views/chart/components/editor/dataset-select/DatasetSelect.vue
+++ b/core/core-frontend/src/views/chart/components/editor/dataset-select/DatasetSelect.vue
@@ -19,6 +19,7 @@ import treeSort from '@/utils/treeSortUtils'
 const dvMainStore = dvMainStoreWithOut()
 const { wsCache } = useCache('localStorage')
 const userStore = useUserStoreWithOut()
+const { t } = useI18n()
 
 const props = withDefaults(
   defineProps<{
@@ -45,6 +46,16 @@ const orgCheck = ref(true)
 
 const datasetTree = ref<Tree[]>([])
 
+const selectSource =
+  props.sourceType === 'datasource'
+    ? t('visualization.select_datasource')
+    : t('visualization.select_dataset')
+
+const newSource =
+  props.sourceType === 'datasource'
+    ? t('visualization.new_datasource')
+    : t('visualization.new_dataset')
+
 const sourceName = computed(() =>
   props.sourceType === 'datasource' ? t('visualization.datasource') : t('visualization.dataset')
 )
@@ -90,10 +101,7 @@ const dsSelectProps = {
   isLeaf: node => !node.children?.length
 }
 
-const { t } = useI18n()
-
 const formRef = ref<FormInstance>()
-
 const searchStr = ref<string>()
 
 watch(searchStr, val => {
@@ -276,7 +284,7 @@ onMounted(() => {
               class="data-set-dark"
               @focus="handleFocus"
               :disabled="disabled"
-              :placeholder="t('common.selectText') + sourceName"
+              :placeholder="selectSource"
             >
               <template #suffix>
                 <el-icon class="input-arrow-icon" :class="{ reverse: _popoverShow }">
@@ -354,7 +362,7 @@ onMounted(() => {
           <el-footer v-if="!isDataEaseBi">
             <div class="footer-container">
               <el-button type="primary" :icon="Plus" link class="add-btn" @click="addDataset">
-                新建{{ sourceName }}
+                {{ newSource }}
               </el-button>
             </div>
           </el-footer>
diff --git a/core/core-frontend/src/views/chart/components/editor/util/chart.ts b/core/core-frontend/src/views/chart/components/editor/util/chart.ts
index 56f706ae8b..d5e019e150 100644
--- a/core/core-frontend/src/views/chart/components/editor/util/chart.ts
+++ b/core/core-frontend/src/views/chart/components/editor/util/chart.ts
@@ -1527,14 +1527,14 @@ export const CHART_TYPE_CONFIGS = [
         render: 'custom',
         category: 'quota',
         value: 'rich-text',
-        title: t('visualization.rich-text'),
+        title: t('visualization.rich_text'),
         icon: 'rich-text'
       },
       {
         render: 'custom',
         category: 'quota',
         value: 'picture-group',
-        title: t('visualization.picture-group'),
+        title: t('visualization.picture_group'),
         icon: 'picture-group'
       }
     ]
diff --git a/core/core-frontend/src/views/common/DeResourceTree.vue b/core/core-frontend/src/views/common/DeResourceTree.vue
index 1d2d37d55e..26c75ee119 100644
--- a/core/core-frontend/src/views/common/DeResourceTree.vue
+++ b/core/core-frontend/src/views/common/DeResourceTree.vue
@@ -76,7 +76,8 @@ const anyManage = ref(false)
 const { curCanvasType, showPosition } = toRefs(props)
 const resourceLabel =
   curCanvasType.value === 'dataV' ? t('work_branch.big_data_screen') : t('work_branch.dashboard')
-const newResourceLabel = t('visualization.new') + resourceLabel
+const newResourceLabel =
+  curCanvasType.value === 'dataV' ? t('visualization.new_screen') : t('visualization.new_dashboard')
 const selectedNodeKey = ref(null)
 const filterText = ref(null)
 const expandedArray = ref([])
diff --git a/core/core-frontend/src/views/workbranch/index.vue b/core/core-frontend/src/views/workbranch/index.vue
index 91a2c5c37b..75c03f508a 100644
--- a/core/core-frontend/src/views/workbranch/index.vue
+++ b/core/core-frontend/src/views/workbranch/index.vue
@@ -569,8 +569,8 @@ loadShareBase()
         justify-content: space-between;
         flex-wrap: wrap;
         .item {
-          padding: 16px;
-          width: 148px;
+          padding: 12px;
+          width: 150px;
           margin-top: 16px;
           border-radius: 4px;
           border: 1px solid #dee0e3;